fix deps, and source useflag support

Package-Manager: portage-2.0.51.22-r1

10 files changed, 50 insertions, 52 deletions

diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog
index 650b828eadbe..e10e0857643c 100644
--- a/dev-java/javacup/ChangeLog
+++ b/dev-java/javacup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/javacup
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.8 2005/04/26 01:42:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.9 2005/07/09 16:03:43 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> javacup-0.10k.ebuild:
+  fix deps, and source useflag support
 
   26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> javacup-0.10k.ebuild:
   Stable on sparc
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 31e20736b0b9..7d247d7abca1 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 11313d8083a4cf281b7caf5e7c2265ad ChangeLog 1030
-MD5 843807a5e0a3a41332f6c798af77b6ac javacup-0.10k.ebuild 888
+MD5 0cbcb6bb24d34a5396a7ac6d91d0b33c javacup-0.10k.ebuild 971
+MD5 7634881ecde94adec7eaa89b3b82f50f ChangeLog 1141
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 908c09cfed6120fc09504305319af259 files/digest-javacup-0.10k 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbZyOKRy60XGEcJIRAijJAKCd7OGEJ8XLhsbHYsbLMaVX5jWdFgCgmpFc
-8eV2NiW7RCdrNz2Z5rDnvsw=
-=IH+x
------END PGP SIGNATURE-----
diff --git a/dev-java/javacup/javacup-0.10k.ebuild b/dev-java/javacup/javacup-0.10k.ebuild
index 58c11e70d4dd..2ddbad320ece 100644
--- a/dev-java/javacup/javacup-0.10k.ebuild
+++ b/dev-java/javacup/javacup-0.10k.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.10k.ebuild,v 1.8 2005/04/26 01:42:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.10k.ebuild,v 1.9 2005/07/09 16:03:43 axxo Exp $
 
 inherit java-pkg
 
@@ -11,9 +11,10 @@ SRC_URI="http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc amd64 sparc ppc64"
-IUSE=""
-DEPEND="virtual/jdk"
-RDEPEND="virtual/jre"
+IUSE="source"
+DEPEND=">=virtual/jdk-1.3
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
 
 S=${WORKDIR}
 
@@ -32,4 +33,5 @@ src_install() {
 	java-pkg_dojar ${PN}.jar
 	dodoc CHANGELOG README LICENSE
 	dohtml manual.html
+	use source && java-pkg_dosrc java_cup
 }
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 6d69a4c33f9e..b5ab6de9626e 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/junit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.19 2005/01/26 21:47:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.20 2005/07/09 16:05:44 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> junit-3.8.1-r1.ebuild:
+  fix deps, and source useflag support
 
   26 Jan 2005; Markus Rothe <corsair@gentoo.org> junit-3.8.1-r1.ebuild:
   Stable on ppc64
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index b95a2a7f7a25..1d6b4e398740 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,4 @@
-MD5 707f8e7750cfec99b61b83f4d32fe48d ChangeLog 3039
-MD5 9b9443fcda36b8dc6e65e71c96020c92 junit-3.8.1-r1.ebuild 1079
+MD5 b4540c90229e2129b69de2b8fc6a1cb7 junit-3.8.1-r1.ebuild 1148
+MD5 f0dcbf2fb85f8500eabbc852abe28c5f ChangeLog 3151
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 bab94fdc8a6c2abf20e0f2cee4849a4e files/digest-junit-3.8.1-r1 59
diff --git a/dev-java/junit/junit-3.8.1-r1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild
index 37bacd3ad19e..91e1cc8437dd 100644
--- a/dev-java/junit/junit-3.8.1-r1.ebuild
+++ b/dev-java/junit/junit-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.6 2005/01/26 21:47:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.7 2005/07/09 16:05:44 axxo Exp $
 
 inherit java-pkg
 
@@ -12,27 +12,29 @@ HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
 DEPEND=">=virtual/jdk-1.3
 	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )
 	>=dev-java/ant-core-1.4
 	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	unzip src.jar
