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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 82 insertions, 57 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/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
 }