Restrict fetch

(Portage version: 2.0.52-r1 all-the-cool-kids-are-doing-it)

4 files changed, 23 insertions, 99 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 8559d7693eae..a413c628968b 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.30 2005/08/26 13:04:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.31 2005/10/01 07:29:28 axxo Exp $
+
+  01 Oct 2005; Thomas Matthijs <axxo@gentoo.org>
+  -ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild:
+  Restrict fetch
 
   26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   ibm-jdk-bin-1.4.2.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r2 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r2
deleted file mode 100644
index 79690c1cbd41..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 fedb35c08896f5f99d4ed67885248da7 IBMJava2-SDK-141.ppc.tgz 57070530
-MD5 3cadd3d32817dd33888b5645e0d1987a IBMJava2-SDK-141.tgz 54177447
-MD5 992e805364a53ff18e624aa6c18789b3 IBMJava2-JAVACOMM-141.tgz 46867
-MD5 f2d5327a7352ee7454c7bb13b1885ae0 IBMJava2-SDK-141.ppc64.tgz 54176779
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
deleted file mode 100644
index 816b70eee922..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.13 2005/07/13 13:57:27 swegener Exp $
-
-inherit java eutils
-
-DESCRIPTION="IBM Java Development Kit ${PV}"
-HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
-SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-141.ppc.tgz )
-	ppc64? ( mirror://gentoo/IBMJava2-SDK-141.ppc64.tgz )
-	x86? ( mirror://gentoo/IBMJava2-SDK-141.tgz )
-	javacomm? (
-		x86? ( mirror://gentoo/IBMJava2-JAVACOMM-141.tgz )
-		ppc64? ( mirror://gentoo/IBMJava2-JAVACOMM-141.tgz )
-		)"
-PROVIDE="virtual/jdk
-	virtual/jre"
-SLOT="1.4"
-LICENSE="IBM-J1.4"
-KEYWORDS="ppc ~x86 ppc64 -*"
-
-DEPEND="virtual/libc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.1* )
-	X? ( virtual/x11 )"
-RDEPEND="${DEPEND}
-	!ppc64? ( sys-libs/lib-compat )"
-
-IUSE="X doc javacomm browserplugin mozilla"
-
-if use ppc; then
-	S="${WORKDIR}/IBMJava2-ppc-141"
-elif use ppc64; then
-	S="${WORKDIR}/IBMJava2-ppc64-141"
-else
-	S="${WORKDIR}/IBMJava2-141"
-fi
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	mkdir -p ${D}opt/${P}
-	cp -dpR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
-
-	mkdir -p ${D}/opt/${P}/share
-	cp -a ${S}/{demo,src.jar} ${D}opt/${P}/share/
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins ${FILESDIR}/cpuinfo
-	fi
-	if ( use browserplugin || use mozilla ) && ! use ppc; then
-		local plugin="libjavaplugin_oji.so"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-}
-
-pkg_postinst() {
-	java_pkg_postinst
-	if ! use X; then
-		echo
-		eerror "You're not using X so its possible that you dont have"
-		eerror "a X server installed, please read the following warning: "
-		eerror "Some parts of IBM JDK require XFree86 to be installed."
-		eerror "Be careful which Java libraries you attempt to use."
-	fi
-	if ! use browserplugin && use mozilla; then
-		ewarn
-		ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-		ewarn "has been renamed to 'browserplugin' please update your USE"
-	fi
-
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
index 6ecc1ec1c6f1..f637a89a465e 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.26 2005/08/26 13:04:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.27 2005/10/01 07:29:28 axxo Exp $
 
 inherit java eutils
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
 HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
-SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-142.ppc.tgz )
-	ppc64? ( mirror://gentoo/IBMJava2-SDK-142.ppc64.tgz )
-	x86? ( mirror://gentoo/IBMJava2-SDK-142.tgz )
-	amd64? ( mirror://gentoo/IBMJava2-SDK-AMD64-142.x86_64.tgz )
+SRC_URI="ppc? ( IBMJava2-SDK-142.ppc.tgz )
+	ppc64? ( IBMJava2-SDK-142.ppc64.tgz )
+	x86? ( IBMJava2-SDK-142.tgz )
+	amd64? ( IBMJava2-SDK-AMD64-142.x86_64.tgz )
 	javacomm? (
-		x86? ( mirror://gentoo/IBMJava2-JAVACOMM-142.tgz )
-		ppc64? ( mirror://gentoo/IBMJava2-JAVACOMM-142.tgz )
-		amd64? ( mirror://gentoo/IBMJava2-JAVACOMM-AMD64-142.x86_64.tgz )
+		x86? ( IBMJava2-JAVACOMM-142.tgz )
+		ppc64? ( IBMJava2-JAVACOMM-142.tgz )
+		amd64? ( IBMJava2-JAVACOMM-AMD64-142.x86_64.tgz )
 		)"
 PROVIDE="virtual/jdk
 	virtual/jre"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64 amd64 -*"
+RESTRICT="fetch"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -40,6 +41,15 @@ else
 	S="${WORKDIR}/IBMJava2-142"
 fi
 
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${HOMEPAGE}"
+	einfo "Download: ${A}"
+	einfo "Place the file in: ${DISTDIR}"
+	einfo "Rerun emerge"
+}
+
 src_compile() { :; }
 
 src_install() {