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.

Package-Manager: portage-2.1.2_pre1

7 files changed, 167 insertions, 103 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/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 19d4fc8c2705..10fdf071aae6 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cpuinfo 12 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d SHA1 2c35d51e0110bd74f2c4cf9f7f063358837ea907 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d files/cpuinfo 12
@@ -55,30 +58,30 @@ DIST ibm-java2-sdk-50-linux-s390.tgz 63680823 RMD160 2b0155ee5509c99d221556c6299
 DIST ibm-java2-sdk-50-linux-x86_64.tgz 62861140 RMD160 327fe57b87ef563f098a958d5e0a43d0238f5140 SHA1 f3b9602cc2efa4f97094f5528084c3b44ce0a3a0 SHA256 351d4dc3ef063d0c5caaecc4c38289088bd0a1f096e98c579b5f43536caadd32
 DIST ibm-java2-x86_64-javacomm-5.0-2.0.x86_64.rpm 127845 RMD160 3063d6f7064aac2eaf52f1fae5ee6a484bd0b57e SHA1 f2996d006651a1ab323f87880320fc19d8307650 SHA256 40dbba9edf6d40a8cbbc70f098acb1cb1c43353049eba6053d04afb21c778c87
 DIST ibm-java2-x86_64-sdk-5.0-2.0.x86_64.rpm 64402669 RMD160 82178652578519966a24d744d07e3d88518a7e16 SHA1 e022f0f3feb7ff1aeaf56726e3838fc524626cc9 SHA256 17976989afe60b2fcd4540fd6e90c1ee1e39671bd9eff6875461963da8cfcee7