+	rm -f junit.jar
 }
 
 src_compile() {
-	rm -f junit.jar
 	local antflags="dist"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "failed to build"
 }
 
 src_install() {
+	use source && java-pkg_dosrc junit
 	cd ${NP}
 	java-pkg_dojar junit.jar
 	dodir /usr/share/ant-core/lib
diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index cfbaa17e4a67..3b6871b3b7a7 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.26 2005/07/01 23:03:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.27 2005/07/09 16:06:00 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r6.ebuild:
+  fix deps, and source useflag support
 
   01 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r6.ebuild:
   fix 94099: unpackable class. 97665: use doc useflag for javadocs
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 9a0fbf1767c0..71c808fe52a5 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ff58672027e349649db700ba9544c874 jython-2.1-r6.ebuild 2190
-MD5 6945f760f0c111fd83e79bb9eef62d62 ChangeLog 3386
+MD5 95020c66e2d812f055881397719914b6 jython-2.1-r6.ebuild 2201
+MD5 30f1b7a72225be1ec9c316a2d975fe49 ChangeLog 3497
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
 MD5 b271f5441bb93491ead9f78332393451 files/jython 363
 MD5 d38ea464f1cad146456318d7ee87319a files/digest-jython-2.1-r6 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxcvk/rLF9B432nYRAjO0AJ9qrzuJaUwiDrCyCe0wHnnCh9F20gCeMAP6
-V0OwY304FwCyiRbslUQkk98=
-=QaAV
------END PGP SIGNATURE-----
diff --git a/dev-java/jython/jython-2.1-r6.ebuild b/dev-java/jython/jython-2.1-r6.ebuild
index ea0c3fb73b48..e66fd0f72e9b 100644
--- a/dev-java/jython/jython-2.1-r6.ebuild
+++ b/dev-java/jython/jython-2.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r6.ebuild,v 1.2 2005/07/01 23:03:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r6.ebuild,v 1.3 2005/07/09 16:06:00 axxo Exp $
 
 inherit java-pkg
 
@@ -12,13 +12,16 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="JPython"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-IUSE="readline jikes doc"
+IUSE="readline jikes source doc"
 # servlet
 
-DEPEND=">=virtual/jdk-1.2
+RDEPEND=">=virtual/jre-1.2
 	readline? ( >=dev-java/libreadline-java-0.8.0 )
 	jikes? ( >=dev-java/jikes-1.18 )"
 #	servlet? ( >=net-www/tomcat-5.0 )
+DEPEND=">=virtual/jdk-1.2
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 src_compile() {
 	javac=$(java-config -c)
@@ -26,28 +29,28 @@ src_compile() {
 		java=$(which jikes)
 	fi
 
-	local cp=".:${CLASSPATH}"
+	local cp="."
 	local exclude=""
 
 	if use readline ; then
-		cp=${cp}:$(java-config -p libreadline-java)
+		cp=${cp}:$(java-pkg_getjars libreadline-java)
 	else
 		exclude="${exclude} ! -name ReadlineConsole.java"
 	fi
 
 	#if use servlet; then
-	#	cp=${cp}:$(java-config -p servlet)
+	#	cp=${cp}:$(java-pkg_getjars servlet)
 	#else
 		exclude="${exclude} ! -name PyServlet.java"
 	#fi
 
 	find org -name "*.java" ${exclude} | xargs ${javac} -source 1.3 -classpath ${cp} -nowarn || die "Failed to compile"
 
-	find org -name "*.class" | xargs jar cf jython-${PV}.jar
+	find org -name "*.class" | xargs jar cf ${PN}.jar
 }
 
 src_install() {
-	java-pkg_newjar jython-${PV}.jar ${PN}.jar || die "install failed"
+	java-pkg_dojar ${PN}.jar
 
 	dodoc README.txt NEWS ACKNOWLEDGMENTS
 	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
@@ -57,12 +60,14 @@ src_install() {
 	dodir /usr/share/jython/cachedir
 	chmod a+rw ${D}/usr/share/jython/cachedir
 
-	cp -R Lib ${D}/usr/share/${PN}/
-	cp -R Demo ${D}/usr/share/${PN}/
+	rm Demo/jreload/example.jar
+	insinto /usr/share/${PN}
+	doins -r Lib Demo registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r Tools/*
 
-	dodir /usr/share/${PN}/tools/
-	cp -R Tools/* ${D}/usr/share/${PN}/tools/
-	cp registry ${D}/usr/share/${PN}/
+	use source && java-pkg_dosrc com org
 }
 
 pkg_postinst() {
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index f062f15775f6..067a5a79336c 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,4 +1,4 @@
-MD5 7f09055714cd18e5d5396356a748e28a ChangeLog 2131
+MD5 d23a5fe5d6cc30e0637852340f25b6d4 xom-1.0-r1.ebuild 1473
+MD5 56dd165e66eb81ab7f51accc5c9c0679 ChangeLog 2224
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7b95bd71c91fdca3c901610113cc3091 xom-1.0-r1.ebuild 1553
 MD5 deb2f00f818f16deba73b81503a0a169 files/digest-xom-1.0-r1 60