Add a distfile with libsplashscreen.so built against libpng-1.4. The file is selected depending on which libpng is installed. Fixes bug #308443.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 30 insertions, 6 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index a1346baa4f2e..e495da53d995 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2010/03/11 13:40:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.21 2010/03/18 06:38:25 caster Exp $
+
+  18 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  icedtea6-bin-1.7.1.ebuild:
+  Add a distfile with libsplashscreen.so built against libpng-1.4. The file
+  is selected depending on which libpng is installed. Fixes bug #308443.
 
   11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   icedtea6-bin-1.6.2-r2.ebuild, icedtea6-bin-1.7-r1.ebuild,
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 8ff90faee009..7c7d4caaee41 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -16,6 +16,8 @@ DIST icedtea6-bin-examples-1.7.1-amd64.tar.bz2 2174725 RMD160 cc7bd3610f1d861ff9
 DIST icedtea6-bin-examples-1.7.1-x86.tar.bz2 2139161 RMD160 2b7b20c347d5e0a12a83d311ea5848b12c84b70d SHA1 f70ed8abfc8131700b1920d10ef9921aff5f9c7f SHA256 55bf95701d2ee9c4451ea2c8136194c3b224d18d604f1a66d747c3fae432f965
 DIST icedtea6-bin-jpeg8-1.7-amd64.tar.bz2 34588 RMD160 0a0805d8e9090e6550e0f4d18f9a1d943c409623 SHA1 8c6a7b27aeea5f7126c6e7311b8d773ca1651c22 SHA256 3842ec3e9153bcbadd69e522ca76c2c4f6fe7405b7466ab1bfcd83a3a44e72ba
 DIST icedtea6-bin-jpeg8-1.7-x86.tar.bz2 30690 RMD160 ccab1fc9c341fae86e31c56400df23c44e53bd5c SHA1 9dc2961fbad0e890888440c03d0c807328fb013a SHA256 264e0fa8cdad71118c1841b330a588032738d8cccdd73696d5d79bd95e93959c
+DIST icedtea6-bin-libpng14-1.7.1-amd64.tar.bz2 18550 RMD160 657d1677a419d97aaee673b447262f2d1850bedb SHA1 2836bb975d5d10adf7e17677a17c3f690a627af5 SHA256 90aae933a72a22de27e87d2d876bf2a39822f80c3b64c6cd3bacfc7126634e62
+DIST icedtea6-bin-libpng14-1.7.1-x86.tar.bz2 17212 RMD160 0382e7c5f32fb4f137d8fe9c139c646f2ed0ab65 SHA1 f1f02e65aeb08120af5434e4fafc9b3f44ac4a15 SHA256 eb437afa9115ee8c6668edd0182ba9bee6d7d55be2708a6eef24087c1dbead0b
 DIST icedtea6-bin-nsplugin-1.6.2-r2-amd64.tar.bz2 87974 RMD160 6db9830f6c59524513bdd200b8f645677f8764d2 SHA1 511392dcce3b56a97222488927ee4f66db969303 SHA256 4c8a5cb3c0d71cf14f464e4a99fd94515de8755f9d318a6d03959f710c0909ad
 DIST icedtea6-bin-nsplugin-1.6.2-r2-x86.tar.bz2 75695 RMD160 6ec9b559386334da68eb464b847bd082b60886e7 SHA1 37c0ab74ad64b5cea1aca01747599f0fa1201519 SHA256 3b3b31cd004700cc68d3def11df9e0cef9c679bb2ae867256570a185d483538d
 DIST icedtea6-bin-nsplugin-1.7-amd64.tar.bz2 78597 RMD160 500fd235600ef1a30c12585f472d6a1a8b9549d4 SHA1 1d42ef7ea996f0ffa84800237837717c28f8b9b7 SHA256 139c6ea8fbcf7c9437da73aaf5071d082c5b1a87ea622dc6af17d7b8ce743282
@@ -27,6 +29,6 @@ DIST icedtea6-bin-src-1.7.1.tar.bz2 26640897 RMD160 162fe8553f8600133796cdcd97f7
 DIST icedtea6-bin-src-1.7.tar.bz2 26615529 RMD160 8b8ed52e0943cf539c31b57235eabe8a6755877c SHA1 a798af258df0e0d1bfd0293066649d808385a7a4 SHA256 2dc853236a898d4163bf514f1a7f090e47249164746a22f121e9081de606dc21
 EBUILD icedtea6-bin-1.6.2-r2.ebuild 2926 RMD160 dcb20cb408e517f8b84c2cf3a6d907faf1f8dbf9 SHA1 7ab38fe821c916faa27e69c39a6a577578c010ff SHA256 3a7c1d43ed9b04f9ed0623a0914bb5e137e46647ef7d2accf502cced573e1f3f
 EBUILD icedtea6-bin-1.7-r1.ebuild 3484 RMD160 8a6d16980b03ba94cc68ba2296165f83519f22ed SHA1 c4162db26a8f0be14f3761314335f38c06421e14 SHA256 1b87b93d6a42fa3ac3515a51a9e7a2f210d429e482eedc34c0712ae52313466c
-EBUILD icedtea6-bin-1.7.1.ebuild 2936 RMD160 2cd6b6965555ecab45543331d74550a6f62be5a2 SHA1 5bf3c7f9252b8fb08950e3a7a2c22661de3b8faa SHA256 55af3a1b953442766df52bc2edde61abe84abe3844d97a80e89ed5a52f7d72c5
-MISC ChangeLog 3759 RMD160 e102f36650e928350c6b1afc1d1d1de85c4b4ac1 SHA1 ff85d9e7bff3d2c3cc4778a2e753a4c137adbe4b SHA256 4931bd235b3f38afd30a4bb3a262da78e25ac7f5e5da3741df0315589e909185
+EBUILD icedtea6-bin-1.7.1.ebuild 3504 RMD160 72e62fb5874fe4b5c478d58f8b7ee27c14f5aedb SHA1 31accfc2c701576f246847ba741636d44315dd93 SHA256 13679832a55fdb3a68de65148ff0c6007301efe3f414fe5500be1d0ba11b5c3a
+MISC ChangeLog 3986 RMD160 b21bd8984445c550a30a64706d4ad07951c7180f SHA1 38f2b1637109ec0a193d439e01a45846bfbe8d6b SHA256 82daa392b3a80add9dfe69b4777abc466c0b09980104a46c66582898f688c167
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
index f1d2119ee2a5..d3cbbf135ce6 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.7.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.1.ebuild,v 1.2 2010/03/11 13:40:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild,v 1.3 2010/03/18 06:38:25 caster Exp $
 
 EAPI="1"
 
@@ -9,8 +9,10 @@ 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 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+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 )
 	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
 	examples? (
 		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
@@ -62,6 +64,21 @@ QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/server/libjvm.so"
 QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/server/libjvm.so
 	opt/${P}/jre/lib/i386/client/libjvm.so"
 
+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}"