Fix installation on Darwin

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 5d3178c5756b4b8639bbb72e8f3016c5285f9956..33b33303c872ef10559007614d2b4fe6042b2a38 100644 (file)
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,9 @@
 # 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.301 2011/09/17 18:26:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.302 2011/09/20 20:31:14 grobian Exp $
+
+  20 Sep 2011; Fabian Groffen <grobian@gentoo.org> libpng-1.4.8-r2.ebuild:
+  Fix installation on Darwin
 
   17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.4.8-r2.ebuild:
   Improve pkg_setup() logic for deleting old library as per example in

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 3cc236f9a4934a14012a424b1bc4725e96747a6a..7787854dc0029370f2820aba707e0cca667589fe 100644 (file)
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libpng-1.2.45-build.patch 384 RMD160 a6567731f964f8a78a2c2be44112761417e4799c SHA1 580afbf794330d33298b62fa84a3da1468c05c43 SHA256 980df151b1b785ab24b86b0e512340b7040c7ac02b58cc835170000b90cfdf7c
 AUX libpng-1.4.8-build.patch 272 RMD160 1f2a9395316c55637ae80207ef589422f2860a6d SHA1 3fb8182441b87f738c019ef2e8d8650042c71d32 SHA256 68342741c0bc08ee30abdbfb808e0c0065851ad5483a3982121ca8be8b7009e6
@@ -13,15 +13,15 @@ DIST libpng-1.5.4.tar.xz 669616 RMD160 27aff1b06f87cea4762d2835f2b133b910ebaacd
 EBUILD libpng-1.2.45.ebuild 1059 RMD160 0f5701f98553c83a1e943eb531ebda3c70fee145 SHA1 109cb715e228a403f58647437360008c120f7c78 SHA256 9e267fb3f0c27fe003163bee9dc5be49d50bcd9706c7d62a8b8eacbf952874ed
 EBUILD libpng-1.2.46.ebuild 995 RMD160 cbc778dc4f81dbfef9cf275e776e01dff731bbd2 SHA1 c258cfead0b506c135e62a632acedbe7f5d34c65 SHA256 31f7e226260ca0f625849ca94f0d192ea7f39f00896c67ff55b4c298fe09fa91
 EBUILD libpng-1.4.8-r1.ebuild 1426 RMD160 88c5a3c9cd84e43aaad1eb059f15b4774d6deb48 SHA1 9522542c4f4a2e5a4f3cf2142f3729fc439d6e0b SHA256 367a1591ba92868095f461498ab1600ff2b771c0211804906dd5f6fb515490f2
-EBUILD libpng-1.4.8-r2.ebuild 1320 RMD160 f0237a6287f9535500e83e577901d48e499dcfba SHA1 cfe898fc1cfcb218d0756aa5b31081bd9a30645f SHA256 20cc95a006b9024916a6e5fefb1fed5ac0d680221197943e72f64b348203ffd2
+EBUILD libpng-1.4.8-r2.ebuild 1369 RMD160 531f587ba91f30eb15135f613068aed99545600f SHA1 bc4b9405b9d7533dd7ece78f7e39542b61d2d6b0 SHA256 ec52f045d997fc9bfb1fa2fe3686489956395c6f079b9a815e2cec32fbf497d2
 EBUILD libpng-1.4.8.ebuild 1467 RMD160 023570d161ac3f93c09893c2292a605ec079418b SHA1 6e2808c79a8c2cebdafa56611c7236d9aa2c195c SHA256 8447d796a9d51d3ed14b91aad3b39d82c4ea1ce0b0d35f8b3fcb6ce2a7abf5c1
 EBUILD libpng-1.5.4.ebuild 1412 RMD160 7edb0df74eedaa4d0778942872a24e9225e51088 SHA1 bb38d4bef6c80939d0907a034ac7b1c8dafa95f4 SHA256 d7e86ac30ec35d34a2e3a0ebe0f7bff6044b31fe949671f49e3ae3be354f958f
-MISC ChangeLog 40531 RMD160 8520f3bd747b7ae2b964ad014a553b0c76569997 SHA1 a1a4308196d23f195f9fe4ff54f1b783a166c16c SHA256 e639dbcd2a8735af46b5c67bb7b6a7bfb95bd6b9cd6c9ab639e5e8e5ed0044f4
+MISC ChangeLog 40634 RMD160 7b41385cdbb16a792c82ac1cef76e5fadd1accc3 SHA1 23b4d54bb1f1e8df355fe14b3ef65b4b846d37f6 SHA256 cd2c50a7d61fb7eec657ecb623c3062710dd2f665418ca15ec4d38e11ea9c6ed
 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iF4EAREIAAYFAk505pEACgkQXkR9YqOcLPFJ0AD+PkPhBD14BaKtaDuJDL5Ju8Vb
-Xos7zK4476ryh5jvmtMA+gOJx6P1UmvI8+kikt0791gKutUku37jIK6FSJ8x/9kD
-=uDl6
+iEYEARECAAYFAk54+BgACgkQX3X2B8XHTomCIgCfYKWJumn8DBnY1MQl9AI9nF1T
+KQAAnRGgnoNp/fD24Ilvyz6fQPOir0SW
+=hUBK
 -----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
index b5aa84d7575e6cf99ca4565e446afd7b07e039e9..354fe806408bcd60aeaef89e2f37303be460f943 100644 (file)
--- a/media-libs/libpng/libpng-1.4.8-r2.ebuild
+++ b/media-libs/libpng/libpng-1.4.8-r2.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.4.8-r2.ebuild,v 1.4 2011/09/17 18:26:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.8-r2.ebuild,v 1.5 2011/09/20 20:31:14 grobian Exp $
 
 # this ebuild is only for the libpng14.so.14 SONAME for ABI compat
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
        if ! has_version media-libs/libpng:${SLOT}; then
-               rm -f "${EROOT}"/usr/$(get_libdir)/libpng14.so.14
+               rm -f "${EROOT}"/usr/$(get_libdir)/libpng14$(get_libname 14)
        fi
 }
 
@@ -43,5 +43,6 @@ src_compile() {
 }
 
 src_install() {
-       newlib.so .libs/libpng14.so.14.* libpng14.so.14
+       local libn=libpng14$(get_libname 14)
+       newlib.so .libs/$(readlink .libs/${libn}) ${libn}
 }