[patch] fix

sun-j2sdk-1.4.2.ebuild-fix-nofetch.patch (text/plain), 1.57 KB, created by Thomas Matthijs (RETIRED) on 2004-06-22 08:39:38 UTC

--- /usr/portage/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild	2004-02-14 06:32:16.000000000 +0100
+++ sun-j2sdk-1.4.2.ebuild	2004-06-22 17:33:28.576304456 +0200
@@ -24,7 +24,7 @@
 SRC_MOZHEADERS="j2sdk-1_4_2-mozilla_headers-unix.zip"
 SRC_BINJAVA="j2sdk-1_4_2-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"
@@ -32,6 +32,7 @@
 SLOT="0"
 KEYWORDS="~x86 -ppc -alpha -sparc"
 LICENSE="sun-csl"
+RESTRICT="fetch"
 
 RDEPEND="virtual/glibc
 	virtual/x11
@@ -48,6 +49,14 @@
 	virtual/jdk-1.4.2
 	virtual/java-scheme-2"
 
+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 +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
-
-	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}