Version bump for security bug #176675; src.zip moved completely for bug #2241; remove...
authorVlastimil Babka <caster@gentoo.org>
Tue, 1 May 2007 14:29:36 +0000 (14:29 +0000)
committerVlastimil Babka <caster@gentoo.org>
Tue, 1 May 2007 14:29:36 +0000 (14:29 +0000)
Package-Manager: portage-2.1.2.5

dev-java/sun-jdk/ChangeLog
dev-java/sun-jdk/Manifest
dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14 [new file with mode: 0644]
dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.10 [deleted file]
dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild [new file with mode: 0644]
dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild [deleted file]

index 0a89010343a560c89c9c432003d0c44779135bf7..840fff7b06428a3f37073edd28a118daeaab6cb5 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.196 2007/04/30 11:03:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.197 2007/05/01 14:29:36 caster Exp $
+
+*sun-jdk-1.4.2.14 (01 May 2007)
+
+  01 May 2007; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.4.2.14.ebuild,
+  -sun-jdk-1.5.0.10.ebuild:
+  Version bump for security bug #176675; src.zip moved completely for bug
+  #2241; remove 1.5.0.10 vulnerable to the same security bug.
 
   30 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> files/sun-jdk-1.6.env:
   Remove sunrsasign.jar from BOOTCLASSPATH as it hasn't been in use since 1.4.
index abc4b14d279cd0b85c2e3727c2fa8f9a3ccd2e72..5c62e295fc8056556f561de9a052e4af50187b3a 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932
 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932
@@ -18,9 +15,8 @@ MD5 12c85d8ae81039e2471baed07fee3cc0 files/sun-jdk-1.6.env 940
 RMD160 2061347f8137915ed421c7592a6909b51bb2110d files/sun-jdk-1.6.env 940
 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8 files/sun-jdk-1.6.env 940
 DIST j2sdk-1_4_2_13-linux-i586.bin 36361814 RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 SHA1 12c679cfa2e212bfa90ae6ef6ad6c477e427bbba SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2
+DIST j2sdk-1_4_2_14-linux-i586.bin 36368335 RMD160 8dfd1755625e50d0b2a3dc25ddcaff17afddca6c SHA1 104a14f94b1ef168498e31bcaab0fb732db2cbca SHA256 f2d374cde37149bdcce00bc9afdd25a4d43c9ae1d4dc871fdb951e7cc57ebb68
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-DIST jdk-1_5_0_10-dlj-linux-amd64.bin 43906073 RMD160 2d13d637b6d7351410f9e18d581206a05091effe SHA1 b0c4440f7059b2d477a437e5c58f135820e86326 SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61
-DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa
 DIST jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 RMD160 bd865019d3fb2268800696207dba158ea2986a7f SHA1 151315b9eb70f81ac88712e151da5c0a5aeaca23 SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db
 DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3
@@ -37,10 +33,10 @@ EBUILD sun-jdk-1.4.2.13.ebuild 6311 RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608c
 MD5 32f196a83b862af4d06b9c1310f8d244 sun-jdk-1.4.2.13.ebuild 6311
 RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608cc0d sun-jdk-1.4.2.13.ebuild 6311
 SHA256 ffed680930da4f61290b79ecadae909dd83ffbde0bf525d35a49aee6dc95a6f7 sun-jdk-1.4.2.13.ebuild 6311
-EBUILD sun-jdk-1.5.0.10.ebuild 4603 RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9373 SHA1 4109f0e797d8db62fcbcf38eef6e6354540d9a93 SHA256 54f252579d64c2ae35b0601a4806c598932a93465949f07974cb819a2f5d49a8
-MD5 aea4f559a38fe9c5d5b5f470386d779a sun-jdk-1.5.0.10.ebuild 4603
-RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9373 sun-jdk-1.5.0.10.ebuild 4603
-SHA256 54f252579d64c2ae35b0601a4806c598932a93465949f07974cb819a2f5d49a8 sun-jdk-1.5.0.10.ebuild 4603
+EBUILD sun-jdk-1.4.2.14.ebuild 5931 RMD160 ff4ee434529784559203b45d76678811a673c527 SHA1 8d051742074f9f583b5e165c124aae0011fcd659 SHA256 a9ecf961a6f28820b26a47a96bdd51c1ad4884edc740fb0786bc809047994725
+MD5 25a3ee5d65ed8f227fd2fdfccaefee31 sun-jdk-1.4.2.14.ebuild 5931
+RMD160 ff4ee434529784559203b45d76678811a673c527 sun-jdk-1.4.2.14.ebuild 5931
+SHA256 a9ecf961a6f28820b26a47a96bdd51c1ad4884edc740fb0786bc809047994725 sun-jdk-1.4.2.14.ebuild 5931
 EBUILD sun-jdk-1.5.0.11-r1.ebuild 5088 RMD160 31511bfbff9b3544a4bd5cd49a2aecd18321d99d SHA1 d0acc77bf7130d53f5bfd2c8fadfe56d29ac0ab3 SHA256 537c08f753046fa476b01c977bd2f10676727de17ae23205aa209062fa9ee21f
 MD5 6f58fe4acada8e7446e4d6e55e20d1a6 sun-jdk-1.5.0.11-r1.ebuild 5088
 RMD160 31511bfbff9b3544a4bd5cd49a2aecd18321d99d sun-jdk-1.5.0.11-r1.ebuild 5088
