fix bug 46369

3 files changed, 39 insertions, 42 deletions

diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index d26bb83aac3a..efdf8510a75f 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2sdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.27 2004/07/02 04:23:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.28 2004/07/14 06:54:00 axxo Exp $
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.2.ebuild:
+  fix bug 46369
+  add restrict fetch + pkg_nofetch, fix src_uri
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sun-j2sdk-1.4.1-r1.ebuild, sun-j2sdk-1.4.1.ebuild, sun-j2sdk-1.4.2.ebuild:
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest
index b92092a9264f..7e543bad9c46 100644
--- a/dev-java/sun-j2sdk/Manifest
+++ b/dev-java/sun-j2sdk/Manifest
@@ -1,30 +1,30 @@
-MD5 1f46d2e639342b339a83e87782584b85 ChangeLog 3970
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 1471350f2bb16113ce2abf465026b063 sun-j2sdk-1.4.1-r1.ebuild 4507
+MD5 f1b4d7d6b050a6944bb0b7db7035f66a sun-j2sdk-1.4.2.ebuild 4032
 MD5 b7e48d076a905a4efea54c144140e4f4 sun-j2sdk-1.4.1.ebuild 4487
-MD5 128796d9a7f970997738233301bb76eb sun-j2sdk-1.4.2.ebuild 4259
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.2 0
+MD5 1e7f4262c8310a1b3812f7e366665d72 ChangeLog 4102
+MD5 1471350f2bb16113ce2abf465026b063 sun-j2sdk-1.4.1-r1.ebuild 4507
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 acb0731490048e056e126272a140bfad files/sun-j2sdk-1.4.1 455
 MD5 1e67e25cf3e4581c754ec00e2e850cee files/sun-j2sdk-1.4.2 455
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1-r1 0
+MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
 MD5 527f4756568740c19c32b1e5eb59ee20 files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch 650
-MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
-MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.1/j2sdk-1.4.1-force-motif.patch 3137
-MD5 9e80bf2ca2a4cbbd2570d00d1fc28143 files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch 2248
+MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
 MD5 0a15b5d4154c7fc0a713970c4b1780f1 files/1.4.1/j2sdk-1.4.1-gcc3.3-fixes.patch 5398
+MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.1/j2sdk-1.4.1-force-motif.patch 3137
 MD5 9f4c7a21ea50890a893b9850bbfc3b67 files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch 592
+MD5 9e80bf2ca2a4cbbd2570d00d1fc28143 files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch 2248
 MD5 95b8d1c6d35af8fd31117163ce56bfe7 files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch 486
-MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
-MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
-MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.2/j2sdk-1.4.2-force-motif.patch 3137
-MD5 276f4ce091acd44428e36c15de66f7d1 files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch 4176
+MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
+MD5 ea3048b7ef26c763bb331b1430061d4c files/1.4.2/j2sdk-1.4.2-static_cxx.patch 434
 MD5 0bb65304895dd012bebfc692fbd48af1 files/1.4.2/j2sdk-1.4.2-pthread.patch 1624
+MD5 276f4ce091acd44428e36c15de66f7d1 files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch 4176
 MD5 df6db4b858ad836d290f1862857622d9 files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch 4525
-MD5 ea3048b7ef26c763bb331b1430061d4c files/1.4.2/j2sdk-1.4.2-static_cxx.patch 434
-MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
+MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.2/j2sdk-1.4.2-force-motif.patch 3137
 MD5 cfe7807401a123893c6bc78aa3ffd170 files/patches/j2sdk-1.4.0-fix-intl-files.patch.bz2 826
+MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
 MD5 70c3f7f9a5a49d7d52283541da221e1f files/patches/j2sdk-1.4.0-gcc3-syntax.patch.bz2 1582
-MD5 266d66824fd48d8590da4aaae84bcd60 files/patches/j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2 863
 MD5 2133d3d4a54ea1db1ce04d72beecb031 files/patches/j2sdk-1.4.0-link-jpda-2-libjvm.patch.bz2 337
-MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
+MD5 266d66824fd48d8590da4aaae84bcd60 files/patches/j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2 863
+MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
index 3b2db1626528..9617ca605c1d 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.6 2004/07/02 04:23:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.7 2004/07/14 06:54:00 axxo Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -20,11 +20,12 @@ JAVA_PATCHES="
 
 S=${WORKDIR}/j2sdk
 
-SRC_JAVA="j2sdk-1_4_2-src-scsl.zip"
-SRC_MOZHEADERS="j2sdk-1_4_2-mozilla_headers-unix.zip"
-SRC_BINJAVA="j2sdk-1_4_2-bin-scsl.zip"
+MY_PV=${PV//./_}
+SRC_JAVA="j2sdk-${MY_PV}-src-scsl.zip"
+SRC_MOZHEADERS="j2sdk-${MY_PV}-mozilla_headers-unix.zip"
+SRC_BINJAVA="j2sdk-${MY_PV}-bin-scsl.zip"
 
-SRC_URI=""
+SRC_URI="${SRC_JAVA} ${SRC_MOZHEADERS} ${SRC_BINJAVA}"
 
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2 (From sources)"
 HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
@@ -48,6 +49,16 @@ PROVIDE="virtual/jre-1.4.2
 	virtual/jdk-1.4.2
 	virtual/java-scheme-2"
 
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	einfo "Please download"
+	einfo " - ${SRC_MOZHEADERS}"
+	einfo " - ${SRC_JAVA}"
+	einfo " - ${SRC_BINJAVA}"
+	einfo "from ${HOMEPAGE} and place them in ${DISTDIR}"
+}
+
 pkg_setup() {
 	#Check if we have enough space
 	if [ `df -P ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le 2597152 ] ; then
@@ -70,24 +81,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-	die_flag=""
-	if [ ! -f ${DISTDIR}/${SRC_MOZHEADERS} ] ; then
-		eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
-		die_flag=1
-	fi
-
-	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
-		eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
-		die_flag=1
-	fi
-
-	if [ ! -f ${DISTDIR}/${SRC_BINJAVA} ] ; then
-		eerror "Please download ${SRC_BINJAVA} from ${HOMEPAGE} to ${DISTDIR}"
-		die_flag=1
-	fi
-
-	[ ! -z ${die_flag} ] && die "Some source files were not found"
-
 	mkdir ${S}
 	cd ${S}
 	unpack ${SRC_JAVA}