commit:     c81802f494ee9697d3667ec2d29ddce4d9d1568b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 19:56:16 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 20:24:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81802f4

dev-java/ibm-jdk-bin: Remove JVM that we don't maintain (bug #483018)

We are removing Java 6 entirely. Newer versions are maintained
upstream but Java team are not interested in supporting a proprietary
JVM that sits behind a registration wall and provides no tangible
benefit over Oracle or IcedTea. haubi may restore this later to
support AIX but this is uncertain.

 dev-java/ibm-jdk-bin/Manifest                      |   8 -
 dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env     |  16 --
 dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env     |  16 --
 .../ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch     |  12 -
 .../ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild   | 284 ---------------------
 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild | 280 --------------------
 dev-java/ibm-jdk-bin/metadata.xml                  |  12 -
 7 files changed, 628 deletions(-)

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
deleted file mode 100644
index 25b1157..0000000
--- a/dev-java/ibm-jdk-bin/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST ibm-java-javacomm-6.0-9.0-linux-i386.tgz 336897 SHA256 
2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705 SHA512 
e1426df1bb2b975185608d5a8889328e03782fd5e5eed82b0df407643b8bbf42b67e6c30644a17d8aec28c8a8cf444c479bbaa6812e48201952ba5f79427e933
 WHIRLPOOL 
22a7e0d5af254d4a496c22b9ead3db4a84aba3ebb9bba60b0153aa7216b6d5acc68436a0d0de54ebf8024b4df664c3b78c2d480f1844e1c5ca5ecd6dd02564dc
-DIST ibm-java-javacomm-6.0-9.0-linux-ppc.tgz 343028 SHA256 
5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0 SHA512 
da7b1709a2595810ea8def039ca88ff28fbf189a825a9229b174a22085d30a26c057ddb9f532940d413f7ecc49f1b201e46003a6842d085afa8038c6b6b89aaf
 WHIRLPOOL 
1682cf4483e8d16287e2526a3f04936a820e47a8257382b6fd943fcc969c6a7ce0ab1204d07a5d45b5a9414d09f0df9d13645695b2e7aa3815944b628897da1c
-DIST ibm-java-javacomm-6.0-9.0-linux-ppc64.tgz 342371 SHA256 
27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a SHA512 
9d6cd92d2da22330e48177776b1a6a7455299890acbc0c36e830f3ea839d988bf0723dc07391c92e0716eba9b840da7091236a6c2042e28299ff87b973876376
 WHIRLPOOL 
5b5415b2c57c3364a85db6445cccc37ed7e9c27de9e370be0e093749aee4278075fc1942213b566650d2b1692fe4ae9b2279d34d9000c386ae3a55c8bbb800cb
-DIST ibm-java-javacomm-6.0-9.0-linux-x86_64.tgz 339256 SHA256 
10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c SHA512 
efb462a833e86697d79b7076e68b4812021cef3736875998aa6971cd23b64909faef7fdff43650337ba60daeeb29c6049fb4ef09666c1242b22963835ed4e043
 WHIRLPOOL 
963b9f717bba9a23ba14c6f2543ba4e1c8395e19b71759127503a9f0d0998cb0d4046f97102c23a348d273cb3ad8ab319260fbfe3beee556d31cda905f6abf4e
-DIST ibm-java-sdk-6.0-9.2-linux-i386.tgz 94285404 SHA256 
cc835013d9b82f4f188bc6036bb9850d7f848c513f73b321539e4eb8cc5a7e71 SHA512 
68862a26e147813b92f071b25e1591f32837789a502859e3045d0b14189fa60766739f587ffce3d1841925ef0305acd5346754d8cb3bb642cda5d43a1785c3ab
 WHIRLPOOL 
780df88cf68853457d5445705cc0404a1d6b5b86e41e9aea74fbb62284e67e7aa9f1d88a2923f1992ba79fa17b3891f9c3eb13f72827bf9d599ca762812d267f
-DIST ibm-java-sdk-6.0-9.2-linux-ppc.tgz 96591020 SHA256 
738bc53ec28ca823d01218ad5a6d665b3b2d5638225c1dc6fad5b6780b953c5b SHA512 
ce538243c359607886183625005b912b3b7613e561ebe5d17a7ec03c01768cc6aa5dc065e28ccc82f6e3d0276b1be85a20c6f008fa90d337fade609163532d41
 WHIRLPOOL 
