Version bump.

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

4 files changed, 113 insertions, 1 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 94ea134c75e3..47e3c4135935 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.285 2011/05/03 13:20:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.286 2011/07/08 12:23:41 ssuominen Exp $
+
+*libpng-1.4.8 (08 Jul 2011)
+*libpng-1.2.45 (08 Jul 2011)
+
+  08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.2.45.ebuild,
+  +files/libpng-1.2.45-build.patch, +libpng-1.4.8.ebuild:
+  Version bump.
 
   03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> libpng-1.5.2.ebuild:
   Use eapi4 to make the ebuild smaller a bit.
diff --git a/media-libs/libpng/files/libpng-1.2.45-build.patch b/media-libs/libpng/files/libpng-1.2.45-build.patch
new file mode 100644
index 000000000000..df1a0af9a5e6
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.2.45-build.patch
@@ -0,0 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -102,7 +102,7 @@
+ 
+ libpng.sym: png.h pngconf.h
+ 	rm -f $@ $@.new
+-	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
++	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h > $(srcdir)/$@
+ 	cat $(srcdir)/$@ | \
+ 		$(SED) -n -e \
+ 		's|^.*PNG_FUNCTION_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
diff --git a/media-libs/libpng/libpng-1.2.45.ebuild b/media-libs/libpng/libpng-1.2.45.ebuild
new file mode 100644
index 000000000000..24284b4601de
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.45.ebuild
@@ -0,0 +1,47 @@
+# 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.2.45.ebuild,v 1.1 2011/07/08 12:23:41 ssuominen Exp $
+
+# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+
+EAPI=4
+
+inherit autotools eutils 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*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+pkg_setup() {
+	if [[ -e ${EROOT}/usr/$(get_libdir)/libpng12.so.0 ]] ; then
+		rm -f "${EROOT}"/usr/$(get_libdir)/libpng12.so.0
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake libpng12.la
+}
+
+src_install() {
+	newlib.so .libs/libpng12.so.0.* libpng12.so.0
+}
diff --git a/media-libs/libpng/libpng-1.4.8.ebuild b/media-libs/libpng/libpng-1.4.8.ebuild
new file mode 100644
index 000000000000..d9eb22945903
--- /dev/null
+++ b/media-libs/libpng/libpng-1.4.8.ebuild
@@ -0,0 +1,47 @@
+# 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.8.ebuild,v 1.1 2011/07/08 12:23:41 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/${PN}-apng/${PN}-master/${PV}/${PN}-1.4.7-apng.patch.gz )"
+
+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"
+IUSE="apng static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	use apng && epatch "${WORKDIR}"/${PN}-1.4.7-apng.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE CHANGES README TODO libpng-*.txt
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:1.2 && return 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$(get_libname 0)
+}