Version bump, security bug #466822. Installs libpng-1.5 or libpng-1.6 file depending on what is detected, bug #464914.

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)

2 files changed, 167 insertions, 1 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index e1646c9b9555..69a793ed6461 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.43 2013/04/09 20:26:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.44 2013/04/29 05:21:17 caster Exp $
+
+*icedtea-bin-7.2.3.9 (29 Apr 2013)
+
+  29 Apr 2013; Vlastimil Babka <caster@gentoo.org> +icedtea-bin-7.2.3.9.ebuild:
+  Version bump, security bug #466822. Installs libpng-1.5 or libpng-1.6 file
+  depending on what is detected, bug #464914.
 
   09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
   icedtea-bin-6.1.12.2.ebuild, icedtea-bin-6.1.12.4.ebuild,
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.9.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.9.ebuild
new file mode 100644
index 000000000000..2e6d2442bee2
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.3.9.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.9.ebuild,v 1.1 2013/04/29 05:21:17 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+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-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=media-libs/freetype-2.3.9:2
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/libX11-1.3
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		x11-libs/libXrender
+		>=x11-libs/libXtst-1.1
+		>=x11-libs/pango-1.24.5"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	media-libs/lcms:2
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '=media-libs/libpng-1.5*:0'; then
+		elog "Installing libpng-1.5 ABI version"
+		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.6"
+		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+	else
+		einfo "Installing libpng-1.6 ABI version"
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	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
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} 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
+}