Fixes #2185.

4 files changed, 20 insertions, 12 deletions

diff --git a/dev-java/jaxp/ChangeLog b/dev-java/jaxp/ChangeLog
index ee6b3d739ecb..05f7a6068e72 100644
--- a/dev-java/jaxp/ChangeLog
+++ b/dev-java/jaxp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/jaxp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.2 2002/04/28 23:22:23 karltk Exp $
+
+*jaxp-1.2-r1 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> jaxp-1.2-r1.ebuild files/digest-jaxp-1.2-r1:
+
+  Upstream package was updated. Direct URL is now in the ebuild so we can 
+  download directly. The jaxp license is _very_ restrictive, so a warning
+  is now issued when the package has been installed. 
+
+  This will have to be updated when the ACCEPT_LICENSE functionality goes 
+  into Portage.
+
+  Removed jaxp-1.2.ebuild files/digest-jaxp-1.2
 
 *jaxp-1.2 (1 Feb 2002)
 
diff --git a/dev-java/jaxp/files/digest-jaxp-1.2 b/dev-java/jaxp/files/digest-jaxp-1.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jaxp/files/digest-jaxp-1.2
+++ /dev/null
diff --git a/dev-java/jaxp/files/digest-jaxp-1.2-r1 b/dev-java/jaxp/files/digest-jaxp-1.2-r1
new file mode 100644
index 000000000000..147bc3a150ca
--- /dev/null
+++ b/dev-java/jaxp/files/digest-jaxp-1.2-r1
@@ -0,0 +1 @@
+MD5 243aac1934573c5826ac88a5ed7097b6 java_xml_pack-spring02-dev.zip 11796594
diff --git a/dev-java/jaxp/jaxp-1.2.ebuild b/dev-java/jaxp/jaxp-1.2-r1.ebuild
index 74ee69517578..8c1619556cb1 100644
--- a/dev-java/jaxp/jaxp-1.2.ebuild
+++ b/dev-java/jaxp/jaxp-1.2-r1.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.2.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.2-r1.ebuild,v 1.1 2002/04/28 23:22:23 karltk Exp $
 
-At=java_xml_pack-winter01-dev.zip
-S=${WORKDIR}/java_xml_pack-winter-01-dev
+S=${WORKDIR}/java_xml_pack-spring-02-dev
 DESCRIPTION="Java API for XML parsing"
-SRC_URI=""
+SRC_URI="ftp://ftp.java.sun.com/pub/xml/msowe93ls/java_xml_pack-spring02-dev.zip"
 HOMEPAGE="http://java.sun.com/xml/"
 
 DEPEND=">=virtual/jdk-1.3
@@ -16,17 +15,12 @@ DEPEND=">=virtual/jdk-1.3
 RDEPEND=">=virtual/jdk-1.3"
 
 
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	jar -xf ${DISTDIR}/${At}
-}
-
 src_install() {                      
 	cd ${S}
 	dojar jaxp-1.2-ea1/xerces.jar jaxp-1.2-ea1/xalan.jar
 	dohtml -r jaxp-1.2-ea1/docs/*
+
+	einfo "!!! Beware that this package has a _very_ restrictive license!"
 }