Revbumps to replace the no* USE flags with standard kind of flags, bug #177362. The 1.7.0-r4 is EAPI=1 with most of the flags enabled by default. Note that user setting of the flags can no longer break building Java packages.

Package-Manager: portage-2.1.4_rc14

6 files changed, 233 insertions, 16 deletions

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 7f5e05881771..b962f3a47006 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/ant-tasks
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.73 2007/11/03 11:43:15 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.74 2008/01/04 19:18:31 caster Exp $
+
+*ant-tasks-1.7.0-r4 (04 Jan 2008)
+*ant-tasks-1.7.0-r3 (04 Jan 2008)
+
+  04 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  +ant-tasks-1.7.0-r3.ebuild, +ant-tasks-1.7.0-r4.ebuild:
+  Revbumps to replace the no* USE flags with standard kind of flags, bug
+  #177362. The 1.7.0-r4 is EAPI=1 with most of the flags enabled by default.
+  Note that user setting of the flags can no longer break building Java
+  packages.
 
   03 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
   -ant-tasks-1.6.5-r3.ebuild:
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index 1968a164211c..2b9bb4c64ad6 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
 EBUILD ant-tasks-1.6.5-r4.ebuild 3423 RMD160 6a80b2086f1fdfbf484724303468c9ad4ffb9861 SHA1 75af0436249274568320c957dc1182e6e7d13015 SHA256 072f5fec48c8406670d7ce485b2b439cb07cebe86f1bc70290bb3b120294dd13
 MD5 4d39e613bb40e1c280158c5cc1bf8698 ant-tasks-1.6.5-r4.ebuild 3423
@@ -10,10 +7,18 @@ EBUILD ant-tasks-1.7.0-r2.ebuild 3991 RMD160 96a0788097853338512aaf72587dff198dc
 MD5 d8ff724701aa04119fdaf4892a200236 ant-tasks-1.7.0-r2.ebuild 3991
 RMD160 96a0788097853338512aaf72587dff198dcee671 ant-tasks-1.7.0-r2.ebuild 3991
 SHA256 80f837cca99db720b4a31cc1487bf2221e522e715531ead00f3f022c4ca7f68c ant-tasks-1.7.0-r2.ebuild 3991
