Version bump, security bug #477210.

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

4 files changed, 29 insertions, 291 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 08a037f07776..7653b27a20b3 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2013/06/10 20:36:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.48 2013/07/24 05:26:57 caster Exp $
+
+*icedtea-bin-6.1.12.6 (24 Jul 2013)
+
+  24 Jul 2013; Vlastimil Babka <caster@gentoo.org>
+  -icedtea-bin-6.1.12.4.ebuild, +icedtea-bin-6.1.12.6.ebuild,
+  -icedtea-bin-7.2.3.6.ebuild, -icedtea-bin-7.2.3.8.ebuild:
+  Version bump, security bug #477210.
 
   10 Jun 2013; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.12.5.ebuild:
   Stable for x86, wrt bug #466822
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild
index 3ebd02cca620..fde98655c924 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild
@@ -1,8 +1,8 @@
 # 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-6.1.12.4.ebuild,v 1.4 2013/04/09 20:26:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild,v 1.1 2013/07/24 05:26:57 caster Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 multilib prefix
 
@@ -13,8 +13,10 @@ 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 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	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 )
@@ -28,7 +30,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"
@@ -52,7 +54,7 @@ X_COMMON_DEP="
 
 COMMON_DEP="
 	>=media-libs/giflib-4.1.6-r1
-	=media-libs/libpng-1.5*
+	>=media-libs/libpng-1.5:0=
 	>=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.11.2
 	>=sys-libs/zlib-1.2.3-r1
@@ -81,6 +83,19 @@ RDEPEND="${COMMON_DEP}
 	alsa? ( ${ALSA_COMMON_DEP} )
 	cups? ( ${CUPS_COMMON_DEP} )"
 
+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 ${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}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
deleted file mode 100644
index 2fd89ccb1edf..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.6.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen 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 )
-	x86? ( ${dist}/${PN}-core-${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_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
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
deleted file mode 100644
index ed8ca9c3fe5b..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.8.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen 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 )
-	x86? ( ${dist}/${PN}-core-${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_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
-}