diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2006-09-17 19:24:36 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2006-09-17 19:24:36 +0000 |
| commit | cef702ad2301e959a83d3d06f4c6eeafb4cc959d (patch) | |
| tree | 9252c33f18afe744add3705b38b33527889e3b5d /dev-java | |
| parent | Fix metadata and add ~x86-fbsd keyword. Closes bug #147934, thanks to uhh, m... (diff) | |
| download | gentoo-2-cef702ad2301e959a83d3d06f4c6eeafb4cc959d.tar.gz gentoo-2-cef702ad2301e959a83d3d06f4c6eeafb4cc959d.tar.bz2 gentoo-2-cef702ad2301e959a83d3d06f4c6eeafb4cc959d.zip | |
It seems that the gtk2 version of javaplugin also needs gtk1. Now depends on both.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ibm-jdk-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index e451900e00a3..bcae262c8631 100644 --- a/dev-java/ibm-jdk-bin/ChangeLog +++ b/dev-java/ibm-jdk-bin/ChangeLog @@ -1,6 +1,11 @@ # 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.77 2006/09/17 11:05:31 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.78 2006/09/17 19:24:36 betelgeuse Exp $ + + 17 Sep 2006; Petteri Räty <betelgeuse@gentoo.org> + ibm-jdk-bin-1.5.0.2.ebuild: + It seems that the gtk2 version of javaplugin also needs gtk1. Now depends on + both. 17 Sep 2006; Petteri Räty <betelgeuse@gentoo.org> ibm-jdk-bin-1.5.0.ebuild: 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 0ab73136513a..a0515ead22d4 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.4 2006/09/17 11:01:58 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild,v 1.5 2006/09/17 19:24:36 betelgeuse Exp $ inherit java-vm-2 versionator eutils rpm @@ -77,7 +77,7 @@ RDEPEND=" ) alsa? ( media-libs/alsa-lib ) nsplugin? ( - x86? ( =x11-libs/gtk+-2* ) + x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* ) ppc? ( =x11-libs/gtk+-1* ) )" DEPEND="" @@ -122,18 +122,15 @@ src_install() { 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} - 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}" || \ + rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \ eerror "Failed to delete gtk2 javaplugin." - fi plugin=/opt/${P}/jre/bin/${plugin} @@ -141,8 +138,8 @@ src_install() { if use nsplugin && ! use amd64 && ! use ppc64; then install_mozilla_plugin ${plugin} elif use x86 || use ppc; then - rm "${D}/${plugin}" || \ - eerror "Failed to delete ${D}/plugin" + rm "${D}/opt/${P}/jre/bin/*javaplugin*.so" || \ + eerror "Failed to delete javaplugin shared libraries" fi use !alsa && rm "${D}/opt/${P}/jre/bin/libjsoundalsa.so" |