Added a fully blown 1.5.17 version as it's needed for stabilization of seamonkey-2.22 (see bug #489796). Moved the SLOT=1.5 ebuild to 1.5.17-r15

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 54 insertions, 2 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index f8c1a7cf153c..24e6f160010b 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,14 @@
 # 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.420 2013/10/01 14:55:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.421 2013/11/06 08:12:36 polynomial-c Exp $
+
+*libpng-1.5.17-r15 (06 Nov 2013)
+*libpng-1.5.17-r1 (06 Nov 2013)
+
+  06 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -libpng-1.5.17.ebuild,
+  +libpng-1.5.17-r1.ebuild, +libpng-1.5.17-r15.ebuild:
+  Added a fully blown 1.5.17 version as it's needed for stabilization of
+  seamonkey-2.22 (see bug #489796). Moved the SLOT=1.5 ebuild to 1.5.17-r15.
 
   01 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> libpng-1.6.6.ebuild:
   Use the 1.6.6 apng patchset since it's released for cosmetics (and SRC_URI wrt
diff --git a/media-libs/libpng/libpng-1.5.17-r1.ebuild b/media-libs/libpng/libpng-1.5.17-r1.ebuild
new file mode 100644
index 000000000000..47692942bb9b
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.17-r1.ebuild
@@ -0,0 +1,44 @@
+# 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.17-r1.ebuild,v 1.1 2013/11/06 08:12:36 polynomial-c Exp $
+
+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="0" # SLOT="0/15"
+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:="
+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) \
+		--enable-arm-neon=$(usex neon on off)
+}
+
+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.17.ebuild b/media-libs/libpng/libpng-1.5.17-r15.ebuild
index bb405f10fc77..8ac51861fea5 100644
--- a/media-libs/libpng/libpng-1.5.17.ebuild
+++ b/media-libs/libpng/libpng-1.5.17-r15.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.5.17.ebuild,v 1.1 2013/07/22 11:51:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.17-r15.ebuild,v 1.1 2013/11/06 08:12:36 polynomial-c Exp $
 
 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat