Version bump to final 1.4.2 and release it into arch wrt #305095.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 89 insertions, 65 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 0897957dfe5c..7d478d9fc6db 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,15 @@
 # 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.251 2010/05/03 20:29:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.252 2010/05/09 00:03:28 ssuominen Exp $
+
+*libpng-1.4.2 (09 May 2010)
+*libpng-1.2.43-r2 (09 May 2010)
+*libpng-1.2.43-r1 (09 May 2010)
+
+  09 May 2010; Samuli Suominen <ssuominen@gentoo.org> libpng-1.2.40.ebuild,
+  -libpng-1.2.42.ebuild, -libpng-1.2.43.ebuild, +libpng-1.2.43-r1.ebuild,
+  +libpng-1.2.43-r2.ebuild, -libpng-1.4.2_rc5.ebuild, +libpng-1.4.2.ebuild:
+  Version bump to final 1.4.2 and release it into arch wrt #305095.
 
 *libpng-1.4.2_rc5 (03 May 2010)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 484d59161bf8..30dc714be127 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,10 +1,9 @@
 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.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.2_rc5.ebuild 760 RMD160 8747afe6ccf12cef7cf97e1e4be118e300beda63 SHA1 cdb029bbe45ebc70c4e7aeb0ad8f75bb0594a871 SHA256 2970dd0bbf3f559e0426476a2b7d45424e25df63078d89b2b90322ea9a11cc5a
-MISC ChangeLog 33170 RMD160 e4c73a5caab3aba72d63488ddb89c0d2bda39795 SHA1 7839a669a226f59e80bf429402cd70325c817d35 SHA256 11837ee679fb638f754e794dc76365df503d719e1a8e588ac0ff812bdd022f7d
+DIST libpng-1.2.43.tar.xz 538832 RMD160 18e56239433f21263b90a93c6ddb941a75a3a544 SHA1 c7013d773eb45b8ed6a864e419e544106a0dd95d SHA256 d634da73842dfd734811de9247403b0aeb16d292d58be2f04abb5c31b54b607a
+DIST libpng-1.4.2.tar.xz 527736 RMD160 3b813503b155cd9b00ba0a77f346bab8b0e82366 SHA1 d6a3ef20f5bb2c13f3d799bd23ffb9ee3dbc844f SHA256 a644469ab0620dcf19351b0739ea1ee6696feb4560b42575af7885a16dfef88e
+EBUILD libpng-1.2.40.ebuild 660 RMD160 8c967d264daa97665723e489c5c116677fe6fe99 SHA1 dc2768e88ccd5326efc0e5b1c8138617bdf65920 SHA256 592224f6fd603be92e2e18cc105e85ee048f17c41da1040bd5b6c6b5fd83741f
+EBUILD libpng-1.2.43-r1.ebuild 1038 RMD160 e82be2c3b161c36142cbde044b9c50b3bc565740 SHA1 270c71cdf4c9484aaf57c0aa109be59d1a9671d1 SHA256 6334ab4c88a8e7d9909d8ea3d71cdcda6416371b58a1add6ab3cac22035f606e
+EBUILD libpng-1.2.43-r2.ebuild 850 RMD160 c814ab77fee66a84ecb9018c4128f7cd0658cf45 SHA1 af62d92f00ab38376131dc7db729469c06579bde SHA256 89d31b8147e44b868d4d680af4624cc36ef02d2f7fc5c329db5865f8fa3598fc
+EBUILD libpng-1.4.2.ebuild 748 RMD160 61669fa366721b3b54cd0255841ebe39fd125ec0 SHA1 5c8e8746922bf7cdf6542d046561173e85bfa545 SHA256 1cc84d02c45d7d5417a4fd063a5fe22a785262d20609189a27c6de196dbd4c4a
+MISC ChangeLog 33558 RMD160 6f17603ca4267bec7e8ce4b731ddd9fde1a27e88 SHA1 4e78300ad8de55f054f40fa8957316234f4d9a20 SHA256 a49409dd1380c5ddd7af6b61baa9c26ab2bb11f5128ec95183acc627be132a80
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/media-libs/libpng/libpng-1.2.40.ebuild b/media-libs/libpng/libpng-1.2.40.ebuild
index f5b6bf4da9a0..b5b95ff76112 100644
--- a/media-libs/libpng/libpng-1.2.40.ebuild
+++ b/media-libs/libpng/libpng-1.2.40.ebuild
@@ -1,7 +1,8 @@
 # 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.2.40.ebuild,v 1.10 2010/01/31 16:11:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.40.ebuild,v 1.11 2010/05/09 00:03:28 ssuominen Exp $
 
