[gentoo-commits] proj/mozilla:master commit in: media-libs/libpng/files/, media-libs/libpng/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     781db5e3a00d058127a02950cc05fef2946ef4b7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 00:44:19 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 00:44:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=781db5e3

libpng: New libpng-1.5.1. Minor tweaks in 1.4.5 ebuild.

---
 media-libs/libpng/Manifest                         |    5 ++-
 media-libs/libpng/files/libpng-1.5.1-apng.patch.gz |  Bin 0 -> 9765 bytes
 media-libs/libpng/libpng-1.4.5.ebuild              |    8 ++--
 media-libs/libpng/libpng-1.5.1.ebuild              |   49 ++++++++++++++++++++
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 171f279..4e4fabb 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,3 +1,6 @@
 AUX libpng-1.4.5-apng.patch.gz 9734 RMD160 925323c7dd73a123e08301007486f76046847a73 SHA1 6b3c4827bdf6f6f5a37fdb28a74087249ab49339 SHA256 aa170f664c3368181758cb82c6dcdeddfb89887919bcc270f8ea8e1924d5b3c4
+AUX libpng-1.5.1-apng.patch.gz 9765 RMD160 109ca5392bdb72182d69cf5f3f85af525227b9f9 SHA1 3d306ffd45f0d6294a1820b28d257e007a5fc5f6 SHA256 f0478e3c905d3b6702a1b72f8c2ff1ea7397bd8818b2473e3e6f033f21f209b2
 DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
-EBUILD libpng-1.4.5.ebuild 1313 RMD160 70fafd78fff5031cc23abc8baae8291c2999f5d2 SHA1 d6416c679fd669863737ab4afa97ea9880ac0d12 SHA256 ec0581c1803de1988a8d6373f3cb400c7da939520a3667e71eeae2cd9b77d779
+DIST libpng-1.5.1.tar.xz 633264 RMD160 09c34d699fa3c324b1d69398bf8b090ac9fb1644 SHA1 fe2ec0a49a0207ba30471704b317e857f896bb09 SHA256 d230837ad959b395bf7e2937e0136e6037208a29cda83000bf8b88a3692e8c69
+EBUILD libpng-1.4.5.ebuild 1327 RMD160 45cc54587ac70391d435a3da4597b1f1cfd8a29c SHA1 d52d23398dfcd601328c0e47ee3effa986acc99f SHA256 7c6518d4e87560e47048fefc57605103040d9eb8e7af9b9313df1b8dd0afb9d0
+EBUILD libpng-1.5.1.ebuild 1402 RMD160 d4150001b1267270e2d2a51256a54c3b743688b3 SHA1 73819431d1769de3f06ec7c2a7fb9762269b9c23 SHA256 19ea9e7cb5868c09b9bbd38e1a8b923d44a1b18a09abe98295474ea41dc3d0e7

diff --git a/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz b/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz
new file mode 100644
index 0000000..bdd699d
Binary files /dev/null and b/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz differ

diff --git a/media-libs/libpng/libpng-1.4.5.ebuild b/media-libs/libpng/libpng-1.4.5.ebuild
index 260181a..dc3dea3 100644
--- a/media-libs/libpng/libpng-1.4.5.ebuild
+++ b/media-libs/libpng/libpng-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5.ebuild,v 1.1 2010/12/22 15:36:51 ssuominen Exp $
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 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"
+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="apng static-libs"
 
 RDEPEND="sys-libs/zlib"
@@ -37,10 +37,10 @@ src_install() {
 
 pkg_preinst() {
 	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng12.so.0
+	preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
 }
 
 pkg_postinst() {
 	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
 }

diff --git a/media-libs/libpng/libpng-1.5.1.ebuild b/media-libs/libpng/libpng-1.5.1.ebuild
new file mode 100644
index 0000000..648bfd2
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.1.ebuild
@@ -0,0 +1,49 @@
+# 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.1.ebuild,v 1.2 2011/02/13 08:52:18 grobian Exp $
+
+EAPI="3"
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+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="apng static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	use apng && epatch "${FILESDIR}"/${P}-apng.patch.gz
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+#	has_version ${CATEGORY}/${PN}:1.4 && return 0
+	preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0)
+}
+
+pkg_postinst() {
+#	has_version ${CATEGORY}/${PN}:1.4 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
+}