Removed redundant src_unpack. Removed block on nonexistant package, ant-optional.

Package-Manager: portage-2.1.1

7 files changed, 46 insertions, 59 deletions

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 80d6f9c52cb6..d5e9aba1eec7 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.31 2006/09/13 09:24:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.32 2006/09/13 22:08:35 nichoj Exp $
+
+  13 Sep 2006; Joshua Nichols <nichoj@gentoo.org> ant-tasks-1.6.2-r9.ebuild,
+  ant-tasks-1.6.2-r10.ebuild, ant-tasks-1.6.5.ebuild,
+  ant-tasks-1.6.5-r2.ebuild:
+  Removed redundant src_unpack. Removed block on nonexistant package,
+  ant-optional.
 
   13 Sep 2006; Vlastimil Babka <caster@gentoo.org>
   ant-tasks-1.6.5-r2.ebuild:
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index 062e3698e81d..87ae51bcb2f4 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -4,26 +4,26 @@ RMD160 ec85134b9c10d603e893ebae068197761efc1b4b files/1.6.2-scp.patch 877
 SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a files/1.6.2-scp.patch 877
 DIST apache-ant-1.6.2-src.tar.bz2 6282237
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-EBUILD ant-tasks-1.6.2-r10.ebuild 3885 RMD160 ac3226813cc3851482ff081287cbfeb54eac807d SHA1 0fb6b6eeb981d312319e1f798b49420d4ff95308 SHA256 01c00b589bee967638b21b25dd056bc9255f6046086fb27e572372aa02aea4fd
-MD5 7e3dc78ffc10165d0dc2d01ddfb4bfc9 ant-tasks-1.6.2-r10.ebuild 3885
-RMD160 ac3226813cc3851482ff081287cbfeb54eac807d ant-tasks-1.6.2-r10.ebuild 3885
-SHA256 01c00b589bee967638b21b25dd056bc9255f6046086fb27e572372aa02aea4fd ant-tasks-1.6.2-r10.ebuild 3885
-EBUILD ant-tasks-1.6.2-r9.ebuild 3806 RMD160 c5db1ae5e487aa44aa742313e91835f4e7499938 SHA1 761d25798fbb54bcf8a3da0ff92a50d4204b3aea SHA256 bec587ffc89d146c3d8ce9fa2448ca154358dff50777978bb523f0ff985d9e26
-MD5 48fb7b03fa4e4525a512d0463fb353ed ant-tasks-1.6.2-r9.ebuild 3806
-RMD160 c5db1ae5e487aa44aa742313e91835f4e7499938 ant-tasks-1.6.2-r9.ebuild 3806
-SHA256 bec587ffc89d146c3d8ce9fa2448ca154358dff50777978bb523f0ff985d9e26 ant-tasks-1.6.2-r9.ebuild 3806
-EBUILD ant-tasks-1.6.5-r2.ebuild 3307 RMD160 b07450101dc1358a4c44903ccc30c4f33b71bf2b SHA1 f2c71d10b847067c6e507cc01a24012dbcc66cc6 SHA256 4659bd6ce59e4e97c3e996a4a55f5fbbc710cbf908975ea1a795eca82998dacd
-MD5 b2852938115dfb0b6fd7f431525e58ff ant-tasks-1.6.5-r2.ebuild 3307
-RMD160 b07450101dc1358a4c44903ccc30c4f33b71bf2b ant-tasks-1.6.5-r2.ebuild 3307
-SHA256 4659bd6ce59e4e97c3e996a4a55f5fbbc710cbf908975ea1a795eca82998dacd ant-tasks-1.6.5-r2.ebuild 3307
-EBUILD ant-tasks-1.6.5.ebuild 3262 RMD160 3313ff7c222ccb7df925fdeab0c9ff8da4a261eb SHA1 b88c865dbc29bf348b45bc8de87c6dd06d79e6bc SHA256 0a78c387f5b128fced6cd676c17a91fd79f96debefa74ba7b28464228ebc64e1
-MD5 4f1d8a44a23875a996018ad379b0c85f ant-tasks-1.6.5.ebuild 3262
-RMD160 3313ff7c222ccb7df925fdeab0c9ff8da4a261eb ant-tasks-1.6.5.ebuild 3262
-SHA256 0a78c387f5b128fced6cd676c17a91fd79f96debefa74ba7b28464228ebc64e1 ant-tasks-1.6.5.ebuild 3262
-MISC ChangeLog 10182 RMD160 8ffa772932e472622be7fcdfda3f6e532be018ec SHA1 8f030e9fa7eadd838c4ff85386c9aaf757a42d43 SHA256 ec155dc6020d13bba09d7d43e5aedf21fc03e0196b03cc7584a7b24d4c8080bf
-MD5 a9f42ede512b1357e65f6aec24d777d5 ChangeLog 10182
-RMD160 8ffa772932e472622be7fcdfda3f6e532be018ec ChangeLog 10182
-SHA256 ec155dc6020d13bba09d7d43e5aedf21fc03e0196b03cc7584a7b24d4c8080bf ChangeLog 10182
+EBUILD ant-tasks-1.6.2-r10.ebuild 3863 RMD160 1bc4ec9ad196cad94c012b06fdfc68033419d824 SHA1 24e53edda9608bdac3b748308bd6c8b54229feee SHA256 1165c29748738434daf1708e127abe11e0e4ffbc0da352781ba353e16d33ebdd
+MD5 bf48890a0f8660476a3e74cf8715d0f8 ant-tasks-1.6.2-r10.ebuild 3863
+RMD160 1bc4ec9ad196cad94c012b06fdfc68033419d824 ant-tasks-1.6.2-r10.ebuild 3863
+SHA256 1165c29748738434daf1708e127abe11e0e4ffbc0da352781ba353e16d33ebdd ant-tasks-1.6.2-r10.ebuild 3863
+EBUILD ant-tasks-1.6.2-r9.ebuild 3784 RMD160 f7097a9a1dde485c30c3f16761b00641d6628c72 SHA1 61e7340cef049dd3ec6e3a15adef2b49907d48b8 SHA256 f571ad8c07a42b9dece88449adc86aaaae12e9b777a3ab68dee22685a0fc9448
+MD5 c03a593d1cba2cdf5ea5c1dca15a03e1 ant-tasks-1.6.2-r9.ebuild 3784
+RMD160 f7097a9a1dde485c30c3f16761b00641d6628c72 ant-tasks-1.6.2-r9.ebuild 3784
+SHA256 f571ad8c07a42b9dece88449adc86aaaae12e9b777a3ab68dee22685a0fc9448 ant-tasks-1.6.2-r9.ebuild 3784
+EBUILD ant-tasks-1.6.5-r2.ebuild 3283 RMD160 38c1561c65ed132a45c93b47d584c00c3610406c SHA1 7ea3764977483f0c640789fc916845afb7331203 SHA256 b8cb0ddef903c27545a60fdf7b24cb99e23b7e43c48a27475f5cbb169a0d6625
+MD5 3ebdb9f2e6d3d70cb5f8727ec88d53ba ant-tasks-1.6.5-r2.ebuild 3283
+RMD160 38c1561c65ed132a45c93b47d584c00c3610406c ant-tasks-1.6.5-r2.ebuild 3283
+SHA256 b8cb0ddef903c27545a60fdf7b24cb99e23b7e43c48a27475f5cbb169a0d6625 ant-tasks-1.6.5-r2.ebuild 3283
+EBUILD ant-tasks-1.6.5.ebuild 3200 RMD160 0d9708451d890f0dee7f57b83836d2e828ebb10d SHA1 60a3a83a8798a1f6a4d5e3ee9121843e17e32413 SHA256 9dbc469b354b11f3f9ac72f98bede35f11d823da9a89e938878fd01689aba04a
+MD5 6d27650378097c46bc39067d56ea5d83 ant-tasks-1.6.5.ebuild 3200
+RMD160 0d9708451d890f0dee7f57b83836d2e828ebb10d ant-tasks-1.6.5.ebuild 3200
+SHA256 9dbc469b354b11f3f9ac72f98bede35f11d823da9a89e938878fd01689aba04a ant-tasks-1.6.5.ebuild 3200
+MISC ChangeLog 10429 RMD160 771b0dbc0281466769bb512e9b280284461bf6dd SHA1 551cf451cd7eda06fb710634ba78ce99179fd136 SHA256 3eb0073cf5ddae4ab341ea2a9159d33de5aae2421a0475fbc3cee97723a51a98
+MD5 b4c80420d140126eee1c16e3c7841a27 ChangeLog 10429
+RMD160 771b0dbc0281466769bb512e9b280284461bf6dd ChangeLog 10429
+SHA256 3eb0073cf5ddae4ab341ea2a9159d33de5aae2421a0475fbc3cee97723a51a98 ChangeLog 10429
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
index 85961228d155..fe01f4f55b87 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.6.2-r10.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.3 2006/09/13 22:08:35 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,6 @@ IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogg
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/ant-core-${PV}*
-	!dev-java/ant-optional
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
index f2019d2af8b4..018ccb26e31f 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.6.2-r9.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild,v 1.3 2006/09/13 22:08:35 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,6 @@ IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging no
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/ant-core-${PV}*
-	!dev-java/ant-optional
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
index 4199f5ecd6f0..fd681868c79d 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.6.5-r2.ebuild,v 1.3 2006/09/13 09:24:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.4 2006/09/13 22:08:35 nichoj Exp $
 
 inherit java-pkg-2 eutils
 
@@ -18,7 +18,6 @@ IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogg
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/ant-core-${PV}*
-	!dev-java/ant-optional
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.7.1 )
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild
index d61218c7766f..674da7f15b5b 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.6.5.ebuild,v 1.4 2005/09/10 16:01:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild,v 1.5 2006/09/13 22:08:35 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -18,7 +18,6 @@ IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogg
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/ant-core-${PV}*
-	!dev-java/ant-optional
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
@@ -43,11 +42,6 @@ DEPEND=">=virtual/jdk-1.4
 
 S="${WORKDIR}/apache-ant-${MY_PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest
index e0503fa106fb..18ec335d0c1a 100644
--- a/dev-java/antenna/Manifest
+++ b/dev-java/antenna/Manifest
@@ -1,30 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX antenna-0.9.13-ant.patch 3893 RMD160 843561997b09401bf4430f99fa19b2453372aa29 SHA1 3553e0120531cde581e95abe1f5260d63659b3a0 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53
 MD5 77471f48c99f338771643a79d2941764 files/antenna-0.9.13-ant.patch 3893
 RMD160 843561997b09401bf4430f99fa19b2453372aa29 files/antenna-0.9.13-ant.patch 3893
 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53 files/antenna-0.9.13-ant.patch 3893
 DIST antenna-src-0.9.13.zip 119536 RMD160 de4a506fe292b88160d2df156f701c8eda1d79d1 SHA256 dbc17fc08a7788da7ac6c42f3a7c49fa78227c3dd9d6d225534c7336a710fe23
