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

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

3 files changed, 54 insertions, 4 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/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 {} +
 }