Revbump to replace nsplugin part by icedtea-web-1.1.2-r1, which respects LDFLAGS and thus --as-needed removes the (false) libpng14 dependency. Fixes bug #383771.

(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)

2 files changed, 133 insertions, 1 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 9af28ab21531..f61abb11317a 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.67 2011/09/19 09:25:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.68 2011/09/20 07:50:27 caster Exp $
+
+*icedtea6-bin-1.10.3-r2 (20 Sep 2011)
+
+  20 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.10.3-r2.ebuild:
+  Revbump to replace nsplugin part by icedtea-web-1.1.2-r1, which respects
+  LDFLAGS and thus --as-needed removes the (false) libpng14 dependency. Fixes
+  bug #383771.
 
 *icedtea6-bin-1.10.3-r1 (19 Sep 2011)
 
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild
new file mode 100644
index 000000000000..3c8995f1483e
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild,v 1.1 2011/09/20 07:50:27 caster Exp $
+
+EAPI="3"
+
+inherit java-vm-2
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PV}-r1"
+SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
+		${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
+		${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PVR}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PVR}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="X alsa doc examples nsplugin source"
+RESTRICT="strip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}"
+
+RDEPEND=">=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=media-libs/giflib-4.1.6-r1
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	>=sys-libs/zlib-1.2.3-r1
+	"
+PDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.20 )
+	X? (
+		>=media-libs/freetype-2.3.9:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXtst-1.1
+		>=x11-libs/libX11-1.3
+		x11-libs/libXt
+	)
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/pango-1.24.5
+	)"
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/libpng-1.5.0'; then
+		einfo "Installing libpng-1.5 ABI version"
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${P}-libpng15/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+	else
+		elog "Installing libpng-1.4 ABI version"
+		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.5"
+		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	local arch=${ARCH}
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
+	if use doc ; then
+		dohtml -r ../doc/html/* || die "Failed to install documentation"
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source ; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin ; then
+		cd ..
+		cp -pPR icedtea6-web-bin "${D}/opt/"
+		install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc doc/icedtea-web/*
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}