Use repackaged version of distfile.

(Portage version: 2.1.2.5)

4 files changed, 20 insertions, 27 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/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 \