Version bump, security bug #330205.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 13 insertions, 25 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index e80076f65c43..560d8795987f 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.31 2010/06/24 20:58:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.32 2010/07/30 14:52:42 caster Exp $
+
+*icedtea6-bin-1.8.1 (30 Jul 2010)
+
+  30 Jul 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.7.2.ebuild, +icedtea6-bin-1.8.1.ebuild:
+  Version bump, security bug #330205.
 
   24 Jun 2010; Pacho Ramos <pacho@gentoo.org> icedtea6-bin-1.8.0.ebuild:
   stable amd64, bug 320163
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild
index 84f1086310b8..fcc1a6e31486 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7.2.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7.2.ebuild,v 1.3 2010/04/15 21:00:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild,v 1.1 2010/07/30 14:52:42 caster Exp $
 
 EAPI="1"
 
@@ -9,10 +9,8 @@ inherit java-vm-2
 dist="mirror://gentoo/"
 DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
 TARBALL_VERSION="${PV}"
-SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
-			${dist}/${PN}-libpng14-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
-		${dist}/${PN}-libpng14-${TARBALL_VERSION}-x86.tar.bz2 )
+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 )
@@ -30,7 +28,7 @@ RESTRICT="strip"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
 
@@ -38,7 +36,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.9
 	>=media-libs/giflib-4.1.6-r1
 	>=media-libs/jpeg-8
-	>=media-libs/libpng-1.2
+	>=media-libs/libpng-1.4:0
 	>=sys-libs/zlib-1.2.3-r1
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	X? (
@@ -60,21 +58,6 @@ RDEPEND=">=sys-devel/gcc-4.3
 	)"
 DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-
-	if has_version '>=media-libs/libpng-1.4.0'; then
-		einfo "Installing libpng-1.4 ABI version"
-		local arch=${ARCH}
-		use x86 && arch=i386
-		mv -v ${P}-libpng14/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
-	else
-		elog "Installing libpng-1.2 ABI version"
-		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.4"
-		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}"
@@ -100,7 +83,7 @@ src_install() {
 
 	if use nsplugin ; then
 		use x86 && arch=i386
-		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaNPPlugin.so"
+		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"
 	fi
 
 	set_java_env
@@ -113,7 +96,6 @@ pkg_postinst() {
 
 	if use nsplugin; then
 		elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
-		elog "We now install the new IcedTeaNPPlugin, note that it's alpha quality."
 		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