Fixed dependencies by adding the deps needed by nsplugin and added the alsa use flag. Now removes the plugin and alsa shared libraries if the use flags are not set. Fixes bug #147610 and bug #118685.

(Portage version: 2.1.2_pre1)

6 files changed, 133 insertions, 79 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 97927b830e6d..0ddba897204f 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.75 2006/09/17 00:36:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.76 2006/09/17 11:01:58 betelgeuse Exp $
+
+  17 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+  ibm-jdk-bin-1.4.2.04.ebuild, ibm-jdk-bin-1.4.2.6-r1.ebuild,
+  ibm-jdk-bin-1.4.2.6-r3.ebuild, ibm-jdk-bin-1.5.0.ebuild,
+  ibm-jdk-bin-1.5.0.2.ebuild:
+  Fixed dependencies by adding the deps needed by nsplugin and added the alsa
+  use flag. Now removes the plugin and alsa shared libraries if the use flags
+  are not set. Fixes bug #147610 and bug #118685.
 
   17 Sep 2006; Vlastimil Babka <caster@gentoo.org> -files/ibm-jdk-bin-1.4.2,
   -files/ibm-jdk-bin-1.4.2.03, -ibm-jdk-bin-1.4.2.03.ebuild,
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild
index 93a8eddf8aea..2fd6bbdfe82a 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.04.ebuild,v 1.5 2006/07/06 11:17:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild,v 1.6 2006/09/17 11:01:58 betelgeuse Exp $
 
 inherit java eutils
 
@@ -51,9 +51,10 @@ SRC_URI="x86? ( IBMJava2-SDK-142-SR4.tgz )
 LICENSE="IBM-J1.4"
 SLOT="1.4"
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="X doc javacomm nsplugin"
+IUSE="X alsa doc javacomm nsplugin"
 
-DEPEND="sys-libs/glibc
+RDEPEND="sys-libs/glibc
+		alsa? ( media-libs/alsa-lib )
 		X? ( || (
 					(
 						x11-libs/libXt
@@ -61,20 +62,15 @@ DEPEND="sys-libs/glibc
 						x11-libs/libXtst
 						x11-libs/libXp
 						x11-libs/libXext
-						x11-libs/libSM
-						x11-libs/libICE
-						x11-libs/libXau
-						x11-libs/libXdmcp
 						x11-libs/libXi
 						x11-libs/libXmu
 					)
 					virtual/x11
 				)
-			)"
-RDEPEND="${DEPEND}
-		 ppc? ( sys-libs/lib-compat )
-		 x86? ( sys-libs/lib-compat )"
-PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+			)
+		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
+		ppc? ( sys-libs/lib-compat )
+		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
 
 RESTRICT="fetch"
 
@@ -130,7 +126,7 @@ src_install() {
 		doins ${FILESDIR}/cpuinfo
 	fi
 
-	if use nsplugin && ! use ppc && ! use amd64 && ! use ppc64; then
+	if use x86 && use nsplugin; then
 		local plugin="libjavaplugin_oji.so"
 
 		if has_version '>=sys-devel/gcc-3' ; then
@@ -138,6 +134,13 @@ 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
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild
index 3d2f557b1179..a1b89db5c4c9 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.6-r1.ebuild,v 1.6 2006/09/15 22:26:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild,v 1.7 2006/09/17 11:01:58 betelgeuse Exp $
 
 inherit java eutils versionator rpm
 
@@ -49,25 +49,28 @@ SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
 LICENSE="IBM-J1.4"
 SLOT="1.4"
 KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X doc javacomm nsplugin"
-
-RDEPEND=" !ppc64? ( !amd64? ( sys-libs/lib-compat ) )
-	virtual/libstdc++
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-libs/libXp
-		x11-libs/libXext
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXi
-		x11-libs/libXmu
-	)"
-DEPEND=""
-PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+IUSE="X alsa doc javacomm nsplugin"
+
+RDEPEND="
+		ppc? ( sys-libs/lib-compat )
+		s390? ( virtual/libstdc++ )
+		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
+					)
+					virtual/x11
+				)
+			)
+		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
+		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
 
 RESTRICT="fetch"
 
@@ -118,7 +121,7 @@ src_install() {
 		doins ${FILESDIR}/cpuinfo
 	fi
 
-	if use nsplugin && ! use ppc && ! use amd64 && ! use ppc64; then
+	if use x86 && use nsplugin; then
 		local plugin="libjavaplugin_oji.so"
 
 		if has_version '>=sys-devel/gcc-3' ; then
@@ -126,6 +129,13 @@ 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
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
index aa79fff075b1..0da4d5f5ce1b 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.6-r3.ebuild,v 1.2 2006/09/15 13:13:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild,v 1.3 2006/09/17 11:01:58 betelgeuse Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -50,25 +50,27 @@ SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
 LICENSE="IBM-J1.4"
 SLOT="1.4"
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X doc javacomm nsplugin"
-
-RDEPEND=" !ppc64? ( !amd64? ( sys-libs/lib-compat ) )
-	virtual/libstdc++
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-libs/libXp
-		x11-libs/libXext
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXi
-		x11-libs/libXmu
-	)"
-DEPEND=""
-PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+IUSE="X alsa doc javacomm nsplugin"
+
+RDEPEND="
+		ppc? ( sys-libs/lib-compat )
+		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
+					)
+					virtual/x11
+				)
+			)
+		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
+		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
 
 RESTRICT="fetch"
 
