Release libpng16 to ~arch with slotted libpng15 for binary-only pkgs.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 68 insertions, 15 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 57971e51d5bf..2bee6a4f254a 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.390 2013/04/05 17:15:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.391 2013/04/09 20:13:51 ssuominen Exp $
+
+*libpng-1.5.15-r15 (09 Apr 2013)
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +libpng-1.5.15-r15.ebuild, libpng-1.6.1.ebuild:
+  Release libpng16 to ~arch with slotted libpng15 for binary-only pkgs.
 
 *libpng-1.6.1 (05 Apr 2013)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0c3d2e605411..de16d30bed5a 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -13,18 +13,19 @@ DIST libpng-1.6.1.tar.xz 835656 SHA256 5ef57f8b9ef591c8504e2a8f78d31779f0c8f2b34
 EBUILD libpng-1.2.50.ebuild 881 SHA256 371168b4ea273ffd639aa71bb7b34c4d666c781969cf9b28e0f41f735bec5aa7 SHA512 4fad7a0852d44e0594495321fc1b7746702a48eaf4d1455ff6517158e934a12c5bb61b691fdc3df91291da9cc82e22154304102bf1ef11c4e9f93ffdaabb1c84 WHIRLPOOL eb7dc0101bc8df649c6e506d47642862626179797c10e874a17428bb6f2115bf3daf557521852eca0a40e417a714643c0441334f9612994c2468844510430c12
 EBUILD libpng-1.5.13-r1.ebuild 1376 SHA256 3b529b117f6f8d5d3e91d30b3c1cb7a87c0f263f8f0ab0b8226cfb06a7dd3b60 SHA512 0211d7d6af9725af0f1378e4dcb4fcd60b7c10451710917858089c4ecec5cd5506296c0228caf3d0102920aebfffd138b69232534d12d520b592db40c81a758a WHIRLPOOL 444b037b7eddef7a6505adb8723a641122dc9ca6eee32b6b8f835057c433f7948c8e3e113a54d29fb14033467b8b469e8309c68b1666e1d64efb950fd649a0dc
 EBUILD libpng-1.5.14.ebuild 1410 SHA256 1103413acb9a6b87da4cb6a863e100e1ae227b8caeacceca18cfc1785601654c SHA512 d5bba685c1b4f91830e4c1e3033a1ab52e57def516e15061eadfff73b67c79b8bc13d685579f439645eb262135cd6cbd3ecb48d14d49f198289cd3503c9faf5e WHIRLPOOL 7f2b737fb0e467c02ac4215d4680ef0ed09394cf560ad1b8d29ff48bcbe7e6cb614e4791db0d69d080a4db5c606a393a32dea6e7ec9fa1cb95ae596d7d418622
+EBUILD libpng-1.5.15-r15.ebuild 1382 SHA256 d8da59937bf358537eadb24a90ae4a168c373e7daaa3c69e5f813b54c0e0106c SHA512 28667ea3aea85ee69ea9079d78328ed4edc0134b12242031dad20a9a565b657b1222fd89813d8a11ef4df1ce3caa460a13d654266f8eb97a2a185fd40a2b0189 WHIRLPOOL 43cccbf2a675046567f4e2dc8388dc852bc10eb6fe0cda37dc4f4bd865d0bf793886bb47bbe4e6dc9336255d70c65be79c6d703fedef599d1a800aeed736679f
 EBUILD libpng-1.5.15.ebuild 1424 SHA256 0868ca404cc954af7fef9c06efd2e297ad073f864f88aeb538b2d2016292a1eb SHA512 6bb286973af354313fc304e591e9b025f0592349f6e3c7689699f86ce265c4641847f86a59a583fa027860d216ac2638c7e129281bed7c5bc9f6f615cf128c81 WHIRLPOOL 48da87fcd39af656f8a581a90b0c65d25c822288a3b18256e00d2cac394341ee7238669db18ca70a9c8e8f41720e1c8c236516b66a1662d6493a2caaf87ab8d2
