Version bump, security bug #198644; remove unneeded libnet deps.
authorVlastimil Babka <caster@gentoo.org>
Tue, 26 Feb 2008 16:28:59 +0000 (16:28 +0000)
committerVlastimil Babka <caster@gentoo.org>
Tue, 26 Feb 2008 16:28:59 +0000 (16:28 +0000)
Package-Manager: portage-2.1.4.4

dev-java/ibm-jdk-bin/ChangeLog
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.10.ebuild [new file with mode: 0644]
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
dev-java/ibm-jre-bin/ChangeLog
dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild [new file with mode: 0644]
dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild
dev-java/jython/Manifest

index 40d05950820c82dd3dd47ac7b40401131adcfc72..22c575e524d5dbdf6366b24fd277d8552d3d1f78 100644 (file)
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/ibm-jdk-bin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.146 2008/01/17 20:09:43 tgall Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.147 2008/02/26 16:24:01 caster Exp $
+
+  26 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jdk-bin-1.4.2.10.ebuild, ibm-jdk-bin-1.5.0.6-r1.ebuild,
+  ibm-jdk-bin-1.6.0.0.ebuild:
+  Version bump, security bug #198644; remove unneeded libnet deps.
+
+*ibm-jdk-bin-1.4.2.10 (26 Feb 2008)
+
+  26 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jdk-bin-1.4.2.10.ebuild, ibm-jdk-bin-1.5.0.6-r1.ebuild,
+  ibm-jdk-bin-1.6.0.0.ebuild:
+  Version bump, security bug #198644; remove unneeded libnet deps.
 
   17 Jan 2008; Tom Gall <tgall@gentoo.org. ibm-jdk-bin-1.6.0.0.ebuild:
   added ~ppc64, bug 166789
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.10.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.10.ebuild
new file mode 100644 (file)
index 0000000..029f4a7
--- /dev/null
@@ -0,0 +1,172 @@
+# Copyright 1999-2008 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.10.ebuild,v 1.1 2008/02/26 16:24:01 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils versionator
+
+JDK_RELEASE=$(get_version_component_range 1-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="IBMJava2-SDK-${RPM_PV}"
+JAVACOMM_DIST_PREFIX="IBMJava2-JAVACOMM-${RPM_PV}"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.tgz"
+
+# wonder why amd64 has this extra special AMD64 in its filename...
+AMD64_JDK_DIST="IBMJava2-SDK-AMD64-${RPM_PV}.x86_64.tgz"
+AMD64_JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}.ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}.ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc64.tgz"
+
+if use x86; then
+       JDK_DIST=${X86_JDK_DIST}
+       JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+       S="${WORKDIR}/IBMJava2-142"
+       LINK_ARCH="ia32"
+elif use amd64; then
+       JDK_DIST=${AMD64_JDK_DIST}
+       JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+       S="${WORKDIR}/IBMJava2-amd64-142"
+       LINK_ARCH="amd64"
+elif use ppc; then
+       JDK_DIST=${PPC_JDK_DIST}
+       JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+       S="${WORKDIR}/IBMJava2-ppc-142"
+       LINK_ARCH="ip32"
+elif use ppc64; then
+       JDK_DIST=${PPC64_JDK_DIST}
+       JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+       S="${WORKDIR}/IBMJava2-ppc64-142"
+       LINK_ARCH="ip64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+# bug #125178
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="x86? ( ${X86_JDK_DIST} )
+       amd64? ( ${AMD64_JDK_DIST} )
+       ppc? ( ${PPC_JDK_DIST} )
+       ppc64? ( ${PPC64_JDK_DIST} )
+       javacomm? (
+               x86? ( ${X86_JAVACOMM_DIST} )
+               amd64? ( ${AMD64_JAVACOMM_DIST} )
+               ppc? ( ${PPC_JAVACOMM_DIST} )
+               ppc64? ( ${PPC64_JAVACOMM_DIST} )
+       )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X alsa doc examples javacomm nsplugin"
+
+RDEPEND="=virtual/libstdc++-3.3
+       alsa? ( media-libs/alsa-lib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXmu
+               x11-libs/libXp
+               x11-libs/libXtst
+               x11-libs/libXt
+               x11-libs/libX11
+       )
+       doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+RESTRICT="fetch"
+
+QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
+       opt/${P}/jre/bin/libjclscar_22.so"
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
+QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
+       opt/${P}/jre/bin/libjaas.so"
+QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
+       opt/${P}/jre/bin/javaplugin.so
+       opt/${P}/jre/bin/classic/libjvm.so
+       opt/${P}/jre/bin/classic/libcore.so"
+
+pkg_nofetch() {
+       einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+       einfo "Please visit: ${DOWNLOADPAGE}"
+
+       einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
+       einfo "${JDK_DIST}"
+       if use javacomm ; then
+               einfo "${JAVACOMM_DIST}"
+       fi
+       einfo "You can also use direct link to your arch download page:"
+       einfo "${DIRECT_DOWNLOAD}"
+       einfo "Place the file(s) in: ${DISTDIR}"
+       einfo "Then restart emerge: 'emerge --resume'"
+
+       einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
+       einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+       einfo "isn't updated, but the files should still available through the"
+       einfo "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # bug #126105
+       epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { true; }
+
+src_install() {
+       # javaws is on x86 only
+       if use x86; then
+               # The javaws execution script is 777 why?
+               chmod 0755 "${S}"/jre/javaws/javaws
+
+               # bug #147259
+               dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+               dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+       fi
+
+       # Copy all the files to the designated directory
+       dodir /opt/${P}
+       cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}"/opt/${P}/
+
+       dodir /opt/${P}/share
+       if use examples; then
+               cp -pPR "${S}"/demo "${D}"/opt/${P}/share/
+       fi
+
+       # 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 x86 && use nsplugin; 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
+       java-vm_revdep-mask
+}
index 77307431c73e25d68b8de05aec9f0b296956cee1..f51afb50d10046552238ffd3f6a1c2fc2ff5e7fb 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5.0.6-r1.ebuild,v 1.2 2007/12/16 19:52:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild,v 1.3 2008/02/26 16:24:01 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -70,25 +70,25 @@ KEYWORDS="-* amd64 ppc ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc"
 
