From 7b03650f1280943be4ef60d6ab4dc9d8bb37370f Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Wed, 6 Mar 2013 09:27:14 +0000 Subject: Security bump. #460360 Package-Manager: portage-2.1.11.52/cvs/Linux x86_64 Manifest-Sign-Key: 0x3C5CF75A --- dev-java/sun-jre-bin/ChangeLog | 8 +- dev-java/sun-jre-bin/Manifest | 23 ++-- dev-java/sun-jre-bin/sun-jre-bin-1.6.0.39.ebuild | 160 ----------------------- dev-java/sun-jre-bin/sun-jre-bin-1.6.0.43.ebuild | 160 +++++++++++++++++++++++ 4 files changed, 179 insertions(+), 172 deletions(-) delete mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.39.ebuild create mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.43.ebuild (limited to 'dev-java') diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 4891dcf2f695..8c30acdafc27 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.235 2013/02/24 08:30:08 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.236 2013/03/06 09:27:03 sera Exp $ + +*sun-jre-bin-1.6.0.43 (06 Mar 2013) + + 06 Mar 2013; Ralph Sennhauser -sun-jre-bin-1.6.0.39.ebuild, + +sun-jre-bin-1.6.0.43.ebuild: + Security bump. #460360 24 Feb 2013; Ralph Sennhauser sun-jre-bin-1.6.0.41.ebuild: Mark stable for amd64 and x86 wrt #458444 diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 42328d4e9e52..43943035a37d 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -4,22 +4,23 @@ Hash: SHA256 AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6 AUX sun-jre-bin-1.6.env-r1 966 SHA256 2825f19a60ecf19c4164a27aa24312c521145236c013759c62242a7772e44efe SHA512 c6975b48f38fc7ed4060c380d0f08c35c331c08a1c20b75455f007b68cdd23137b86b5b1263ad3db9408393f1920f189b119d85e6c99d50580c765403a03a316 WHIRLPOOL 4cb95b06911b859ee01e5be2069154f8bd3d1816bfd60f170af1e84b93bae6b1b426d6d5728a650a990110ceeffcc8a8b5369e9634f0248ee2bd06d7f71b9e7a -DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f -DIST jre-6u39-linux-x64.bin 21319520 SHA256 84ce40370e60096167221d7577806d83206b988fb06d96990f3160136c9361b5 SHA512 9800bf965f3fc56d9d4a54d56203ac43758385eb39b77979455a6e156f9129122fbcf6567da3a36a2399b8217a7fe2f1d4afe8fc93385328c7b0d45140eabc38 WHIRLPOOL f894c6f03ca7c87f20927a18f86c5741d695b09afed7f4c0feea1a021884c9edde6ca2daf24b95270ae4c3931558a85f4be86095336b6205928889da1e9d2c04 DIST jre-6u41-linux-i586.bin 21726301 SHA256 e89181b56652face6db2704cfbeded2774c27e413f080875a2cea90a45519ad0 SHA512 ddb05f6ecc2cb25122125a16575249002919866a1ab31fdc200bfd4cffeb4b31466987dd434b8efe3b87be1740bcc97162091eaeb2058ee0a34cc684518d2623 WHIRLPOOL f6dea559c0d97b9a465c7d68601fe96603e51c0814e34e93f49c851aa06254389a30e84130549c8ffdcbb3fb360dc261825ef0c01dac5f7d1700571a00bcc2b8 DIST jre-6u41-linux-x64.bin 21326570 SHA256 ed96bd190537146784e645667137e54192566c32cf3cd7dab610d37888d9ed8c SHA512 0b5e16074fc4b0b62deb30746dbb5a4ec3a70fe48c975228bdd0d1aed0eaafd38dff3b71f6ebc841aa9246c17e87ad126cbbbeb9c934fd03ffc85eace8bc3dff WHIRLPOOL c39f67d460abee07f9ea2f2929a1c42d8eafbdc7ce3bb3bfa5f40dcb5a42884cbcf2ab380e8ae0231268baa9fa619ca97026f99f6e634500378b36cbc206917f -EBUILD sun-jre-bin-1.6.0.39.ebuild 4716 SHA256 84d646829bbdb74c781d5fb1e7e4e6f1477f233faecae0300a969224cb54c8a1 SHA512 bbc88261dde01976030e6282e4c27dbfed8b5b85ccf4fe6a21f82940ea8007e6e3e34ef3396435f2d858af1bc1555c8c5d9e0363104ed6f9abf5fcb3d1f27a77 WHIRLPOOL dfe6823295fa58b6d9a59f8c7b6071cda86f38402c9ce837122cb16a68e14ebce9e662d7ea698a0246dc95b7986a9bfe223ac53c42fb0bfda307110d517a5555 +DIST jre-6u43-linux-i586.bin 21727684 SHA256 e6bb81281f661580ea0351726611e064ba95d929f83a7a9f9b71e5ac50d315a3 SHA512 25ca97b5d0811b430fc546c4efa5b8fbdb4cd7bb677370600f8333d8e4e70bb511a5db2b0a4fafc84b5abad099d678f64727d6dcde0fb609795db4ef2f5981b0 WHIRLPOOL 10d0549661a69c61144be9a477c77edf844ee7b1c2f8941f30230157261db6cb8297e5c4217980409b3416cc979e0289fedc330142e97a0a364ae60c9577291e +DIST jre-6u43-linux-ia64.bin 22886380 SHA256 10d15014d9c1f665ff986c49bccfcabcca77123464cd0a05d53a39b77bc4d41a SHA512 0afecd968207e201866034bdd1486a5e3ac1436b8f85472be12c833dad456f04dca5315067ad70e8efd11295794659abd0d04e8e535cfa12f249b713b81b4143 WHIRLPOOL 23d24f1ca7ac15b2e1773ee3851761d5a8b1b173e7372285785c24c17aaa0a75fad55760f709430fddbbac812d3b09f8139166fb215b628926ad449e2c30b0a2 +DIST jre-6u43-linux-x64.bin 21326376 SHA256 df234136c074db02a42187b662b8ba96bed0c7dd2ddfa9fe1f7938b8db6a084c SHA512 32e596de32e6241a401bcc635a4c2e411c731f93546b467aa720f93264a9cb50b351569dfae3140fa71141767be7cc7b2d90f9ebfaa1f2f8c78c54206af08e4c WHIRLPOOL 3e38ee19b0bb833faaa2017d927f4f192048899dfbf5af6cb926d734acab9e82c17fed27eb12620b0d5839c4913ff06ab6fccb6b8164164736259b5713fdc887 EBUILD sun-jre-bin-1.6.0.41.ebuild 4717 SHA256 459d51ac894a729868ee02e5179c21f3b0c73bd9cfc938694fbf29583e4e5b95 SHA512 f33867ca25949082578fd883191c394eaa79d0139e89d409d6058d7a937dc93132960f56c1adc9a1914da2023bc975a9bd4d597e175feb519c40d859a34065b2 WHIRLPOOL 825d1a0841ff5e62d4dfcd1415f16bcd34c1e64be0f128896b5f603f7972f98ab59f602dead5e1def788550143d508a614f4d5d15c2f61166dab5527b7bf9f22 -MISC ChangeLog 40904 SHA256 578cacdc31b42290ea7506a7d5d22a15b43bfd9b76b4c46b98f794e939d0115f SHA512 eb94ca2dd712a307abbfc516aba6d8f8480898a2bae9ab07cd75445f44d6314aefcb4bd9b60204558abecc94458e539bc420e32346ff1a6b0345df7c862e059e WHIRLPOOL deef44c2ef25de5a7c35f746daaab1a82037bef88302724f2f75390e442f56a3d53dcc72a4db299c6735326dafebe1abe1fe95b3fe461f3112f1c04107a5a251 +EBUILD sun-jre-bin-1.6.0.43.ebuild 4712 SHA256 5180e56ef2eebe457156582beb321ba0ba7cbca36622a5a8ba186d45cfa1c084 SHA512 a99be725390c4fc85252aaed965304171de10ad2ebf26b8f46c0e056804462d28ec1b707dd9931b4191d32ae8a14c612b7db15f023b7a985e5a2b47da4e7731e WHIRLPOOL e61f7c3d3f89eba50b4be949271f5099f9dd87ee01617bef4997ff8f1aeb659b79e9878f4a2eaad7a6257d9f848f87224d3da4ef30274e442f4069b97d7fd1d8 +MISC ChangeLog 41079 SHA256 e8c24f9635ccfbb3a8b0bdd75529fdd00429eeb7832796f6725bb3f421704748 SHA512 20e24666dd6ac5e8b1c06599b4e49b0d0d2ed79c5bb12bf7ee84bf21a45cd4c4d294e26bfbe05721688715759f5ffc918f66967f720f0aa6fe8177e6f8f69618 WHIRLPOOL 2e3aac728ffaf159a4cd05e51af5fc28ccc70ed3b5a20b659c2fb037329213ab07efe5d404c9150c90f37abf6eae3cf42ec2d6fe9c81874e3105dd1bb7643b1f MISC metadata.xml 427 SHA256 567a5ce3eef1c4b18ed6b9f04b664a159cfe9367bba0886feef6b1069f2d6416 SHA512 e9c46980a3afe93ced0225b63841d19bd7382673e5d7c36d3e66085339d2eede7c666dcc8cb07658fd349f56e079da24196b884df5f28d0e60becdab8a790e05 WHIRLPOOL ac6a4606217946f8968cb1200ef971fc3879518bfad0ccc463284a3c39ccbecad4515ce3f22415dff4bd74b335da23a57a70af3192f9d92be84a5c3979f935d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRKc+dAAoJELjwI6Q8XPdatnMIAL5BtEB2tTqss/6PepscuCiE -MZMmpm5W6npFAX1JkgmYtP4q65QsU0EO5A8oNi8/CzQE2zu94A1agTg1QwJu4nmD -NGnJdz2qrzGXUo9KyxNYA7HvtXrrnk5H7k7FRogVdq1EV0Eh6tFbit/kvxWCG1rE -peOHpqj71OIGL2Hyi8czlK1NfqaHFf+qyzB4EX2e4a2N7/wdpPeFrEfbFFH378IZ -D3FwxDh6g3YqugF0+of2/MFj5csblAMFfm6aWbclfATfFndBUPl2yeoKA5BPlYH7 -CmZkSUtBwMZ4HDWEUhH2RLmzW2CHhe5rLRiQel0M4MR+7Fq7rRaZUtMN6rT4hNA= -=qBSt +iQEcBAEBCAAGBQJRNwvxAAoJELjwI6Q8XPda8LoIAITpyQCSrHLL3ne5ApBjBEnV +yhdoF/cEUVmKl+Cm0zZrWqkjjUOmNfodFMAN6hyfeglZdWaPmNnneCzF85WZt15N +yH3oNIPYp/MJy9myMTJoGQVBEm5ljIR/cfZ8DWaaQO1VOABr2vCeTLmd8jaVJzJj +3LJNSr/L2I4LqthyJR1Nd8o42DlQPDYrL8izOQDK8qJxDFjE2iHBJn6ROiNq1YdO +fr4bVImqLp94p2caKXZ+Map+ExTDtc7ph0ZVkxnrDLaTZll3qFLkQ5ojSTIdHgQe +xUsfEKocsVohcFmCCF7UdDdrRc0uyoM7H6oyG/2G5ed7E9wwKi+eVdqeQIIQ4YU= +=AwTP -----END PGP SIGNATURE----- diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.39.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.39.ebuild deleted file mode 100644 index 65c3ef3073da..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.39.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2013 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.6.0.39.ebuild,v 1.3 2013/02/14 13:14:13 ago Exp $ - -EAPI="5" - -inherit java-vm-2 eutils prefix versionator - -# This URIs need to be updated when bumping! -JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html" - -MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" -S_PV="$(replace_version_separator 3 '_')" - -X86_AT="jre-${MY_PV}-linux-i586.bin" -AMD64_AT="jre-${MY_PV}-linux-x64.bin" -IA64_AT="jre-${MY_PV}-linux-ia64.bin" - -DESCRIPTION="Oracle's Java SE Runtime Environment" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI=" - amd64? ( ${AMD64_AT} ) - x86? ( ${X86_AT} )" - #ia64? ( ${IA64_AT} ) - -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.6" -KEYWORDS="amd64 -ia64 x86" -IUSE="X alsa jce nsplugin pax_kernel" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -RDEPEND=" - X? ( - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libX11 - ) - alsa? ( media-libs/alsa-lib ) - jce? ( dev-java/sun-jce-bin:1.6 ) - !prefix? ( sys-libs/glibc )" -# scanelf won't create a PaX header, so depend on paxctl to avoid fallback -# marking. #427642 -DEPEND=" - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jre${S_PV}" - -pkg_nofetch() { - if use x86; then - AT=${X86_AT} - elif use amd64; then - AT=${AMD64_AT} - elif use ia64; then - AT=${IA64_AT} - fi - - einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package" - einfo "has become fetch restricted again. Alternatives are switching to" - einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" - einfo "" - einfo "Please download '${AT}' from:" - einfo "'${JRE_URI}'" - einfo "and move it to '${DISTDIR}'" -} - -src_unpack() { - sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" -} - -src_compile() { - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${S}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - if use x86; then - bin/java -client -Xshare:dump || die - fi - # limit heap size for large memory on x86 #405239 - # this is a workaround and shouldn't be needed. - bin/java -server -Xmx64m -Xshare:dump || die -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86; then - rm -vf lib/i386/libjavaplugin_oji.so \ - lib/i386/libjavaplugin_nscp*.so - rm -vrf plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf lib/${arch}/libnpjp2.so \ - lib/${arch}/libjavaplugin_jni.so - fi - - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die - - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir {} + || die - - dodoc COPYRIGHT README - - if use jce; then - dodir "${dest}"/lib/security/strong-jce - mv "${ddest}"/lib/security/US_export_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - mv "${ddest}"/lib/security/local_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \ - "${dest}"/lib/security/US_export_policy.jar - dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ - "${dest}"/lib/security/local_policy.jar - fi - - if use nsplugin; then - install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ - -e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - - # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/lib/fontconfig.* || die - cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - - set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" - java-vm_revdep-mask -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - elog "If you want Oracles JRE 7 'emerge oracle-jre-bin' instead." -} diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.43.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.43.ebuild new file mode 100644 index 000000000000..6472f6116844 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.43.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2013 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.6.0.43.ebuild,v 1.1 2013/03/06 09:27:03 sera Exp $ + +EAPI="5" + +inherit java-vm-2 eutils prefix versionator + +# This URIs need to be updated when bumping! +JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jre-${MY_PV}-linux-i586.bin" +AMD64_AT="jre-${MY_PV}-linux-x64.bin" +IA64_AT="jre-${MY_PV}-linux-ia64.bin" + +DESCRIPTION="Oracle's Java SE Runtime Environment" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI=" + amd64? ( ${AMD64_AT} ) + ia64? ( ${IA64_AT} ) + x86? ( ${X86_AT} )" + +LICENSE="Oracle-BCLA-JavaSE" +SLOT="1.6" +KEYWORDS="~amd64 ~x86" +IUSE="X alsa jce nsplugin pax_kernel" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + ) + alsa? ( media-libs/alsa-lib ) + jce? ( dev-java/sun-jce-bin:1.6 ) + !prefix? ( sys-libs/glibc )" +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}/jre${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + elif use ia64; then + AT=${IA64_AT} + fi + + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package" + einfo "has become fetch restricted again. Alternatives are switching to" + einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" + einfo "" + einfo "Please download '${AT}' from:" + einfo "'${JRE_URI}'" + einfo "and move it to '${DISTDIR}'" +} + +src_unpack() { + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + bin/java -client -Xshare:dump || die + fi + # limit heap size for large memory on x86 #405239 + # this is a workaround and shouldn't be needed. + bin/java -server -Xmx64m -Xshare:dump || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf lib/i386/libjavaplugin_oji.so \ + lib/i386/libjavaplugin_nscp*.so + rm -vrf plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf lib/${arch}/libnpjp2.so \ + lib/${arch}/libjavaplugin_jni.so + fi + + dodir "${dest}" + cp -pPR bin lib man "${ddest}" || die + + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir {} + || die + + dodoc COPYRIGHT README + + if use jce; then + dodir "${dest}"/lib/security/strong-jce + mv "${ddest}"/lib/security/US_export_policy.jar \ + "${ddest}"/lib/security/strong-jce || die + mv "${ddest}"/lib/security/local_policy.jar \ + "${ddest}"/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \ + "${dest}"/lib/security/US_export_policy.jar + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ + "${dest}"/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. + # make_desktop_entry can't be used as ${P} would end up in filename. + newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ + -e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + lib/desktop/applications/sun_java.desktop > \ + "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + + # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html + rm "${ddest}"/lib/fontconfig.* || die + cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} + +pkg_postinst() { + java-vm-2_pkg_postinst + + elog "If you want Oracles JRE 7 'emerge oracle-jre-bin' instead." +} -- cgit v1.2.3-65-gdbad