From: Petteri Räty Date: Sun, 3 Dec 2006 21:22:30 +0000 (+0000) Subject: Version bump using the new pax-utils.eclass (bug #156135). Thanks to Kevin F. Quinn... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d25d2441b62f64a3768cf80b24a45b9e5aeacfdf;p=gentoo.git Version bump using the new pax-utils.eclass (bug #156135). Thanks to Kevin F. Quinn . Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 2d692b51f609..2d3c8d5113e7 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.68 2006/11/23 00:13:48 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.69 2006/12/03 21:22:30 betelgeuse Exp $ + +*sun-jre-bin-1.5.0.10 (03 Dec 2006) + + 03 Dec 2006; Petteri Räty + +sun-jre-bin-1.5.0.10.ebuild: + Version bump using the new pax-utils.eclass (bug #156135). Thanks to Kevin + F. Quinn . 23 Nov 2006; Vlastimil Babka sun-jre-bin-1.4.2.13.ebuild: diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index c5976d9a50b5..b926f3888dd7 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 SHA1 966b9c8229ef3dfb588c108124f367cc993cb581 SHA256 55ca240c8cb0e01b0548e66b0c6446437ebeff541334ead256b5139c1e14ea3f MD5 94065b612df0046d9ae758943f9f6a75 files/construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 files/construct.sh 6959 @@ -20,6 +23,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-jre-bin-1.4.2.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 SHA1 a384cfc5f10c28512b3aed25256cbdb8683db5c4 SHA256 eb93119c3ccec0d85f0578441b467aeba4a68229df21c620e501a3addb23f4b2 MD5 e304bb1cc98f7f73fb6c74db329784b9 sun-jre-bin-1.4.2.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 sun-jre-bin-1.4.2.12-r2.ebuild 4608 @@ -40,10 +45,14 @@ EBUILD sun-jre-bin-1.5.0.09.ebuild 4291 RMD160 1b406162946f37959c078bdc02e763548 MD5 49f71d6fabfa9443cbb20629331b1223 sun-jre-bin-1.5.0.09.ebuild 4291 RMD160 1b406162946f37959c078bdc02e7635487a4a6d5 sun-jre-bin-1.5.0.09.ebuild 4291 SHA256 6c32a641cf0e4356f847f082b89b86801399d67f776bde8e0b8b416171a50661 sun-jre-bin-1.5.0.09.ebuild 4291 -MISC ChangeLog 13037 RMD160 f673c6e0587ba08f99a167d621aabb4c5db46a21 SHA1 af8bcc88ab7b5f0b9b12b1cbc97957b0e410597b SHA256 b7f32c2bbf14461b16b42b58116bdef3729c2d1c68ac0dc1ccfa570c3b80837c -MD5 975ec90312cda185679c9e8f5f79161f ChangeLog 13037 -RMD160 f673c6e0587ba08f99a167d621aabb4c5db46a21 ChangeLog 13037 -SHA256 b7f32c2bbf14461b16b42b58116bdef3729c2d1c68ac0dc1ccfa570c3b80837c ChangeLog 13037 +EBUILD sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b482b0ed55 SHA1 820ef9c4ff8e8f6a3a3c83200d6d1a722435ff17 SHA256 93e25a95dd175e50a8398d90d0599214188e9a843bac505423954a671616d7fa +MD5 006e178438065b2ce976b59e5429c860 sun-jre-bin-1.5.0.10.ebuild 3839 +RMD160 9953890d379a23266669ae40bec710b482b0ed55 sun-jre-bin-1.5.0.10.ebuild 3839 +SHA256 93e25a95dd175e50a8398d90d0599214188e9a843bac505423954a671616d7fa sun-jre-bin-1.5.0.10.ebuild 3839 +MISC ChangeLog 13275 RMD160 8424c1b5e6e360348e4a48fbf9d61b5da480fcce SHA1 80ccd5303ec39ee00f1628b364e443cc119f4e1f SHA256 03aa2126c3aea0da9a8e21f6de44bdbe94ebfd1dc01ba168b3884373c18a5567 +MD5 a438ef29e6149a2755b73221d024bd44 ChangeLog 13275 +RMD160 8424c1b5e6e360348e4a48fbf9d61b5da480fcce ChangeLog 13275 +SHA256 03aa2126c3aea0da9a8e21f6de44bdbe94ebfd1dc01ba168b3884373c18a5567 ChangeLog 13275 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -63,3 +72,13 @@ SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/di MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jre-bin-1.5.0.09-r1 563 RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jre-bin-1.5.0.09-r1 563 SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jre-bin-1.5.0.09-r1 563 +MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jre-bin-1.5.0.10 563 +RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jre-bin-1.5.0.10 563 +SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jre-bin-1.5.0.10 563 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFc0AxcxLzpIGCsLQRAh2JAJ9VFpRFEvvDwKAPOalCMwsDWPqN3ACgmE/2 +SQ87T9Ck7Yc62oa765XAJDs= +=cv8g +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.10 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.10 new file mode 100644 index 000000000000..d0c6ebd39a99 --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-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-jre-bin/sun-jre-bin-1.5.0.10.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild new file mode 100644 index 000000000000..4452f4d91f97 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild,v 1.1 2006/12/03 21:22:30 betelgeuse Exp $ + +inherit pax-utils eutils java-vm-2 + +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 nsplugin" + +RDEPEND=" + sys-libs/glibc + alsa? ( media-libs/alsa-lib ) + X? ( || ( ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst + ) + virtual/x11 + ) + )" + +DEPEND="" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so" + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}. Please check the permission and try again." + fi + + mkdir bundled-jdk + cd bundled-jdk + sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" +} + +src_install() { + local dirs="bin 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}/bin/*) + + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} javaws plugin" + dodir /opt/${P} + + for i in $dirs ; do + cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" + done + dodoc CHANGES README THIRDPARTYLICENSEREADME.txt + dohtml Welcome.html + dodir /opt/${P}/share/ + + 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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + else + eerror "No plugin available for amd64 arch" + fi + fi + + # TODO Don't think we still needs these -nichoj + # 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 + + # FIXME figure out how to handle the control pannel conflict with + # sun-jdk-bin + + # 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}/plugin/desktop/sun_java.desktop > \ +# ${T}/sun_java-${SLOT}.desktop + +# domenu ${T}/sun_java-${SLOT}.desktop + + # bug #56444 + insinto /opt/${P}/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 "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" +}