-MISC ChangeLog 16200 RMD160 1e13cfdeb3c533bb629d3c6f939506fa31542a7c SHA1 fa4dcd67dede04575461e462e61b1b56a0fd89ad SHA256 b0371c1e2aca085ecb83a77b507d74b31a1ef0c09007cacf2e52fe36b999df42
-MD5 dc61092aa7e74ea8f7f147d3e826740f ChangeLog 16200
-RMD160 1e13cfdeb3c533bb629d3c6f939506fa31542a7c ChangeLog 16200
-SHA256 b0371c1e2aca085ecb83a77b507d74b31a1ef0c09007cacf2e52fe36b999df42 ChangeLog 16200
+EBUILD ant-tasks-1.7.0-r3.ebuild 3273 RMD160 570b4283ed283cef1bcc7b99d1a91659aa2007da SHA1 efe6309c057b52328fc455f29d1bcbe2bd15d170 SHA256 db72bd7f51e47f97be3fe9692482feca46602b50340a040df1ae72b2091a03a0
+MD5 9addff98366211936a125f3b1ea74de4 ant-tasks-1.7.0-r3.ebuild 3273
+RMD160 570b4283ed283cef1bcc7b99d1a91659aa2007da ant-tasks-1.7.0-r3.ebuild 3273
+SHA256 db72bd7f51e47f97be3fe9692482feca46602b50340a040df1ae72b2091a03a0 ant-tasks-1.7.0-r3.ebuild 3273
+EBUILD ant-tasks-1.7.0-r4.ebuild 3375 RMD160 caf76fe09b4608d9076511840e1a4511227c3d75 SHA1 8e2716bbf124aa351ef98ae4e057b9aca575ae16 SHA256 744d2dc1590e0e953876091bbc03b9dd739cf3fd6b92063ea9c424bbda30067f
+MD5 7e7b1d1f1c9b34c2aa50e364bdaf2ede ant-tasks-1.7.0-r4.ebuild 3375
+RMD160 caf76fe09b4608d9076511840e1a4511227c3d75 ant-tasks-1.7.0-r4.ebuild 3375
+SHA256 744d2dc1590e0e953876091bbc03b9dd739cf3fd6b92063ea9c424bbda30067f ant-tasks-1.7.0-r4.ebuild 3375
+MISC ChangeLog 16609 RMD160 fc34e853a4bffb25bd8703b1ed0ba898f25f067c SHA1 944f7561208835a3d1c875e60e9acef8d3e4bb9e SHA256 b190f25fd372a4063bd59f59fcd56b6ce1e3f834a8cee9a3c80e1065d25b6660
+MD5 949606faa70d833354515ac51b74dc9a ChangeLog 16609
+RMD160 fc34e853a4bffb25bd8703b1ed0ba898f25f067c ChangeLog 16609
+SHA256 b190f25fd372a4063bd59f59fcd56b6ce1e3f834a8cee9a3c80e1065d25b6660 ChangeLog 16609
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,10 +29,9 @@ SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r2 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHLF7bcxLzpIGCsLQRApFHAJ0RVm60DojASz/Gb2/+94lJIjpORwCcDLCW
-+XZeKETOl3CEPueX/ehnU38=
-=GJN7
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r4 0
diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild
new file mode 100644
index 000000000000..938dce71e5b8
--- /dev/null
+++ b/dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild,v 1.1 2008/01/04 19:18:31 caster Exp $
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="Meta-package for Apache Ant's optional tasks."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="X antlr bcel bsf commonslogging commonsnet jai javamail jdepend jmf jsch
+	log4j oro regexp resolver"
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	~dev-java/ant-trax-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+my_reg_jars() {
+	# Recording jars to get the same behaviour as before
+	local jars="$(java-pkg_getjars ${1})"
+	for jar in ${jars//:/ }; do
+		# these two are only for tasks, not core
+		if [[ "${1}" != ant-core ]]; then
+			# this one for package.env, thus java-config -p etc
+			java-pkg_regjar "${jar}"
+			# this one for broken stuff with hardcoded paths
+			dosym ${jar} /usr/share/${PN}/lib/
+		fi
+		# this one for the non-split $ANT_HOME/lib expected by stuff that
+		# doesn't use the launcher
+		dosym ${jar} /usr/share/ant/lib/
+	done
+}
+
+src_install() {
+	# create the fake ANT_HOME with symlinks to all ant jars
+	# starting with ant-core
+	dodir /usr/share/ant/lib
+	my_reg_jars ant-core
+	# just in case
+	dosym /usr/share/ant-core/bin /usr/share/ant/bin
+
+	# now process the tasks
+	my_reg_jars ant-nodeps
+	my_reg_jars ant-junit
+	my_reg_jars ant-trax
+	use antlr && my_reg_jars ant-antlr
+	use bcel && my_reg_jars ant-apache-bcel
+	use bsf && my_reg_jars ant-apache-bsf
+	use log4j && my_reg_jars ant-apache-log4j
+	use oro && my_reg_jars ant-apache-oro
+	use regexp && my_reg_jars ant-apache-regexp
+	use resolver && my_reg_jars ant-apache-resolver
+	use commonslogging && my_reg_jars ant-commons-logging
+	use commonsnet && my_reg_jars ant-commons-net
+	use jai && my_reg_jars ant-jai
+	use javamail && my_reg_jars ant-javamail
+	use jdepend && my_reg_jars ant-jdepend
+	use jmf && my_reg_jars ant-jmf
+	use jsch && my_reg_jars ant-jsch
+
+	use X && my_reg_jars ant-swing
+
+	# point ANT_HOME to the one with all symlinked jars
+	# ant-core startup script will ignore this one anyway
+	echo "ANT_HOME=\"/usr/share/ant\"" > "${T}/21ant-tasks"
+	doenvd "${T}/21ant-tasks" || die "failed to install env.d file"
+}
+
+pkg_postinst() {
+	elog "You may now freely set the USE flags of this package without breaking"
+	elog "building of Java packages, which DEPEND on the exact tasks they need."
+}
diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild
new file mode 100644
index 000000000000..12289da44139
--- /dev/null
+++ b/dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild,v 1.1 2008/01/04 19:18:31 caster Exp $
+
+EAPI="1"
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="Meta-package for Apache Ant's optional tasks."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf +jsch
+	+log4j +oro +regexp +resolver"
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	~dev-java/ant-trax-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+my_reg_jars() {
+	# Recording jars to get the same behaviour as before
+	local jars="$(java-pkg_getjars ${1})"
+	for jar in ${jars//:/ }; do
+		# these two are only for tasks, not core
+		if [[ "${1}" != ant-core ]]; then
+			# this one for package.env, thus java-config -p etc
+			java-pkg_regjar "${jar}"
+			# this one for broken stuff with hardcoded paths
+			dosym ${jar} /usr/share/${PN}/lib/
+		fi
+		# this one for the non-split $ANT_HOME/lib expected by stuff that
+		# doesn't use the launcher
+		dosym ${jar} /usr/share/ant/lib/
+	done
+}
+
+src_install() {
+	# create the fake ANT_HOME with symlinks to all ant jars
+	# starting with ant-core
+	dodir /usr/share/ant/lib
+	my_reg_jars ant-core
+	# just in case
+	dosym /usr/share/ant-core/bin /usr/share/ant/bin
+
+	# now process the tasks
+	my_reg_jars ant-nodeps
+	my_reg_jars ant-junit
+	my_reg_jars ant-trax
+	use antlr && my_reg_jars ant-antlr
+	use bcel && my_reg_jars ant-apache-bcel
+	use bsf && my_reg_jars ant-apache-bsf
+	use log4j && my_reg_jars ant-apache-log4j
+	use oro && my_reg_jars ant-apache-oro
+	use regexp && my_reg_jars ant-apache-regexp
+	use resolver && my_reg_jars ant-apache-resolver
+	use commonslogging && my_reg_jars ant-commons-logging
+	use commonsnet && my_reg_jars ant-commons-net
+	use jai && my_reg_jars ant-jai
+	use javamail && my_reg_jars ant-javamail
+	use jdepend && my_reg_jars ant-jdepend
+	use jmf && my_reg_jars ant-jmf
+	use jsch && my_reg_jars ant-jsch
+
+	use X && my_reg_jars ant-swing
+
+	# point ANT_HOME to the one with all symlinked jars
+	# ant-core startup script will ignore this one anyway
+	echo "ANT_HOME=\"/usr/share/ant\"" > "${T}/21ant-tasks"
+	doenvd "${T}/21ant-tasks" || die "failed to install env.d file"
+}
+
+pkg_postinst() {
+	elog "You may now freely set the USE flags of this package without breaking"
+	elog "building of Java packages, which DEPEND on the exact tasks they need."
+	elog "The USE flags default to enabled except X, jai and jmf for convenience."
+}
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r3 b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r3
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r4 b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r4