Add examples USE flag, prevent breakage with java-strict due to optional jaxen; prevent breakage with different slot brought by ant task.

Package-Manager: portage-2.1.2.9

5 files changed, 94 insertions, 84 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index d1f452b8692a..965d0212bb37 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.47 2007/05/25 09:24:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.48 2007/06/01 19:40:06 caster Exp $
+
+  01 Jun 2007; Vlastimil Babka <caster@gentoo.org> jdom-1.0_beta9-r2.ebuild,
+  jdom-1.0_beta10-r4.ebuild, jdom-1.0-r2.ebuild:
+  Add examples USE flag, prevent breakage with java-strict due to optional
+  jaxen; prevent breakage with different slot brought by ant task.
 
   25 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   jdom-1.0_beta9-r2.ebuild:
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index afbf47e9f085..4b1876a2054d 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,33 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jdom-1.0.tar.gz 3571788 RMD160 3b72316f3282a25bca8e0b03e7a5ac07da2d38e9 SHA1 d3499d71b180cdeeb6b9537bb197751aa7f8e974 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77
 DIST jdom-b10.tar.gz 3565663 RMD160 9c15b2165180cee7a61b0086c283463dd000d9d9 SHA1 c1be10849432fc766aef7af8cdf90d747f768938 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66
 DIST jdom-b9.tar.gz 3417274 RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 SHA1 f28f676809e3333254e6041e342f2d4e314b4908 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676
-EBUILD jdom-1.0-r2.ebuild 1439 RMD160 ae2030ec0ba9e525f8fc6747cb501fca84235bde SHA1 89da20e9dfb6d53360743fb712415de5d477937c SHA256 764e82e6b17837bf79e60ff23eb353dc69d16ccc79e116a564b7eecfe587fd90
-MD5 16a2c77f2e36fca50856bcb5a48defc2 jdom-1.0-r2.ebuild 1439
-RMD160 ae2030ec0ba9e525f8fc6747cb501fca84235bde jdom-1.0-r2.ebuild 1439
-SHA256 764e82e6b17837bf79e60ff23eb353dc69d16ccc79e116a564b7eecfe587fd90 jdom-1.0-r2.ebuild 1439
+EBUILD jdom-1.0-r2.ebuild 1753 RMD160 76fd63c6f45fbd4326f281d4c98bad961f135c5d SHA1 3ea4738d5f159572162ead1cb7286f66d8c6786a SHA256 4e947f27b98b290e38875e04036e6d82909eab11fd9c9a757f1686f1772a0d39
+MD5 5c9494eb0abe1315405b16598044c42a jdom-1.0-r2.ebuild 1753
+RMD160 76fd63c6f45fbd4326f281d4c98bad961f135c5d jdom-1.0-r2.ebuild 1753
+SHA256 4e947f27b98b290e38875e04036e6d82909eab11fd9c9a757f1686f1772a0d39 jdom-1.0-r2.ebuild 1753
 EBUILD jdom-1.0_beta10-r3.ebuild 1587 RMD160 529898c6d3c62caa5c8d9a65bd4094b3cd4aa97c SHA1 8aa4f593d9e79c54c0aae1389d3f517d89ba1d21 SHA256 ec516859e1cd09b0d0f22e2581d649683b87a2d1d6a1f686b4c5a6cbdb839ff3
 MD5 fb888f820c2aebbf5b291144bc2e34db jdom-1.0_beta10-r3.ebuild 1587
 RMD160 529898c6d3c62caa5c8d9a65bd4094b3cd4aa97c jdom-1.0_beta10-r3.ebuild 1587
 SHA256 ec516859e1cd09b0d0f22e2581d649683b87a2d1d6a1f686b4c5a6cbdb839ff3 jdom-1.0_beta10-r3.ebuild 1587
