add restrict fetch + pkg_nofetch, fix src_uri, remove invalid sandbox disabling, closes 49853

4 files changed, 22 insertions, 29 deletions

diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index efdf8510a75f..5b49acd2183c 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.28 2004/07/14 06:54:00 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.29 2004/07/14 11:44:21 axxo Exp $
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.1-r1.ebuild:
+  add restrict fetch + pkg_nofetch, fix src_uri, remove invalid sandbox
+  disabling, closes 49853
 
   14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.2.ebuild:
   fix bug 46369
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest
index 80577ae34dee..7a9c6cbe5b0b 100644
--- a/dev-java/sun-j2sdk/Manifest
+++ b/dev-java/sun-j2sdk/Manifest
@@ -1,13 +1,13 @@
 MD5 f1b4d7d6b050a6944bb0b7db7035f66a sun-j2sdk-1.4.2.ebuild 4032
 MD5 b7e48d076a905a4efea54c144140e4f4 sun-j2sdk-1.4.1.ebuild 4487
 MD5 1e7f4262c8310a1b3812f7e366665d72 ChangeLog 4102
-MD5 1471350f2bb16113ce2abf465026b063 sun-j2sdk-1.4.1-r1.ebuild 4507
+MD5 0a4c9602a2bdef686775680b43e78feb sun-j2sdk-1.4.1-r1.ebuild 3972
 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 8dd70a39cc87436b9e6f41ea3fbfd480 files/digest-sun-j2sdk-1.4.2 223
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1-r1 0
+MD5 5ad67dddd14ba49a697fc53bc1a9ddb9 files/digest-sun-j2sdk-1.4.1-r1 153
 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 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1-r1 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1-r1
index e69de29bb2d1..82e9b8e8cbc1 100644
--- a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1-r1
+++ b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1-r1
@@ -0,0 +1,2 @@
+MD5 e6f35d1183660682f4f03965d35b67c5 j2sdk-1_4_1-src-scsl.zip 52251762
+MD5 cf52ee3389a4a6fbef9e59bff136d4ee j2sdk-1_4_1-mozilla_headers-unix.zip 6569569
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
index c38c95694cc2..807b23c654cc 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.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.1-r1.ebuild,v 1.10 2004/07/02 04:23:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.11 2004/07/14 11:44:21 axxo Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -23,10 +23,11 @@ JAVA_PATCHES="disable-sanity-check
 
 S=${WORKDIR}/j2sdk
 
-SRC_JAVA="j2sdk-1_4_1-src-scsl.zip"
-SRC_MOZHEADERS="j2sdk-1_4_1-mozilla_headers-unix.zip"
+MY_PV=${PV//./_}
+SRC_JAVA="j2sdk-${MY_PV}-src-scsl.zip"
+SRC_MOZHEADERS="j2sdk-${MY_PV}-mozilla_headers-unix.zip"
 
-SRC_URI=""
+SRC_URI="${SRC_JAVA} ${SRC_MOZHEADERS}"
 
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1 (From sources)"
 HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
@@ -34,6 +35,7 @@ HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
 SLOT="0"
 KEYWORDS="x86 -ppc -alpha -sparc"
 LICENSE="sun-csl"
+RESTRICT="fetch"
 
 RDEPEND="virtual/libc
 	virtual/x11
@@ -49,6 +51,13 @@ PROVIDE="virtual/jre-1.4.1
 	virtual/jdk-1.4.1
 	virtual/java-scheme-2"
 
+pkg_nofetch() {
+	einfo "Please download"
+	einfo "  - ${SRC_MOZHEADERS}"
+	einfo "  - ${SRC_JAVA}"
+	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
@@ -71,19 +80,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
-
-	[ ! -z ${die_flag} ] && die "Some source files were not found"
-
 	mkdir ${S}
 	cd ${S}
 	unpack ${SRC_JAVA}
@@ -105,13 +101,6 @@ src_compile () {
 	cd ${S}
 	unset CLASSPATH JAVA_HOME JAVAC
 
-	# Otherwise the command:
-	# (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2re-image; tar cf - .) | \
-	#    (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2sdk-image/jre; tar xf -)
-	# Will fail, you have been warned!!!! There are NO sandbox violations anyway
-	LD_PRELOAD_SAVE=$LD_PRELOAD
-	unset LD_PRELOAD
-
 	# Any CFLAGS will cause the build to fail!
 	# If you don't believe me ...
 	export OTHER_CFLAGS=${CFLAGS}
@@ -139,8 +128,6 @@ src_compile () {
 		JOBS=1
 	fi
 	make HOTSPOT_BUILD_JOBS=${JOBS} || die
-
-	export LD_PRELOAD=$LD_PRELOAD_SAVE
 }
 
 src_install () {