Updated ebuilds to fix fetch Restriction.

8 files changed, 33 insertions, 23 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 520e93d0b380..7b689632ae85 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.16 2003/08/13 00:10:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.17 2003/09/09 04:36:02 strider Exp $
+
+  09 Sep 2003; Adrian Almenar <strider@gentoo.org> java-sdk-docs-1.3.1.ebuild,
+  java-sdk-docs-1.4.1.ebuild, java-sdk-docs-1.4.2.ebuild:
+  Updated ebuilds for fetch RESTRICTION
 
   11 Aug 2003; Luca Barbato <lu_zero@gentoo.org> java-sdk-docs-1.4.1.ebuild:
   Marked ~ppc again.
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 2970563ddae7..37b3dfd058ff 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,7 +1,7 @@
-MD5 ddf582ef4e8e31fd408afd76370d14d0 java-sdk-docs-1.4.2.ebuild 869
-MD5 f3b434253431685f5ab7a4191ff50c74 java-sdk-docs-1.3.1.ebuild 840
-MD5 deab4478d1bc394227c13a524d130337 java-sdk-docs-1.4.1.ebuild 851
-MD5 86eda2252b0cef2709c4b67108fb94af ChangeLog 2681
+MD5 a723e971258e22ec458c2d67898d1e98 java-sdk-docs-1.4.2.ebuild 868
+MD5 301aee71b4309f13d8ba1b3b24a0a92f java-sdk-docs-1.3.1.ebuild 840
+MD5 b03765770708999a4a9020a8765157c7 java-sdk-docs-1.4.1.ebuild 850
+MD5 9de8c9ecd78a01582f8e80e8f50a1163 ChangeLog 2681
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 6dc4baf5fd91548abdb10317d37bb4f2 files/digest-java-sdk-docs-1.3.1 66
 MD5 0645a1f4c374e0fb15f893bdd22bf9a2 files/digest-java-sdk-docs-1.4.1 66
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.3.1 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.3.1
index e69de29bb2d1..e85dec0e3227 100644
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.3.1
+++ b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.3.1
@@ -0,0 +1 @@
+MD5 0362c571b7b2f4e4d3c627e37a757ad5 j2sdk-1_3_1-doc.zip 22577838
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1
index e69de29bb2d1..ef43ca170208 100644
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1
+++ b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1
@@ -0,0 +1 @@
+MD5 105e236ee793b5d01be899527f36ca94 j2sdk-1_4_1-doc.zip 32765641
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.2 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.2
index e69de29bb2d1..df6d105eb0bc 100644
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.2
+++ b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.2
@@ -0,0 +1 @@
+MD5 fe7aa32c8847028a4c79d962176e28dc j2sdk-1_4_2-doc.zip 34397778
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
index f1af72a82f6e..e7a7e91c7026 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild,v 1.9 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild,v 1.10 2003/09/09 04:36:03 strider Exp $
 
 At="j2sdk-1_3_1-doc.zip"
 S="${WORKDIR}/docs"
-SRC_URI=""
+SRC_URI="j2sdk-1_3_1-doc.zip"
 DESCRIPTION="Javadoc for Java SDK version 1.3.1"
 HOMEPAGE="http://java.sun.com/j2se/1.3/docs.html"
 LICENSE="sun-j2sl"
@@ -13,11 +13,12 @@ KEYWORDS="x86 ppc sparc alpha"
 DEPEND=">=app-arch/unzip-5.50-r1"
 RESTRICT="fetch"
 
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and move it to ${DISTDIR}"
+}
+
 src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} and move it to ${DISTDIR}"
-	fi
-	unpack ${At} || die
+	unpack ${At} || die "Failed Unpacking"
 }
 
 src_install(){
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
index 9a7973f59943..eb4fcb9656b4 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild,v 1.11 2003/09/09 04:36:03 strider Exp $
 
 At="j2sdk-1_4_1-doc.zip"
 S="${WORKDIR}/docs"
-SRC_URI=""
+SRC_URI="j2sdk-1_4_1-doc.zip"
 DESCRIPTION="Javadoc for Java SDK version 1.4.1"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
 LICENSE="sun-j2sl"
@@ -13,11 +13,12 @@ KEYWORDS="x86 ~ppc sparc -alpha"
 DEPEND=">=app-arch/unzip-5.50-r1"
 RESTRICT="fetch"
 
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and move it to ${DISTDIR}"
+}
+
 src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} and move it to ${DISTDIR}"
-	fi
-	unpack ${At} || die
+	unpack ${At} || die "Failed Unpacking"
 }
 
 src_install(){
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
index 2eb3d61e0a64..5d68e753f8e1 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.7 2003/09/09 04:36:03 strider Exp $
 
 At="j2sdk-1_4_2-doc.zip"
 S="${WORKDIR}/docs"
-SRC_URI=""
+SRC_URI="j2sdk-1_4_2-doc.zip"
 DESCRIPTION="Javadoc for Java SDK version 1.4.2"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
 LICENSE="sun-j2sl"
@@ -13,11 +13,12 @@ KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 DEPEND=">=app-arch/unzip-5.50-r1"
 RESTRICT="fetch"
 
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and move it to ${DISTDIR}"
+}
+
 src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} and move it to ${DISTDIR}"
-	fi
-	unpack ${At} || die
+	unpack ${At} || die "Failed Unpacking"
 }
 
 src_install(){