Use repackaged version of distfile.

Package-Manager: portage-2.1.2.5

5 files changed, 39 insertions, 46 deletions

diff --git a/dev-java/jaxp/ChangeLog b/dev-java/jaxp/ChangeLog
index 19dede2a19fa..b061e697052f 100644
--- a/dev-java/jaxp/ChangeLog
+++ b/dev-java/jaxp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.6 2007/05/04 18:21:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.7 2007/05/04 19:29:40 nelchael Exp $
+
+  04 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> files/build.xml-1.4,
+  jaxp-1.4.ebuild:
+  Use repackaged version of distfile.
 
   04 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> jaxp-1.4.ebuild:
   Set JDK/JRE to 1.5, see bug #177069.
diff --git a/dev-java/jaxp/Manifest b/dev-java/jaxp/Manifest
index d05821d151cd..e03ee3510a53 100644
--- a/dev-java/jaxp/Manifest
+++ b/dev-java/jaxp/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX build.xml-1.4 566 RMD160 301c6c2db1b7a734c300482138c92b6280093c71 SHA1 2fe32809aaf5c93a6a9c9bc2e08f9a10439a5759 SHA256 d7215c4bbee3e32da2312a2dddf3320c49e8208c7806c411601165eb44303a75
-MD5 12473f8524a901a63cdca7978a6d84c4 files/build.xml-1.4 566
-RMD160 301c6c2db1b7a734c300482138c92b6280093c71 files/build.xml-1.4 566
-SHA256 d7215c4bbee3e32da2312a2dddf3320c49e8208c7806c411601165eb44303a75 files/build.xml-1.4 566
-DIST JAXP_14_FCS.class 9437514 RMD160 b30e20618635a03fd4970c28c635546bfb9df176 SHA1 bb8683074b4427dfdea7a5411a45f13e652cd9cb SHA256 77d6479b69941203adf5b0b76e09472cdb2bcd647b845d6b7e3ed6f0b3be7b23
-EBUILD jaxp-1.4.ebuild 1197 RMD160 5b90c9509abee503f181ca6b3ca54f3610296d8e SHA1 f7fde55e6e89c88da1d5fff2326f0ffccb3cf7f3 SHA256 ee0985e1dbb2f9e6e850a5325ac76bd4c8315608e39f93dc822ba4da79ed7eb5
-MD5 1b309df547192ce2adce4f67030d69a5 jaxp-1.4.ebuild 1197
-RMD160 5b90c9509abee503f181ca6b3ca54f3610296d8e jaxp-1.4.ebuild 1197
-SHA256 ee0985e1dbb2f9e6e850a5325ac76bd4c8315608e39f93dc822ba4da79ed7eb5 jaxp-1.4.ebuild 1197
-MISC ChangeLog 473 RMD160 074053c332e38466cb7aa0816352dce736e35662 SHA1 1a6382a72ff3cb56ba232ab40b75be7d1c3bb25c SHA256 3c2c5d85924474de0f68cd911bf9e7714b836947862db9b8345f01c9a31a1e70
-MD5 f000cd4af671fa9a764477920ab2217a ChangeLog 473
-RMD160 074053c332e38466cb7aa0816352dce736e35662 ChangeLog 473
-SHA256 3c2c5d85924474de0f68cd911bf9e7714b836947862db9b8345f01c9a31a1e70 ChangeLog 473
+AUX build.xml-1.4 458 RMD160 8e0b598f7c02ed915c9243ae086d1e3681304f58 SHA1 1becba813a4bf002b9ef66dc9e3b483f2f27d79d SHA256 8c2c00c17923070530bfd92f6e8dccce617f121e181024d804cb74f2a259aa66
+MD5 9192285e255c48ea8a7ca50da75fd54b files/build.xml-1.4 458
+RMD160 8e0b598f7c02ed915c9243ae086d1e3681304f58 files/build.xml-1.4 458
+SHA256 8c2c00c17923070530bfd92f6e8dccce617f121e181024d804cb74f2a259aa66 files/build.xml-1.4 458
+DIST jaxp-1.4.tar.bz2 644928 RMD160 c338f965447b4fa616ec605e8d56cbd96d33c0a6 SHA1 f778650ddc9a6f6729087da27213e5e71570e1d0 SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe
+EBUILD jaxp-1.4.ebuild 921 RMD160 eac3bf039213e677a5e9bc9bb2110f198b693abd SHA1 08243d6804800d9b38099b5d0c6c4186f22ed685 SHA256 43be23db6c5a21249bbd1b9265f655f5fdc4c99ea55e87acb1ad3c40db1e1b21
+MD5 23b45b68511bdce6ed270ccf29851d4c jaxp-1.4.ebuild 921
+RMD160 eac3bf039213e677a5e9bc9bb2110f198b693abd jaxp-1.4.ebuild 921
+SHA256 43be23db6c5a21249bbd1b9265f655f5fdc4c99ea55e87acb1ad3c40db1e1b21 jaxp-1.4.ebuild 921
+MISC ChangeLog 605 RMD160 220b68224fc36412fc9523ce90f52573407b447a SHA1 ac95f80d0b7f789244a314a3933627f0dadebfd4 SHA256 9dd1a0e935725b8d6dac584abdb7d87eba31e3345043342bc62145265ca3bd7a
+MD5 5b1147306d52c55982b4f4f1c3aa0475 ChangeLog 605
+RMD160 220b68224fc36412fc9523ce90f52573407b447a ChangeLog 605
+SHA256 9dd1a0e935725b8d6dac584abdb7d87eba31e3345043342bc62145265ca3bd7a ChangeLog 605
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata.xml 229
-MD5 16bb177e35a409fb177e1102ed07bf21 files/digest-jaxp-1.4 235
-RMD160 7c29af8ca398c52d199907a94020099032fa5f85 files/digest-jaxp-1.4 235
-SHA256 d503ec1ba22169d03e789f6d52c800fbf8da9a0cd7dd15c79dd1bdf9fb6f39ba files/digest-jaxp-1.4 235
+MD5 7450bd5b52850b6771f82867cb3a7ddd files/digest-jaxp-1.4 229
+RMD160 ede5ef458f4590b7d5d4e0d61c508967b197bc07 files/digest-jaxp-1.4 229
+SHA256 3776e957dd4071ba05fda6aca2332006cf722a08d51d41de4e70c00036973779 files/digest-jaxp-1.4 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGO3oCgo/w9rxVVVERArkSAKCxZWf3DCbWdSG+VOXkrNyMGe78cACfR4TS
-D26MGzVUbi9xovB2VYShfBs=
-=7ybJ
+iD8DBQFGO4njgo/w9rxVVVERAnjMAJ46QmgmSPyYT2nc4XTCkyxOXXm3vgCfRlZG
+YJR/xLDOptrnKm2sveoWMXE=
+=j9uo
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxp/files/build.xml-1.4 b/dev-java/jaxp/files/build.xml-1.4
index 98b9f2ac7dda..9068b31f7b9f 100644
--- a/dev-java/jaxp/files/build.xml-1.4
+++ b/dev-java/jaxp/files/build.xml-1.4
@@ -9,11 +9,8 @@
     </javac>
   </target>
   <target name="jar" depends="compile">