cc9fddb0414f05545526843a8967497f1f7152306cd5a2e6cfdb97fcfc7e4a63b3a93f24446e1dd9729234e996c3469b2ada7a765ee414467a323f37866cc174
-DIST ibm-java-sdk-6.0-9.2-linux-ppc64.tgz 99395016 SHA256 
2c831e79a5e8f87e716e216edb29825c9f3e4d4e473ec6cb3b71bdf88ae8ef0d SHA512 
5af2dd4b4258c413f4d2c59a991e7f05371a26ee186af681580e55d62e082b9dc89cce6e089a108e1ce8b80f5b62b99f35fecaea7c9bb55315067048e2299b70
 WHIRLPOOL 
2a17f1ff64d18bd8a34225bbde8b0b93bfce8bcb338f4bdc1b49f44eabdc23644ba41f0217b5a5f88af7c1e28906e2cc5e36951cb02c6fea1d11686a5164ebe9
-DIST ibm-java-sdk-6.0-9.2-linux-x86_64.tgz 95834113 SHA256 
025ac23ebc96d0d88e80cef1b27fea9b2a72253e49274b1f729995d33fb4e02c SHA512 
431d6336074858c1da102b6df01ebbb55919e89018f4636b251187465921474171cb2d801f5c3ba64faea63e3a4718f588d931ce270d5ce9a864c1847469853a
 WHIRLPOOL 
428c21877fb66d97ea8f938e8271c50e315c82f56f8933cfe2d7d02d81b400ec75aec49ec6413d8f216feb2609f4717daea4fd8f724645fe76d9177a053a5d4a

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env 
b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
deleted file mode 100644
index 8129abd..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/bin/:${JAVA_HOME}/jre/bin/classic"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/graphics.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmjaaslm.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/server.jar:${JAVA_HOME}/jre/lib/xml.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env 
b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
deleted file mode 100644
index 1f5df15..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.6"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/facilitators.jar:${JAVA_HOME}/jre/lib/annotation.jar:${JAVA_HOME}/jre/lib/beans.jar:${JAVA_HOME}/jre/lib/java.util.jar:${JAVA_HOME}/jre/lib/jndi.jar:${JAVA_HOME}/jre/lib/logging.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/sql.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathfw.jar:${JAVA_HOME}/jre/lib/ibmjgssfw.jar:${JAVA_HOME}/jre/lib/ibmjssefw.jar:${JAVA_HOME}/jre/lib/ibmsaslfw.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/ibmxmlcrypto.jar:${JAVA_HOME}/jre/lib/management-agent.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/jlm.jar:${JAVA_HOME}/jr
 e/lib/javascript.jar:${JAVA_HOME}/jre/lib/RACF.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch 