-EBUILD libpng-1.6.1.ebuild 1702 SHA256 a37b78364c2b1b05304259d7ae677f20969858f3f22c25b44523813e1ff60afa SHA512 99813f584dca5e94a6631cc53141698830b4b2196b90105587ddef49021603383356d09a679f09e9ce4c969e52bfbab8a2c8a9453ec419dc4da6e56bd98a541f WHIRLPOOL 1e53dd7ad57d529462cba9744d79397fde3b2aecce35bcc6c54d65417271b8d6b99c6702aab78d6c1bfdc6820715ac171691548b1098f311dabad41957844039
-MISC ChangeLog 51339 SHA256 93268cf79a1035c3769d7017742521323bac43fe28a1043fb5a7f678c665f846 SHA512 877ded7da09ffc3a99793a9d67a1970c8d2099ff513672ea22ca7cb39a3c3359957fb81162cea0d5076633894d4277c91738f27fcfdcb6f361f16a85f2c38b5c WHIRLPOOL b53c384136105a1a0c2351ed4093e892fb46dd6734aaeaaeb7ed7c11ec6c8b15aaea1d825b7ef718b9e0880da940c62b1f9053f0131a95bac3e9e7b678e3f7ed
+EBUILD libpng-1.6.1.ebuild 1687 SHA256 dc81ae4b0e98b9187fff738ec09d2681ca196fa615b66bff3a3300bae69964c6 SHA512 baed22f4d375595f99c41de68234f0e88ab3ca986b4c302a9974c0f1f5d9eec57319317164e10d882cf904e61b2ddf6101293cb3bad0cd01dea6df06602aa23b WHIRLPOOL a35559cebf028031a86640d7e75fd65ad30679a415bc4ebaa41a836760ca7a72990afd6f86ab132e5e93a1f43b2d4a6eeabe0236d4c00cd5f3dab23a6e291340
+MISC ChangeLog 51550 SHA256 5def034d2f3ecbe03bde9d4d1e06e87f032c8af0d5d9716c0f963ad9f76c8379 SHA512 4a1201ce52ad85a9e577f287fe41b4a5cda64f296d0a086830136112f2a119b6ff3543b308aa9a6ae449ef9330b8fed97b47bce37e434584aa5594a3c1be682d WHIRLPOOL 7afb8cbc476a624dfa6899522b067695bff7123f842b5e58da980ce37c03bf6a5dee9fb6e9b66472891a28aeeca1f8050ab4d4164243d2232e27e75855c12245
 MISC metadata.xml 247 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 SHA512 f87239088300fd36fad8c64309774ec33c6ee0d0b2c8a43b8bfdd4a53223c4e3ad8bfe31f8e7ccfc12af7ab81cf54d2440070e26ad2ddf774be0b40f9218f05f WHIRLPOOL fd606eed56c413ebfb17ef83fcd32540f0a871febeb21e7f17b77d687d6556f75103f0036a3be2ca0251071e5cfaf0ec9d71b1c2a8c087f68ea50f15bef87eba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRXwaAAAoJEEdUh39IaPFNsR0H/iBSup1c9MBzLqdJFJLPdgY2
-SGimP7NxnDow7iKWATWFrbmvfzuEAYJoMXiRubkLPx0eOmn9Dui/oyez9n41dCtS
-zzlTigkmjdlDFhLHaUn7s/eZQWOHK6aEbFJOIWZRDLccCe9d1f6tl0ou4JJ1FV0u
-a/6zLJbZnT+hLJfUEcRMgHPdWp4TPQWg0AUdzmNwlnUCiY8eCFBZAKh5w87rc1u1
-0ZIcecM874S3Pvhb02Ax1qjOuilz/U+ZpqYJJ7dj++jKIUxG/tCQeWVUT4fmbcDf
-nzOh0ialXZsPI8YUA/nAducSOLr/6CkF9h5o65M+BYok2weRPQYB2XZTirVo1BQ=
-=oQeA
+iQEcBAEBCAAGBQJRZHZ9AAoJEEdUh39IaPFNmNAIAJHvgcLw47BJWW8ky7NKfTjA
+52gbX/vuu/iHEZ9IxyNkBzR6DglS1BybXu5OwvkSWMLEOCTVIlpzkrTO3tCZqWs1
+c7LCOV2142GCZk4Y20pEhOZiNDlFbt08dtS6wYwnRaBgO6OFMxVIt+lKN4RaU12B
+GvxUpKQzeKB6hpvgQxxFpMj14yfwqNVvKAxiVRZIrmsXTbexQ1EEz50/ILCZwMlI
+sDfPRZ6YFSq6PIjZ/vHfaqIQCT3IrlNwkVfKgT8FwPuls4e4zPOtUEgx3mwsYClO
+S0hq8snSZD4yIyaVCcZug8sCLWk0mJfnRuJ7rpTDK2On8lCEj93GnyyK4q4Ijgg=
+=5muq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.5.15-r15.ebuild b/media-libs/libpng/libpng-1.5.15-r15.ebuild
new file mode 100644
index 000000000000..1edcd4756337
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.15-r15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.15-r15.ebuild,v 1.1 2013/04/09 20:13:51 ssuominen Exp $
+
+# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+
+EAPI=5
+
+inherit eutils libtool
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon"
+
+RDEPEND="sys-libs/zlib:=
+	!=media-libs/libpng-1.5*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-arm-neon=$(usex neon on off)
+}
+
+src_compile() {
+	emake libpng15.la
+}
+
+src_install() {
+	newlib.so .libs/libpng15.so.15.* libpng15.so.15
+}
diff --git a/media-libs/libpng/libpng-1.6.1.ebuild b/media-libs/libpng/libpng-1.6.1.ebuild
index 6ddaacfc41d8..8f418a3a7519 100644
--- a/media-libs/libpng/libpng-1.6.1.ebuild
+++ b/media-libs/libpng/libpng-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.1.ebuild,v 1.1 2013/04/05 17:15:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.1.ebuild,v 1.2 2013/04/09 20:13:51 ssuominen Exp $
 
 EAPI=5
 
@@ -13,8 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"
 
 RDEPEND="sys-libs/zlib:="
@@ -45,11 +44,11 @@ src_install() {
 }
 
 pkg_preinst() {
-#	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
 	preserve_old_lib /usr/$(get_libdir)/libpng15$(get_libname 15)
 }
 
 pkg_postinst() {
-#	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
 	preserve_old_lib_notify /usr/$(get_libdir)/libpng15$(get_libname 15)
 }