@@ -114,7 +116,7 @@ src_install() {
 		doins ${FILESDIR}/cpuinfo
 	fi
 
-	if use nsplugin && ! use ppc && ! use amd64 && ! use ppc64; then
+	if use x86 && use nsplugin; then
 		local plugin="libjavaplugin_oji.so"
 
 		if has_version '>=sys-devel/gcc-3' ; then
@@ -122,6 +124,13 @@ 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
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
index 91f9cc7842f3..0ab73136513a 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.ebuild,v 1.3 2006/09/02 20:10:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild,v 1.4 2006/09/17 11:01:58 betelgeuse Exp $
 
 inherit java-vm-2 versionator eutils rpm
 
@@ -68,19 +68,21 @@ RDEPEND="
 						x11-libs/libXtst
 						x11-libs/libXp
 						x11-libs/libXext
-						x11-libs/libSM
-						x11-libs/libICE
-						x11-libs/libXau
-						x11-libs/libXdmcp
 						x11-libs/libXi
 						x11-libs/libXmu
+						x11-libs/libXft
 					)
 					virtual/x11
 				)
-			)"
+			)
+		alsa? ( media-libs/alsa-lib )
+		nsplugin? (
+			x86? ( =x11-libs/gtk+-2* )
+			ppc? ( =x11-libs/gtk+-1* )
+		)"
 DEPEND=""
 
-IUSE="X javacomm nsplugin"
+IUSE="X alsa javacomm nsplugin"
 
 
 pkg_nofetch() {
@@ -117,16 +119,34 @@ src_install() {
 	#	doins ${FILESDIR}/cpuinfo
 	#fi
 
+
+	local x86plugin=libjavaplugin_ojigtk2.so
+	local ppcplugin=libjavaplugin_oji.so
+
+	local plugin
+	if use x86; then
+		plugin=${x86plugin}
+		rm "${D}/opt/${P}/jre/bin/${ppcplugin}" || \
+			eerror "Failed to delete gtk1 javaplugin."
+
+	elif use ppc; then
+		plugin=${ppcplugin}
+		rm "${D}/opt/${P}/jre/bin/${x86plugin}" || \
+			eerror "Failed to delete gtk2 javaplugin."
+
+	fi
+
+	plugin=/opt/${P}/jre/bin/${plugin}
+
 	if use nsplugin  && ! use amd64 && ! use ppc64; then
-		local plugin
-		if use x86; then
-			plugin="libjavaplugin_ojigtk2.so"
-		elif use ppc; then
-			plugin="libjavaplugin_oji.so"
-		fi
-		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
+		install_mozilla_plugin ${plugin}
+	elif use x86 || use ppc; then
+		rm "${D}/${plugin}" || \
+			eerror "Failed to delete ${D}/plugin"
 	fi
 
+	use !alsa && rm "${D}/opt/${P}/jre/bin/libjsoundalsa.so"
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc ${S}/COPYRIGHT
 
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
index f3244159b71b..34d5a9bc9318 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.8 2006/09/02 20:10:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild,v 1.9 2006/09/17 11:01:58 betelgeuse Exp $
 
 inherit java eutils
 
@@ -23,9 +23,9 @@ LICENSE="IBM-J1.5"
 SLOT="1.5"
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~s390 ~x86"
 RESTRICT="fetch"
-IUSE="X javacomm browserplugin mozilla"
+IUSE="X alsa javacomm browserplugin mozilla"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
 		X? ( || (
 					(
 						x11-libs/libXt
@@ -33,17 +33,19 @@ RDEPEND="sys-libs/glibc
 						x11-libs/libXtst
 						x11-libs/libXp
 						x11-libs/libXext
-						x11-libs/libSM
-						x11-libs/libICE
-						x11-libs/libXau
-						x11-libs/libXdmcp
 						x11-libs/libXi
 						x11-libs/libXmu
+						x11-libs/libXft
 					)
 					virtual/x11
 				)
-			)"
-DEPEND="${DEPEND}"
+			)
+		alsa? ( media-libs/alsa-lib )
+		nsplugin? (
+			x86? ( =x11-libs/gtk+-2* )
+			ppc? ( =x11-libs/gtk+-1* )
+		)"
+DEPEND=""
 
 if use x86; then
 	S="${WORKDIR}/ibm-java2-i386-50"
@@ -94,6 +96,8 @@ src_install() {
 		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
 	fi
 
+	use !alsa && rm "${D}/opt/${P}/jre/bin/libjsoundalsa.so"
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc ${S}/COPYRIGHT