fix deps, small cleanups, add source useflag support

Package-Manager: portage-2.0.51.22-r1

5 files changed, 46 insertions, 28 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 2a0f9d660e35..938dc32f27c6 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.15 2005/06/12 18:12:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.16 2005/07/09 16:04:05 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jaxen-1.0.ebuild,
+  jaxen-1.1_beta2-r1.ebuild, jaxen-1.1_beta6.ebuild:
+  fix deps, small cleanups, add source useflag support
 
   12 Jun 2005; Jason Wever <weeve@gentoo.org> jaxen-1.1_beta6.ebuild:
   Added ~sparc keyword wrt bug #95859.
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 20a6a44e8627..ceb29c7fc6c0 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6ec921bde5ccb366778f6abfb2e79c4d jaxen-1.0.ebuild 1396
 MD5 fbb52532fe663e132d9bd0a88dba218c jaxen-1.1_beta2-r1.ebuild 1374
 MD5 1075345d96ff713f8adbe26938987b3e jaxen-1.1_beta6.ebuild 1386
@@ -9,3 +12,10 @@ MD5 7155bee4486dae1d29f03ce768a5a36e files/digest-jaxen-1.1_beta2-r1 72
 MD5 316a481f610ecae9085418b487d1fe1b files/build.xml.patch 1018
 MD5 18b53511f075c771c0b69c5bc0b65dba files/MANIFEST.MF 307
 MD5 a6ab57e343fb58a0af99d74124df491d files/digest-jaxen-1.1_beta6 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/WQ/rLF9B432nYRAtytAJ4ssDTzDAgNzGR3a9v+Zp76vxSjjQCcCNKD
+FFkC/HArP8N2LV9RcHuhFqo=
+=nvMA
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jaxen/jaxen-1.0.ebuild b/dev-java/jaxen/jaxen-1.0.ebuild
index c652abfe5c81..1f2174a6b4cc 100644
--- a/dev-java/jaxen/jaxen-1.0.ebuild
+++ b/dev-java/jaxen/jaxen-1.0.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/jaxen/jaxen-1.0.ebuild,v 1.8 2005/05/29 15:58:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.9 2005/07/09 16:04:05 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -10,16 +10,18 @@ SRC_URI="mirror://sourceforge/jaxen/${P}-FCS.tar.gz"
 LICENSE="jaxen"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
-IUSE="doc junit"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant
-	junit? ( dev-java/junit )
+IUSE="doc junit source"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
 	dev-java/xalan
 	>=dev-java/xerces-2.6.2-r1
 	=dev-java/dom4j-1*
 	~dev-java/jdom-1.0_beta9
 	dev-java/saxpath"
-RDEPEND=">=virtual/jre-1.3"
+
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+	dev-java/ant
+	junit? ( dev-java/junit )
+	${RDEPEND}"
 
 S=${WORKDIR}/${P}-FCS
 
@@ -31,7 +33,7 @@ src_unpack() {
 	cp ${FILESDIR}/MANIFEST.MF src/conf
 	rm -f *.jar
 	cd ${S}/lib
-	rm -f ant-1.3.jar jakarta-ant-1.3-optional.jar junit.jar xerces.jar dom4j-core.jar
+	rm -f *.jar
 
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from xalan
@@ -52,5 +54,6 @@ src_install() {
 	java-pkg_dojar build/jaxen-full.jar
 
 	use doc && java-pkg_dohtml -r build/doc/*
+	use source && java-pkg_dosrc src/java/main/*
 }
 
diff --git a/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild b/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild
index e40ac5e27528..aed57594a86e 100644
--- a/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta2-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/jaxen/jaxen-1.1_beta2-r1.ebuild,v 1.2 2005/04/22 08:51:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild,v 1.3 2005/07/09 16:04:05 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -10,19 +10,19 @@ SRC_URI="http://www.ibiblio.org/maven/jaxen/distributions/${PN}-1.1-beta-2-src.t
 LICENSE="jaxen"
 SLOT="1.1"
 KEYWORDS="x86 ~ppc ~sparc amd64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	jikes? ( dev-java/jikes )
-	dev-java/ant
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-RDEPEND=">=virtual/jre-1.3
+RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
 	>=dev-java/xerces-2.6.2-r1
 	=dev-java/dom4j-1*
 	~dev-java/jdom-1.0_beta9"
 
+DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
+	jikes? ( dev-java/jikes )
+	dev-java/ant-core
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
 S=${WORKDIR}/${PN}-1.1-beta-2
 
 src_unpack() {
@@ -33,7 +33,6 @@ src_unpack() {
 
 	mkdir -p target/lib
 	cd target/lib
-	rm -f *.jar
 	java-pkg_jar-from xerces-2
 	java-pkg_jar-from dom4j-1
 	java-pkg_jar-from jdom-1.0_beta9
@@ -50,9 +49,9 @@ src_compile() {
 }
 
 src_install() {
-	mv target/jaxen*.jar target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar
+	java-pkg_newjar target/jaxen*.jar ${PN}.jar
 
 	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/main/*
 }
 
diff --git a/dev-java/jaxen/jaxen-1.1_beta6.ebuild b/dev-java/jaxen/jaxen-1.1_beta6.ebuild
index c3e0eb848e04..c52b568f37e4 100644
--- a/dev-java/jaxen/jaxen-1.1_beta6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta6.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/jaxen/jaxen-1.1_beta6.ebuild,v 1.2 2005/06/12 18:12:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta6.ebuild,v 1.3 2005/07/09 16:04:05 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,16 +13,19 @@ SLOT="1.1"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3
+RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
 	~dev-java/jdom-1.0_beta9
 	=dev-java/dom4j-1*
 	=dev-java/xerces-2.6*
 	dev-java/xom"
 
+DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+
 S=${WORKDIR}/${PN}-1.1-beta-6
 
 src_unpack() {
@@ -47,8 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	mv target/jaxen*.jar target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar
+	java-pkg_newjar target/jaxen*.jar ${PN}.jar
 
 	use doc && java-pkg_dohtml -r dist/docs/*
 	use source && java-pkg_dosrc src/java/main/*