From 14f7795550d9aae3fa61b56cd9f45cfbc1363529 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sun, 3 Dec 2006 21:02:56 +0000 Subject: [PATCH] Version bump using the new pax-utils.eclass (bug #156135). Thanks to Kevin F. Quinn . Package-Manager: portage-2.1.2_rc2-r3 --- dev-java/sun-jdk/ChangeLog | 9 +- dev-java/sun-jdk/Manifest | 27 ++- .../sun-jdk/files/digest-sun-jdk-1.5.0.10 | 6 + dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild | 154 ++++++++++++++++++ 4 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.10 create mode 100644 dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 975c980a2e3b..d1ac5741e803 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.168 2006/11/23 00:01:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.169 2006/12/03 21:02:56 betelgeuse Exp $ + +*sun-jdk-1.5.0.10 (03 Dec 2006) + + 03 Dec 2006; Petteri Räty + +sun-jdk-1.5.0.10.ebuild: + Version bump using the new pax-utils.eclass (bug #156135). Thanks to Kevin + F. Quinn . *sun-jdk-1.4.2.13 (23 Nov 2006) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 98c84a653f13..a67084b60178 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,3 +1,6 @@ +-----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 @@ -17,6 +20,8 @@ DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff SHA1 b3cd93b445ce68b8d4b88c4afa9a177473adf3f7 SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 DIST jdk-1_5_0_09-dlj-linux-i586.bin 49504315 RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e SHA1 36a065b72af226804ff0b64b9c40859c7a879b6f SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 +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 EBUILD sun-jdk-1.4.2.12-r2.ebuild 6295 RMD160 169f60bb6d88164d5f4c867766a9651a93bb7457 SHA1 5a386fadb3a76080fbfd81f847ef3f4dce84fe73 SHA256 d2ca54862998c72351c6fa09f2c87c71b705c42df41468a2cb8e51cf394be058 MD5 47e6303ad612a0b25879b412e5f7bc32 sun-jdk-1.4.2.12-r2.ebuild 6295 RMD160 169f60bb6d88164d5f4c867766a9651a93bb7457 sun-jdk-1.4.2.12-r2.ebuild 6295 @@ -37,10 +42,14 @@ EBUILD sun-jdk-1.5.0.09.ebuild 5116 RMD160 ff9350a4624070304b5e09190c53280b0c3f3 MD5 9b72c60b6d428ee54ecdd02140bb90d9 sun-jdk-1.5.0.09.ebuild 5116 RMD160 ff9350a4624070304b5e09190c53280b0c3f322b sun-jdk-1.5.0.09.ebuild 5116 SHA256 9d36d435e63f93cf5f5a28e633359409f6d06567ed875e9ebca3ff49c00d6f42 sun-jdk-1.5.0.09.ebuild 5116 -MISC ChangeLog 33998 RMD160 95bb8cbf6118be88b30f85440fde6e6cae53da2a SHA1 e11c425a1290c123cab1852c8f8d478dd8d2f19d SHA256 1c7324ff72fdcde8ce2636a7bf3f599a2a68ab1eb4f03cd2b764abb652739fad -MD5 6fba0e544f2565e0961df4ec9d42a1a5 ChangeLog 33998 -RMD160 95bb8cbf6118be88b30f85440fde6e6cae53da2a ChangeLog 33998 -SHA256 1c7324ff72fdcde8ce2636a7bf3f599a2a68ab1eb4f03cd2b764abb652739fad ChangeLog 33998 +EBUILD sun-jdk-1.5.0.10.ebuild 4609 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b08a SHA1 437fb1347fa492898c7c477e5d5456b6dba162d4 SHA256 1d8c680beb034af272bb74d08df9188d89c52dc5a9ea189a267af9ee478ab7c0 +MD5 0398222bf82947653361b77d469b66ef sun-jdk-1.5.0.10.ebuild 4609 +RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b08a sun-jdk-1.5.0.10.ebuild 4609 +SHA256 1d8c680beb034af272bb74d08df9188d89c52dc5a9ea189a267af9ee478ab7c0 sun-jdk-1.5.0.10.ebuild 4609 +MISC ChangeLog 34228 RMD160 154a9ee17bf99c6287cbef1591fd2031e3966909 SHA1 bee836c9a2417398f91bb37b2908d939a97e1bf3 SHA256 8b2d1121aefb178192974d2142220ed7955fab13bcc80cc57dfa3f61e5db2ede +MD5 bd54f31a0618b717aef09b16b408d502 ChangeLog 34228 +RMD160 154a9ee17bf99c6287cbef1591fd2031e3966909 ChangeLog 34228 +SHA256 8b2d1121aefb178192974d2142220ed7955fab13bcc80cc57dfa3f61e5db2ede ChangeLog 34228 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239 @@ -60,3 +69,13 @@ SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/di MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jdk-1.5.0.09-r1 563 RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jdk-1.5.0.09-r1 563 SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jdk-1.5.0.09-r1 563 +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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFczyEcxLzpIGCsLQRAv0nAJ4hK5t3j9vtycIuYH7CdxPxi/BD1wCfVaNY +yzhBp1R+FN1UKgpdSWN96sw= +=TmvO +-----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..d0c6ebd39a99 --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.10 @@ -0,0 +1,6 @@ +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.5.0.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild new file mode 100644 index 000000000000..566754948f75 --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2006 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.1 2006/12/03 21:02:56 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" +} -- 2.26.2