Restore old libtool file removal find because prune_libtool_files --all fails to remove libpng.la dead symlink wrt #436996 by Francesco Turco

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

4 files changed, 64 insertions, 13 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 0fbc62f1c3d2..a81c9c690be6 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.373 2012/09/29 11:51:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.374 2012/10/02 18:32:19 ssuominen Exp $
+
+*libpng-1.5.13-r1 (02 Oct 2012)
+
+  02 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.5.13-r1.ebuild:
+  Restore old libtool file removal find because prune_libtool_files --all fails
+  to remove libpng.la dead symlink wrt #436996 by Francesco Turco
 
   29 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -libpng-1.5.11.ebuild,
   -libpng-1.5.12.ebuild:
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0606c85543e2..51a0882a653f 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -10,17 +10,18 @@ DIST libpng-1.5.13.tar.xz 705912 SHA256 b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf
 EBUILD libpng-1.2.49.ebuild 850 SHA256 872edf7d4d56fd3fc05b7add761e1943bbc88176c1a405e517abcd39d7855a6d SHA512 56082b772b097d17aaabe3822b267a9e77f89f32597c9acbee52f8cc1ccf78caeba17c2ba5d77e36bd5248824840b653616bb56686e763931cfd7e210ebd175d WHIRLPOOL 88cccdda710f9babd14a8ae23ff3b38b1b57d66eaf23c3be8fcf55bef193560076d3e20d23ac140aa20574aaf49dc7f915fbfe55f0d75e87775d37943d4df22e
 EBUILD libpng-1.2.50.ebuild 858 SHA256 e543ea2ddec9228f268d34cbb37181e2f01b8a433b28aa0bb2bec5752648736b SHA512 e71ee148e0abaa1d97641aeb993bb88a8a81bc557ce056eb6fceb7507c6a3edbdeee0a4e4863223acf7b5d5718d84fe2008dd727e837416a5486b988b6145249 WHIRLPOOL 1e8e8259b497b4443cb30f14b94672aa79b577d1e14cd383ee0420cff2f2dc69ce03701f870934523f63748d3720c3af5ff7f94d6aad0544dc3ca028dd7eb40e
 EBUILD libpng-1.5.10.ebuild 1569 SHA256 9245e961e5ec16b893963e8ad93746e6d7e84e89d0fe12d6ce17dc5479d1a717 SHA512 4e3c75e4ffc5b397bc7e24563d63f6c12a7b42d09493532ca6855dadf2c511f4875f7e859546450cc226b600ba15be0642e4b13cc748c4633adfa4219962a05a WHIRLPOOL 62bcf920c7a076056624d0e72aca9a222f7c1272e9473b115d496723a0e79881f25e73248f634d22965acf7c1e8cb6ca0fff19b5bad91470fa92cd626538785d
-EBUILD libpng-1.5.13.ebuild 1347 SHA256 a28cb031e72407c9d8e929a099140b1f3f6b364ea4dc01bf0943c4a760c295c6 SHA512 4cf5c956c9b63ad03ac41eb8852552895aa9ac59e52ff29c123369a8934b8897a74fe4125c79b61c16fa5a12c5a35832907b6050ca3ae1eac7b6b8b92f1d62c1 WHIRLPOOL 311b4fe943f32514fac4835aa9a07af667f21665023bf2ae14486d9c3019806b54247de519494442021ce2e2acd43e483330023ec3a0c8aba8f3d9efcd6523cb
-MISC ChangeLog 49073 SHA256 3a7cde85b03be711bdbd27eee43124e3ba3ce4bc67bbeae2b4ad9b0e222bac22 SHA512 2dde95cff6d7ce640373a73e6ef80da9dd116c1ce73514f8fcc6572a2b67657cfb2644d692464545cf0b5ec4dd1dafaa57e2d78fb5f411dea65e4222876b57fd WHIRLPOOL 41e1fdeaef71fb3539b1117951acf0800727e86813f0a1251e2ca9ff988b823aaa270340837908ab3fd7243cdb32fbb993c842e6963e3ead112f66ee352fee81
+EBUILD libpng-1.5.13-r1.ebuild 1388 SHA256 dc1e7dd31ce5302184e53b4824bdaf23e9452c26813f1e6aa37cfaebed4ecd6a SHA512 072eff9267fdaf1748cefe7a0ce369b13fdad297a66cf5e3f1abfbb599aae8aa4663be47bbd458e29585da487f085745599872d3951a439e849d851ad530b417 WHIRLPOOL 789c6d86aca0ea089b42706b52625bcd729f1126037f802cc5cfa1f85eb81d691af38b36e69c18cd93c7a8a0d9157e542359ad9ee3848ea97eba97d359cd07c3
+EBUILD libpng-1.5.13.ebuild 1385 SHA256 b30a31e02ea18a34744a47d72aa3e320681288cb7c78d37c32c0e7a619b913ad SHA512 07882dd9254a219668fc797c6b882951bcbdebfa90971fd91926f8d3aaa80a60ff1941ce57146341102b580ec81991b16229d095942415723948d905d8bce4ea WHIRLPOOL af174ecd46b0703940a31a16c9d3e4614a411a4b2edab1935768a908c713827fc6c7d7f2f1f5653da9e60d92574f136045afb5c03b825e152e8eabba67133d75
+MISC ChangeLog 49333 SHA256 668ed02c5cbff1ec451452e385bce5a83af19a2ea57b2027cc2f0f0ef989096c SHA512 2102b4a88629a6870485c438e149d31e5d2d55a4be32c02f79142040e8321c53efcb9b750a76bed88d7d5b594dc8723cd7829bd0681cdfd89daecdf3ccd065d8 WHIRLPOOL e65e6408d3193e3b7c7aa0df8917c22af8b5f3d2ec6abb0f3c314d6681ea8ad1b94c8f0476d24e0911c734b67923f3d48ea5bd35668f1eb0071184b8634e02e9
 MISC metadata.xml 247 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 SHA512 f87239088300fd36fad8c64309774ec33c6ee0d0b2c8a43b8bfdd4a53223c4e3ad8bfe31f8e7ccfc12af7ab81cf54d2440070e26ad2ddf774be0b40f9218f05f WHIRLPOOL fd606eed56c413ebfb17ef83fcd32540f0a871febeb21e7f17b77d687d6556f75103f0036a3be2ca0251071e5cfaf0ec9d71b1c2a8c087f68ea50f15bef87eba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJQZt/4AAoJEEdUh39IaPFNQGQH9Ai+90pGGCkbbhI1yJEsbaJO
