Update to 2.4.3

3 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34c2c614bc1a..6744bcf9bbc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = alice
 	pkgdesc = An educational software that teaches students computer programming in a 3D environment
-	pkgver = 2.4.2
-	pkgrel = 2
+	pkgver = 2.4.3
+	pkgrel = 1
 	url = http://www.alice.org/
 	arch = i686
 	arch = x86_64
 	license = custom
-	depends = bin32-jre
-	depends = lib32-mesa
+	depends = java-environment
+	depends = mesa
 	options = !emptydirs
-	source = http://www.alice.org/downloads/2.4/Alice2.4.tar.gz
+	source = http://www.alice.org/downloads/2.4/Alice2_4e.tar.gz
 	source = alice
 	source = alice.png
 	source = alice.desktop
 	source = LICENSE
-	sha512sums = 55ce61d45ca08364f2476134de87bac54dba755444d8d86bb13c7bd280a6dfcf12b40e6ed12c2c0b0c8b011e4703c73fea43e99cd29ba87c3ceb5188989a9013
-	sha512sums = b92998c9baffc9b0a766c649fe52b2c63a88d752cc73d8d65e051783b090b307932135024672162392ba7c0b49f4c3269111b9e9f3b6e62806781c547b22529d
+	sha512sums = 7caf72e0550b3dfcf4a5b15118c495b5267f86ea7e975f692242fc794276c7b98833e6b304f8240d741d15fd33d8397f30d405709af86117ed9bdb5131790664
+	sha512sums = 2401cc32d57a3a531c8670ff97af5151857ea7cf4555dc5c231e9fcc0a3a14b7fd1b1a7b5fd7c141a5bc1d2823ff3aab901e28248be192a15f616434a86d64b2
 	sha512sums = 7d3473033a44b964c7a25f7387363a76fe3cccccc18732f72c6308b43c79dd7f2a546465e35fbd8625e5d68287f54807a1a2d29b9ed67793b9cc5a3f24261264
 	sha512sums = 8db4e9a8c2221b26dc9c0ce850206c9646b343cc839c46d9a21e43f87e0298cac97a1a362f22bdbef2d05329fb7c9662d6575560bc30c2cac9e304093cb881ba
 	sha512sums = 7cf223bcdfb4929c4c4f89ccbd14a49101c742e646a841d64eee6dd7b4c8c4917e0ab7e3bd59e800e4eb3ab266b3fc4312df7b4deb448504ce021af79b4cd1eb
diff --git a/PKGBUILD b/PKGBUILD
index 74fc13255d9a..20e8e8bbed1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,22 @@
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 pkgname=alice
 _realname=Alice
-pkgver=2.4.2
-pkgrel=2
+pkgver=2.4.3
+_pkgver=2_4e
+pkgrel=1
 pkgdesc="An educational software that teaches students computer programming in a 3D environment"
 arch=('i686' 'x86_64')
 url="http://www.alice.org/"
 license=("custom")
-depends=('bin32-jre' 'lib32-mesa')
+depends=('java-environment' 'mesa')
 options=(!emptydirs)
-source=("http://www.alice.org/downloads/2.4/${_realname}${pkgver//.2/}.tar.gz" \
+source=("http://www.alice.org/downloads/2.4/${_realname}${_pkgver}.tar.gz" \
   "${pkgname}" \
   "${pkgname}.png" \
 	"${pkgname}.desktop" \
 	"LICENSE")
-sha512sums=('55ce61d45ca08364f2476134de87bac54dba755444d8d86bb13c7bd280a6dfcf12b40e6ed12c2c0b0c8b011e4703c73fea43e99cd29ba87c3ceb5188989a9013'
-            'b92998c9baffc9b0a766c649fe52b2c63a88d752cc73d8d65e051783b090b307932135024672162392ba7c0b49f4c3269111b9e9f3b6e62806781c547b22529d'
+sha512sums=('7caf72e0550b3dfcf4a5b15118c495b5267f86ea7e975f692242fc794276c7b98833e6b304f8240d741d15fd33d8397f30d405709af86117ed9bdb5131790664'
+            '2401cc32d57a3a531c8670ff97af5151857ea7cf4555dc5c231e9fcc0a3a14b7fd1b1a7b5fd7c141a5bc1d2823ff3aab901e28248be192a15f616434a86d64b2'
             '7d3473033a44b964c7a25f7387363a76fe3cccccc18732f72c6308b43c79dd7f2a546465e35fbd8625e5d68287f54807a1a2d29b9ed67793b9cc5a3f24261264'
             '8db4e9a8c2221b26dc9c0ce850206c9646b343cc839c46d9a21e43f87e0298cac97a1a362f22bdbef2d05329fb7c9662d6575560bc30c2cac9e304093cb881ba'
             '7cf223bcdfb4929c4c4f89ccbd14a49101c742e646a841d64eee6dd7b4c8c4917e0ab7e3bd59e800e4eb3ab266b3fc4312df7b4deb448504ce021af79b4cd1eb')
@@ -25,13 +26,13 @@ sha512sums=('55ce61d45ca08364f2476134de87bac54dba755444d8d86bb13c7bd280a6dfcf12b
 prepare()
 {
 
-echo -n 'python.cachedir='"${HOME}"'/.jython-cache' >> ${srcdir}/${_realname}\ ${pkgver//.2/}/Required/jython-2.1/registry
+echo -n 'python.cachedir='"${HOME}"'/.jython-cache' >> ${srcdir}/${_realname}\ ${pkgver//.3/}/Required/jython-2.1/registry
 
 }
 
 package()
 {
-	cd ${srcdir}/${_realname}\ ${pkgver//.2/}/Required
+	cd ${srcdir}/${_realname}\ ${pkgver/.3/}/Required
 
 	# Directories
 	install -d ${pkgdir}/opt/${pkgname}/
@@ -55,3 +56,4 @@ package()
 }
 
 # vim:set ts=2 sw=2 et:
+
diff --git a/alice b/alice
index 05ed89e5decb..195c9ce66564 100644
--- a/alice
+++ b/alice
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-ARCH=`uname -m`
-
-if [ ${ARCH} == 'x86_64' ]; then
-  export PATH="/usr/lib32/jvm/default/bin/:$PATH"
-fi
-
 cd /opt/alice/
 ./run-alice
 cd -