-    <jar destfile="jaxp-api.jar">
-      <fileset dir="build" includes="javax/**/*.class"/>
-    </jar>
-    <jar destfile="jaxp-impl.jar">
-      <fileset dir="build" includes="org/**/*.class"/>
+    <jar destfile="jaxp-ri.jar">
+      <fileset dir="build" includes="**/*.class"/>
     </jar>
   </target>
 </project>
diff --git a/dev-java/jaxp/files/digest-jaxp-1.4 b/dev-java/jaxp/files/digest-jaxp-1.4
index 6ce6c0d8f53a..96ad8e121264 100644
--- a/dev-java/jaxp/files/digest-jaxp-1.4
+++ b/dev-java/jaxp/files/digest-jaxp-1.4
@@ -1,3 +1,3 @@
-MD5 e11a5e23cc9841345e1592b93ddc4052 JAXP_14_FCS.class 9437514
-RMD160 b30e20618635a03fd4970c28c635546bfb9df176 JAXP_14_FCS.class 9437514
-SHA256 77d6479b69941203adf5b0b76e09472cdb2bcd647b845d6b7e3ed6f0b3be7b23 JAXP_14_FCS.class 9437514
+MD5 4231a1007e6daa3687ca2c808c66f608 jaxp-1.4.tar.bz2 644928
+RMD160 c338f965447b4fa616ec605e8d56cbd96d33c0a6 jaxp-1.4.tar.bz2 644928
+SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe jaxp-1.4.tar.bz2 644928
diff --git a/dev-java/jaxp/jaxp-1.4.ebuild b/dev-java/jaxp/jaxp-1.4.ebuild
index ac8d7a547bef..839624b8ea65 100644
--- a/dev-java/jaxp/jaxp-1.4.ebuild
+++ b/dev-java/jaxp/jaxp-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4.ebuild,v 1.2 2007/05/04 18:21:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4.ebuild,v 1.3 2007/05/04 19:29:40 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -8,38 +8,30 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="The Java API for XML Processing (JAXP)"
 HOMEPAGE="https://jaxp.dev.java.net/"
-SRC_URI="https://jaxp-sources.dev.java.net/files/documents/2779/42920/JAXP_14_FCS.class"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/jaxp-1_4-20061026"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 
 src_unpack() {
 
-	cd "${WORKDIR}"
-	echo "A" | java -cp "${DISTDIR}" JAXP_14_FCS -console > /dev/null || die "unpack failed"
-
-	cd "${S}"
-	rm -v lib/*.jar
-	unpack ./jaxp-api.src.zip || die
+	unpack ${A}
 
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" -i || die "cp failed"
+	cp -i "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
 
 }
 
-src_compile() {
-	eant jar #bundled javadocs but no build.xml to generate
-}
+# bundled javadocs but no build.xml to generate
+EANT_DOC_TARGET="jar"
 
 src_install() {
-	java-pkg_dojar jaxp-api.jar
-	java-pkg_dojar jaxp-impl.jar
+
+	java-pkg_dojar jaxp-ri.jar
 
 	use source && java-pkg_dosrc jaxp-1_4-api/src/{javax,org}
 	dodoc \