-VyziA079FYFU1PG+B2477+WzR8miogrFWrfYxwR/AaA6RhlB88i58uN9ovw8mdV3
-47THEbqvEj501crjFQTFG5JyQj/FoeJhB2zLSsG9bIF5c2hJYMV+7cGJv54YcPL/
-Zxm/pyTYquMqYzj6WDkRZssF2rqSd5hJ9Tlj9FLGswxhMB2qKCNWNp4U6m00njLf
-0ojKFc0uF0wjEfAS52zMtVaUpKh6nDb3hwTqgKT1E5bZhsN099L5hNMTkAIPpjj4
-LhGcj45/wdaX7oYXiykDk3Nvzb33HNVZ6DNJ2VeQ96Rxoo5vVbtsM1PbQvCraA==
-=wsn8
+iQEcBAEBCAAGBQJQazKpAAoJEEdUh39IaPFNE1IH/1fJdVxhGev06a7QIHb9QyF6
+vHkuL8WnTds6lPfrLQxjBW7gxZYIeslFRAp7UjHfORDNApKKgw3i5yqqq9c4YmSa
+CrpgB7wEhUkZEXdNwVzxqX3TH7nCM320G4j8XKBRaXgrFY/9TLsbvEnimhzeV/HX
+XxBYDCo56CIW1Zi5qGdlRIqJLm9/dF0b5CVLXiBz2ZnnuEuprzendyKw0qSbAadT
+5To6A5uWbBqCC8oqkwBitW7OQbkWm+rB/5I34qlnIbWmZ/fuYlnrqA5AlIUVzheE
+EzCHWG+BGxGLYr0mCBBs2orVZ1UvGsVWEkkbRh2x94zltxNzS4m2I4eeBWMMfSw=
+=owzL
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.5.13-r1.ebuild b/media-libs/libpng/libpng-1.5.13-r1.ebuild
new file mode 100644
index 000000000000..1626c8d7a6fc
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.13-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.13-r1.ebuild,v 1.1 2012/10/02 18:32:19 ssuominen Exp $
+
+EAPI=4
+
+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="0"
+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 ~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"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+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 \
+		$(use_enable static-libs static) \
+		$(use_enable neon arm-neon)
+}
+
+src_install() {
+	default
+	# Even prune_libtool_all fails to remove libpng.la dead symlink wrt #436996
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libpng/libpng-1.5.13.ebuild b/media-libs/libpng/libpng-1.5.13.ebuild
index 32e5769abeaf..a29e8bf32154 100644
--- a/media-libs/libpng/libpng-1.5.13.ebuild
+++ b/media-libs/libpng/libpng-1.5.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.13.ebuild,v 1.1 2012/09/29 11:49:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.13.ebuild,v 1.2 2012/10/02 18:32:19 ssuominen Exp $
 
 EAPI=4
 
@@ -39,6 +39,6 @@ src_configure() {
 
 src_install() {
 	default
-	# Use --all because otherwise libpng.la is left around
-	prune_libtool_files --all
+	# Even prune_libtool_all fails to remove libpng.la dead symlink wrt #436996
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }