From: Vlastimil Babka Date: Wed, 13 Dec 2006 22:54:28 +0000 (+0000) Subject: A minor version bump I bet nobody cares about (bug #133657). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e5e7753d2f175d2852622d2f178fc968437ab60;p=gentoo.git A minor version bump I bet nobody cares about (bug #133657). Package-Manager: portage-2.1.2_rc3-r4 --- diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index d1ac5741e803..5d1878b813c1 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.169 2006/12/03 21:02:56 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.170 2006/12/13 22:54:28 caster Exp $ + +*sun-jdk-1.6.0 (13 Dec 2006) + + 13 Dec 2006; Vlastimil Babka +files/sun-jdk-1.6.env, + +sun-jdk-1.6.0.ebuild: + A minor version bump I bet nobody cares about (bug #133657). *sun-jdk-1.5.0.10 (03 Dec 2006) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index a67084b60178..d1dd2cc33580 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,6 +1,3 @@ ------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 @@ -13,6 +10,10 @@ AUX sun-jdk-1.5.env 925 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 SHA1 d93 MD5 9b9e4337c1fb2f73b1adad1db1e01325 files/sun-jdk-1.5.env 925 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 files/sun-jdk-1.5.env 925 SHA256 9faf2bfbdec7fd92e6fc3509a22ae8ec9a3527d850f9763cef42575e0dec13fe files/sun-jdk-1.5.env 925 +AUX sun-jdk-1.6.env 925 RMD160 cac1306ba6dd05dcf74fb2e536bf40bd3f03bee1 SHA1 02587c415e0dffefdf8900fad5884d2bd604056c SHA256 8fd2d12405a41b923b3c64d56b9e42a89d2479323fd78703f2b065fb0ee7ec2b +MD5 f356c5b7e3ccb4243bac775c0286c4fb files/sun-jdk-1.6.env 925 +RMD160 cac1306ba6dd05dcf74fb2e536bf40bd3f03bee1 files/sun-jdk-1.6.env 925 +SHA256 8fd2d12405a41b923b3c64d56b9e42a89d2479323fd78703f2b065fb0ee7ec2b files/sun-jdk-1.6.env 925 DIST j2sdk-1_4_2_12-linux-i586.bin 36337163 RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 SHA1 74f88c386985ba01b7c574e441f3f479b4a3b549 SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531 DIST j2sdk-1_4_2_13-linux-i586.bin 36361814 RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 SHA1 12c679cfa2e212bfa90ae6ef6ad6c477e427bbba SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 @@ -22,6 +23,8 @@ DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c 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 +DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 +DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 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 @@ -46,10 +49,14 @@ 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 -MISC ChangeLog 34228 RMD160 154a9ee17bf99c6287cbef1591fd2031e3966909 SHA1 bee836c9a2417398f91bb37b2908d939a97e1bf3 SHA256 8b2d1121aefb178192974d2142220ed7955fab13bcc80cc57dfa3f61e5db2ede -MD5 bd54f31a0618b717aef09b16b408d502 ChangeLog 34228 -RMD160 154a9ee17bf99c6287cbef1591fd2031e3966909 ChangeLog 34228 -SHA256 8b2d1121aefb178192974d2142220ed7955fab13bcc80cc57dfa3f61e5db2ede ChangeLog 34228 +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 metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239 @@ -72,10 +79,6 @@ SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/di 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----- +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 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0 new file mode 100644 index 000000000000..95693b0f544e --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0 @@ -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/files/sun-jdk-1.6.env b/dev-java/sun-jdk/files/sun-jdk-1.6.env new file mode 100644 index 000000000000..dcbac3ea4cf9 --- /dev/null +++ b/dev-java/sun-jdk/files/sun-jdk-1.6.env @@ -0,0 +1,17 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.1 2006/12/13 22:54:28 caster Exp $ + +VERSION="Sun JDK @PV@" +JAVA_HOME=/opt/@P@ +JDK_HOME=/opt/@P@ +JAVAC=${JAVA_HOME}/bin/javac +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" +MANPATH="/opt/@P@/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.6" +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild new file mode 100644 index 000000000000..e958547e491b --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild @@ -0,0 +1,157 @@ +# 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.ebuild,v 1.1 2006/12/13 22:54:28 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/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.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" +}