+EAPI=3
 inherit libtool
 
 DESCRIPTION="Portable Network Graphics library"
@@ -13,17 +14,13 @@ SLOT="1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="sys-libs/zlib
+	!>=media-libs/libpng-1.2.40-r1"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# So we get sane .so versioning on FreeBSD
+src_prepare() {
 	elibtoolize
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
 }
diff --git a/media-libs/libpng/libpng-1.2.43-r1.ebuild b/media-libs/libpng/libpng-1.2.43-r1.ebuild
new file mode 100644
index 000000000000..bf2969511738
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.43-r1.ebuild
@@ -0,0 +1,43 @@
+# 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.2.43-r1.ebuild,v 1.1 2010/05/09 00:03:28 ssuominen Exp $
+
+# this ebuild is only for the libpng12.so SONAME for ABI compat
+
+EAPI=3
+inherit multilib libtool
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	!<media-libs/libpng-1.2.43-r1"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+pkg_setup() {
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0.43.0 ]]; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0.43.0
+	fi
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)
+	doexe .libs/libpng12.so.0.43.0 || die
+}
diff --git a/media-libs/libpng/libpng-1.2.42.ebuild b/media-libs/libpng/libpng-1.2.43-r2.ebuild
index b71e7899d6eb..a4e0afa8bc0e 100644
--- a/media-libs/libpng/libpng-1.2.42.ebuild
+++ b/media-libs/libpng/libpng-1.2.43-r2.ebuild
@@ -1,29 +1,35 @@
 # 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.2.42.ebuild,v 1.1 2010/01/24 20:24:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.43-r2.ebuild,v 1.1 2010/05/09 00:03:28 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/${PN}/${P}.tar.xz"
 
 LICENSE="as-is"
-SLOT="1.2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-libs/zlib
+	!<media-libs/libpng-1.2.43-r1"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# So we get sane .so versioning on FreeBSD
+pkg_setup() {
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0.43.0 ]]; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0.43.0
+	fi
+}
+
+
+src_prepare() {
 	elibtoolize
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
 }
diff --git a/media-libs/libpng/libpng-1.2.43.ebuild b/media-libs/libpng/libpng-1.2.43.ebuild
deleted file mode 100644
index 871e7f6e4a50..000000000000
--- a/media-libs/libpng/libpng-1.2.43.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.2.43.ebuild,v 1.1 2010/03/06 23:43:52 vapier Exp $
-
-inherit libtool
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# So we get sane .so versioning on FreeBSD
-	elibtoolize
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
-}
diff --git a/media-libs/libpng/libpng-1.4.2_rc5.ebuild b/media-libs/libpng/libpng-1.4.2.ebuild
index 2d0cb9b77997..591ae8921311 100644
--- a/media-libs/libpng/libpng-1.4.2_rc5.ebuild
+++ b/media-libs/libpng/libpng-1.4.2.ebuild
@@ -1,30 +1,29 @@
 # 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.2_rc5.ebuild,v 1.1 2010/05/03 20:29:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.1 2010/05/09 00:03:28 ssuominen Exp $
 
 EAPI=3
 inherit libtool
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${P/_rc/rc0}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="as-is"
-SLOT="1.2"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="sys-libs/zlib"
+RDEPEND="sys-libs/zlib
+	!<media-libs/libpng-1.2.43-r1"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
-S=${WORKDIR}/${P/_rc/rc0}
-
 src_prepare() {
-	elibtoolize # fbsd
+	elibtoolize
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES README TODO
+	dodoc ANNOUNCE CHANGES README TODO || die
 }