Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the deps.

(Portage version: 2.1.4_rc9)

4 files changed, 27 insertions, 401 deletions

diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.6 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.6
deleted file mode 100644
index fdfd4920a2a8..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.6
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 4c454d5500f4ed9efbe7af3ed1959a6f ibm-java2-javacomm-5.0-6.0-linux-i386.tgz 119310
-RMD160 8009b7e10da297476169d29f3e0afe37a9a858f0 ibm-java2-javacomm-5.0-6.0-linux-i386.tgz 119310
-SHA256 adff409840898174684483b59ee2b0b9bafe6f19a781671d2b604dbec9dc5c48 ibm-java2-javacomm-5.0-6.0-linux-i386.tgz 119310
-MD5 3c008e8d23cd00cb2f701fb480f54d51 ibm-java2-javacomm-5.0-6.0-linux-ppc.tgz 125788
-RMD160 92f4e542b1c3392579d93018bed37734b9938201 ibm-java2-javacomm-5.0-6.0-linux-ppc.tgz 125788
-SHA256 a34a09cf9b892230f6eeb26b1f607abe1ffdf8dccff1402b21281972db4bfac2 ibm-java2-javacomm-5.0-6.0-linux-ppc.tgz 125788
-MD5 2b5cd08ad4cd417620501c34bcb221c2 ibm-java2-javacomm-5.0-6.0-linux-ppc64.tgz 128332
-RMD160 726c5ec0260313770f9c4be237955118d3721104 ibm-java2-javacomm-5.0-6.0-linux-ppc64.tgz 128332
-SHA256 643287ebe3d0551f2a49642b75ad3635e57589473df0d3c15b4ce1b20533266e ibm-java2-javacomm-5.0-6.0-linux-ppc64.tgz 128332
-MD5 1af4017d762c7deb0fcf199521138dce ibm-java2-javacomm-5.0-6.0-linux-x86_64.tgz 121803
-RMD160 66144c0ef46786bebc795e57d449a09fd4a88da5 ibm-java2-javacomm-5.0-6.0-linux-x86_64.tgz 121803
-SHA256 176914ab03a4a9b02a8cad0675e3dadb5893eac62d7b4cbc129fc783ed0a1436 ibm-java2-javacomm-5.0-6.0-linux-x86_64.tgz 121803
-MD5 a3dda2bc8c9a826b63dec1ef9aa0e39c ibm-java2-sdk-5.0-6.0-linux-i386.tgz 63445375
-RMD160 49e496ccfc145f321bbb5b21624eba8a058123b2 ibm-java2-sdk-5.0-6.0-linux-i386.tgz 63445375
-SHA256 b860d4c690f173d97d8c8d9a0289b2d7ced333f0b60ee4aa2dcf60881300488e ibm-java2-sdk-5.0-6.0-linux-i386.tgz 63445375
-MD5 f13c24eb8e2a12289d91e3e818eb5db9 ibm-java2-sdk-5.0-6.0-linux-ppc.tgz 71512415
-RMD160 e3f247e5b9b812426695d03debcee42fb7d2c7de ibm-java2-sdk-5.0-6.0-linux-ppc.tgz 71512415
-SHA256 fb887c12443fec7ff8f2733231b7a117a36519769e7d40ef9e53d55cfcaabdee ibm-java2-sdk-5.0-6.0-linux-ppc.tgz 71512415
-MD5 1f06bba0a24d0242408059a28ca30cff ibm-java2-sdk-5.0-6.0-linux-ppc64.tgz 69246934
-RMD160 643d26c304e7da6443c05ee325ff22151f507a6e ibm-java2-sdk-5.0-6.0-linux-ppc64.tgz 69246934
-SHA256 827aecea96d0d3bf4fa757f9982732f5c8aa42a9e1586dd3dcdd5b9078a0270c ibm-java2-sdk-5.0-6.0-linux-ppc64.tgz 69246934
-MD5 1035bb94586db42b36755265b43d8068 ibm-java2-sdk-5.0-6.0-linux-x86_64.tgz 65138260
-RMD160 cea7a326a9e9b4e4df167b6af93c851c3226938b ibm-java2-sdk-5.0-6.0-linux-x86_64.tgz 65138260
-SHA256 e669f594a2d5e420bd6c14f3c83fe6fe6903f60cb7123f535e9b82f4908802e2 ibm-java2-sdk-5.0-6.0-linux-x86_64.tgz 65138260
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild
index 6d8619c979f5..4e3626635cfc 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9.ebuild,v 1.5 2007/08/12 14:29:16 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild,v 1.6 2007/12/16 19:52:57 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator
@@ -64,24 +64,24 @@ SRC_URI="x86? ( ${X86_JDK_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="
+RDEPEND="x86? ( net-libs/libnet )
 		=virtual/libstdc++-3.3
 		alsa? ( media-libs/alsa-lib )
 		X? (
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXp
 			x11-libs/libXext
 			x11-libs/libXi
 			x11-libs/libXmu
+			x11-libs/libXp
+			x11-libs/libXtst
+			x11-libs/libXt
+			x11-libs/libX11
 		)
 		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
 		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
@@ -132,7 +132,7 @@ src_install() {
 	# javaws is on x86 only
 	if use x86; then
 		# The javaws execution script is 777 why?
-		chmod 0755 ${S}/jre/javaws/javaws
+		chmod 0755 "${S}"/jre/javaws/javaws
 
 		# bug #147259
 		dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
@@ -141,22 +141,19 @@ src_install() {
 
 	# Copy all the files to the designated directory
 	dodir /opt/${P}
-	cp -pR ${S}/{bin,jre,lib,include} ${D}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/
+		cp -pPR "${S}"/demo "${D}"/opt/${P}/share/
 	fi
 
-	cp -pPR ${S}/src.jar "${D}/opt/${P}/"
-	dosym "../src.jar" /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
+		doins "${FILESDIR}/cpuinfo"
 	fi
 
 	if use x86 && use nsplugin; then
@@ -167,39 +164,11 @@ src_install() {
 		fi
 
 		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
-	elif use x86; then
-		rm ${D}/opt/${P}/jre/bin/libjavaplugin*.so
-	fi
-
-	if ! use alsa; then
-		rm ${D}/opt/${P}/jre/bin/libjsoundalsa.so \
-			|| eerror "${D}/opt/${P}/jre/bin/libjsoundalsa.so not found"
 	fi
 
 	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
+	dodoc "${S}"/docs/COPYRIGHT
 
 	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn
-		ewarn "You have not enabled the X useflag.  It is possible that"
-		ewarn "you do not have an X server installed.  Please note that"
-		ewarn "some parts of the IBM JDK require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-	elog ""
-	elog "Starting with 1.4.2.8 demos are installed only with USE=examples"
-	elog ""
-	elog "Starting with 1.4.2.8 the src.jar is installed to the standard"
-	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
-	elog "but it will be removed if there will ever be a version bump."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
-	elog "for more details."
+	java-vm_revdep-mask
 }
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
index 86c76ea60422..77307431c73e 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1 2007/12/12 15:10:07 caster Exp $
+# $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 $
 
 inherit java-vm-2 versionator eutils
 
@@ -68,25 +68,27 @@ SRC_URI="x86? ( ${X86_JDK_DIST} )
 LICENSE="IBM-J1.5"
 KEYWORDS="-* amd64 ppc ppc64 x86"
 RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin"
+IUSE="X alsa doc examples javacomm nsplugin odbc"
 
-RDEPEND="
+RDEPEND="x86? ( net-libs/libnet )
 		=virtual/libstdc++-3.3
-		X? ( x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXp
+		X? (
 			x11-libs/libXext
+			x11-libs/libXft
 			x11-libs/libXi
 			x11-libs/libXmu
-			x11-libs/libXft
-			)
+			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
@@ -217,23 +219,13 @@ src_compile() { :; }
 src_install() {
 	# Copy all the files to the designated directory
 	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include} "${D}/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
 
-	cp -pPR "${S}/src.jar" "${D}/opt/${P}/"
-
-	# 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
-
 	local x86plugin=libjavaplugin_ojigtk2.so
 	local ppcplugin=libjavaplugin_oji.so
 	local jrebindest="${D}/opt/${P}/jre/bin/"
@@ -243,8 +235,6 @@ src_install() {
 		plugin=${x86plugin}
 	elif use ppc; then
 		plugin=${ppcplugin}
-	#	rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
-	#		eerror "Failed to delete gtk2 javaplugin."
 	fi
 
 	plugin=/opt/${P}/jre/bin/${plugin}
@@ -252,35 +242,12 @@ src_install() {
 	if use x86 || use ppc; then
 		if use nsplugin; then
 			install_mozilla_plugin ${plugin}
-		else
-			rm "${jrebindest}/*javaplugin*.so" || \
-				eerror "Failed to delete javaplugin shared libraries"
 		fi
 	fi
 
-	use !alsa && rm "${jrebindest}/libjsoundalsa.so"
-
 	dohtml -a html,htm,HTML -r docs
 	dodoc "${S}/COPYRIGHT"
 
 	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	if ! use X; then
-		echo
-		ewarn "You're not using X so its possible that you dont have"
-		ewarn "a X server installed, please read the following warning: "
-		ewarn "Some parts of IBM JDK require XFree86 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-
-	elog ""
-	elog "Starting with 1.5.0.4-r1 demos are installed only with USE=examples"
-	elog ""
-	elog "Starting with 1.5.0.5 the src.jar is installed to the standard"
-	elog "location only (/opt/${P}/) and not /opt/${P}/share/"
-	elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241"
-	elog "for more details."
+	java-vm_revdep-mask
 }
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6.ebuild
deleted file mode 100644
index 48a2597abf6c..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.5 2007/11/18 18:20:47 dertobi123 Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java2-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${TGZ_PV}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-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}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc64-50"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
-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.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin"
-
-RDEPEND="
-		=virtual/libstdc++-3.3
-		X? ( x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXp
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXmu
-			x11-libs/libXft
-			)
-		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* )
-		)"
-DEPEND=""
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libjaas.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libjsig.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/xawt/libmawt.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/motif21/libmawt.so
-	opt/${P}/jre/bin/headless/libmawt.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "(note that we switched to tgz format because it's now versioned)"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-
-	einfo "You can 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() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR ${S}/{bin,jre,lib,include} ${D}/opt/${P}/
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR ${S}/demo ${D}/opt/${P}/share/
-	fi
-
-	cp -pPR ${S}/src.jar "${D}/opt/${P}/"
-
-	# 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
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/jre/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	#	rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
-	#		eerror "Failed to delete gtk2 javaplugin."
-	fi
-
-	plugin=/opt/${P}/jre/bin/${plugin}
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			install_mozilla_plugin ${plugin}
-		else
-			rm "${jrebindest}/*javaplugin*.so" || \
-				eerror "Failed to delete javaplugin shared libraries"
-		fi
-	fi
-
-	use !alsa && rm "${jrebindest}/libjsoundalsa.so"
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/COPYRIGHT
-
-	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	if ! use X; then
-		echo
-		ewarn "You're not using X so its possible that you dont have"
-		ewarn "a X server installed, please read the following warning: "
-		ewarn "Some parts of IBM JDK require XFree86 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-
-	elog ""
-	elog "Starting with 1.5.0.4-r1 demos are installed only with USE=examples"
-	elog ""
-	elog "Starting with 1.5.0.5 the src.jar is installed to the standard"
-	elog "location only (/opt/${P}/) and not /opt/${P}/share/"
-	elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241"
-	elog "for more details."
-}