Delete bundled jars and classes in src_unpack.

Package-Manager: portage-2.1.2.7

3 files changed, 29 insertions, 24 deletions

diff --git a/dev-java/dtdparser/ChangeLog b/dev-java/dtdparser/ChangeLog
index 6c0e33eafa23..094815f8bd36 100644
--- a/dev-java/dtdparser/ChangeLog
+++ b/dev-java/dtdparser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dtdparser
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dtdparser/ChangeLog,v 1.4 2006/12/27 22:45:51 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dtdparser/ChangeLog,v 1.5 2007/05/27 15:40:28 betelgeuse Exp $
+
+  27 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  dtdparser-1.21-r1.ebuild:
+  Delete bundled jars and classes in src_unpack.
 
 *dtdparser-1.21-r1 (27 Dec 2006)
 
diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest
index c99961c8ef27..a5caf354f011 100644
--- a/dev-java/dtdparser/Manifest
+++ b/dev-java/dtdparser/Manifest
@@ -6,18 +6,18 @@ MD5 977b4c772bc01096ee71c8df9d288eb9 files/buildfile.patch 1180
 RMD160 acc2b36b99776e6cc56ac711505e2ca01b47abb4 files/buildfile.patch 1180
 SHA256 7cb18e69d523666a828e6f45cf79e008f1c92c9429bf5518c0aa6c0cf70f0af7 files/buildfile.patch 1180
 DIST dtdparser-1.21.tgz 138335 RMD160 29f24651690088fb1bf2947eb3d8d52e1740b131 SHA1 566bf9aab4817e3968e93332745ddf78a22ed6e1 SHA256 67fb4af8aa48733b027724c1244e614d9621724efa47e2c9ddb69edecc8dd034
-EBUILD dtdparser-1.21-r1.ebuild 872 RMD160 26693560c7e144db469d4f80d627e23faaccb97c SHA1 1031091c86b8a8ba6d62d33b774fe943269bbcb3 SHA256 1f4e4e139dc861b02438b79e6b5fc2aa06483ea22d00831e49d00052bca74d85
-MD5 bc8bf21784d31af9b78db4f7a31c55e3 dtdparser-1.21-r1.ebuild 872
-RMD160 26693560c7e144db469d4f80d627e23faaccb97c dtdparser-1.21-r1.ebuild 872
-SHA256 1f4e4e139dc861b02438b79e6b5fc2aa06483ea22d00831e49d00052bca74d85 dtdparser-1.21-r1.ebuild 872
+EBUILD dtdparser-1.21-r1.ebuild 913 RMD160 8c29c214241de988848d51778d0c030a2967c2a6 SHA1 bac99319e37c96387908e36d5ebf099337ef5663 SHA256 f4e377638c9704c3f5629f56fd99c953c98671fb1b8a56ea1385df24fb7e492a
+MD5 4eb07d805fac10334cb37f72c317412d dtdparser-1.21-r1.ebuild 913
+RMD160 8c29c214241de988848d51778d0c030a2967c2a6 dtdparser-1.21-r1.ebuild 913
+SHA256 f4e377638c9704c3f5629f56fd99c953c98671fb1b8a56ea1385df24fb7e492a dtdparser-1.21-r1.ebuild 913
 EBUILD dtdparser-1.21.ebuild 1030 RMD160 5b4f463d5506601ce4aa777d0c8518e57fb0ce52 SHA1 eafd45ff43ad482ffe00fa26224cfffab648e9c3 SHA256 d6296bd5a84178c42df9a6dce513dd331e3b2e9aada6daa30546d6f209db92aa
 MD5 27be20bc806f4deace83fed31a1b8e88 dtdparser-1.21.ebuild 1030
 RMD160 5b4f463d5506601ce4aa777d0c8518e57fb0ce52 dtdparser-1.21.ebuild 1030
 SHA256 d6296bd5a84178c42df9a6dce513dd331e3b2e9aada6daa30546d6f209db92aa dtdparser-1.21.ebuild 1030
-MISC ChangeLog 785 RMD160 ed98187ee4b5e712266a684c96f7089b7ceedad0 SHA1 2b6d2f968ef5e09d63e2f7880f8a6c754a05b7ef SHA256 374314a0c3f861ea6edfb99340be90d8f729090b102d7dedaf207cde82cac46a
-MD5 ffde50cee0ef3997d6e49e89085f38b1 ChangeLog 785
-RMD160 ed98187ee4b5e712266a684c96f7089b7ceedad0 ChangeLog 785
-SHA256 374314a0c3f861ea6edfb99340be90d8f729090b102d7dedaf207cde82cac46a ChangeLog 785
+MISC ChangeLog 916 RMD160 28cbcbb8dc6db48b7def7603ccd8ba8e4f47f639 SHA1 12ab132e83476c0a2f82c9c2b11e3fd06b2c941c SHA256 b899d5fb91c18b69db8a0c18984b4f7a8dfdbf09a5076fc459009a22ba7bb170
+MD5 5d35d5d5d53b8131b2ff2912cf76f88e ChangeLog 916
+RMD160 28cbcbb8dc6db48b7def7603ccd8ba8e4f47f639 ChangeLog 916
+SHA256 b899d5fb91c18b69db8a0c18984b4f7a8dfdbf09a5076fc459009a22ba7bb170 ChangeLog 916
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,9 +29,9 @@ MD5 86eba2cfacdc1b4562e29b8e460e498a files/digest-dtdparser-1.21-r1 235
 RMD160 55ffcb90c1ce3c3edd0fb6e9f6e917d28fa699bd files/digest-dtdparser-1.21-r1 235
 SHA256 8e0f3c20b47a47f624d4137c1c9027000356f8b8cf4805aecbfa8ca300498956 files/digest-dtdparser-1.21-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFkvepcxLzpIGCsLQRAgwsAJ4jwzGWqlEVANUZ1tqpwYL3FNwOQACgmpwO
-/c1qZNv0lnFXJfDkLW/mNkI=
-=FygE
+iD8DBQFGWaZzcxLzpIGCsLQRApTvAJ9TVLvnVOXzb7RkytZT800Aci3t8ACfa6BN
+weA9Rn9Cjy+Rin4XfjWZfEo=
+=B+L9
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dtdparser/dtdparser-1.21-r1.ebuild b/dev-java/dtdparser/dtdparser-1.21-r1.ebuild
index 626a2772a115..01c7994cf1ef 100644
--- a/dev-java/dtdparser/dtdparser-1.21-r1.ebuild
+++ b/dev-java/dtdparser/dtdparser-1.21-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dtdparser/dtdparser-1.21-r1.ebuild,v 1.1 2006/12/27 22:45:52 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dtdparser/dtdparser-1.21-r1.ebuild,v 1.2 2007/05/27 15:40:28 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -11,18 +13,17 @@ SRC_URI="http://www.wutka.com/download/${P}.tgz"
 LICENSE="LGPL-2.1 Apache-1.1"
 SLOT="${PV}"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="doc source"
+IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/buildfile.patch
+	cd "${S}"
+	rm -v *.jar || die
+	rm -v classes/com/wutka/dtd/*.class || die
+	epatch "${FILESDIR}/buildfile.patch"
 }
 
 EANT_BUILD_TARGET="build"
@@ -30,7 +31,7 @@ EANT_DOC_TARGET="createdoc"
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	dodoc CHANGES README
+	dodoc CHANGES README || die
 
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc source/*