Fixed a syntax error and better java deps

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 21 insertions, 17 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 77a6ec6da231..70e1ed64dafe 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/yacas
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.21 2008/08/06 20:51:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.22 2008/11/06 12:07:53 bicatali Exp $
+
+  06 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> yacas-1.2.2.ebuild:
+  Fixed a syntax error and better java deps
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 03debf34ac26..de4cb0c104bf 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -8,13 +8,13 @@ DIST yacas-1.0.63.tar.gz 2145848 RMD160 7a17c88756874a245eba7961d19b73d4fc45a840
 DIST yacas-1.2.2.tar.gz 1203303 RMD160 6c49ca60e4f1f92e7d30e8d91b6126e55d77321b SHA1 8e753c22c207a5aa5e9fd2a9d519605d5b73d5b9 SHA256 e8345de267ed41790128649e3ff5ab7be7d0a2fa6e721b82e0a552c04775aab6
 EBUILD yacas-1.0.61.ebuild 1626 RMD160 68dfe945b22d2b62fb8a5b91cb36ab02fed9a6e9 SHA1 f0472274e4594556624464906ab0ace5a3d0e6ae SHA256 d8e4997f464c6d5fc9f7accef64698c8605afbcf3538899f97d6fdd3440e02bc
 EBUILD yacas-1.0.63.ebuild 1811 RMD160 0c4b6a36ca3d402a1d5922521e596c29ec4b486b SHA1 4937fecd299494c7a30f7ae833e2063591609f8e SHA256 ae2f144af0ac7d2e842df1c61b18c99e7b1ffee4834869b28e7283d2429ac141
-EBUILD yacas-1.2.2.ebuild 1264 RMD160 8aba5a5bea1dc8a630942213db4e34cff0066ca0 SHA1 ab74e6623529c282004384860c09fa75c4b1c0ab SHA256 414b20a3f81761b53d28e2154e38063d6fce1a1cbe654262b8b559ef8a44e8d8
-MISC ChangeLog 5132 RMD160 57bd8459383d1346f9e1f532289747e29953da46 SHA1 9dee6465b9a7a0ed31f268b1ecab5c30dda8ce98 SHA256 4d63c7e913c6240cca1dc486b47b2980a1c93fd53ab05505a2d97a3089d68af2
-MISC metadata.xml 640 RMD160 450ab695c0f3d78707c4630850e8bb65641292e8 SHA1 80db3e9b2d6bd3fd9dbf11ca718ae4385b072c5c SHA256 c9694478ca81700e08b41497e26a505c4f6da8a9822623a463f0d07f29c8c7bd
+EBUILD yacas-1.2.2.ebuild 1309 RMD160 19ac57df2354acc3ff63dde93dfd89eabd8b184c SHA1 93a68027ef359ea7715a3532bbb56bdfbe76a0f8 SHA256 12981b8dce0a79143f1b768d2a9f0dba788dafc056afaad2ac95211e568ac43b
+MISC ChangeLog 5257 RMD160 3692872c46f895e9b57cb4955b0f4bee38d09841 SHA1 17d031b6e3c16dc39888f7ccef7c5f634feb4df5 SHA256 bb7427941cea11f2fda6cbbc877970f082ede023ef04f4653249b12a83f284f6
+MISC metadata.xml 652 RMD160 271e435f003d4c7587aeabae1a79db2f6941dae3 SHA1 7f0d2103397e65a72c70c3c32ac05a363ff31e83 SHA256 1a7b21bc7f24f77ac3c15e96bdf2f96390aca1ab85387bedcd4caaa7b61017a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiaDugACgkQOeoy/oIi7uxbBACggZwioJcUmr7tQl5iYvIfa6u0
-m34AoOWoRkhXEC3xraFMXRC5IzPkU85z
-=b/We
+iEYEARECAAYFAkkS3iIACgkQ1ycZbhPLE2BNKwCfbPwCMgFT21ARvrkw4PeE9tu6
+C4IAnRfWHsCsmo7Xb5Ww8DGRlJWYme8R
+=ucqF
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index 6e77c599070e..011ad83be5d3 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 <herd>sci-mathematics</herd>
 <longdescription lang="en">
-Yacas (Yet Another Computer Algebra System) is a small and highly
-flexible general-purpose computer algebra language. The syntax uses a
-infix-operator grammar parser. The distribution contains a small
-library of mathematical functions, but its real strength is in the
-language in which you can easily write your own symbolic manipulation
-algorithms.
+  Yacas (Yet Another Computer Algebra System) is a small and highly
+  flexible general-purpose computer algebra language. The syntax uses a
+  infix-operator grammar parser. The distribution contains a small
+  library of mathematical functions, but its real strength is in the
+  language in which you can easily write your own symbolic manipulation
+  algorithms.
 </longdescription>
 <use>
   <flag name='server'>Build the network server version</flag>
diff --git a/sci-mathematics/yacas/yacas-1.2.2.ebuild b/sci-mathematics/yacas/yacas-1.2.2.ebuild
index bc5e9c3cd9cc..a2373c340103 100644
--- a/sci-mathematics/yacas/yacas-1.2.2.ebuild
+++ b/sci-mathematics/yacas/yacas-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.2 2008/04/19 09:49:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.3 2008/11/06 12:07:53 bicatali Exp $
 
 inherit eutils java
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="doc java server"
 
-DEPEND="java? ( virtual/jdk )"
+RDEPEND="java? ( >=virtual/jdk-1.6 )"
+DEPEND="java? ( >=virtual/jre-1.6 )"
 
 src_unpack() {
 	unpack ${A}
@@ -43,7 +44,7 @@ src_install() {
 		insinto /usr/share/${PN}
 		doins yacas.jar hints.txt yacasconsole.html || die "doins java interface failed"
 		echo "#!/bin/sh" > jyacas
-		echo "java -jar /usr/share/${PN}/java.jar" >> jyacas
+		echo "java -jar /usr/share/${PN}/yacas.jar" >> jyacas
 		exeinto /usr/bin
 		doexe jyacas
 	fi