-EBUILD jdom-1.0_beta10-r4.ebuild 1470 RMD160 6184b9762156fb5312d33bcbe3fdf2eef0b9a83e SHA1 454cda6ae8064dd1caec0c0554142f37762913cc SHA256 50db32d0b5a5f430e7ae6efcb0775b94e9cfac5345b31fae66f9136f6f655c7c
-MD5 d7f96b63b56c7584f904289965ae7a19 jdom-1.0_beta10-r4.ebuild 1470
-RMD160 6184b9762156fb5312d33bcbe3fdf2eef0b9a83e jdom-1.0_beta10-r4.ebuild 1470
-SHA256 50db32d0b5a5f430e7ae6efcb0775b94e9cfac5345b31fae66f9136f6f655c7c jdom-1.0_beta10-r4.ebuild 1470
+EBUILD jdom-1.0_beta10-r4.ebuild 1819 RMD160 05d83244e6ecea73f655c76eeca228d291a84e14 SHA1 4316008d3895ccc90394a40072ac364c6fa1c571 SHA256 49160ebe25d4102f13d662fbe58d0efedb1aaf2d54804948f17dc57debb92809
+MD5 af1deea4629050139f7de019d00e9699 jdom-1.0_beta10-r4.ebuild 1819
+RMD160 05d83244e6ecea73f655c76eeca228d291a84e14 jdom-1.0_beta10-r4.ebuild 1819
+SHA256 49160ebe25d4102f13d662fbe58d0efedb1aaf2d54804948f17dc57debb92809 jdom-1.0_beta10-r4.ebuild 1819
 EBUILD jdom-1.0_beta9-r1.ebuild 1589 RMD160 0210e1050a05cbf3663ccff59e41f3da659329bc SHA1 78be5c0e9a329106506eda9011a61fd2970eebab SHA256 1f9c00f19bed3e350c77e54ede0c1e86b4a17d3e972a890a75b76a083244e73f
 MD5 9c1cc3b24b91625fa84daffc90392945 jdom-1.0_beta9-r1.ebuild 1589
 RMD160 0210e1050a05cbf3663ccff59e41f3da659329bc jdom-1.0_beta9-r1.ebuild 1589
 SHA256 1f9c00f19bed3e350c77e54ede0c1e86b4a17d3e972a890a75b76a083244e73f jdom-1.0_beta9-r1.ebuild 1589
-EBUILD jdom-1.0_beta9-r2.ebuild 1511 RMD160 746dea1e207c6ecabfdc44aaffca1698dde421e3 SHA1 62bc573f4f3ed48c93b1eb808e4f037168a590b8 SHA256 90612aa75a82aeec826fd3d9557274341dc352b7b0c8cccc5dec44753ada3f59
-MD5 3c2c2c12949195ef930cd6fa67fcecbe jdom-1.0_beta9-r2.ebuild 1511
-RMD160 746dea1e207c6ecabfdc44aaffca1698dde421e3 jdom-1.0_beta9-r2.ebuild 1511
-SHA256 90612aa75a82aeec826fd3d9557274341dc352b7b0c8cccc5dec44753ada3f59 jdom-1.0_beta9-r2.ebuild 1511
-MISC ChangeLog 7636 RMD160 110ac9505f4fc60e97312ac77a1fe7adf032c0c7 SHA1 d890350ebdd128decc25f87b7222f29199a2e523 SHA256 66902b73cfe21c035df14bb4d36f85d2b2ef24b573f82277610b94145fd6cabf
-MD5 c42265b9eef5762f7cd0972a657a0604 ChangeLog 7636
-RMD160 110ac9505f4fc60e97312ac77a1fe7adf032c0c7 ChangeLog 7636
-SHA256 66902b73cfe21c035df14bb4d36f85d2b2ef24b573f82277610b94145fd6cabf ChangeLog 7636
+EBUILD jdom-1.0_beta9-r2.ebuild 1815 RMD160 bf1e3e9ef763eec90f4354b8bacfa607ecd6401c SHA1 2bd879e422cd49937369450d5d4d3ffb1c337826 SHA256 441ebef63b97830a1210aec23cec68bacb4baa1288d753a98f5011368a7a602e
+MD5 c1654875630811472f26c0aa35219f18 jdom-1.0_beta9-r2.ebuild 1815
+RMD160 bf1e3e9ef763eec90f4354b8bacfa607ecd6401c jdom-1.0_beta9-r2.ebuild 1815
+SHA256 441ebef63b97830a1210aec23cec68bacb4baa1288d753a98f5011368a7a602e jdom-1.0_beta9-r2.ebuild 1815
+MISC ChangeLog 7901 RMD160 ff6d02288b7825e202d8e9f8263c3ebce24b275d SHA1 61c3c29617ada20a52962becaf7d5dd015ad3ffd SHA256 258f1f419d8cd5474a51404563345b9ee28a4cfbaa6d6eeafc9f82e466bf40e1
+MD5 e9480f844a9f37f23482584c42a77881 ChangeLog 7901
+RMD160 ff6d02288b7825e202d8e9f8263c3ebce24b275d ChangeLog 7901
+SHA256 258f1f419d8cd5474a51404563345b9ee28a4cfbaa6d6eeafc9f82e466bf40e1 ChangeLog 7901
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -47,10 +44,3 @@ SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/di
 MD5 d26a104d6e08295aa1296456a0a9334d files/digest-jdom-1.0_beta9-r2 226
 RMD160 d30ad45a2ed73ca3377629ecb2e6f8268a60d33b files/digest-jdom-1.0_beta9-r2 226
 SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/digest-jdom-1.0_beta9-r2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGVqtBcxLzpIGCsLQRAvnpAJ4jqORC8YxKpXb0eAQphvhD5Q5s/gCcCZnj
