From: Samuli Suominen Date: Sat, 17 Sep 2011 17:52:35 +0000 (+0000) Subject: Commit binary compat ebuild for SONAME libpng14.so.14 and release libpng15 for genera... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f2b612478cd72424520c111c2e4f137a2a02c1c7;p=gentoo.git Commit binary compat ebuild for SONAME libpng14.so.14 and release libpng15 for general consumption. Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 675c5b080f9a..604f1a0809d0 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.298 2011/09/13 12:54:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.299 2011/09/17 17:52:35 ssuominen Exp $ + +*libpng-1.4.8-r2 (17 Sep 2011) + + 17 Sep 2011; Samuli Suominen +libpng-1.4.8-r2.ebuild, + libpng-1.5.4.ebuild: + Commit binary compat ebuild for SONAME libpng14.so.14 and release libpng15 + for general consumption. *libpng-1.2.46 (13 Sep 2011) diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index 3e4a5a8d60eb..7f3bba7106da 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -21,15 +21,16 @@ EBUILD libpng-1.2.46.ebuild 995 RMD160 cbc778dc4f81dbfef9cf275e776e01dff731bbd2 EBUILD libpng-1.4.5.ebuild 1267 RMD160 81bff4266eaefe7ef0256d463cbd3e7bbbeca8c3 SHA1 d4a4ada9bbb14ba2f0782bbca63e61b190ec8f1e SHA256 157c80ab4bcd2097af02f8cc2b7f5c3d60ef2f0ff3b62e93363f49e3a8a86417 EBUILD libpng-1.4.7.ebuild 1458 RMD160 b2807fc85c2e765a6ab26aac3b72eabd858845e1 SHA1 6e615aa59095d643cfb6021a44804fab103a629f SHA256 8c58d5a91c45bfeccad6595c4c7e07538fd8843326f0dcf69a599147f91aa716 EBUILD libpng-1.4.8-r1.ebuild 1426 RMD160 88c5a3c9cd84e43aaad1eb059f15b4774d6deb48 SHA1 9522542c4f4a2e5a4f3cf2142f3729fc439d6e0b SHA256 367a1591ba92868095f461498ab1600ff2b771c0211804906dd5f6fb515490f2 +EBUILD libpng-1.4.8-r2.ebuild 1328 RMD160 65457b077db520cbfe1485e9de70226bdedebd1a SHA1 e1e2a63b092cd44cb1c3f0c70205a8004c4eacb1 SHA256 e57ae152c35ec6811845868c8fc9422ad8948c65c28f9a6421493592d19535ad EBUILD libpng-1.4.8.ebuild 1467 RMD160 023570d161ac3f93c09893c2292a605ec079418b SHA1 6e2808c79a8c2cebdafa56611c7236d9aa2c195c SHA256 8447d796a9d51d3ed14b91aad3b39d82c4ea1ce0b0d35f8b3fcb6ce2a7abf5c1 EBUILD libpng-1.5.2.ebuild 1402 RMD160 add14a2a9a17a99ff9cad4a537ee15842e9e9687 SHA1 ca14b76e893d559618e4d01ecbb38a4ae0993433 SHA256 f941c4e6e0266e340d26db7922c9fcf0143496d6d64db8993fcd14885794e103 -EBUILD libpng-1.5.4.ebuild 1402 RMD160 00a99ce1c59ba9a643f3c6593d75c5608cd2fef3 SHA1 35d3c6b4e47b42e7ffbb611c20fbf5b409a38b44 SHA256 a8ad4d6343cceb80567cd9ab333779092e10c243a3676c9c08625412f202025d -MISC ChangeLog 39928 RMD160 27245ee8b61062de5eb8b1b8db9ea7f39852287c SHA1 f971e41db604df3a593c7ca002fe352c4c7e70e9 SHA256 5e6006833f277a88cd37fa34fb56a04e4ce6367fbd9382e18ab63ea609a767e6 +EBUILD libpng-1.5.4.ebuild 1412 RMD160 7edb0df74eedaa4d0778942872a24e9225e51088 SHA1 bb38d4bef6c80939d0907a034ac7b1c8dafa95f4 SHA256 d7e86ac30ec35d34a2e3a0ebe0f7bff6044b31fe949671f49e3ae3be354f958f +MISC ChangeLog 40167 RMD160 954be2304e21decb21250672bfcbf621247f706a SHA1 eb0ce6c32d81ccfc22aff0b239e4a22212e6c29a SHA256 9a00a4d5408ab2e728e3e2dd1fbce8c14836d617b946a60effebe22635097cea MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk5vUrEACgkQXkR9YqOcLPFFWwEAjodhcHtQ/x2R8AR21tv70dEh -ifKg9GPqHtDNlx1IcsYA/09x4cv+Jz64yFByjzlVF1u/WFQEo6AnPwrbKMmhprda -=XDNL +iF4EAREIAAYFAk503p8ACgkQXkR9YqOcLPFNdwEAgJSf+yFK8b34w8zZ41Q80RGX +DfqBgxfQEL2Z/4ND/3YBAKp6+yVV5M7vXWpbdQ3lx5lFNfu/sBptsXpAjxtocVKF +=VS8O -----END PGP SIGNATURE----- diff --git a/media-libs/libpng/libpng-1.4.8-r2.ebuild b/media-libs/libpng/libpng-1.4.8-r2.ebuild new file mode 100644 index 000000000000..b270f89889b8 --- /dev/null +++ b/media-libs/libpng/libpng-1.4.8-r2.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-r2.ebuild,v 1.1 2011/09/17 17:52:35 ssuominen Exp $ + +# this ebuild is only for the libpng14.so.0 SONAME for ABI compat + +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}/${P}-apng.patch.gz )" + +LICENSE="as-is" +SLOT="1.4" +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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="apng" + +RDEPEND="sys-libs/zlib + !=media-libs/libpng-1.4*:0" +DEPEND="${RDEPEND} + app-arch/xz-utils" + +pkg_setup() { + if [[ -e ${EROOT}/usr/$(get_libdir)/libpng14.so.0 ]]; then + rm -f "${EROOT}"/usr/$(get_libdir)/libpng14.so.0 + fi +} + +src_prepare() { + use apng && epatch "${WORKDIR}"/${P}-apng.patch + elibtoolize +} + +src_configure() { + econf --disable-static +} + +src_compile() { + emake libpng14.la +} + +src_install() { + newlib.so .libs/libpng14.so.14.* libpng14.so.14 +} diff --git a/media-libs/libpng/libpng-1.5.4.ebuild b/media-libs/libpng/libpng-1.5.4.ebuild index 721dd6806b36..8a94c7fd1ba3 100644 --- a/media-libs/libpng/libpng-1.5.4.ebuild +++ b/media-libs/libpng/libpng-1.5.4.ebuild @@ -1,6 +1,6 @@ # 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.4.ebuild,v 1.1 2011/07/09 16:37:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.4.ebuild,v 1.2 2011/09/17 17:52:35 ssuominen Exp $ EAPI=4 @@ -13,7 +13,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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng static-libs" RDEPEND="sys-libs/zlib" @@ -37,11 +37,11 @@ src_install() { } pkg_preinst() { -# has_version ${CATEGORY}/${PN}:1.4 && return 0 - preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0) + has_version ${CATEGORY}/${PN}:1.4 && return 0 + preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 14) } pkg_postinst() { -# has_version ${CATEGORY}/${PN}:1.4 && return 0 - preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0) + has_version ${CATEGORY}/${PN}:1.4 && return 0 + preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 14) }