-RDEPEND="x86? ( net-libs/libnet )
-               =virtual/libstdc++-3.3
-               X? (
-                       x11-libs/libXext
-                       x11-libs/libXft
-                       x11-libs/libXi
-                       x11-libs/libXmu
-                       x11-libs/libXp
-                       x11-libs/libXtst
-                       x11-libs/libXt
-                       x11-libs/libX11
-               )
-               alsa? ( media-libs/alsa-lib )
-               doc? ( =dev-java/java-sdk-docs-1.5.0* )
-               nsplugin? (
-                       x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-                       ppc? ( =x11-libs/gtk+-1* )
-               )
-               odbc? ( dev-db/unixODBC )"
+RDEPEND="=virtual/libstdc++-3.3
+       X? (
+               x11-libs/libXext
+               x11-libs/libXft
+               x11-libs/libXi
+               x11-libs/libXmu
+               x11-libs/libXp
+               x11-libs/libXtst
+               x11-libs/libXt
+               x11-libs/libX11
+       )
+       alsa? ( media-libs/alsa-lib )
+       doc? ( =dev-java/java-sdk-docs-1.5.0* )
+       nsplugin? (
+               x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
+               ppc? ( =x11-libs/gtk+-1* )
+       )
+       odbc? ( dev-db/unixODBC )"
+
 DEPEND=""
 
 QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
index fd061510854de2ddaafdd5a1bb08eb1df897208a..5ab1645805c0a52be2a2d7aca165b657da7c8052 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6.0.0.ebuild,v 1.5 2008/01/17 20:09:43 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild,v 1.6 2008/02/26 16:24:01 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -73,19 +73,20 @@ KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc"
 
-RDEPEND="x86? ( net-libs/libnet )
-               X? (
-                       x11-libs/libXext
-                       x11-libs/libXft
-                       x11-libs/libXi
-                       x11-libs/libXp
-                       x11-libs/libXtst
-                       x11-libs/libX11
-                       amd64? ( x11-libs/libXt )
-               )
-               alsa? ( media-libs/alsa-lib )
-               doc? ( =dev-java/java-sdk-docs-1.6.0* )
-               odbc? ( dev-db/unixODBC )"
+RDEPEND="
+       X? (
+               x11-libs/libXext
+               x11-libs/libXft
+               x11-libs/libXi
+               x11-libs/libXp
+               x11-libs/libXtst
+               x11-libs/libX11
+               amd64? ( x11-libs/libXt )
+       )
+       alsa? ( media-libs/alsa-lib )
+       doc? ( =dev-java/java-sdk-docs-1.6.0* )
+       odbc? ( dev-db/unixODBC )"
+
 DEPEND=""
 
 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