-EBUILD ibm-jdk-bin-1.4.2.04.ebuild 4687 RMD160 4c1732409e6b06200c14ebafff906705bf4264c9 SHA1 0187bdf5883e9e38bb17d2e38a1f4850535de9a1 SHA256 bd19bd105d542c253ca35b8caede264c8df95318e40ae9180f567bdf6ff6cc44
-MD5 b0df94d6d5a432019ffaac41133a008b ibm-jdk-bin-1.4.2.04.ebuild 4687
-RMD160 4c1732409e6b06200c14ebafff906705bf4264c9 ibm-jdk-bin-1.4.2.04.ebuild 4687
-SHA256 bd19bd105d542c253ca35b8caede264c8df95318e40ae9180f567bdf6ff6cc44 ibm-jdk-bin-1.4.2.04.ebuild 4687
-EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4595 RMD160 b835b838b09729eb9002de2044c0375e02f6589a SHA1 0e4b454f7d6bd66cb70d11cc0a5acac2523b7fa2 SHA256 ebf4b35dff7dfda3ac209d6fba9e3edc8920652da1e5791973bacb7c1aed0934
-MD5 7a8640f64876859191f2846425741ddd ibm-jdk-bin-1.4.2.6-r1.ebuild 4595
-RMD160 b835b838b09729eb9002de2044c0375e02f6589a ibm-jdk-bin-1.4.2.6-r1.ebuild 4595
-SHA256 ebf4b35dff7dfda3ac209d6fba9e3edc8920652da1e5791973bacb7c1aed0934 ibm-jdk-bin-1.4.2.6-r1.ebuild 4595
-EBUILD ibm-jdk-bin-1.4.2.6-r3.ebuild 4366 RMD160 647f75640cab7ce62f4b31f3dfe007044398031d SHA1 df3f81333ee9050f65e17e05156f053732fd3cf7 SHA256 823b42648c0a2dc69fd63ba26155106ede87f767995c2349f76f34a13b859ab0
-MD5 21ccd152efb172afd49656e555e49f53 ibm-jdk-bin-1.4.2.6-r3.ebuild 4366
-RMD160 647f75640cab7ce62f4b31f3dfe007044398031d ibm-jdk-bin-1.4.2.6-r3.ebuild 4366
-SHA256 823b42648c0a2dc69fd63ba26155106ede87f767995c2349f76f34a13b859ab0 ibm-jdk-bin-1.4.2.6-r3.ebuild 4366
-EBUILD ibm-jdk-bin-1.5.0.2.ebuild 3981 RMD160 bb4a886dc794badbce0bdc45eb60c776e40d5936 SHA1 478abe836b32af95ee94a7dfc6e7f6333a149bbb SHA256 532afe4e7994672e7efef6499201ea69836674ed23214b3d17edb529ecc0ef8e
-MD5 e22a716aa94211b53ae5a094ebfe422e ibm-jdk-bin-1.5.0.2.ebuild 3981
-RMD160 bb4a886dc794badbce0bdc45eb60c776e40d5936 ibm-jdk-bin-1.5.0.2.ebuild 3981
-SHA256 532afe4e7994672e7efef6499201ea69836674ed23214b3d17edb529ecc0ef8e ibm-jdk-bin-1.5.0.2.ebuild 3981
-EBUILD ibm-jdk-bin-1.5.0.ebuild 3192 RMD160 4958da77c1d53998e6269c3948f5ff0a7e0c4397 SHA1 00a7d3cd35b052871f8e67c7e766f1cd8068b356 SHA256 158268b7d3ff98d8bbccb3ccd5495888a3a814bcc4055fe09a9d84a1c9c183b6
-MD5 4780f474f1be61217982b6c8091de638 ibm-jdk-bin-1.5.0.ebuild 3192
-RMD160 4958da77c1d53998e6269c3948f5ff0a7e0c4397 ibm-jdk-bin-1.5.0.ebuild 3192
-SHA256 158268b7d3ff98d8bbccb3ccd5495888a3a814bcc4055fe09a9d84a1c9c183b6 ibm-jdk-bin-1.5.0.ebuild 3192
-MISC ChangeLog 11757 RMD160 e3ba4bd9a86745915824af84ac8907303f24458a SHA1 f1e448d3dbac97d53fb444bf0c33c9b22fae7c48 SHA256 2d54ee3c883c90faa00a88f91679f5228f12368fa648d58587d513dfafab186a
-MD5 27a60b8ec2de5ab060d4ad2dead41134 ChangeLog 11757
-RMD160 e3ba4bd9a86745915824af84ac8907303f24458a ChangeLog 11757
-SHA256 2d54ee3c883c90faa00a88f91679f5228f12368fa648d58587d513dfafab186a ChangeLog 11757
+EBUILD ibm-jdk-bin-1.4.2.04.ebuild 4807 RMD160 b5b90c77ddc0139681a8664d649009543268e7c5 SHA1 d0fe04d34d5a1ba933edf8b968923ed8b55213da SHA256 03e447c4fbbef79f61c7edc8b0360a44571a9695a28b235d75f885eb566e7439
+MD5 3235dd69c2a988eb1f0d0ac7924081ba ibm-jdk-bin-1.4.2.04.ebuild 4807
+RMD160 b5b90c77ddc0139681a8664d649009543268e7c5 ibm-jdk-bin-1.4.2.04.ebuild 4807
+SHA256 03e447c4fbbef79f61c7edc8b0360a44571a9695a28b235d75f885eb566e7439 ibm-jdk-bin-1.4.2.04.ebuild 4807
+EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4845 RMD160 c258b6eaebda22dabe88a5ac449e812c6b535870 SHA1 40d06a50656e50fafd7989eb6c2b251918d6964d SHA256 e70b5deff274b12016420fd84f6f57f8096bfd83138625d1d7bcfb767b686844
+MD5 886411b0d84fa070af3da8d19c271065 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
+RMD160 c258b6eaebda22dabe88a5ac449e812c6b535870 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
+SHA256 e70b5deff274b12016420fd84f6f57f8096bfd83138625d1d7bcfb767b686844 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
+EBUILD ibm-jdk-bin-1.4.2.6-r3.ebuild 4588 RMD160 74ec1e708cecf3398257f484870d797c6f7482ff SHA1 019044c67a8ef573b5838e52fed6cf2b311f8ad1 SHA256 02dd723672f9ac0ce6710531920eaf92a61cd3cca4e2cd4acaf929d7cad53ac4
+MD5 15e65c92a799daf4d124895896e4735f ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
+RMD160 74ec1e708cecf3398257f484870d797c6f7482ff ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
+SHA256 02dd723672f9ac0ce6710531920eaf92a61cd3cca4e2cd4acaf929d7cad53ac4 ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
+EBUILD ibm-jdk-bin-1.5.0.2.ebuild 4447 RMD160 876c0e7ebe0ebe366243bd105ac87321828fc21f SHA1 f7903ec41bb0029d88dfa1b0e8685a04012d3c54 SHA256 13639fa7354af76a981d5f96cf6d8311e3da30227ff371839b7a721e0d952a90
+MD5 09265faed31280fe9626dc178ddecf47 ibm-jdk-bin-1.5.0.2.ebuild 4447
+RMD160 876c0e7ebe0ebe366243bd105ac87321828fc21f ibm-jdk-bin-1.5.0.2.ebuild 4447
+SHA256 13639fa7354af76a981d5f96cf6d8311e3da30227ff371839b7a721e0d952a90 ibm-jdk-bin-1.5.0.2.ebuild 4447
+EBUILD ibm-jdk-bin-1.5.0.ebuild 3276 RMD160 f5d151f4d1584ffb5caeaadf689dad334a0ede1a SHA1 639a6bfb40519aa50d2417c721e0ed2757859bdf SHA256 85dc33ff4aa1da2c56a186e8d25bb5b0628057f79234665566b036d9c55a68cf
+MD5 0b56373a9375adf9ab6818031231b461 ibm-jdk-bin-1.5.0.ebuild 3276
+RMD160 f5d151f4d1584ffb5caeaadf689dad334a0ede1a ibm-jdk-bin-1.5.0.ebuild 3276
+SHA256 85dc33ff4aa1da2c56a186e8d25bb5b0628057f79234665566b036d9c55a68cf ibm-jdk-bin-1.5.0.ebuild 3276
+MISC ChangeLog 12172 RMD160 e4558e709c7ab453bcc0814f909e22d4e71322fd SHA1 64f7946dd8dc59e55e308416beff07f99babca99 SHA256 0d598cceab44dd7706ba108a981fdadaa3cc4e286b1fd1233a6781a37e83baba
+MD5 249074e4679fe286c38276e25f6476df ChangeLog 12172
+RMD160 e4558e709c7ab453bcc0814f909e22d4e71322fd ChangeLog 12172
+SHA256 0d598cceab44dd7706ba108a981fdadaa3cc4e286b1fd1233a6781a37e83baba ChangeLog 12172
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -98,3 +101,10 @@ SHA256 1e4a90eb01b02f89c96f042546b5461b16c07868222bf643eb99af50a1a8d951 files/di
 MD5 51e8e04e14a44502ca27a46a6fa16355 files/digest-ibm-jdk-bin-1.5.0.2 2396
 RMD160 1b3fe81686391ecf0fdef07586643292b64e071f files/digest-ibm-jdk-bin-1.5.0.2 2396
 SHA256 904666cd8dbe71ebed3d7c19323c840b26ff3d6390fbaa2e918cc2d9376d3485 files/digest-ibm-jdk-bin-1.5.0.2 2396
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFDSs/cxLzpIGCsLQRAmbMAKCU7c2j30UNd0Yk6KO20T6ukuFBDACfd5KB
+79qbel+GstdjdyoO6dERXHI=
+=Gb3O
+-----END PGP SIGNATURE-----
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