Add USE=apng support #183370 by Radoslaw Szkodzinski.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 27 insertions, 15 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 37e5693c48a4..1142f92653d7 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.283 2011/04/23 19:06:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.284 2011/04/26 17:32:40 vapier Exp $
+
+  26 Apr 2011; Mike Frysinger <vapier@gentoo.org> libpng-1.4.7.ebuild,
+  libpng-1.5.2.ebuild, metadata.xml:
+  Add USE=apng support #183370 by Radoslaw Szkodzinski.
 
 *libpng-1.5.2 (23 Apr 2011)
 *libpng-1.4.7 (23 Apr 2011)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index f6b7d6b1c4c5..27d48f3c9cdc 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 DIST libpng-1.2.44.tar.xz 540480 RMD160 be002467e8b32b33fd2bfff6bf69c6228c91c241 SHA1 08a7760264a7cb5463a21ca122eacd2ee91b7e09 SHA256 b1ed29bb652cfc6ef63e7c31d0fabab7dfe79e009b145bab8bb906a8c1bd4751
 DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
+DIST libpng-1.4.7-apng.patch.gz 10437 RMD160 f0e2e8862f057fcc1be7ce26063fc58e58774720 SHA1 8286b869d0adabc77d25ca5fca3d4895b8b9618f SHA256 2e3db25f04cf3bdc193b04e431b8cca31d3d7d3616cee0bd7e58c0a46715e09d
 DIST libpng-1.4.7.tar.xz 547660 RMD160 5bc7f8931fac08655f42890b6d5423762f2747a9 SHA1 49ed9977bf7450089d2c156db3d28f772a4c9a87 SHA256 326d226e987973a05be2ac8ab9edc6c69bf3b5ba6a7886fad55d6c38199e807f
+DIST libpng-1.5.2-apng.patch.gz 10452 RMD160 c8c6f97028e7107cb71a34ae643ed796ad9bec84 SHA1 8dcb17d1946f09b499ef1097db4db6b112348973 SHA256 7396cf3efab8295930df480c24e91eaadc1222afd3f74ba0b83ca57009a84f04
 DIST libpng-1.5.2.tar.xz 636256 RMD160 5334e340825dc097692358660ca95d4bc6697ef2 SHA1 50243a46c4745b39e7fcda7a39f498f38e084ad6 SHA256 f2bb6be8202af630fc7615fe3ff529aeb45be6ceeb3ad459f94edbf4e01d1cae
 EBUILD libpng-1.2.44.ebuild 1055 RMD160 6a942b39733057d62a3bf5b72593b03feaa0b18c SHA1 6e051ed808272259da8a3670b095c048bb57c0ff SHA256 109412b86be6e722ed2a42f1b85387e76a06fe9f0a325dc0651db073c33151f8
 EBUILD libpng-1.4.5.ebuild 1267 RMD160 81bff4266eaefe7ef0256d463cbd3e7bbbeca8c3 SHA1 d4a4ada9bbb14ba2f0782bbca63e61b190ec8f1e SHA256 157c80ab4bcd2097af02f8cc2b7f5c3d60ef2f0ff3b62e93363f49e3a8a86417
-EBUILD libpng-1.4.7.ebuild 1326 RMD160 c5046915ec404c19eec5bce877f1c2244e904adc SHA1 9caaaf919c1d5c5150bdb681fa7f6dc0ea0babda SHA256 c45f01e2d7effa183238e73a01a7634994fba166e7dea98fa4c640a7c7f85a1d
-EBUILD libpng-1.5.2.ebuild 1346 RMD160 f638f8fc9639db7c2c5e27d690a9245a1cef1fe9 SHA1 105d4b69a227b7310a291e5dd00ba088a482d1a7 SHA256 eff413b85f9aa7ef8eee63c0a9c2553cb1a5b33054741e1e29a773b0cf357b8f
-MISC ChangeLog 37827 RMD160 5dad821237ba9ea22641def687c2316b36680a45 SHA1 2f33a51c8c637ade82d9e58a88e02e9b32c28c23 SHA256 42f3ebb910e4eb9a4d34ccab11e7ee29c32b197628d3d3de9a6286cf5f4f4698
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD libpng-1.4.7.ebuild 1458 RMD160 b2807fc85c2e765a6ab26aac3b72eabd858845e1 SHA1 6e615aa59095d643cfb6021a44804fab103a629f SHA256 8c58d5a91c45bfeccad6595c4c7e07538fd8843326f0dcf69a599147f91aa716
+EBUILD libpng-1.5.2.ebuild 1465 RMD160 7b85c6cbbf535940c44c64cbdceedcf1f92848a6 SHA1 2ed3b1547b5d88112bfa9ed033b150db6bd97121 SHA256 abeca466195d481612ea3f6412230085ef2a5e1685fe202943046adfb393bdc9
+MISC ChangeLog 37989 RMD160 b1436c43566306ae3f39d56af59dbe954506c25b SHA1 d4b1edaf16008e868c57dae6a35af5a6728c519c SHA256 23a7f72a751a8eb3cd6f889cfdc88c0831026e155043caf3fae5c89d26d76c49
+MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2zI5cACgkQXkR9YqOcLPH1OgD/ZfUS9W1GpAihvpjmBu1OMDQF
-aIb69b1VaAwV39khKFkA/j4eCHZLeZzWk9WwEZRQVvR/swZ+VASx+5aI1zYOrzSN
-=4yTB
+iF4EAREIAAYFAk23AaIACgkQaC/OocHi7Jar8AEAkxnCK93jNUPfQg7O9xwWNwrQ
+7DVnsoR2JbHb3SQH6UMBAIyPtn7XIkykOBKaDb1YkhiyUfU/Ago5KuESURh4mlz7
+=kiYo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.4.7.ebuild b/media-libs/libpng/libpng-1.4.7.ebuild
index 539218c8e3bb..74786b26e315 100644
--- a/media-libs/libpng/libpng-1.4.7.ebuild
+++ b/media-libs/libpng/libpng-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.7.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.7.ebuild,v 1.2 2011/04/26 17:32:40 vapier Exp $
 
 EAPI="3"
 
@@ -8,18 +8,20 @@ inherit eutils libtool multilib
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/${PN}-apng/${PN}-master/${PV}/${P}-apng.patch.gz )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs"
+IUSE="apng static-libs"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
+	use apng && epatch "${WORKDIR}"/${P}-apng.patch
 	elibtoolize
 }
 
diff --git a/media-libs/libpng/libpng-1.5.2.ebuild b/media-libs/libpng/libpng-1.5.2.ebuild
index 5608b511e1a3..89ff8afbfec1 100644
--- a/media-libs/libpng/libpng-1.5.2.ebuild
+++ b/media-libs/libpng/libpng-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.2.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.2.ebuild,v 1.2 2011/04/26 17:32:40 vapier Exp $
 
 EAPI="3"
 
@@ -8,19 +8,20 @@ inherit eutils libtool multilib
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/${PN}-apng/${PN}-devel/${PV}/${P}-apng.patch.gz )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS=""
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs"
+IUSE="apng static-libs"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
+	use apng && epatch "${WORKDIR}"/${P}-apng.patch
 	elibtoolize
 }
 
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 96a2d586367d..14900c8a73d0 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+	<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
+</use>
 </pkgmetadata>