-EBUILD antenna-0.9.13-r1.ebuild 1243 RMD160 6dbace6eb1d125f284a548d614de98e51a357ce0 SHA1 77cd9f790a318b48376872a884811bf30e03302c SHA256 855ce691a1133f0f229a6e6a9f8b295495205a5ff10120016086ed1be9867f1a
-MD5 112a38b62a7aa28bbb404da1c5e60d33 antenna-0.9.13-r1.ebuild 1243
-RMD160 6dbace6eb1d125f284a548d614de98e51a357ce0 antenna-0.9.13-r1.ebuild 1243
-SHA256 855ce691a1133f0f229a6e6a9f8b295495205a5ff10120016086ed1be9867f1a antenna-0.9.13-r1.ebuild 1243
-MISC ChangeLog 504 RMD160 802f95e9b636168447cc1c3a4097ed355d70f3ec SHA1 2726d23475d6acf1ee989e65425a4f00dede35b7 SHA256 248e86566c5e500c4872da20fbacaed06ae032c6bfbda4949c45dab61b0e42a2
-MD5 5880a9643e208d68fa816b50b7e3576b ChangeLog 504
-RMD160 802f95e9b636168447cc1c3a4097ed355d70f3ec ChangeLog 504
-SHA256 248e86566c5e500c4872da20fbacaed06ae032c6bfbda4949c45dab61b0e42a2 ChangeLog 504
-MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
-MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
-RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
-SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata.xml 159
+EBUILD antenna-0.9.13-r1.ebuild 1257 RMD160 82b0d411e530bb488edb142a9bdf11f942f994fa SHA1 6fd4755f317697fa88f2048ef67a6b167d3378f4 SHA256 2131c9700f69c1dc6bb621c4fc2904d6a86dd4b3935f45ff89010b1459691937
+MD5 a0c495e3dd0ce91266137c46f50c146d antenna-0.9.13-r1.ebuild 1257
+RMD160 82b0d411e530bb488edb142a9bdf11f942f994fa antenna-0.9.13-r1.ebuild 1257
+SHA256 2131c9700f69c1dc6bb621c4fc2904d6a86dd4b3935f45ff89010b1459691937 antenna-0.9.13-r1.ebuild 1257
+MISC ChangeLog 658 RMD160 561ea21a4cf7051bf67cfee5ca2c0658803677bc SHA1 41467c94e134285b44c2c507471d77a8dc9e7f47 SHA256 2e8b7ba1545eb5e0cef5f94119dad7f14c9b10fbfd86a94d384ef829dbd9a08b
+MD5 2965733bb8bee403d7925f61a2552289 ChangeLog 658
+RMD160 561ea21a4cf7051bf67cfee5ca2c0658803677bc ChangeLog 658
+SHA256 2e8b7ba1545eb5e0cef5f94119dad7f14c9b10fbfd86a94d384ef829dbd9a08b ChangeLog 658
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
 MD5 eda94272b805f1d530d18f0932e60c92 files/digest-antenna-0.9.13-r1 247
 RMD160 41b0859dab4cba69bfd393a0dffdf9a4367c1dd5 files/digest-antenna-0.9.13-r1 247
 SHA256 7a3dbf1af466171960ace729dff6f0f72c8f8eb3c16b6da1a2f5be7aa6d97973 files/digest-antenna-0.9.13-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwpfBgo/w9rxVVVERAjGFAJ9Fc8VQ3MCg+I18kDnnyClrayveqACeOp24
-injzowkAfdzUIA4reeNYiP4=
-=3PYO
------END PGP SIGNATURE-----