diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 18:26:29 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 18:26:29 +0000 |
| commit | 7b70ec85150dbc82ed640c8279c1dddbc78bcdf8 (patch) | |
| tree | c3c19170e65501e3c629569ce9b799fb2a7f27a8 /media-libs | |
| parent | ia64/s390/sparc stable wrt #369409 (diff) | |
| download | historical-7b70ec85150dbc82ed640c8279c1dddbc78bcdf8.tar.gz historical-7b70ec85150dbc82ed640c8279c1dddbc78bcdf8.tar.bz2 historical-7b70ec85150dbc82ed640c8279c1dddbc78bcdf8.zip | |
Improve pkg_setup() logic for deleting old library as per example in dev-libs/openssl:0.9.8.
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libpng/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libpng/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/libpng/libpng-1.4.8-r2.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 03740c3c06e3..5d3178c5756b 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,10 @@ # 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.300 2011/09/17 18:01:14 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.301 2011/09/17 18:26:29 ssuominen Exp $ + + 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 + dev-libs/openssl:0.9.8. 17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -libpng-1.2.44.ebuild, -libpng-1.4.5.ebuild, -libpng-1.4.7.ebuild, -libpng-1.5.2.ebuild: diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index e36b03d7c2a3..3cc236f9a493 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -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 1331 RMD160 a60c8aa1541138c72c5a3a3fb72ab53c6ada10e7 SHA1 45650b1928ad8f9cc59142d1f7c0daa485b0282a SHA256 5e25d50265a6d9f3462f7ca977cee88ba95bc9dda934e1bf95271a4c25d71063 +EBUILD libpng-1.4.8-r2.ebuild 1320 RMD160 f0237a6287f9535500e83e577901d48e499dcfba SHA1 cfe898fc1cfcb218d0756aa5b31081bd9a30645f SHA256 20cc95a006b9024916a6e5fefb1fed5ac0d680221197943e72f64b348203ffd2 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 40355 RMD160 c6f7ef262f4c42e422cbda059ad74d004a1168da SHA1 10ca7172430c7acdca065e5ffc2e87980be4d66a SHA256 4d533c56d72c7422f931907d8a6ad12ce2905327f17f64385b28e7511a699406 +MISC ChangeLog 40531 RMD160 8520f3bd747b7ae2b964ad014a553b0c76569997 SHA1 a1a4308196d23f195f9fe4ff54f1b783a166c16c SHA256 e639dbcd2a8735af46b5c67bb7b6a7bfb95bd6b9cd6c9ab639e5e8e5ed0044f4 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk505D8ACgkQXkR9YqOcLPGtbgD/W9dPSfacH6W4MjUq/iLZjyRM -vtB1HFZPJUPEFOU3FYwBAI0L9bWhSouXM69tvykcCmvKjswI1DYhci78xgnVXA23 -=y+NJ +iF4EAREIAAYFAk505pEACgkQXkR9YqOcLPFJ0AD+PkPhBD14BaKtaDuJDL5Ju8Vb +Xos7zK4476ryh5jvmtMA+gOJx6P1UmvI8+kikt0791gKutUku37jIK6FSJ8x/9kD +=uDl6 -----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 82a0a084ee2a..b5aa84d7575e 100644 --- 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.3 2011/09/17 18:16:35 ssuominen Exp $ +# $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 $ # this ebuild is only for the libpng14.so.14 SONAME for ABI compat @@ -24,7 +24,7 @@ DEPEND="${RDEPEND} app-arch/xz-utils" pkg_setup() { - if [[ -e ${EROOT}/usr/$(get_libdir)/libpng14.so.14 ]]; then + if ! has_version media-libs/libpng:${SLOT}; then rm -f "${EROOT}"/usr/$(get_libdir)/libpng14.so.14 fi } |