ant_src_unpack -> src_unpack

(Portage version: 2.1.1_pre3-r3)
 (Signed Manifest commit)

3 files changed, 21 insertions, 80 deletions

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index f9e4e6c6d4a7..1405d9eb4a2a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX MANIFEST.MF 307 RMD160 5ea86bacf9c7970517fec106b82e6bf8636f7d85 SHA1 eb1790b6969977bc2625263b599532d78924efe8 SHA256 ce3b32e0966eb674c18fee3ed17d7567fc3e25c619af2c72612a0b728f20ddce
 MD5 18b53511f075c771c0b69c5bc0b65dba files/MANIFEST.MF 307
 RMD160 5ea86bacf9c7970517fec106b82e6bf8636f7d85 files/MANIFEST.MF 307
@@ -26,18 +29,18 @@ EBUILD jaxen-1.1_beta6.ebuild 1388 RMD160 f33653324f7e3f7d8513bbde3b43ba48940e29
 MD5 eecfe9dc7752506178a29f3bc6b9a0be jaxen-1.1_beta6.ebuild 1388
 RMD160 f33653324f7e3f7d8513bbde3b43ba48940e29d1 jaxen-1.1_beta6.ebuild 1388
 SHA256 80a0d7764bc2c23a59563850810db07a9b25b4dc8086c102dea8273d2301a082 jaxen-1.1_beta6.ebuild 1388
-EBUILD jaxen-1.1_beta7-r1.ebuild 1513 RMD160 639db22c4bb27e677c885f3b72ae12883bac26cc SHA1 2366dbb517e5e8cf15488c2ecf58302ff2579992 SHA256 c1ebb33b91ba3fb3224cd56ed9e921d2bf43c96f35b6ff558302a7afbd5647dd
-MD5 4051b89193cfcef07c7ecd456bf91fed jaxen-1.1_beta7-r1.ebuild 1513
-RMD160 639db22c4bb27e677c885f3b72ae12883bac26cc jaxen-1.1_beta7-r1.ebuild 1513
-SHA256 c1ebb33b91ba3fb3224cd56ed9e921d2bf43c96f35b6ff558302a7afbd5647dd jaxen-1.1_beta7-r1.ebuild 1513
+EBUILD jaxen-1.1_beta7-r2.ebuild 1511 RMD160 f578a497093c35999b25533a0ae3824c85f186dc SHA1 5fdd1ed32b55f216099053273e43c60861a6a02b SHA256 b22b736fe592ae5c9279f31175276d5c6911d3797a7fbb8f974f8228a2c61344
+MD5 55571eb178bed777e415ca8af7861134 jaxen-1.1_beta7-r2.ebuild 1511
+RMD160 f578a497093c35999b25533a0ae3824c85f186dc jaxen-1.1_beta7-r2.ebuild 1511
+SHA256 b22b736fe592ae5c9279f31175276d5c6911d3797a7fbb8f974f8228a2c61344 jaxen-1.1_beta7-r2.ebuild 1511
 EBUILD jaxen-1.1_beta7.ebuild 1664 RMD160 22f08b16355e7026fd4be41ff6881070af2d74d5 SHA1 1f1973d9b1739b7933d011ecdf58615e8f8564a2 SHA256 32c2517f9fc9afe00c32e591c1397ef81a14d2c19a0812439f022f7db2fcaa26
 MD5 adfaa75a24f8a22c45b93020fcbd92f9 jaxen-1.1_beta7.ebuild 1664
 RMD160 22f08b16355e7026fd4be41ff6881070af2d74d5 jaxen-1.1_beta7.ebuild 1664
 SHA256 32c2517f9fc9afe00c32e591c1397ef81a14d2c19a0812439f022f7db2fcaa26 jaxen-1.1_beta7.ebuild 1664
-MISC ChangeLog 3175 RMD160 04962223f5c98b7534a0c106c438d5dcbf4bae1f SHA1 f463f0f95c145771aa5636b530fae81c6c9169e7 SHA256 debcb8eb211efed6817f1840636f34bfaf3a8e778b3e893e7644fcda19488823
-MD5 175f76447c850afce66ba76991555bc4 ChangeLog 3175
-RMD160 04962223f5c98b7534a0c106c438d5dcbf4bae1f ChangeLog 3175
-SHA256 debcb8eb211efed6817f1840636f34bfaf3a8e778b3e893e7644fcda19488823 ChangeLog 3175
+MISC ChangeLog 3355 RMD160 8378f2b32a3b6c84a91fbdad233404c9485eb22c SHA1 ad4bc22b2449455e91f8d2cf5da8865e1a5d72f1 SHA256 be4cd524eac9130777f95b94cd35a23b83d1479d2b2ffc6da16d7f33268064fc
+MD5 b2c70db329290d77e5f4fff4336dc51d ChangeLog 3355
+RMD160 8378f2b32a3b6c84a91fbdad233404c9485eb22c ChangeLog 3355
+SHA256 be4cd524eac9130777f95b94cd35a23b83d1479d2b2ffc6da16d7f33268064fc ChangeLog 3355
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -54,6 +57,13 @@ SHA256 5191f2b0724275382cc02c601cd436ea2d7cb83c0015b6c7457007456d795a12 files/di
 MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7 262
 RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7 262
 SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7 262
-MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7-r1 262
-RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7-r1 262
-SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7-r1 262
+MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7-r2 262
+RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7-r2 262
+SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7-r2 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEwpckgo/w9rxVVVERAlmQAJ42A8ZgJb1iUnHv8Ozovc7wtrEfHgCfdfR7
+87B7YKBhRDrUOaoFaMCKTYo=
+=Gnzm
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1
deleted file mode 100644
index a562287121e5..000000000000
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
-RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
-SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild b/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild
deleted file mode 100644
index dc4de8a1c759..000000000000
--- a/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild,v 1.1 2006/07/04 18:40:50 nichoj Exp $
-
-inherit java-pkg-2 eutils java-ant-2
-
-MY_P=${P/_beta/-beta-}
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
-
-LICENSE="jaxen"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc source test"
-
-RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
-	~dev-java/jdom-1.0
-	=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
-	test? ( dev-java/ant-tasks )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-
-S=${WORKDIR}/${MY_P}
-
-ant_src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from xom
-
-	cd ${S}
-	# Make tests non-compuslatory
-	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-}
-
-src_compile() {
-	eant jar -Dnoget=1 $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_P}-SNAPSHOT.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use source && java-pkg_dosrc src/java/main/*
-}
-
-src_test() {
-	if ! use test; then
-		ewarn "You must be using the 'test' USE flag in order to"
-		ewarn "get the dependencies to run tests."
-		ewarn "Skipping tests..."
-	else
-		eant test -Dnoget=true
-	fi
-}