index ab7994f7cbbc26941c3fd3234a475e2bd1a82e5b..4bf6260dbfe0fcfc9e44f2acf9d40ca2caeab03c 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ibm-jre-bin
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.84 2008/01/17 20:12:18 tgall Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.85 2008/02/26 16:28:59 caster Exp $
+
+*ibm-jre-bin-1.4.2.10 (26 Feb 2008)
+
+  26 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jre-bin-1.4.2.10.ebuild, ibm-jre-bin-1.5.0.6-r1.ebuild,
+  ibm-jre-bin-1.6.0.0.ebuild:
+  Version bump, security bug #198644; remove unneeded libnet deps.
 
   17 Jan 2008; Tom Gall <tgall@gentoo.org> ibm-jre-bin-1.6.0.0.ebuild:
   added ~ppc64, bug #166789
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild
new file mode 100644 (file)
index 0000000..24b0b46
--- /dev/null
@@ -0,0 +1,127 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild,v 1.1 2008/02/26 16:28:59 caster Exp $
+
+inherit java-vm-2 eutils versionator
+
+JDK_RELEASE=$(get_version_component_range 1-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JRE_DIST_PREFIX="IBMJava2-JRE-${RPM_PV}"
+
+X86_JRE_DIST="${JRE_DIST_PREFIX}.tgz"
+# wonder why amd64 has this extra special AMD64 in its filename...
+AMD64_JRE_DIST="IBMJava2-JRE-AMD64-${RPM_PV}.x86_64.tgz"
+PPC_JRE_DIST="${JRE_DIST_PREFIX}.ppc.tgz"
+PPC64_JRE_DIST="${JRE_DIST_PREFIX}.ppc64.tgz"
+
+if use x86; then
+       JRE_DIST=${X86_JRE_DIST}
+       S="${WORKDIR}/IBMJava2-142"
+       LINK_ARCH="ia32"
+elif use amd64; then
+       JRE_DIST=${AMD64_JRE_DIST}
+       S="${WORKDIR}/IBMJava2-amd64-142"
+       LINK_ARCH="amd64"
+elif use ppc; then
+       JRE_DIST=${PPC_JRE_DIST}
+       S="${WORKDIR}/IBMJava2-ppc-142"
+       LINK_ARCH="ip32"
+elif use ppc64; then
+       JRE_DIST=${PPC64_JRE_DIST}
+       S="${WORKDIR}/IBMJava2-ppc64-142"
+       LINK_ARCH="ip64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
+
+DESCRIPTION="IBM Java Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+       amd64? ( ${AMD64_JRE_DIST} )
+       ppc? ( ${PPC_JRE_DIST} )
+       ppc64? ( ${PPC64_JRE_DIST} )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X alsa nsplugin"
+
+RDEPEND="=virtual/libstdc++-3.3
+       alsa? ( media-libs/alsa-lib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXmu
+               x11-libs/libXp
+               x11-libs/libXtst
+               x11-libs/libXt
+               x11-libs/libX11
+       )"
+DEPEND=""
+
+RESTRICT="fetch"
+
+QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
+       opt/${P}/bin/javaplugin.so
+       opt/${P}/bin/classic/libjvm.so
+       opt/${P}/bin/classic/libcore.so"
+QA_TEXTRELS_amd64="
+       opt/${P}/bin/libj9jit22.so
+       opt/${P}/bin/libjclscar_22.so
+"
+
+pkg_nofetch() {
+       einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+       einfo "Please visit: ${DOWNLOADPAGE}"
+
+       einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
+       einfo "${JRE_DIST}"
+
+       einfo "Direct link:"
+       einfo "${DIRECT_DOWNLOAD}"
+       einfo "Place the file(s) in: ${DISTDIR}"
+       einfo "Then restart emerge: 'emerge --resume'"
+
+       einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
+       einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+       einfo "isn't updated, but the files should still available through the"
+       einfo "direct link. If it doesn't work, file a bug."
+}
+
+src_compile() { :; }
+
+src_install() {
+       # javaws is on x86 only
+       if use x86; then
+               # The javaws execution script is 777 why?
+               chmod 0755 "${S}"/jre/javaws/javaws
+
+               # bug #147259
+               dosym ../javaws/javaws /opt/${P}/bin/javaws
+       fi
+
+       # Copy all the files to the designated directory
+       dodir /opt/${P}
+       cp -pR "${S}"/jre/* "${D}"/opt/${P}/
+
+       if use x86 && use nsplugin; then
+               local plugin="libjavaplugin_oji.so"
+
+               if has_version '>=sys-devel/gcc-3' ; then
+                       plugin="libjavaplugin_ojigcc3.so"
+               fi
+
+               install_mozilla_plugin /opt/${P}/bin/${plugin}
+       fi
+
+       dohtml -a html,htm,HTML -r docs
+       dodoc "${S}"/docs/COPYRIGHT
+
+       set_java_env
+       java-vm_revdep-mask
+}
index 3e39fb664343e2147bbd6b7eb2945e65e8c021c0..a15b3d22256144cdd76cb56a6878aa42ec87bd70 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.2 2007/12/16 20:13:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.3 2008/02/26 16:28:59 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -52,8 +52,7 @@ KEYWORDS="-* amd64 ppc ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc"
 
-RDEPEND="x86? ( net-libs/libnet )
-               =virtual/libstdc++-3.3
+RDEPEND="=virtual/libstdc++-3.3
                X? (
                        x11-libs/libXext
                        x11-libs/libXft
index 069c9d329a17b5cec05c9d880186bff55c9288a7..8ad466f1c82c79b45e3f6434646637c9580ae989 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.4 2008/01/17 20:12:18 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.5 2008/02/26 16:28:59 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -52,7 +52,7 @@ KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc"
 
-RDEPEND="x86? ( net-libs/libnet )
+RDEPEND="
                X? (
                        x11-libs/libXext
                        x11-libs/libXft
index 26a6a9c2b140d7043a1223fa4b453a38783c6e1f..323e95c45d171d49c3ba9cad35121c1e3c95eaef 100644 (file)
@@ -6,6 +6,6 @@ DIST jython-2.1.tar.bz2 1301528 RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1
 DIST jython_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a847e5c2ab SHA1 6fea1e8985af955fc843789e2d60fcfc38a76fd8 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68
 EBUILD jython-2.1-r10.ebuild 2674 RMD160 85b56e5d602522d25e722a77123826920e01413a SHA1 80e584728ea84918ee057c477d829aa6ca57fc91 SHA256 9b7660235fb4583d02fc5799cf2aa80bb0a195c5490ee56c4a1bbcb3f2ee38ab
 EBUILD jython-2.1-r11.ebuild 2948 RMD160 960108d66f0fad28090222179e947f70cd699027 SHA1 9ab5b19ff83ea2a573b614d6bacbceb6d8adc9d7 SHA256 b66850640319a2339e1f51cef4f94f15d1006b87f307ca0dfc3f7d1e9ff5c5df
-EBUILD jython-2.2.1-r1.ebuild 3749 RMD160 ddd64add31ed05458f5827580079e6a4cb42343a SHA1 d2639c72c87ed6632ed75ff8f2475e61e08b572a SHA256 0891a70b85762ca1d5c08236236f287cc6c5337ba610ca439452e396cf083f87
+EBUILD jython-2.2.1-r1.ebuild 3747 RMD160 2bcb4b460607d24e4b875ae708cdf4586a34d65e SHA1 74d6b0df2fbec94a2952bcd26496c5e3133955cd SHA256 810d0aa733fedc41d224b4aac727309dbb048f3d3e8a7f74b3a29219d297f904
 MISC ChangeLog 7512 RMD160 4cef7aa4ecbf1a56d0b44952db829654d9aa5df8 SHA1 b0f491b6851a5350807eb171ad8f3d69f78673ff SHA256 bb37d79501c8a9b25ae3e032ca3274b08e531c6a577e288dba41e87dc2c806a2
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9