summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2006-09-18 18:45:15 +0000
committerVlastimil Babka <caster@gentoo.org>2006-09-18 18:45:15 +0000
commit6e72dbbf9a3b2e3fa9e6df8d58b23aa6f055af26 (patch)
tree53035412fc10fcf8a32998f784e9b056258fe017 /dev-java
parentAdd ~x86-fbsd keyword (diff)
downloadhistorical-6e72dbbf9a3b2e3fa9e6df8d58b23aa6f055af26.tar.gz
historical-6e72dbbf9a3b2e3fa9e6df8d58b23aa6f055af26.tar.bz2
historical-6e72dbbf9a3b2e3fa9e6df8d58b23aa6f055af26.zip
Replaced deprecated browserplugin and mozilla USE flags with nsplugin which was already used in DEPEND but was not in IUSE. Whitespace cleanup.
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog7
-rw-r--r--dev-java/ibm-jdk-bin/Manifest34
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild23
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild15
4 files changed, 33 insertions, 46 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/Manifest b/dev-java/ibm-jdk-bin/Manifest
index d53916292217..dd4a180e1aa4 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,6 +1,3 @@
------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
@@ -58,10 +55,10 @@ 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 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.04.ebuild 4732 RMD160 1487bf5cccce3e880afeae5999ca7483353add2e SHA1 1d684901703a3f9041baccd264483b427c98a5e0 SHA256 652e72bdc1499c4cfdaf03295a879bb1275697fde87ae1d6dc92dca61d8098e7
+MD5 022c976201ba07e446517a7439fe28e8 ibm-jdk-bin-1.4.2.04.ebuild 4732
+RMD160 1487bf5cccce3e880afeae5999ca7483353add2e ibm-jdk-bin-1.4.2.04.ebuild 4732
+SHA256 652e72bdc1499c4cfdaf03295a879bb1275697fde87ae1d6dc92dca61d8098e7 ibm-jdk-bin-1.4.2.04.ebuild 4732
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
@@ -74,14 +71,14 @@ EBUILD ibm-jdk-bin-1.5.0.2.ebuild 4488 RMD160 cb81ec19d039c8c712724f59c835511232
MD5 015ec351a20fcd15b8ad557860a7ceb9 ibm-jdk-bin-1.5.0.2.ebuild 4488
RMD160 cb81ec19d039c8c712724f59c835511232f99951 ibm-jdk-bin-1.5.0.2.ebuild 4488
SHA256 64f4833e4f02a6ebd347d4775cd6b523fda8595651ec9e5d56b8fac107bf8c31 ibm-jdk-bin-1.5.0.2.ebuild 4488
-EBUILD ibm-jdk-bin-1.5.0.ebuild 3253 RMD160 9d5ea5cf6a30e4137896e4195575c122d89b38b2 SHA1 e32e17cdb9770916af8545dfdd08353f4c236a55 SHA256 84b23c9ec21f34f95b30ced114889d6e8f0f7868da6c2381b6607086e78dd11e
-MD5 5026f4f8ea3a8876c7b7bd9319e7e97c ibm-jdk-bin-1.5.0.ebuild 3253
-RMD160 9d5ea5cf6a30e4137896e4195575c122d89b38b2 ibm-jdk-bin-1.5.0.ebuild 3253
-SHA256 84b23c9ec21f34f95b30ced114889d6e8f0f7868da6c2381b6607086e78dd11e ibm-jdk-bin-1.5.0.ebuild 3253
-MISC ChangeLog 12688 RMD160 2b0bef1da747f6bb54aa9de604239f9d3fd8fdca SHA1 1739121076873a592d01503e54a3313ca77c22be SHA256 9790060722ff86c7efe32009d40c50b55cc6a093825ac4dc002333ea4813dec2
-MD5 d3862413811f6afb0bcb3ec31ec07f3c ChangeLog 12688
-RMD160 2b0bef1da747f6bb54aa9de604239f9d3fd8fdca ChangeLog 12688
-SHA256 9790060722ff86c7efe32009d40c50b55cc6a093825ac4dc002333ea4813dec2 ChangeLog 12688
+EBUILD ibm-jdk-bin-1.5.0.ebuild 2956 RMD160 086616bb4e6575e2c68814bb5153b511b8033498 SHA1 2ed88646d6d794c5c9740dd008925da665c62ba4 SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4
+MD5 b100e3010595d20ad0feb9e46aa49160 ibm-jdk-bin-1.5.0.ebuild 2956
+RMD160 086616bb4e6575e2c68814bb5153b511b8033498 ibm-jdk-bin-1.5.0.ebuild 2956
+SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4 ibm-jdk-bin-1.5.0.ebuild 2956
+MISC ChangeLog 12941 RMD160 4a425bec684b808e9c8da256b2bba110137ad006 SHA1 10438f13fdb8433f21664e03637ee1227988fac5 SHA256 950c695640b213df4a429c7f4e975acd52a53bbfab66a54706faabb230e47adb
+MD5 23ead966943f2caf23b428c3ec6a2a64 ChangeLog 12941
+RMD160 4a425bec684b808e9c8da256b2bba110137ad006 ChangeLog 12941
+SHA256 950c695640b213df4a429c7f4e975acd52a53bbfab66a54706faabb230e47adb ChangeLog 12941
MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -101,10 +98,3 @@ 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)
-
-iD8DBQFFDs2fcxLzpIGCsLQRAsSzAJ4/dwpBauKyT99bt0BaUz75ZvS+CgCglOu/
-h4dpsGdf9UEaOeTmUR2+h/0=
-=gCQR
------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 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
-
}