Register task using java-pkg_register-ant-task so it doesn't automatically get picked up any more. Reported in #177814.

Package-Manager: portage-2.1.2.7

5 files changed, 89 insertions, 16 deletions

diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index 93c045dd3c80..059480daa3ff 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ant-contrib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.17 2007/04/26 12:19:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.18 2007/05/09 16:05:25 betelgeuse Exp $
+
+*ant-contrib-1.0_beta2-r2 (09 May 2007)
+
+  09 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +ant-contrib-1.0_beta2-r2.ebuild:
+  Register task using java-pkg_register-ant-task so it doesn't automatically
+  get picked up any more. Reported in #177814.
 
   26 Apr 2007; Vlastimil Babka <caster@gentoo.org>
   -ant-contrib-1.0_beta2.ebuild:
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 21d32fa6eb45..661704b4f423 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 SHA1 b93f62923922d9ec718239e4ecb3c1677c14a125 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269
 EBUILD ant-contrib-1.0_beta2-r1.ebuild 1271 RMD160 f52f0b9e7352c55dab50ba14ba08570f4f5c21cd SHA1 b6caf272bfbfbc6e6e1266a9214ea0c04a3099a0 SHA256 fb1b51bc20d08d3a67fe35c9f0224616577f66bec16e3a9d4203c0276e06582b
 MD5 c045296397400b5f6025382cd7ad7b24 ant-contrib-1.0_beta2-r1.ebuild 1271
 RMD160 f52f0b9e7352c55dab50ba14ba08570f4f5c21cd ant-contrib-1.0_beta2-r1.ebuild 1271
 SHA256 fb1b51bc20d08d3a67fe35c9f0224616577f66bec16e3a9d4203c0276e06582b ant-contrib-1.0_beta2-r1.ebuild 1271
-MISC ChangeLog 2440 RMD160 893ab10a9f3c0f3f81cb77882eba798186b9ec5a SHA1 cc519aea83f1b070de9303b2b814e82da85d38b9 SHA256 b00855d42e6489737148c7a805bbe3b63e4a58e8ec5119097fdf2f8795fd9fff
-MD5 66d8e26384accca8baeafd5629db91f9 ChangeLog 2440
-RMD160 893ab10a9f3c0f3f81cb77882eba798186b9ec5a ChangeLog 2440
-SHA256 b00855d42e6489737148c7a805bbe3b63e4a58e8ec5119097fdf2f8795fd9fff ChangeLog 2440
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1218 RMD160 04bf853bd794a2e7aefbba371db4b2900e387d52 SHA1 68f1426461f09e11672e10643469495458760580 SHA256 d78aa7db6e8710cc42834d395e183a5eb990c41e004613de49ee5b21c3dadcd8
+MD5 86f57734f3ff8b830ce8843003282bd7 ant-contrib-1.0_beta2-r2.ebuild 1218
+RMD160 04bf853bd794a2e7aefbba371db4b2900e387d52 ant-contrib-1.0_beta2-r2.ebuild 1218
+SHA256 d78aa7db6e8710cc42834d395e183a5eb990c41e004613de49ee5b21c3dadcd8 ant-contrib-1.0_beta2-r2.ebuild 1218
+MISC ChangeLog 2699 RMD160 f4c36b4255d52b65014ec5cd7d21d4fbd5b10ad5 SHA1 c5c12aea7e5fe6c8b7336fbe0074658f9f1b0a33 SHA256 de180c29d759a8ec3f766fe48f53952002d9bdf7065c049329403ab5db7b8103
+MD5 a7bcd75d74a553e4d596f10fc55c5864 ChangeLog 2699
+RMD160 f4c36b4255d52b65014ec5cd7d21d4fbd5b10ad5 ChangeLog 2699
+SHA256 de180c29d759a8ec3f766fe48f53952002d9bdf7065c049329403ab5db7b8103 ChangeLog 2699
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -14,3 +21,13 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 a1efe17f9c88aa58d63072ac53c0f94c files/digest-ant-contrib-1.0_beta2-r1 268
 RMD160 51de18e8f2ce7da67489214bd131f0ebee6d7495 files/digest-ant-contrib-1.0_beta2-r1 268
 SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/digest-ant-contrib-1.0_beta2-r1 268