b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
deleted file mode 100644
index c3fa40c..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/jawt.h     2006/07/20 23:02:04     1.1
-+++ include/jawt.h     2006/07/20 23:03:13
-@@ -298,7 +298,9 @@ typedef struct jawt {
-  * Get the AWT native structure.  This function returns JNI_FALSE if
-  * an error occurs.
-  */
-+#ifdef _JNI_IMPORT_OR_EXPORT_
- _JNI_IMPORT_OR_EXPORT_
-+#endif
- jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
- 
- #define JAWT_VERSION_1_3 0x00010003

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild 
b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
deleted file mode 100644
index b23969e..0000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-
-# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
-if [[ $(get_version_component_count) == 5 ]]; then
-       FP_VERSION="$(get_version_component_range 5)"
-       FP_VERSION="${FP_VERSION#p}"
-       FP_WEB="-FP${FP_VERSION}"
-       FP_LINK="fp${FP_VERSION}"
-       TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
-else
-       FP_WEB=""
-       FP_LINK=""
-       TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-fi
-
-#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they don't bump javacomm in service releases anymore
-JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
-JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
-JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
-
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/";
-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.6"
-SLOT="1.6"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
-
-RDEPEND="
-       ppc? ( =virtual/libstdc++-3.3 )
-       ppc64? ( =virtual/libstdc++-3.3 )
-       X? (
-               x11-libs/libXext
-               x11-libs/libXft
-               x11-libs/libXi
-               x11-libs/libXp
-               x11-libs/libXtst
-               x11-libs/libX11
-               x11-libs/libXt
-       )
-       alsa? ( media-libs/alsa-lib )
-       doc? ( =dev-java/java-sdk-docs-1.6.0* )
-       odbc? ( dev-db/unixODBC )
-       selinux? ( sec-policy/selinux-java )"
-
-DEPEND=""
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
-opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/default/libj9hookable24.so
-opt/${P}/jre/lib/amd64/default/libj9vm24.so
-opt/${P}/jre/lib/amd64/default/libjclscar_24.so
-opt/${P}/jre/lib/amd64/default/libj9jpi24.so
-opt/${P}/jre/lib/amd64/default/libj9thr24.so
-opt/${P}/jre/lib/amd64/default/libj9dmp24.so
-opt/${P}/jre/lib/amd64/default/libj9prt24.so
-opt/${P}/jre/lib/amd64/default/libj9jit24.so
-opt/${P}/jre/lib/amd64/default/libiverel24.so
-opt/${P}/jre/lib/amd64/default/libj9trc24.so
-opt/${P}/jre/lib/amd64/default/libj9dbg24.so
-opt/${P}/jre/lib/amd64/default/libj9shr24.so
-opt/${P}/jre/lib/amd64/default/libj9gc24.so
-opt/${P}/jre/lib/amd64/default/libj9bcv24.so
-opt/${P}/jre/lib/amd64/default/libj9ute24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
-
-_init_at_vars() {
-       if use x86; then
-               JDK_DIST=${X86_JDK_DIST}
-               JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-               JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
-               S="${WORKDIR}/ibm-java-i386-60"
-               LINK_ARCH="intel"
-       elif use amd64; then
-               JDK_DIST=${AMD64_JDK_DIST}
-               JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-               JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
-               S="${WORKDIR}/ibm-java-x86_64-60"
-               LINK_ARCH="amd64"
-       elif use ppc; then
-               JDK_DIST=${PPC_JDK_DIST}
-               JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-               JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
-               S="${WORKDIR}/ibm-java-ppc-60"
-               LINK_ARCH="ipseries32"
-       elif use ppc64; then
-               JDK_DIST=${PPC64_JDK_DIST}
-               JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-               JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
-               S="${WORKDIR}/ibm-java-ppc64-60"
-               LINK_ARCH="ipseries64"
-       fi
-}
-
-pkg_nofetch() {
-       _init_at_vars
-
-       
DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6";
-       
DIRECT_DOWNLOAD+="&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-       DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-       # bug #125178
-       ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-       einfo "Due to license restrictions, we cannot redistribute or fetch the 
distfiles"
-       einfo "Please visit: ${DOWNLOADPAGE}"
-
-       einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your 
arch:"
-       einfo "${JDK_DIST}"
-       if use javacomm ; then
-               einfo "Also download ${JAVACOMM_DIST_ORIG}"
-               ewarn "and save it as ${JAVACOMM_DIST}"
-               ewarn "Renaming is needed because javacomm changes content 
without changing filename."
-       fi
-
-       einfo "You can also use a 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}${FP_WEB} 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() {
-       _init_at_vars
-
-       unpack ${JDK_DIST}
-       if use javacomm; then
-               mkdir "${WORKDIR}/javacomm/" || die
-               cd "${WORKDIR}/javacomm/"
-               unpack ${JAVACOMM_DIST}
-       fi
-}
-
-src_prepare() {
-       # bug #126105
-       epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-       # Copy all the files to the designated directory
-       dodir /opt/${P}
-       cp -pPR bin jre lib include src.zip "${ED}/opt/${P}" || die
-
-       if use examples; then
-               cp -pPR demo "${ED}"/opt/${P} || die
-       fi
-       if use javacomm; then
-               chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar 
"${WORKDIR}"/javacomm/*/lib/*.properties || die
-               cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar 
"${ED}"/opt/${P}/jre/lib/ext/ || die
-               cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties 
"${ED}"/opt/${P}/jre/lib/ || die
-               cp -pR "${WORKDIR}"/javacomm/*/lib/*.so 
"${ED}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
-               if use examples; then
-                       cp -pPR "${WORKDIR}"/javacomm/*/examples 
"${ED}"/opt/${P}/ || die
-               fi
-       fi
-
-       if use x86 || use ppc; then
-               local 
plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
-               if use nsplugin; then
-                       install_mozilla_plugin "${plugin}"
-               else
-                       rm "${ED}${plugin}" || die
-               fi
-       fi
-
-       # Install desktop file for the Java Control Panel. Using VMHANDLE as 
file
-       # name to prevent file collision with jre and or other slots.
-       sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
-               -e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/jre/bin/jcontrol#" \
-               -e 
"s#Icon=.*#Icon=${EPREFIX}/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-               "${ED}"/opt/${P}/jre/plugin/desktop/sun_java.desktop \
-               > "${T}"/${VMHANDLE}.desktop || die
-       domenu "${T}"/${VMHANDLE}.desktop || die
-
-       dohtml -a html,htm,HTML -r docs
-       dodoc copyright notices.txt readmefirst.lnx.txt
-
-       set_java_env
-
-       # a workaround to fix the BOOTCLASSPATH in our env file
-       # this is not optimal, using -Xcompressedrefs would probably make it
-       # expect the compressedrefs version...
-       if use amd64; then
-               sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" 
"${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-       fi
-       if use ppc64; then
-               sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" 
"${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-       fi
-
-       java-vm_set-pax-markings "${ED}"/opt/${P}
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /proc/cpuinfo /proc/self/coredump_filter 
/proc/self/maps
-}

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild 
b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
deleted file mode 100644
index cafcb35..0000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-
-# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
-if [[ $(get_version_component_count) == 5 ]]; then
-       FP_VERSION="$(get_version_component_range 5)"
-       FP_VERSION="${FP_VERSION#p}"
-       FP_WEB="-FP${FP_VERSION}"
-       FP_LINK="fp${FP_VERSION}"
-       TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
-else
-       FP_WEB=""
-       FP_LINK=""
-       TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-fi
-
-#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they don't bump javacomm in service releases anymore
-JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
-JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
-JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
-
-if use x86; then
-       JDK_DIST=${X86_JDK_DIST}
-       JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-       JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
-       S="${WORKDIR}/ibm-java-i386-60"
-       LINK_ARCH="intel"
-elif use amd64; then
-       JDK_DIST=${AMD64_JDK_DIST}
-       JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-       JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
-       S="${WORKDIR}/ibm-java-x86_64-60"
-       LINK_ARCH="amd64"
-elif use ppc; then
-       JDK_DIST=${PPC_JDK_DIST}
-       JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-       JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
-       S="${WORKDIR}/ibm-java-ppc-60"
-       LINK_ARCH="ipseries32"
-elif use ppc64; then
-       JDK_DIST=${PPC64_JDK_DIST}
-       JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-       JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
-       S="${WORKDIR}/ibm-java-ppc64-60"
-       LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK";
-
-SLOT="1.6"
-DESCRIPTION="IBM Java SE 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.6"
-KEYWORDS="-* amd64 ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
-
-RDEPEND="
-       ppc? ( =virtual/libstdc++-3.3 )
-       ppc64? ( =virtual/libstdc++-3.3 )
-       X? (
-               x11-libs/libXext
-               x11-libs/libXft
-               x11-libs/libXi
-               x11-libs/libXp
-               x11-libs/libXtst
-               x11-libs/libX11
-               x11-libs/libXt
-       )
-       alsa? ( media-libs/alsa-lib )
-       doc? ( =dev-java/java-sdk-docs-1.6.0* )
-       odbc? ( dev-db/unixODBC )
-       selinux? ( sec-policy/selinux-java )"
-
-DEPEND=""
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
-opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/default/libj9hookable24.so
-opt/${P}/jre/lib/amd64/default/libj9vm24.so
-opt/${P}/jre/lib/amd64/default/libjclscar_24.so
-opt/${P}/jre/lib/amd64/default/libj9jpi24.so
-opt/${P}/jre/lib/amd64/default/libj9thr24.so
-opt/${P}/jre/lib/amd64/default/libj9dmp24.so
-opt/${P}/jre/lib/amd64/default/libj9prt24.so
-opt/${P}/jre/lib/amd64/default/libj9jit24.so
-opt/${P}/jre/lib/amd64/default/libiverel24.so
-opt/${P}/jre/lib/amd64/default/libj9trc24.so
-opt/${P}/jre/lib/amd64/default/libj9dbg24.so
-opt/${P}/jre/lib/amd64/default/libj9shr24.so
-opt/${P}/jre/lib/amd64/default/libj9gc24.so
-opt/${P}/jre/lib/amd64/default/libj9bcv24.so
-opt/${P}/jre/lib/amd64/default/libj9ute24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
-
-pkg_nofetch() {
-       einfo "Due to license restrictions, we cannot redistribute or fetch the 
distfiles"
-       einfo "Please visit: ${DOWNLOADPAGE}"
-
-       einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your 
arch:"
-       einfo "${JDK_DIST}"
-       if use javacomm ; then
-               einfo "Also download ${JAVACOMM_DIST_ORIG}"
-               ewarn "and save it as ${JAVACOMM_DIST}"
-               ewarn "Renaming is needed because javacomm changes content 
without changing filename."
-       fi
-
-       einfo "You can also use a 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}${FP_WEB} 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 ${JDK_DIST}
-       if use javacomm; then
-               mkdir "${WORKDIR}/javacomm/" || die
-               cd "${WORKDIR}/javacomm/"
-               unpack ${JAVACOMM_DIST}
-       fi
-       cd "${S}"
-
-       # bug #126105
-       epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-       # Copy all the files to the designated directory
-       dodir /opt/${P}
-       cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
-
-       if use examples; then
-               cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
-       fi
-       if use javacomm; then
-               chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar 
"${WORKDIR}"/javacomm/*/lib/*.properties || die
-               cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar 
"${D}"/opt/${P}/jre/lib/ext/ || die
-               cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties 
"${D}"/opt/${P}/jre/lib/ || die
-               cp -pR "${WORKDIR}"/javacomm/*/lib/*.so 
"${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
-               if use examples; then
-                       cp -pPR "${WORKDIR}"/javacomm/*/examples 
"${D}"/opt/${P}/ || die
-               fi
-       fi
-
-       if use x86 || use ppc; then
-               if use nsplugin; then
-                       local 
plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
-                       install_mozilla_plugin "${plugin}"
-               fi
-       fi
-
-       local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
-       if [[ -f "${desktop_in}" ]]; then
-               local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
-               # install control panel for Gnome/KDE
-               # The jre also installs these so make sure that they do not 
have the same
-               # Name
-               sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK 
${SLOT}/" \
-                       -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-                       -e 
"s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-                       "${desktop_in}" > \
-                       "${desktop_out}" || die
-
-               domenu "${desktop_out}" || die
-       fi
-
-       dohtml -a html,htm,HTML -r docs || die
-       dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
-       set_java_env
-
-       # a workaround to fix the BOOTCLASSPATH in our env file
-       # this is not optimal, using -Xcompressedrefs would probably make it
-       # expect the compressedrefs version...
-       if use amd64; then
-               sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" 
"${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-       fi
-       if use ppc64; then
-               sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" 
"${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-       fi
-
-       java-vm_revdep-mask
-
-       # bug #321695
-       dodir /etc/sandbox.d
-       echo 'SANDBOX_PREDICT="/proc/self/coredump_filter"' > 
"${D}/etc/sandbox.d/20${VMHANDLE}"
-}

diff --git a/dev-java/ibm-jdk-bin/metadata.xml 
b/dev-java/ibm-jdk-bin/metadata.xml
deleted file mode 100644
index 4e9689c..0000000
--- a/dev-java/ibm-jdk-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="project">
-    <email>j...@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>IBM SDK Development kit.</longdescription>
-  <use>
-    <flag name="javacomm">Enable Java Communications API support</flag>
-  </use>
-</pkgmetadata>

Reply via email to