From 6d5352d434adf6898f77e272e42ca4cbeb3be3f3 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Tue, 9 Sep 2008 14:00:30 +0000 Subject: Sun finally made libstdc++ statically linked again for 1.6 so removing the dep on virtual/libstdc++. Reported in bug #237181. Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686 --- dev-java/sun-jdk/ChangeLog | 9 +- dev-java/sun-jdk/Manifest | 13 ++- dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild | 138 ++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild (limited to 'dev-java') diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 2744992f9022..a4bd8d4f8cd6 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.243 2008/07/16 11:15:37 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.244 2008/09/09 14:00:30 betelgeuse Exp $ + +*sun-jdk-1.6.0.07-r1 (09 Sep 2008) + + 09 Sep 2008; Petteri Räty + +sun-jdk-1.6.0.07-r1.ebuild: + Sun finally made libstdc++ statically linked again for 1.6 so removing the + dep on virtual/libstdc++. Reported in bug #237181. 16 Jul 2008; Christian Faulhammer sun-jdk-1.6.0.07.ebuild: diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index dd5e62cb2662..0a4daba51a4d 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 AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8cee6524044fc3bc1bde9c9ec02c420c52ec5499 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49 AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585 @@ -23,6 +26,14 @@ EBUILD sun-jdk-1.5.0.16.ebuild 4465 RMD160 0566c2220e5efa619b934f28edbaefb8a7a30 EBUILD sun-jdk-1.6.0.05-r1.ebuild 4822 RMD160 b92baf2e6d802a17344e8d4c62a701f290373ab3 SHA1 d769056c7de14c94322ccca720ef2bee845b8254 SHA256 de62d7b34189185184e8c250783fa2fa99e6453f216116e03d3779b04dd1c210 EBUILD sun-jdk-1.6.0.05.ebuild 4568 RMD160 ccab3316dc2dc2ab71d6db2836ecf5e6decea575 SHA1 db84a0fa9797237f676a58b1a8de811085ac2b65 SHA256 7793bee9d5fdadf262632a5142153141435d3402990aa7398e567c5c5e117956 EBUILD sun-jdk-1.6.0.06.ebuild 4283 RMD160 b5f905d0b3e94de676fab7f1ba37d9fa7dc61cd3 SHA1 f711c4219d3709b5495e2c6b41ae7c2217e73ad4 SHA256 926f1eb1b66e620e8cbef68054b08a2a1dbc605434a4a83d06af1480424830e1 +EBUILD sun-jdk-1.6.0.07-r1.ebuild 4259 RMD160 c12c32cb5789ac05d3901e25eb81a7f5d9a1db4f SHA1 c1e5e7700f6a2d33c8df800f4e71561f9f9151f4 SHA256 9f0d37a4a9432c1a6c984d61917b09215db3b9d018c9ad402bcbbb9b1b0b1fc0 EBUILD sun-jdk-1.6.0.07.ebuild 4282 RMD160 6893667750d098f6d2789596fd42e38403c807c9 SHA1 a8a6adf1927504f1cfb9ac72132656ffc5ec4b88 SHA256 49a8c73aa7a658d90402f0afee9b00bd39c0c44b5bf7ab6ecfae46cd78a50377 -MISC ChangeLog 45983 RMD160 fa33da8244bfc2e768fad73cb6e60642976968b9 SHA1 d72e805426f830084dd5120993847676fec79c5e SHA256 c9b6c84da135a6d15238e9534f33160437e224a4f369aea7b3ac0c6067ee053e +MISC ChangeLog 46239 RMD160 809996fd876148bf3501b1ed9e99f9eb2002383b SHA1 e0ed8c9b19f6bcd54bff11a66a4c7f44a9d66b18 SHA256 41babd1967cf2c95d99ed5eac55a5ed1d5be14b7fdad84164c1ee53fd8a26920 MISC metadata.xml 352 RMD160 ca3d9b5f1a29c794d25667b59fb8dd6d18959c85 SHA1 daec179189ca09e38ffab061bb9f7c0c1766f09a SHA256 2e33901e40dedf73f59b2779ae2fe5d995a6a03cafb7944a6c067555222cae4c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkjGgZIACgkQcxLzpIGCsLQEswCgm83IqkzJRtAA57ffWitIL/gz +EbAAn1/NSyQbYSc1NhYLEcJW2i2UlSf7 +=i+Lb +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild new file mode 100644 index 000000000000..8f8165d1c6c9 --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2008 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.6.0.07-r1.ebuild,v 1.1 2008/09/09 14:00:30 betelgeuse Exp $ + +inherit versionator java-vm-2 eutils pax-utils + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +MY_PV="$(get_version_component_range 2)u${UPDATE}" +X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" +AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" + +DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" +HOMEPAGE="http://java.sun.com/javase/6/" +URL_BASE="http://download.java.net/dlj/binaries" +SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) + amd64? ( ${URL_BASE}/${AMD64_AT} )" +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="~amd64 ~x86" +RESTRICT="strip" +IUSE="X alsa doc examples jce nsplugin odbc" + +QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so + opt/${P}/jre/lib/i386/libdeploy.so + opt/${P}/jre/lib/i386/client/libjvm.so + opt/${P}/jre/lib/i386/server/libjvm.so" + +DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" +RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* ) + sys-libs/glibc + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + amd64? ( x11-libs/libXt ) + x11-libs/libX11 + ) + odbc? ( dev-db/unixODBC )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +S="${WORKDIR}/jdk$(replace_version_separator 3 _)" + +src_unpack() { + sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" +} + +src_compile() { + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. This needs to be done before CDS - #215225 + pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) + + # see bug #207282 + if use x86; then + einfo "Creating the Class Data Sharing archives" + "${S}"/bin/java -client -Xshare:dump || die + "${S}"/bin/java -server -Xshare:dump || die + fi +} + +src_install() { + local dirs="bin include jre lib man" + + dodir /opt/${P} + + cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" + dodoc COPYRIGHT || die + dohtml README.html || die + + cp -pP src.zip "${D}/opt/${P}/" || die + + if use examples; then + cp -pPR demo sample "${D}/opt/${P}/" || die + 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 || die + mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ + "${D}"/opt/${P}/jre/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ + dosym /opt/sun-jce-bin-1.6.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 + + if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then + # install control panel for Gnome/KDE + # The jre also installs these so make sure that they do not have the same + # Name + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ + "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ + "${T}"/sun_jdk-${SLOT}.desktop + + domenu "${T}"/sun_jdk-${SLOT}.desktop + fi + + # bug #56444 + insinto /opt/${P}/jre/lib/ + newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + elog "Please reinstall eclipse-sdk if you have it installed and want" + elog "workaround for bug #215150." +} -- cgit v1.2.3-65-gdbad