Version bump. Fixes problems with xcb - bug #156353.

Package-Manager: portage-2.1.5_rc3

3 files changed, 132 insertions, 2 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 183ebd721f50..7f0f57139ffc 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 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.126 2008/03/30 23:59:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.127 2008/04/16 21:37:39 caster Exp $
+
+*sun-jre-bin-1.6.0.06 (16 Apr 2008)
+
+  16 Apr 2008; Vlastimil Babka <caster@gentoo.org>
+  +sun-jre-bin-1.6.0.06.ebuild:
+  Version bump. Fixes problems with xcb - bug #156353.
 
   30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org>
   sun-jre-bin-1.6.0.05-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index a40d8d73f02c..700c1c54c53c 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -9,9 +9,12 @@ DIST jdk-5.0u15-dlj-linux-amd64.bin 44048720 RMD160 624e7cd75c82891b54f7a3183ded
 DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
 DIST jdk-6u5-dlj-linux-amd64.bin 63756779 RMD160 ed4d9d72845fb15e7731582996b078b4449da1f6 SHA1 c0eac2aa33a0ad05fdeb960708cc270b2d330af5 SHA256 9a9b97ce5ac821f9a92541eb5e2353ddefd485eaa1b4f4de6b41fce8281831d4
 DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
+DIST jdk-6u6-dlj-linux-amd64.bin 63757892 RMD160 a28c5d8f9e43826d8e770a7755261ea153d82dac SHA1 f498cc49096278fe440caa586593268eb26461bb SHA256 f9e80c53e15d8faf0d3381e2e2540bade4c5f849ff72984a2ed34e3208f0b7ea
+DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1460b1064 SHA1 a14c3003425b99ca2b89ebf7a82a8a33b0139894 SHA256 35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076
 EBUILD sun-jre-bin-1.4.2.17.ebuild 3503 RMD160 7ff6561d50b051553521379572a7b73015031396 SHA1 b10d6c3329e3446137ad575ccd09fc78abf39b6f SHA256 966723812c942d55c2e85a227210b3517a7aeb3ca18a30609c9aa560f27db2de
 EBUILD sun-jre-bin-1.5.0.15.ebuild 3157 RMD160 c4ca728904e16c3a7db973e1cdb9c60ebc4e31db SHA1 cde8ddcea82862c6c6d406c436e32246013cb7c2 SHA256 9199bba86b527fd4d802051a381d7ee4c7928b36d441267ad08c223aa690757a
 EBUILD sun-jre-bin-1.6.0.05-r1.ebuild 3418 RMD160 617c08a4b6729822d2d5f00c856c811762c07473 SHA1 85d68bf94fca90490e09a104892493520edbdeb1 SHA256 aa1f5458f48c5fbd9fa617ed2d59c158903240e1a0de2631ed9dd742b51edb5d
 EBUILD sun-jre-bin-1.6.0.05.ebuild 3168 RMD160 3ae8a742a5844f5af02342659fd86d51aece04e1 SHA1 51aa392763c1ae3ef5e1165ffb638b5f60d1e126 SHA256 6befb730a5d54554b8fad7f39fc68a835d0273487f4f2f7e26fdc83db5b5b843
-MISC ChangeLog 22855 RMD160 0eb422a42f6abc24d4ce05cadd40d15ae06dfe67 SHA1 f7309520ce8bb07da3bf99749563371e86b8db52 SHA256 c2435798510f8c8ff28e1453e5302a8f20caf4d0b17b6ff7912e640b1ef2de96
+EBUILD sun-jre-bin-1.6.0.06.ebuild 3414 RMD160 0abee8fceadda981b3b97094e41c57263a1f8f57 SHA1 709790a0aa304ed07ef5bfc1c7673511b9f1f9a3 SHA256 d8a519fec61dc86bca29085b52bc85067c799214e3172b18981533053d9480e8
+MISC ChangeLog 23030 RMD160 7cf59b3ade5acc76441fbe13d4ab8f43b38736a8 SHA1 ab5afefaff62fc54fc3f677cf662cbe547bfc403 SHA256 90d9f325a797a8d0e9c257bbf88e6c81e6d940e453467173116d08e5dc91b91a
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.06.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.06.ebuild
new file mode 100644
index 000000000000..a9a990862127
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.06.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 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.06.ebuild,v 1.1 2008/04/16 21:37:39 caster Exp $
+
+inherit versionator pax-utils eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+
+SUFFIX=".bin"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
+
+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 nsplugin odbc"
+
+RDEPEND="sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
+	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 )"
+DEPEND=""
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/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 lib man"
+
+	# only X86 has the plugin and javaws
+	use x86 && dirs="${dirs} javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+	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
+
+	# install control panel for Gnome/KDE
+	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
+		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
+			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+			"${T}/sun_jre-${SLOT}.desktop" || die
+		domenu "${T}/sun_jre-${SLOT}.desktop" || die
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/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 "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"
+}