+MD5 a1efe17f9c88aa58d63072ac53c0f94c files/digest-ant-contrib-1.0_beta2-r2 268
+RMD160 51de18e8f2ce7da67489214bd131f0ebee6d7495 files/digest-ant-contrib-1.0_beta2-r2 268
+SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/digest-ant-contrib-1.0_beta2-r2 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGQfFKcxLzpIGCsLQRAgvbAJwOCyghXZMoi1s09HnBUGxbkJHQ5wCgmG6U
+NlZu3F7FXuQ5ed+xERHXKOA=
+=kzUA
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..28a19caca300
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild,v 1.1 2007/05/09 16:05:25 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1
+	>=dev-java/xerces-2.7
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
+	java-pkg_jar-from xerces-2
+}
+
+src_compile() {
+	eant jar -Dversion=${PV} $(use_doc docs)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/net
+	java-pkg_dohtml -r manual
+}
diff --git a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta2-r2 b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta2-r2
new file mode 100644
index 000000000000..6e75f888b150
--- /dev/null
+++ b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta2-r2
@@ -0,0 +1,3 @@
+MD5 9f4563dffa0050feb9946fb2433a880d ant-contrib-1.0b2-src.tar.bz2 118216
+RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 ant-contrib-1.0b2-src.tar.bz2 118216
+SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 ant-contrib-1.0b2-src.tar.bz2 118216
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index ec8841437d4e..8d9374deb32d 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -36,14 +36,14 @@ EBUILD jdbc-mysql-3.1.13-r5.ebuild 1575 RMD160 b63a2348f01d698dc322f788ff0df839c
 MD5 fb0f803b67a1874b89ee39c972a1d7f6 jdbc-mysql-3.1.13-r5.ebuild 1575
 RMD160 b63a2348f01d698dc322f788ff0df839c1ad9f70 jdbc-mysql-3.1.13-r5.ebuild 1575
 SHA256 284101edc52503f9b7265956188304449bff7b2c57067681af7eefd6dcdbfb60 jdbc-mysql-3.1.13-r5.ebuild 1575
-EBUILD jdbc-mysql-5.0.5.ebuild 1827 RMD160 be1fdf5ce0ac3290137a647ed3d0eec9a7feec0e SHA1 76a2e6ca23e78ca95ebc318b8a31c0ad72878727 SHA256 28e0bf62de7b9b92fa4d46654326157c1c1656b4dd836d82ea3355a9202e70a1
-MD5 3991b15dbf149502275927a070fc017f jdbc-mysql-5.0.5.ebuild 1827
-RMD160 be1fdf5ce0ac3290137a647ed3d0eec9a7feec0e jdbc-mysql-5.0.5.ebuild 1827
-SHA256 28e0bf62de7b9b92fa4d46654326157c1c1656b4dd836d82ea3355a9202e70a1 jdbc-mysql-5.0.5.ebuild 1827
-MISC ChangeLog 9471 RMD160 7fa0148f34e26952da229714ab3fc39340275c06 SHA1 2183aa3652ab395550c5263b5f59e27b8aafc4b5 SHA256 1d2429f2ac639ec9666c4d98f000e18526148dadc9d8492d5423cd8bbf330beb
-MD5 bec8b1fcb8a2a71b95a035f58d0a8235 ChangeLog 9471
-RMD160 7fa0148f34e26952da229714ab3fc39340275c06 ChangeLog 9471
-SHA256 1d2429f2ac639ec9666c4d98f000e18526148dadc9d8492d5423cd8bbf330beb ChangeLog 9471
+EBUILD jdbc-mysql-5.0.5.ebuild 1856 RMD160 0052fa30100656382cf6d68e658b9a72d22acb13 SHA1 5e785b44a6dff0cb153bfe84f357f33622f469bf SHA256 9be7f82f6758908a39176ffe196d6dc8a0744c719c94a33e2cca3e2f926fda29
+MD5 979ae13d53e42b0f17555b9f67417ceb jdbc-mysql-5.0.5.ebuild 1856
+RMD160 0052fa30100656382cf6d68e658b9a72d22acb13 jdbc-mysql-5.0.5.ebuild 1856
+SHA256 9be7f82f6758908a39176ffe196d6dc8a0744c719c94a33e2cca3e2f926fda29 jdbc-mysql-5.0.5.ebuild 1856
+MISC ChangeLog 9617 RMD160 26864a0587f49247e689136d4fbffece276bd29f SHA1 de972619a241bb3955252e2f0813fe90ec4da3ea SHA256 f7edce6db9ecb55f6f33755f395819afb82d08ebcbcf0518d9b68b69216a6791
+MD5 de52a376a7a74b2cadf106097261281b ChangeLog 9617
+RMD160 26864a0587f49247e689136d4fbffece276bd29f ChangeLog 9617
+SHA256 f7edce6db9ecb55f6f33755f395819afb82d08ebcbcf0518d9b68b69216a6791 ChangeLog 9617
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -63,7 +63,7 @@ SHA256 694ff597b2fe0c1065c0f2063df10bdbf2823db29236a597af07ce069c1a4ba4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGP5X/cxLzpIGCsLQRArGzAJsExzZ+LSNXYOweQN16XmOvEjYZjACfRXft
-0drCTy4Jxvh93LXR8qn/EuM=
-=l8Vy
+iD8DBQFGQfHfcxLzpIGCsLQRAnYyAJwM5rynbvWYW1wFS8J5BtsZVCRl3QCgkmgF
+21sjIQNiWvgwN9OYnYdlQJw=
+=IZ4G
 -----END PGP SIGNATURE-----