diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-09-18 18:45:15 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-09-18 18:45:15 +0000 |
| commit | 2d128488f65d1e13af512f87a1fb2e2f444e06dc (patch) | |
| tree | 49366046c15c7dd19f6065ccd04a596aa4e448fd /dev-java | |
| parent | Add ~x86-fbsd keyword (diff) | |
| download | gentoo-2-2d128488f65d1e13af512f87a1fb2e2f444e06dc.tar.gz gentoo-2-2d128488f65d1e13af512f87a1fb2e2f444e06dc.tar.bz2 gentoo-2-2d128488f65d1e13af512f87a1fb2e2f444e06dc.zip | |
Replaced deprecated browserplugin and mozilla USE flags with nsplugin which was already used in DEPEND but was not in IUSE. Whitespace cleanup.
(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.4.2.04.ebuild | 23 | ||||
| -rw-r--r-- | dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild | 15 |
3 files changed, 21 insertions, 24 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index 7d5c0eccfe9f..4e9bdbb8a00e 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.79 2006/09/18 16:46:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.80 2006/09/18 18:45:15 caster Exp $ + + 18 Sep 2006; Vlastimil Babka <caster@gentoo.org> + ibm-jdk-bin-1.4.2.04.ebuild, ibm-jdk-bin-1.5.0.ebuild: + Replaced deprecated browserplugin and mozilla USE flags with nsplugin which + was already used in DEPEND but was not in IUSE. Whitespace cleanup. 18 Sep 2006; Petteri Räty <betelgeuse@gentoo.org> ibm-jdk-bin-1.5.0.2.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 2fd6bbdfe82a..df34bf698731 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.6 2006/09/17 11:01:58 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild,v 1.7 2006/09/18 18:45:15 caster Exp $ inherit java eutils @@ -36,17 +36,16 @@ HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/" # bug #125178 ALT_HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/linux/older_download.html" SRC_URI="x86? ( IBMJava2-SDK-142-SR4.tgz ) - amd64? ( IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz ) - ppc? ( IBMJava2-SDK-142.ppc-SR4.tgz ) - ppc64? ( IBMJava2-SDK-142.ppc64-SR4.tgz ) - s390? ( IBMJava2-SDK-142.s390.tgz ) - javacomm? ( - x86? ( IBMJava2-JAVACOMM-142-SR4.tgz ) - amd64? ( IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz ) - ppc? ( IBMJava2-JAVACOMM-142.ppc-SR4.tgz ) - ppc64? ( IBMJava2-JAVACOMM-142.ppc64-SR4.tgz ) - )" -# s390? ( IBMJava2-JAVACOMM-142.s390-SR4.tgz ) + amd64? ( IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz ) + ppc? ( IBMJava2-SDK-142.ppc-SR4.tgz ) + ppc64? ( IBMJava2-SDK-142.ppc64-SR4.tgz ) + s390? ( IBMJava2-SDK-142.s390.tgz ) + javacomm? ( + x86? ( IBMJava2-JAVACOMM-142-SR4.tgz ) + amd64? ( IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz ) + ppc? ( IBMJava2-JAVACOMM-142.ppc-SR4.tgz ) + ppc64? ( IBMJava2-JAVACOMM-142.ppc64-SR4.tgz ) + )" LICENSE="IBM-J1.4" SLOT="1.4" 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 5e1014d28eda..8f4900560e40 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.10 2006/09/17 11:05:31 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild,v 1.11 2006/09/18 18:45:15 caster Exp $ inherit java eutils @@ -16,14 +16,13 @@ SRC_URI="x86? ( ibm-java2-sdk-50-linux-i386.tgz ) amd64? ( ibm-java2-javacomm-50-linux-x86_64.tgz ) ppc? ( ibm-java2-javacomm-50-linux-ppc.tgz ) ppc64? ( ibm-java2-javacomm-50-linux-ppc64.tgz ) - )" -# s390? ( ibm-java2-javacomm-50-linux-s390.tgz ) + )" LICENSE="IBM-J1.5" SLOT="1.5" KEYWORDS="-* ~s390" RESTRICT="fetch" -IUSE="X alsa javacomm browserplugin mozilla" +IUSE="X alsa javacomm nsplugin" RDEPEND=" X? ( || ( @@ -86,7 +85,7 @@ src_install() { # doins ${FILESDIR}/cpuinfo #fi - if ( use browserplugin || use mozilla ) && ! use amd64 && ! use ppc64; then + if use nsplugin && ! use amd64 && ! use ppc64; then local plugin if use x86; then plugin="libjavaplugin_ojigtk2.so" @@ -114,10 +113,4 @@ pkg_postinst() { ewarn "Some parts of IBM JDK require XFree86 to be installed." ewarn "Be careful which Java libraries you attempt to use." fi - if ! use browserplugin && use mozilla; then - ewarn - ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" - ewarn "has been renamed to 'browserplugin' please update your USE" - fi - } |