--- /usr/portage/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild	2004-02-14 06:32:16.000000000 +0100
+++ sun-j2sdk-1.4.1-r1.ebuild	2004-06-22 17:30:38.081223648 +0200
@@ -26,7 +26,7 @@
 SRC_JAVA="j2sdk-1_4_1-src-scsl.zip"
 SRC_MOZHEADERS="j2sdk-1_4_1-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 +34,7 @@
 SLOT="0"
 KEYWORDS="x86 -ppc -alpha -sparc"
 LICENSE="sun-csl"
+RESTRICT="fetch"
 
 RDEPEND="virtual/glibc
 	virtual/x11
@@ -49,6 +50,13 @@
 	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 +79,6 @@
 }
 
 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 +100,6 @@
 	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 +127,6 @@
 		JOBS=1
 	fi
 	make HOTSPOT_BUILD_JOBS=${JOBS} || die
-
-	export LD_PRELOAD=$LD_PRELOAD_SAVE
 }
 
 src_install () {