-rvSS3TfP3TnmLLBR2goDYuk=
-=3Rfd
------END PGP SIGNATURE-----
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
index ae7bf50dcac8..fbf1691140b6 100644
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r2.ebuild,v 1.6 2007/05/09 15:16:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r2.ebuild,v 1.7 2007/06/01 19:40:06 caster Exp $
 
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc examples source"
 
-IUSE="doc source"
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java API to manipulate XML data"
 SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
@@ -12,43 +12,45 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-COMMON_DEP="
-		dev-java/saxpath
-		dev-java/xalan
+COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
-
 RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEP}"
+	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		source? ( app-arch/zip )
-		${COMMON_DEP}"
+	${COMMON_DEP}"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm -f build/*.jar lib/*.jar
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
 
 	cd ${S}/lib
-	java-pkg_jar-from saxpath
-	java-pkg_jar-from xerces-2
+	java-pkg_jar-from saxpath,xerces-2
 
 	if has_version '=dev-java/jaxen-1.1*'; then
-		java-pkg_jar-from jaxen-1.1
+		elog "jaxen detected - building jaxen support."
+		elog "you can ignore the warnings below"
+		elog "one day there will be better solution"
+		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
 	fi
 }
 
 src_compile() {
-	eant package
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
 }
 
 src_install() {
 	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
 	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/java/*
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {
diff --git a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
index dfee5e33e230..596ef337ca7f 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r4.ebuild,v 1.5 2007/01/05 23:31:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r4.ebuild,v 1.6 2007/06/01 19:40:06 caster Exp $
+
+JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -14,43 +16,47 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
-RDEPEND=">=virtual/jre-1.4
-		dev-java/saxpath
-		dev-java/xalan
+COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		${RDEPEND}"
+	${COMMON_DEP}"
+IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm -f build/*.jar lib/*.jar
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
 
 	cd ${S}/lib
-	java-pkg_jar-from saxpath
-	java-pkg_jar-from xerces-2
+	java-pkg_jar-from saxpath,xerces-2
 
 	if has_version '=dev-java/jaxen-1.1*'; then
-		java-pkg_jar-from jaxen-1.1
+		elog "jaxen detected - building jaxen support."
+		elog "you can ignore the warnings below"
+		elog "one day there will be better solution"
+		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
 	fi
 }
 
 src_compile() {
-
-	eant package || die "compile problem"
-
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
 }
 
 src_install() {
 	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
-	use doc && java-pkg_dohtml -r build/apidocs/*
-	use source && java-pkg_dosrc src/java/*
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {
diff --git a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
index 8afe378e7a02..008ff3ae07c5 100644
--- a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r2.ebuild,v 1.6 2007/05/25 09:24:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r2.ebuild,v 1.7 2007/06/01 19:40:06 caster Exp $
 
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc examples source"
 
-IUSE="doc source"
+inherit java-pkg-2 java-ant-2
 
 MY_PN="jdom"
 MY_PV="b9"
@@ -17,40 +17,47 @@ LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=virtual/jre-1.4
-		dev-java/saxpath
-		dev-java/xalan
+COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}"
+	${COMMON_DEP}"
+IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm -f build/*.jar lib/*.jar
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/apidocs || die
 
 	cd ${S}/lib
-	java-pkg_jar-from saxpath
-	java-pkg_jar-from xerces-2
+	java-pkg_jar-from saxpath,xerces-2
 
 	if has_version '=dev-java/jaxen-1.1*'; then
-		java-pkg_jar-from jaxen-1.1
+		elog "jaxen detected - building jaxen support."
+		elog "you can ignore the warnings below"
+		elog "one day there will be better solution"
+		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
 	fi
 }
 
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET=""
-# to prevent a newer jdom from going into cp
-ANT_TASKS="none"
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
 
 src_install() {
 	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
-	use doc && java-pkg_dohtml -r build/apidocs/*
-	use source && java-pkg_dosrc src/java/*
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {