From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 3 May 2010 20:29:29 +0000 (+0000)
Subject: Replace 1.4.1 with 1.4.2_rc5 which should fix problems with xfig, transfig, and timid... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fff6f1fda38e9657d403fa3f6ee8c67a06d64192;p=gentoo.git

Replace 1.4.1 with 1.4.2_rc5 which should fix problems with xfig, transfig, and timidity++ by restoring a function.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 001d0b6d0755..0897957dfe5c 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.250 2010/03/06 23:43:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.251 2010/05/03 20:29:29 ssuominen Exp $
+
+*libpng-1.4.2_rc5 (03 May 2010)
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +libpng-1.4.2_rc5.ebuild:
+  Replace 1.4.1 with 1.4.2_rc5 which should fix problems with xfig,
+  transfig, and timidity++ by restoring a function.
 
 *libpng-1.2.43 (06 Mar 2010)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 9a4b7da8ae11..484d59161bf8 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST libpng-1.2.40.tar.bz2 629950 RMD160 1ba929e73493bfc81bc95113f69f0ff9c5f47814 SHA1 776cf18a799af58303590f6996f6d3aa5a7908ff SHA256 a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
 DIST libpng-1.2.42.tar.bz2 670811 RMD160 37e297f139ec91017c92990ca4c0f376f548853d SHA1 e41cea7a6f5e3065f4289de3742db87ded05b99d SHA256 a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7
 DIST libpng-1.2.43.tar.bz2 678799 RMD160 6c108f06ae32a86ddd8571e9031f143932f19531 SHA1 28ea29305d233669ce565894a95151e4427d1f34 SHA256 c76d5540b0c09e130497be8906e0acadbbf9e299d0aa2258d912c4ee7cacc82a
-DIST libpng-1.4.1.tar.bz2 643261 RMD160 55b210afa675ee735e59241fb7dac10b9d7877ad SHA1 a29310db901f8d9b79a80ca85fd51fa48b243c31 SHA256 bc03009c62c07fc08d1d91ba130c39dc99bef68b533cad4e846835d0bfc4ee5e
+DIST libpng-1.4.2rc05.tar.xz 528216 RMD160 38ac9c700e5fff5c5123e3df2c3cf85bbd90e59e SHA1 b0c74009fe62c45d1f41ad67b6f4b18179ff8386 SHA256 f10f0cb2c19961c617991b8a38ccf95cec325737b44c313f5dd972f065b52c15
 EBUILD libpng-1.2.40.ebuild 760 RMD160 03db5ee78225314e54dc761a8c4f61b29d6be8c1 SHA1 2a34f63bcfcb75cbc2bccb37762a44a3c3ddf0ba SHA256 4c59abed158156a9bffe72aabb2c330ab9e70a084823198634a354d37150ed70
 EBUILD libpng-1.2.42.ebuild 770 RMD160 2f4d4f968131d99ff150332cdad508d3230ce601 SHA1 45bcf5c46d38b12e1624a87aa52eca7b97c467de SHA256 89365cc1019cec6d38591309cec1f64c993f90c1954f5535c9145af1f8d4febf
 EBUILD libpng-1.2.43.ebuild 770 RMD160 486ab342e879f1999e2d173e4722d1c3d6859268 SHA1 5e660bfb680e01ebdbefbb20e29eb676c79d2089 SHA256 726769607214db7bf92cf2ae8b31352b5b8a7b8f3360315ae469a74f1d19b8ef
-EBUILD libpng-1.4.1.ebuild 753 RMD160 ca712083f96d116926b43677ea33fc48b572ac29 SHA1 f49cebb0d2f25c3d4f8fbd035dbf800d68f0ab56 SHA256 658a64f42de2bc2bef447f8ec0323c0e21e52ca98f5662205eef55c9715546da
-MISC ChangeLog 32931 RMD160 2b9557bc2ab786c074399ed691745fa31cfe07f3 SHA1 3b7b8fe6a89f9cbdd25186d4094773e54b68c11a SHA256 5eb885df94274fc78feab8f95c40b2b6958d8499d66b00ccc26f684437edfc5e
+EBUILD libpng-1.4.2_rc5.ebuild 760 RMD160 8747afe6ccf12cef7cf97e1e4be118e300beda63 SHA1 cdb029bbe45ebc70c4e7aeb0ad8f75bb0594a871 SHA256 2970dd0bbf3f559e0426476a2b7d45424e25df63078d89b2b90322ea9a11cc5a
+MISC ChangeLog 33170 RMD160 e4c73a5caab3aba72d63488ddb89c0d2bda39795 SHA1 7839a669a226f59e80bf429402cd70325c817d35 SHA256 11837ee679fb638f754e794dc76365df503d719e1a8e588ac0ff812bdd022f7d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkuS6L8ACgkQTwhj9JtAlp6THgD/ezzRrYGDi+yg1xKuCrbhDxt9
-vc+XriGJhuW6378cvF0A+wcFWxLktDXPyn/qDkbG5BgJqEMQRzW4ulUyyPm2QD1k
-=HAIq
------END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.4.1.ebuild b/media-libs/libpng/libpng-1.4.2_rc5.ebuild
similarity index 70%
rename from media-libs/libpng/libpng-1.4.1.ebuild
rename to media-libs/libpng/libpng-1.4.2_rc5.ebuild
index b2c55600d483..2d0cb9b77997 100644
--- a/media-libs/libpng/libpng-1.4.1.ebuild
+++ b/media-libs/libpng/libpng-1.4.2_rc5.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.1.ebuild,v 1.1 2010/03/06 23:43:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2_rc5.ebuild,v 1.1 2010/05/03 20:29:29 ssuominen Exp $
 
+EAPI=3
 inherit libtool
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/libpng/${P/_rc/rc0}.tar.xz"
 
 LICENSE="as-is"
 SLOT="1.2"
@@ -14,13 +15,13 @@ SLOT="1.2"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# So we get sane .so versioning on FreeBSD
-	elibtoolize
+S=${WORKDIR}/${P/_rc/rc0}
+
+src_prepare() {
+	elibtoolize # fbsd
 }
 
 src_install() {