summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-07-22 22:05:58 +0000
committerVlastimil Babka <caster@gentoo.org>2007-07-22 22:05:58 +0000
commit53782e310b414c3c445b934dd82024ea463c169d (patch)
tree3e132d13064bc5f074f543ee4e69b3c39b64dd87 /dev-java/ibm-jdk-bin
parentstable on ppc64 (diff)
downloadhistorical-53782e310b414c3c445b934dd82024ea463c169d.tar.gz
historical-53782e310b414c3c445b934dd82024ea463c169d.tar.bz2
historical-53782e310b414c3c445b934dd82024ea463c169d.zip
Version bump, security bug #186277, cleanup.
Package-Manager: portage-2.1.3_rc8
Diffstat (limited to 'dev-java/ibm-jdk-bin')
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog9
-rw-r--r--dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.721
-rw-r--r--dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.924
-rw-r--r--dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r124
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild (renamed from dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild)103
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild268
6 files changed, 96 insertions, 353 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 59af3edb1671..e037915ec769 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/ibm-jdk-bin
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.122 2007/07/22 20:48:15 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.123 2007/07/22 22:02:08 caster Exp $
+
+*ibm-jdk-bin-1.4.2.9 (22 Jul 2007)
+
+ 22 Jul 2007; Vlastimil Babka <caster@gentoo.org>
+ -ibm-jdk-bin-1.4.2.7.ebuild, +ibm-jdk-bin-1.4.2.9.ebuild,
+ -ibm-jdk-bin-1.5.0.3-r1.ebuild:
+ Version bump, security bug #186277, cleanup.
22 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
ibm-jdk-bin-1.4.2.8.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7
deleted file mode 100644
index a9f7245bb236..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 f8b5ad3fa9bee0b26db5311107fb417d IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
-RMD160 001b31d128ed10215ca4b25c9367234ceca917c4 IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
-SHA256 3c858493e83701ee083a4da922c1cfc73dde84cb8a34526d1cfbdf7601c73100 IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
-MD5 1bc9d350357eaf6228a7508809b610d3 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
-RMD160 0b77d8c3b82acff94e866162b6bea1dc28e98812 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
-SHA256 c04cd708e09713a7504b87c6abbb80f2219cdf77ebb03f3c9031f75fe8813dd0 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
-MD5 bd6a0f5031be57ec2bcca9af5476cfdb IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
-RMD160 f6d29a181ec778148e69a1f05d3645c3acc7e62e IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
-SHA256 999af5dbc1ed0aabc6f81e9807a54861df29f2cab37a750087bc8c3a5c4a8b4d IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
-MD5 eac0df64f9c877f007f8602f15d938f7 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
-RMD160 dbdfc1661057847d6002a8e14ca4f12267cebc02 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
-SHA256 9631e42f57a72d2127504e71a23a1598a44eb88789d05d76addbbbf4260a7918 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
-MD5 f105636f5bead5aa9b6d220b92ad4037 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
-RMD160 57e4dda6b0dd8780bf495da0dfa10f84e8172948 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
-SHA256 04bd30e3a2b5ae2cabc5c052b73afc5dd4b8196f922f6916d318d90ff7435321 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
-MD5 59029c0af259531f3ca25eea4353628c IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
-RMD160 64088291369bc4f75f83467bbd674f0396e7d77e IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
-SHA256 5cc7e42477aa62d6c50668b53b21bb464aa4dcb031844994a50394d30da2626e IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
-MD5 740f71ce3a7acf6a0c5571ac238c38ba IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
-RMD160 58ca636893249e0c476d316c491f09568aaa995b IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
-SHA256 519300df0c1144e600c29172f84cdeea739b29f83640b8f6b69b3d02996ed3ed IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.9 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.9
new file mode 100644
index 000000000000..dfc47f233596
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.9
@@ -0,0 +1,24 @@
+MD5 6cbd67dc6b7d3aaa2159a391e58ed8c6 IBMJava2-JAVACOMM-1.4.2-9.0.ppc.tgz 124662
+RMD160 4ccf44bb473a45b5520fdf601bd5be03a1de4455 IBMJava2-JAVACOMM-1.4.2-9.0.ppc.tgz 124662
+SHA256 e38e089997fbaabac606d0a197991ef734e122940c1dbe7da4511e137346c4a3 IBMJava2-JAVACOMM-1.4.2-9.0.ppc.tgz 124662
+MD5 bfa6b319bcf730e3187d3916b9923dba IBMJava2-JAVACOMM-1.4.2-9.0.ppc64.tgz 126796
+RMD160 22192ffbfdcec9e00c1f001aaec01e57cb6d317c IBMJava2-JAVACOMM-1.4.2-9.0.ppc64.tgz 126796
+SHA256 c616d91a4f334cea6280dd363dc878768f4c4da89e086ed6b82bd40ade06c190 IBMJava2-JAVACOMM-1.4.2-9.0.ppc64.tgz 126796
+MD5 cbce28ee2fbdc79185fe0a08f1ecbdda IBMJava2-JAVACOMM-1.4.2-9.0.tgz 118352
+RMD160 e78be880b01e2a7841155513887abafc27b0358a IBMJava2-JAVACOMM-1.4.2-9.0.tgz 118352
+SHA256 69d9f1d579dac81e867c921275e399492079ba5db2934b02d0bbbeb32bc6e10f IBMJava2-JAVACOMM-1.4.2-9.0.tgz 118352
+MD5 fc5d81bfed7f5f49fcb1d07f1871fb63 IBMJava2-JAVACOMM-AMD64-1.4.2-9.0.x86_64.tgz 120038
+RMD160 21c10b155b1978ddfcd50a3cdb53949c0b4335d4 IBMJava2-JAVACOMM-AMD64-1.4.2-9.0.x86_64.tgz 120038
+SHA256 75ffaa1a68f055e13c7b8b7b08b347246d68c595a38b21a8583e49c09d6fe978 IBMJava2-JAVACOMM-AMD64-1.4.2-9.0.x86_64.tgz 120038
+MD5 fb23499fe5a78fc0a7ab556d23c76b2a IBMJava2-SDK-1.4.2-9.0.ppc.tgz 66479398
+RMD160 6abb8a050b32f20844d962c4e89451a852b71348 IBMJava2-SDK-1.4.2-9.0.ppc.tgz 66479398
+SHA256 353098bc1f4eaea191436d7d9cd65ff319696203e86384f3d1949df509577968 IBMJava2-SDK-1.4.2-9.0.ppc.tgz 66479398
+MD5 e1b1c92c14d50faefe93d1ce75acea1f IBMJava2-SDK-1.4.2-9.0.ppc64.tgz 64747287
+RMD160 4d5b2ab9fac2f12e9741a13284098c2c9ce0d783 IBMJava2-SDK-1.4.2-9.0.ppc64.tgz 64747287
+SHA256 8b69ced827010509da42f8602d5eaa811a849093493d80c6a47c8013602c0e04 IBMJava2-SDK-1.4.2-9.0.ppc64.tgz 64747287
+MD5 9afa8fcb33258ec483c853a5cb11db34 IBMJava2-SDK-1.4.2-9.0.tgz 58721903
+RMD160 95a6c97348394e4873c1d8c94e9ed7220c4500e2 IBMJava2-SDK-1.4.2-9.0.tgz 58721903
+SHA256 aadf52aeb370cf38c533fa57ec83fbb9baa17d990d6d9cbd5aedfda3852a82fb IBMJava2-SDK-1.4.2-9.0.tgz 58721903
+MD5 19b2a60ea2f49cf02c7cafc129c3576c IBMJava2-SDK-AMD64-1.4.2-9.0.x86_64.tgz 52870559
+RMD160 9b431a783994c9a86e4f2a4ed30e649d3434c166 IBMJava2-SDK-AMD64-1.4.2-9.0.x86_64.tgz 52870559
+SHA256 fc2d5088de3c1280b49754f283d5ae4d44f2f16261a6d80cf181ecf067e7fd69 IBMJava2-SDK-AMD64-1.4.2-9.0.x86_64.tgz 52870559
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1
deleted file mode 100644
index f50cb1dfd0df..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 7157bf3cc0884860000bd995fbadea5c ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
-RMD160 7f730b454c73f95f59589735713d748736c6e7a5 ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
-SHA256 5766c8d8656c7dff6defda953954dee8f22d18c6dfbadb889bc5b27534ebd730 ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
-MD5 450dd489ff72641b9d01939c8affd3de ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
-RMD160 dd32bc82e274923bb23e538942f727f1cbf36528 ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
-SHA256 6455de039dac7c5ee6642d04940b2704fdf611f6275914821fdc548ee685ecd8 ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
-MD5 a2f565793a04d8705ff37aa19d43792f ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
-RMD160 082e914b846803bbb5b777dad28dc93cc605ecc8 ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
-SHA256 c1179604922b978d720fc15b1eca24c411d0bd61cb3e006e147c19cf8376cafa ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
-MD5 f49d17f854699b92155c69ed4b292bac ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
-RMD160 c354d619b720f36bacd8592ac32cb6d4b7034b99 ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
-SHA256 cd947dc317c8d0ae91ecdce44ee4165aa6cba0c018ee5f706125ec12f37ab141 ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
-MD5 d4bbed3c0b449b7e11236c478462b962 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
-RMD160 a7853bfc8c33eda88092abb49b245d73fe1eb733 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
-SHA256 b2ea5661b97a6a5bce130ad7137ff94a60f15f56774be9fad2e35f587ece7c71 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
-MD5 a35a2f110ad2af1238e0705496af69d3 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
-RMD160 9ba5e027ea38aaf2164e5eeb88eface227d7c8d0 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
-SHA256 74771d4d40f044f54a93d0711937976afc840e4f117b4f0d46609d361e421727 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
-MD5 06eb61046f8bb9fb0b4e8e6fdfbef26a ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
-RMD160 e574bebd9ab5ddc82b68a585e927c574de4f19f7 ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
-SHA256 fc1c7ce4a63ac61c76c99125218e504598849398645be711f6c44d47c6a4e54c ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
-MD5 9571673c3eac80ba2e1f20b69df56002 ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
-RMD160 1d6c9441b1b7ce62b6e7967509ad3cb0732543ec ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
-SHA256 75fe72f73c226084c21e7f63bd5267006c48daa7121f47c9034aad00c48e29a4 ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild
index 43784423f8d0..3736c491014b 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild
@@ -1,38 +1,50 @@
# Copyright 1999-2007 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.7.ebuild,v 1.8 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.9.ebuild,v 1.1 2007/07/22 22:02:08 caster Exp $
JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils versionator rpm
+inherit java-vm-2 eutils versionator
JDK_RELEASE=$(get_version_component_range 1-3)
SERVICE_RELEASE=$(get_version_component_range 4)
RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-if use x86 ; then
- JDK_DIST="IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm"
- JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm"
- S="${WORKDIR}/opt/IBMJava2-142"
+JDK_DIST_PREFIX="IBMJava2-SDK-${RPM_PV}"
+JAVACOMM_DIST_PREFIX="IBMJava2-JAVACOMM-${RPM_PV}"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.tgz"
+
+# wonder why amd64 has this extra special AMD64 in its filename...
+AMD64_JDK_DIST="IBMJava2-SDK-AMD64-${RPM_PV}.x86_64.tgz"
+AMD64_JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}.ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}.ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc64.tgz"
+
+if use x86; then
+ JDK_DIST=${X86_JDK_DIST}
+ JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+ S="${WORKDIR}/IBMJava2-142"
LINK_ARCH="ia32"
-elif use amd64 ; then
- JDK_DIST="IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm"
- JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm"
- S="${WORKDIR}/opt/IBMJava2-amd64-142"
+elif use amd64; then
+ JDK_DIST=${AMD64_JDK_DIST}
+ JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+ S="${WORKDIR}/IBMJava2-amd64-142"
LINK_ARCH="amd64"
-elif use ppc ; then
- JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
- JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
- S="${WORKDIR}/opt/IBMJava2-ppc-142"
+elif use ppc; then
+ JDK_DIST=${PPC_JDK_DIST}
+ JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+ S="${WORKDIR}/IBMJava2-ppc-142"
LINK_ARCH="ip32"
-elif use ppc64 ; then
- JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
- JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
- S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+elif use ppc64; then
+ JDK_DIST=${PPC64_JDK_DIST}
+ JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+ S="${WORKDIR}/IBMJava2-ppc64-142"
LINK_ARCH="ip64"
-elif use s390 ; then
- JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
- S="${WORKDIR}/opt/IBMJava2-s390-142"
- LINK_ARCH="s39031"
fi
DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
@@ -42,22 +54,22 @@ HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
# bug #125178
ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
- amd64? ( IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm )
- ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
- ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
- s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm )
- javacomm? (
- x86? ( IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm )
- amd64? ( IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm )
- ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
- ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
- )"
+
+SRC_URI="x86? ( ${X86_JDK_DIST} )
+ amd64? ( ${AMD64_JDK_DIST} )
+ ppc? ( ${PPC_JDK_DIST} )
+ ppc64? ( ${PPC64_JDK_DIST} )
+ javacomm? (
+ x86? ( ${X86_JAVACOMM_DIST} )
+ amd64? ( ${AMD64_JAVACOMM_DIST} )
+ ppc? ( ${PPC_JAVACOMM_DIST} )
+ ppc64? ( ${PPC64_JAVACOMM_DIST} )
+ )"
LICENSE="IBM-J1.4"
SLOT="1.4"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X alsa doc javacomm nsplugin"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X alsa doc examples javacomm nsplugin"
RDEPEND="
=virtual/libstdc++-3.3
@@ -107,7 +119,7 @@ pkg_nofetch() {
}
src_unpack() {
- rpm_src_unpack
+ unpack ${A}
cd "${S}"
# bug #126105
@@ -128,11 +140,16 @@ src_install() {
fi
# Copy all the files to the designated directory
- mkdir -p ${D}opt/${P}
+ dodir /opt/${P}
cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
- mkdir -p ${D}/opt/${P}/share
- cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
+ dodir /opt/${P}/share
+ if use examples; then
+ cp -pPR ${S}/demo ${D}opt/${P}/share/
+ fi
+
+ cp -pPR ${S}/src.jar "${D}/opt/${P}/"
+ dosym "../src.jar" /opt/${P}/share
# setting the ppc stuff
if use ppc; then
@@ -177,4 +194,12 @@ pkg_postinst() {
ewarn "use with your installation."
ewarn
fi
+ elog ""
+ elog "Starting with 1.4.2.8 demos are installed only with USE=examples"
+ elog ""
+ elog "Starting with 1.4.2.8 the src.jar is installed to the standard"
+ elog "location. It is still symlinked to the old location (/opt/${P}/share)"
+ elog "but it will be removed if there will ever be a version bump."
+ elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
+ elog "for more details."
}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
deleted file mode 100644
index 2b38ad92e3ca..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2007 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.3-r1.ebuild,v 1.9 2007/07/22 09:39:06 graaff Exp $
-
-inherit java-vm-2 versionator eutils rpm
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-X86_JDK_DIST="ibm-java2-i386-sdk-${RPM_PV}.i386.rpm"
-X86_JAVACOMM_DIST="ibm-java2-i386-javacomm-${RPM_PV}.i386.rpm"
-
-AMD64_JDK_DIST="ibm-java2-x86_64-sdk-${RPM_PV}.x86_64.rpm"
-AMD64_JAVACOMM_DIST="ibm-java2-x86_64-javacomm-${RPM_PV}.x86_64.rpm"
-
-PPC_JDK_DIST="ibm-java2-ppc-sdk-${RPM_PV}.ppc.rpm"
-PPC_JAVACOMM_DIST="ibm-java2-ppc-javacomm-${RPM_PV}.ppc.rpm"
-
-PPC64_JDK_DIST="ibm-java2-ppc64-sdk-${RPM_PV}.ppc64.rpm"
-PPC64_JAVACOMM_DIST="ibm-java2-ppc64-javacomm-${RPM_PV}.ppc64.rpm"
-
-if use x86; then
- JDK_DIST=${X86_JDK_DIST}
- JAVACOMM_DIST=${X86_JAVACOMM_DIST}
- S="${WORKDIR}/opt/ibm/java2-i386-50"
- LINK_ARCH="intel"
-elif use amd64; then
- JDK_DIST=${AMD64_JDK_DIST}
- JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
- S="${WORKDIR}/opt/ibm/java2-x86_64-50"
- LINK_ARCH="amd64"
-elif use ppc; then
- JDK_DIST=${PPC_JDK_DIST}
- JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
- S="${WORKDIR}/opt/ibm/java2-ppc-50"
- LINK_ARCH="ipseries32"
-elif use ppc64; then
- JDK_DIST=${PPC64_JDK_DIST}
- JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
- S="${WORKDIR}/opt/ibm/java2-ppc64-50"
- LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JDK_DIST} )
- amd64? ( ${AMD64_JDK_DIST} )
- ppc? ( ${PPC_JDK_DIST} )
- ppc64? ( ${PPC64_JDK_DIST} )
- javacomm? (
- x86? ( ${X86_JAVACOMM_DIST} )
- amd64? ( ${AMD64_JAVACOMM_DIST} )
- ppc? ( ${PPC_JAVACOMM_DIST} )
- ppc64? ( ${PPC64_JAVACOMM_DIST} )
- )"
-LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-
-RDEPEND="
- =virtual/libstdc++-3.3
- X? ( x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXp
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXft )
- alsa? ( media-libs/alsa-lib )
- nsplugin? (
- x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
- ppc? ( =x11-libs/gtk+-1* )
- )"
-DEPEND=""
-
-IUSE="X alsa javacomm nsplugin"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
- opt/${P}/jre/bin/libj9vrb23.so
- opt/${P}/jre/bin/libj9vm23.so
- opt/${P}/jre/bin/libj9trc23.so
- opt/${P}/jre/bin/libj9thr23.so
- opt/${P}/jre/bin/libj9shr23.so
- opt/${P}/jre/bin/libj9prt23.so
- opt/${P}/jre/bin/libj9jvmti23.so
- opt/${P}/jre/bin/libj9jpi23.so
- opt/${P}/jre/bin/libj9jit23.so
- opt/${P}/jre/bin/libj9jextract.so
- opt/${P}/jre/bin/libj9hookable23.so
- opt/${P}/jre/bin/libj9gc23.so
- opt/${P}/jre/bin/libj9dyn23.so
- opt/${P}/jre/bin/libj9dmp23.so
- opt/${P}/jre/bin/libj9dbg23.so
- opt/${P}/jre/bin/libj9bcv23.so
- opt/${P}/jre/bin/libiverel23.so
- opt/${P}/jre/bin/classic/libjvm.so
- opt/${P}/jre/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
- opt/${P}/jre/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
- opt/${P}/jre/bin/libj9jvmti23.so
- opt/${P}/jre/bin/libj9hookable23.so
- opt/${P}/jre/bin/libj9vm23.so
- opt/${P}/jre/bin/libj9dyn23.so
- opt/${P}/jre/bin/libjclscar_23.so
- opt/${P}/jre/bin/libj9jpi23.so
- opt/${P}/jre/bin/libj9thr23.so
- opt/${P}/jre/bin/libj9dmp23.so
- opt/${P}/jre/bin/libj9prt23.so
- opt/${P}/jre/bin/libj9jit23.so
- opt/${P}/jre/bin/libiverel23.so
- opt/${P}/jre/bin/libj9trc23.so
- opt/${P}/jre/bin/libj9dbg23.so
- opt/${P}/jre/bin/libj9jextract.so
- opt/${P}/jre/bin/libj9shr23.so
- opt/${P}/jre/bin/libj9gc23.so
- opt/${P}/jre/bin/libj9vrb23.so
- opt/${P}/jre/bin/libj9bcv23.so
- opt/${P}/jre/bin/libj9aotrt23.so
- opt/${P}/jre/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
- opt/${P}/jre/bin/j9vm/libjvm.so
- opt/${P}/jre/bin/libj9aotrt23.so
- opt/${P}/jre/bin/libj9dbg23.so
- opt/${P}/jre/bin/libj9gc23.so
- opt/${P}/jre/bin/libj9gcchk23.so
- opt/${P}/jre/bin/libj9jextract.so
- opt/${P}/jre/bin/libj9jit23.so
- opt/${P}/jre/bin/libj9jitd23.so
- opt/${P}/jre/bin/libj9jpi23.so
- opt/${P}/jre/bin/libj9jvmti23.so
- opt/${P}/jre/bin/libj9prt23.so
- opt/${P}/jre/bin/libj9thr23.so
- opt/${P}/jre/bin/libj9thr23.so
- opt/${P}/jre/bin/libj9ute23.so
- opt/${P}/jre/bin/libj9vm23.so
- opt/${P}/jre/bin/libj9vm23.so
- opt/${P}/jre/bin/libjaas.so
- opt/${P}/jre/bin/libjclscar_23.so
- opt/${P}/jre/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
- opt/${P}/jre/bin/libjsig.so
- opt/${P}/jre/bin/libj9jitd23.so
- opt/${P}/jre/bin/libj9ute23.so
- opt/${P}/jre/bin/classic/libjvm.so
- opt/${P}/jre/bin/libj9prt23.so
- opt/${P}/jre/bin/libjclscar_23.so
- opt/${P}/jre/bin/j9vm/libjvm.so
- opt/${P}/jre/bin/libj9gc23.so
- opt/${P}/jre/bin/libj9dbg23.so
- opt/${P}/jre/bin/libj9thr23.so
- opt/${P}/jre/bin/libj9jpi23.so
- opt/${P}/jre/bin/libj9gcchk23.so
- opt/${P}/jre/bin/libj9vm23.so
- opt/${P}/jre/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
- opt/${P}/jre/bin/j9vm/libjvm.so
- opt/${P}/jre/bin/xawt/libmawt.so
- opt/${P}/jre/bin/javaplugin.so
- opt/${P}/jre/bin/motif21/libmawt.so
- opt/${P}/jre/bin/headless/libmawt.so
- opt/${P}/jre/bin/classic/libjvm.so
- opt/${P}/jre/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
- einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
- einfo "Please visit: ${DOWNLOADPAGE}"
-
- einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE}:"
- einfo "${JDK_DIST}"
- if use javacomm ; then
- einfo "${JAVACOMM_DIST}"
- fi
-
- einfo "Direct link:"
- einfo "${DIRECT_DOWNLOAD}"
- einfo "Place the file(s) in: ${DISTDIR}"
- einfo "Then restart emerge: 'emerge --resume'"
-
- einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
- einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
- einfo "isn't updated, but the files should still available through the"
- einfo "direct link. If it doesn't work, file a bug."
-}
-
-src_unpack() {
- rpm_src_unpack
- cd "${S}"
-
- # bug #126105
- epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- # Copy all the files to the designated directory
- mkdir -p ${D}opt/${P}
- cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
-
- mkdir -p ${D}/opt/${P}/share
- cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
-
- # setting the ppc stuff
- #if use ppc; then
- # dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
- # dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
- # insinto /etc
- # doins ${FILESDIR}/cpuinfo
- #fi
-
- 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}
- elif use ppc; then
- plugin=${ppcplugin}
- # rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
- # eerror "Failed to delete gtk2 javaplugin."
- fi
-
- plugin=/opt/${P}/jre/bin/${plugin}
-
- if use x86 || use ppc; then
- if use nsplugin; then
- install_mozilla_plugin ${plugin}
- else
- rm "${jrebindest}/*javaplugin*.so" || \
- eerror "Failed to delete javaplugin shared libraries"
- fi
- fi
-
- use !alsa && rm "${jrebindest}/libjsoundalsa.so"
-
- dohtml -a html,htm,HTML -r docs
- dodoc ${S}/COPYRIGHT
-
- set_java_env
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
- if ! use X; then
- echo
- ewarn "You're not using X so its possible that you dont have"
- ewarn "a X server installed, please read the following warning: "
- ewarn "Some parts of IBM JDK require XFree86 to be installed."
- ewarn "Be careful which Java libraries you attempt to use."
- fi
-}