From: Vlastimil Babka Date: Sat, 16 Dec 2006 22:56:30 +0000 (+0000) Subject: Fix the control panel desktop menuitem wrt bug #158243 by nunogt . X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d225f6192d3be5aac911262fd05c9074ae2c43d8;p=gentoo.git Fix the control panel desktop menuitem wrt bug #158243 by nunogt . Package-Manager: portage-2.1.2_rc3-r5 --- diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 5d1878b813c1..ff9ab5b1100a 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,12 @@ # 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.170 2006/12/13 22:54:28 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.171 2006/12/16 22:56:30 caster Exp $ + +*sun-jdk-1.6.0-r1 (16 Dec 2006) + + 16 Dec 2006; Vlastimil Babka +sun-jdk-1.6.0-r1.ebuild: + Fix the control panel desktop menuitem wrt bug #158243 by nunogt + . *sun-jdk-1.6.0 (13 Dec 2006) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index d1dd2cc33580..ee6583a490be 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -49,14 +49,18 @@ EBUILD sun-jdk-1.5.0.10.ebuild 4609 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b 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 +EBUILD sun-jdk-1.6.0-r1.ebuild 4704 RMD160 7996ef040d66c9ac97ad4d07941d5b2ebc878dd0 SHA1 c9d85eed724b0e3f63c1fb19cae6e78131762b9e SHA256 4db01eb2e32b69b30c9d405123bf1ca598e956edf9f4abf915bb1ed5c98f9f36 +MD5 4e8f6bf6367875a1ebb88920b39b2058 sun-jdk-1.6.0-r1.ebuild 4704 +RMD160 7996ef040d66c9ac97ad4d07941d5b2ebc878dd0 sun-jdk-1.6.0-r1.ebuild 4704 +SHA256 4db01eb2e32b69b30c9d405123bf1ca598e956edf9f4abf915bb1ed5c98f9f36 sun-jdk-1.6.0-r1.ebuild 4704 EBUILD sun-jdk-1.6.0.ebuild 4631 RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 SHA1 1c4156581260485573da3fea61436a30db271fcc SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23 MD5 d72a0e789e04a3f5f960e8ae37103aaa sun-jdk-1.6.0.ebuild 4631 RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 sun-jdk-1.6.0.ebuild 4631 SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23 sun-jdk-1.6.0.ebuild 4631 -MISC ChangeLog 34418 RMD160 fd0abb225ee47ff042b953148cecd5c115d6c251 SHA1 0c4fabe35bab9a47e6a89983dd0db58b9d49656f SHA256 1280dd77f14c88ea2e89ce3ab6c3218fa10833fb292b8b19b6a4dcab3b6e21d6 -MD5 70216d3ba65a84f55b165a5fb5b12eda ChangeLog 34418 -RMD160 fd0abb225ee47ff042b953148cecd5c115d6c251 ChangeLog 34418 -SHA256 1280dd77f14c88ea2e89ce3ab6c3218fa10833fb292b8b19b6a4dcab3b6e21d6 ChangeLog 34418 +MISC ChangeLog 34618 RMD160 424c19b7ec42e7ba7e5be90b21c636b616c92e52 SHA1 80510b1d67428e588b77365c867826a5cf33f2aa SHA256 6dca5794d59bd5e670a5c38e4f17535baf2ae0d6aee0d32779bf1aa33a427835 +MD5 ed385a8aab322798189d8ecb7f2db20f ChangeLog 34618 +RMD160 424c19b7ec42e7ba7e5be90b21c636b616c92e52 ChangeLog 34618 +SHA256 6dca5794d59bd5e670a5c38e4f17535baf2ae0d6aee0d32779bf1aa33a427835 ChangeLog 34618 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239 @@ -82,3 +86,6 @@ SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/di MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0 521 +MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521 +RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521 +SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1 new file mode 100644 index 000000000000..95693b0f544e --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1 @@ -0,0 +1,6 @@ +MD5 2e0c075c27b09aed67f99475c3a19f83 jdk-6-dlj-linux-amd64.bin 56347832 +RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e jdk-6-dlj-linux-amd64.bin 56347832 +SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 jdk-6-dlj-linux-amd64.bin 56347832 +MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862 +RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862 +SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862 diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild new file mode 100644 index 000000000000..3eadba653c7b --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild @@ -0,0 +1,158 @@ +# 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.6.0-r1.ebuild,v 1.1 2006/12/16 22:56:30 caster Exp $ + +inherit java-vm-2 eutils pax-utils + +#MY_PVA=${PV//./_} +MY_PVA=6 +S="${WORKDIR}/jdk${PV}" + +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/javase/6/" +SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) + amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" +SLOT="1.6" +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 + opt/${P}/jre/lib/i386/client/libjvm.so + opt/${P}/jre/lib/i386/server/libjvm.so" + +DEPEND=" + doc? ( =dev-java/java-sdk-docs-1.6.0* ) + jce? ( =dev-java/sun-jce-bin-1.6.0* )" + +RDEPEND=" + ${DEPEND} + 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 + ) + )" + +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.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 + + # install control panel for Gnome/KDE + sed -e "s/\(Name=Java\)/\1 Control Panel (${PN}-${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 + + # 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.6' 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" +}