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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 58 insertions, 6 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/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)
 }