@@ -57,10 +53,10 @@ EBUILD sun-jdk-1.6.0-r2.ebuild 5252 RMD160 ccbfb62a918ac7d15571f52882f67f2e46869
 MD5 db8862f92fb8cf93bbf50c163d764c2d sun-jdk-1.6.0-r2.ebuild 5252
 RMD160 ccbfb62a918ac7d15571f52882f67f2e46869983 sun-jdk-1.6.0-r2.ebuild 5252
 SHA256 8813bf7ef638c88a06c2cc0bb53aaf63223fea7e351399804bb4649f0ee87875 sun-jdk-1.6.0-r2.ebuild 5252
-MISC ChangeLog 38351 RMD160 06bcdb86a566275a0d43ecef29aff914f8169b9b SHA1 74b72b63f3151f20cb48c36cf590f77a9db51fd3 SHA256 b15b3870afa67fadb752763971eae83008c872b03f4609bef4cd7b5b222cd723
-MD5 f2950822d5119b7d5d04436272858d08 ChangeLog 38351
-RMD160 06bcdb86a566275a0d43ecef29aff914f8169b9b ChangeLog 38351
-SHA256 b15b3870afa67fadb752763971eae83008c872b03f4609bef4cd7b5b222cd723 ChangeLog 38351
+MISC ChangeLog 38622 RMD160 8a9d355d44e2e77ddc960fffef0ffe1201f2fc29 SHA1 38ddf1839b520aef440b02a17523d67158bb4a9c SHA256 bc99bc285f8c70c320f9853e3a1ff024b51818f9a0c3df87c22a1c482f294e3a
+MD5 7b8ba4d0e64cf4a1e6a39898406b9ba3 ChangeLog 38622
+RMD160 8a9d355d44e2e77ddc960fffef0ffe1201f2fc29 ChangeLog 38622
+SHA256 bc99bc285f8c70c320f9853e3a1ff024b51818f9a0c3df87c22a1c482f294e3a ChangeLog 38622
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -74,9 +70,9 @@ SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/di
 MD5 4551e92262ffc2bc93ba3941a5f49f30 files/digest-sun-jdk-1.4.2.13-r2 512
 RMD160 6c0a27d829f9b9b868feedd086b0929f015e48a2 files/digest-sun-jdk-1.4.2.13-r2 512
 SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/digest-sun-jdk-1.4.2.13-r2 512
-MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jdk-1.5.0.10 563
-RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jdk-1.5.0.10 563
-SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jdk-1.5.0.10 563
+MD5 ffad4bc2554bbddcdccc5aa2a5ee5609 files/digest-sun-jdk-1.4.2.14 512
+RMD160 28fe51695b1cbed50a36003c294aa89a32c0c5ae files/digest-sun-jdk-1.4.2.14 512
+SHA256 fb7d100238ae0d45342dfefe665929d6bc1cc7e7d010a2006f78b36ca22c018f files/digest-sun-jdk-1.4.2.14 512
 MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jdk-1.5.0.11 563
 RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jdk-1.5.0.11 563
 SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jdk-1.5.0.11 563
@@ -89,10 +85,3 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r2 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r2 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r2 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGNc0BcxLzpIGCsLQRAh03AJ0SSNEo5mp0cjwyzPWYm018LNpnSwCbBF2j
-+OZBBAvtaGxioVRDUolv39U=
-=mNax
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14
new file mode 100644 (file)
index 0000000..1b91fb6
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 c5f5ae15bc73f17f22c3ddaf45ee45ad j2sdk-1_4_2_14-linux-i586.bin 36368335
+RMD160 8dfd1755625e50d0b2a3dc25ddcaff17afddca6c j2sdk-1_4_2_14-linux-i586.bin 36368335
+SHA256 f2d374cde37149bdcce00bc9afdd25a4d43c9ae1d4dc871fdb951e7cc57ebb68 j2sdk-1_4_2_14-linux-i586.bin 36368335
+MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
+RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
+SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.10 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.10
deleted file mode 100644 (file)
index d0c6ebd..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 eca3b5106aa3cb0469ea01b96dc70510 jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-RMD160 2d13d637b6d7351410f9e18d581206a05091effe jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61 jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-MD5 baa5f71d72d1d4d7c38374d59bedfe7c jdk-1_5_0_10-dlj-linux-i586.bin 49553457
-RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 jdk-1_5_0_10-dlj-linux-i586.bin 49553457
-SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa jdk-1_5_0_10-dlj-linux-i586.bin 49553457
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild
new file mode 100644 (file)
index 0000000..8516ea3
--- /dev/null
@@ -0,0 +1,187 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild,v 1.1 2007/05/01 14:29:36 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit pax-utils java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=j2sdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+jce_policy="jce_policy-${MY_PVB//./_}.zip"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI="${At}
+               jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples nsplugin jce"
+
+DEPEND="sys-apps/sed
+       app-arch/unzip"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+       doc? ( =dev-java/java-sdk-docs-1.4.2* )
+       X? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXau
+               x11-libs/libXdmcp
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXp
+               x11-libs/libXt
+               x11-libs/libXtst
+       )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
+jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemrsv"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
+       opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
+       opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+       opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+       einfo "Please download ${At} from:"
+       einfo ${DOWNLOAD_URL}
+       einfo "(first select 'Accept License', then click on 'self-extracting file'"
+       einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')"
+       einfo "and move it to ${DISTDIR}"
+       if use jce; then
+               echo
+               einfo "Also download ${jce_policy} from:"
+               einfo ${DOWNLOAD_URL_JCE}
+               einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+               einfo "and move it to ${DISTDIR}"
+       fi
+}
+
+src_unpack() {
+       if [ ! -r ${DISTDIR}/${At} ]; then
+               die "cannot read ${At}.bin. Please check the permission and try again."
+       fi
+       if use jce; then
+               if [ ! -r ${DISTDIR}/${jce_policy} ]; then
+                       die "cannot read ${jce_policy}. Please check the permission and try again."
+               fi
+       fi
+       #Search for the ELF Header
+       testExp=$'\177\105\114\106\001\001\001'
+       startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+       tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
+       chmod +x install.sfx
+       ./install.sfx || die
+       rm install.sfx
+
+       if [ -f ${S}/lib/unpack ]; then
+               UNPACK_CMD=${S}/lib/unpack
+               chmod +x $UNPACK_CMD
+               sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+               for i in $PACKED_JARS; do
+                       PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+                       if [ -f ${PACK_FILE} ]; then
+                               echo "  unpacking: $i"
+                               $UNPACK_CMD ${PACK_FILE} ${S}/$i
+                               rm -f ${PACK_FILE}
+                       fi
+               done
+       fi
+}
+
+src_install() {
+       local dirs="bin include jre lib man"
+       dodir /opt/${P}
+
+       for i in $dirs ; do
+               cp -dPR $i ${D}/opt/${P}/
+       done
+
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler.
+       pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
+
+       dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die
+       dohtml README.html || die
+       dodir /opt/${P}/share/
+       if use examples; then
+               cp -pPR demo ${D}/opt/${P}/share/
+       fi
+
+       cp -pPR src.zip "${D}/opt/${P}/"
+
+       if use jce ; then
+               # Using unlimited jce while still retaining the strong jce
+               # May have repercussions when you find you cannot symlink libraries
+               # in classpaths.
+               cd ${D}/opt/${P}/jre/lib/security
+               unzip ${DISTDIR}/${jce_policy}
+               mv jce unlimited-jce
+               dodir /opt/${P}/jre/lib/security/strong-jce
+               mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
+               mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
+               dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+               dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+       fi
+
+       if use nsplugin; then
+               local plugin_dir="ns610"
+               if has_version '>=sys-devel/gcc-3.2' ; then
+                       plugin_dir="ns610-gcc32"
+               fi
+
+               install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+       fi
+
+       # bug #147259
+       dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+       dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+
+       # create dir for system preferences
+       dodir /opt/${P}/.systemPrefs
+       # Create files used as storage for system preferences.
+       touch ${D}/opt/${P}/.systemPrefs/.system.lock
+       chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
+       touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+       chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+
+       # install control panel for Gnome/KDE
+       sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+               -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+               ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+               ${T}/sun_java-${SLOT}.desktop
+
+       domenu ${T}/sun_java-${SLOT}.desktop
+
+       set_java_env
+}
+
+pkg_postinst() {
+       # Set as default VM if none exists
+       java-vm-2_pkg_postinst
+
+       if ! use X; then
+               ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+               ewarn "Be careful which Java libraries you attempt to use."
+       fi
+       elog "Starting with 1.4.2.14 the src.zip is installed to the standard"
+       elog "location only (/opt/${P}/) and not /opt/${P}/share/"
+       elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+       elog "http://java.sun.com/j2se/1.4.2/docs/tooldocs/linux/jdkfiles.html"
+       elog "for more details."
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
deleted file mode 100644 (file)
index 0eab135..0000000
+++ /dev/null
@@ -1,154 +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/sun-jdk/sun-jdk-1.5.0.10.ebuild,v 1.4 2007/02/11 11:52:31 betelgeuse Exp $
-
-inherit java-vm-2 eutils pax-utils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-       At=${X86_AT}
-elif use amd64; then
-       At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-               amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
-RESTRICT="nostrip"
-IUSE="X alsa doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-
-DEPEND="
-       doc? ( =dev-java/java-sdk-docs-1.5.0* )
-       jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-
-RDEPEND="
-       sys-libs/glibc
-       alsa? ( media-libs/alsa-lib )
-       doc? ( =dev-java/java-sdk-docs-1.5.0* )
-       X? ( || ( ( x11-libs/libX11
-                               x11-libs/libXext
-                               x11-libs/libXi
-                               x11-libs/libXp
-                               x11-libs/libXt
-                               x11-libs/libXtst
-                               )
-                               virtual/x11
-                       )
-               )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-src_unpack() {
-       if [ ! -r ${DISTDIR}/${At} ]; then
-               die "cannot read ${At}. Please check the permission and try again."
-       fi
-
-       sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_install() {
-       local dirs="bin include jre lib man"
-
-       # Set PaX markings on all JDK/JRE executables to allow code-generation on
-       # the heap by the JIT compiler.
-       pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
-
-       dodir /opt/${P}
-
-       for i in $dirs ; do
-               cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-       done
-       dodoc COPYRIGHT README.html
-       dohtml README.html
-       dodir /opt/${P}/share/
-
-       cp -pPR src.zip ${D}/opt/${P}/share/
-
-       if use examples; then
-               cp -pPR demo ${D}/opt/${P}/share/
-               if ( use x86 || use amd64 ); then
-                       cp -pPR sample ${D}/opt/${P}/share/
-               fi
-       fi
-
-       if use jce; then
-               cd ${D}/opt/${P}/jre/lib/security
-               dodir /opt/${P}/jre/lib/security/strong-jce
-               mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-               mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-               dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-               dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-       fi
-
-       if use nsplugin; then
-               local plugin_dir="ns7-gcc29"
-               if has_version '>=sys-devel/gcc-3' ; then
-                       plugin_dir="ns7"
-               fi
-
-               if use x86 ; then
-                       install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-               else
-                       eerror "No plugin available for amd64 arch"
-               fi
-       fi
-
-       # create dir for system preferences
-       dodir /opt/${P}/jre/.systemPrefs
-       # Create files used as storage for system preferences.
-       touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-       chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-       touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-       chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-       # install control panel for Gnome/KDE
-       sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-               -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-               ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-               ${T}/sun_java-${SLOT}.desktop
-
-       domenu ${T}/sun_java-${SLOT}.desktop
-
-       # bug #56444
-       insinto /opt/${P}/jre/lib/
-       newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-       set_java_env
-}
-
-pkg_postinst() {
-       # Set as default VM if none exists
-       java-vm-2_pkg_postinst
-
-       if ! use X; then
-               local xwarn="virtual/x11 and/or"
-       fi
-
-       echo
-       ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-       ewarn "Be careful which Java libraries you attempt to use."
-
-       echo
-       elog " Be careful: ${P}'s Java compiler uses"
-       elog " '-source 1.5' as default. Some keywords such as 'enum'"
-       elog " are not valid identifiers any more in that mode,"
-       elog " which can cause incompatibility with certain sources."
-
-       echo
-       elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-       elog "The epoll-based implementation of SelectorProvider is not selected by"
-       elog "default."
-       elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-}