From: Marien Zwart Date: Mon, 19 Feb 2007 01:46:44 +0000 (+0000) Subject: Move preserve_old_lib call from src_install to pkg_postinst because preserve_old_lib... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a7357deba8a63b865d4b7d74a65084652884db3;p=gentoo.git Move preserve_old_lib call from src_install to pkg_postinst because preserve_old_lib now calls die if called from src_install. Changes a stable ebuild because libexif-0.6.13-r2 probably has too many changes to go stable everywhere right now. Thanks to Logix101 for reporting the problem on irc. Package-Manager: portage-2.1.2-r9 --- diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog index 63ea61c17169..149fe65186c2 100644 --- a/media-libs/libexif/ChangeLog +++ b/media-libs/libexif/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libexif # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.65 2007/02/08 19:29:24 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.66 2007/02/19 01:46:44 marienz Exp $ + + 19 Feb 2007; Marien Zwart libexif-0.6.13-r1.ebuild: + Move preserve_old_lib call from src_install to pkg_postinst because + preserve_old_lib now calls die if called from src_install. Changes a stable + ebuild because libexif-0.6.13-r2 probably has too many changes to go stable + everywhere right now. Thanks to Logix101 for reporting the problem on irc. 08 Feb 2007; Fabian Groffen libexif-0.5.12-r3.ebuild, libexif-0.6.12-r4.ebuild, libexif-0.6.13-r1.ebuild: diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest index e2803d2e67b5..3f180f0c54cd 100644 --- a/media-libs/libexif/Manifest +++ b/media-libs/libexif/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libexif-0.5-CAN-2005-0664.patch 860 RMD160 1c179d8c5e00180a4f7e28f27e3dd5f852f51ca6 SHA1 1b4bd2c6f9a9cd894438bf167e998e2bc6130f26 SHA256 2affec46d9081bfacfeb5d92ce7092636451f0e752407aed0d3603c03a8f2f86 MD5 a8085215f21d54708b3bfca3e1aeb612 files/libexif-0.5-CAN-2005-0664.patch 860 RMD160 1c179d8c5e00180a4f7e28f27e3dd5f852f51ca6 files/libexif-0.5-CAN-2005-0664.patch 860 @@ -57,18 +60,18 @@ EBUILD libexif-0.6.12-r4.ebuild 1650 RMD160 b3bef58578c748c0825016f2d8c1dd2ca2ba MD5 3f2a38afa563b09b818ca56c792d7daf libexif-0.6.12-r4.ebuild 1650 RMD160 b3bef58578c748c0825016f2d8c1dd2ca2ba93e9 libexif-0.6.12-r4.ebuild 1650 SHA256 2ee818621a4dbf027dea8c902e07352de00a57cd02cbef229012ff1850783c0a libexif-0.6.12-r4.ebuild 1650 -EBUILD libexif-0.6.13-r1.ebuild 1947 RMD160 68ea80a51f9f0bd6580b0cd27bf3557e3a05b0bc SHA1 065f8ea56a0b2acdc678d0705408326c8d2a2d5d SHA256 b0f3f8f50378fa6b9ee0f76fef944fe3fadbfee66e69b71ad334d8e35cce1492 -MD5 4ac16edc4b869a7b26a0d9c413e64ff3 libexif-0.6.13-r1.ebuild 1947 -RMD160 68ea80a51f9f0bd6580b0cd27bf3557e3a05b0bc libexif-0.6.13-r1.ebuild 1947 -SHA256 b0f3f8f50378fa6b9ee0f76fef944fe3fadbfee66e69b71ad334d8e35cce1492 libexif-0.6.13-r1.ebuild 1947 +EBUILD libexif-0.6.13-r1.ebuild 1965 RMD160 9465aec2d820ecb3fc3bce569114befce4d4245c SHA1 27211cb521413cabd29146f8bd4419a8b82b6cab SHA256 b3ab2ed0dc66c7b82e362a4f331ab9a257fe3b2c4e53fe157d22cc01efe13de7 +MD5 d666298e9d02d559303e8183b6636fb3 libexif-0.6.13-r1.ebuild 1965 +RMD160 9465aec2d820ecb3fc3bce569114befce4d4245c libexif-0.6.13-r1.ebuild 1965 +SHA256 b3ab2ed0dc66c7b82e362a4f331ab9a257fe3b2c4e53fe157d22cc01efe13de7 libexif-0.6.13-r1.ebuild 1965 EBUILD libexif-0.6.13-r2.ebuild 1866 RMD160 4efb08e1bc8fee5bf082df3c45094c58811dd920 SHA1 afda53e2859aad43ed6714d434775beee7e7ed58 SHA256 33a359cd20521613772ad3b68d485e4ebb88a5ac026ddd70ad427bb72582e6fb MD5 38028593fdb8b4caeb20e84f75fbe7d2 libexif-0.6.13-r2.ebuild 1866 RMD160 4efb08e1bc8fee5bf082df3c45094c58811dd920 libexif-0.6.13-r2.ebuild 1866 SHA256 33a359cd20521613772ad3b68d485e4ebb88a5ac026ddd70ad427bb72582e6fb libexif-0.6.13-r2.ebuild 1866 -MISC ChangeLog 9751 RMD160 4ca49b827b67ec6ad01b364356a733784dee147c SHA1 2fffc02e36a116562e27c9a1caabab63df93167f SHA256 943fde44f9444c811e4417d9b7b70908e128a946673529dc84c43adefec82a62 -MD5 f98a7b94b4e7a365ebad9eb1eafc070c ChangeLog 9751 -RMD160 4ca49b827b67ec6ad01b364356a733784dee147c ChangeLog 9751 -SHA256 943fde44f9444c811e4417d9b7b70908e128a946673529dc84c43adefec82a62 ChangeLog 9751 +MISC ChangeLog 10130 RMD160 3d08ffa9569901b1345a972a65c3f14acdf88ff2 SHA1 68d3c386fd54eae230b2b9eb0fb9c25d66af26eb SHA256 a711a106d55684bfb35e1754a82e3e31633ddbc06834c66bc1522449c50b9937 +MD5 2d32f2a9a5a7c0073681fc26bb47f7f3 ChangeLog 10130 +RMD160 3d08ffa9569901b1345a972a65c3f14acdf88ff2 ChangeLog 10130 +SHA256 a711a106d55684bfb35e1754a82e3e31633ddbc06834c66bc1522449c50b9937 ChangeLog 10130 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259 @@ -85,3 +88,10 @@ SHA256 cc40bb596055061fa461e6808cbc5166d426cfc0b8e8533a7c3d05262fbd4e35 files/di MD5 71a29ea4c5ef7e414ab84bd5a2034bac files/digest-libexif-0.6.13-r2 247 RMD160 2bf3f9c1ecf43d26db3de4c6efe68536db395043 files/digest-libexif-0.6.13-r2 247 SHA256 cc40bb596055061fa461e6808cbc5166d426cfc0b8e8533a7c3d05262fbd4e35 files/digest-libexif-0.6.13-r2 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF2QGeUElL7eJpfEQRAo8iAJ0cXjAqVyjaSh2sIPHQ1XfZPWYlvgCfdeZk +jOB1+N4wqTaOsB45D8m2+Qs= +=LOBS +-----END PGP SIGNATURE----- diff --git a/media-libs/libexif/libexif-0.6.13-r1.ebuild b/media-libs/libexif/libexif-0.6.13-r1.ebuild index 4b4cf7378b2b..7204bc92b352 100644 --- a/media-libs/libexif/libexif-0.6.13-r1.ebuild +++ b/media-libs/libexif/libexif-0.6.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.13-r1.ebuild,v 1.11 2007/02/08 19:29:24 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.13-r1.ebuild,v 1.12 2007/02/19 01:46:44 marienz Exp $ inherit eutils libtool @@ -58,7 +58,9 @@ src_install() { # installs a blank directory for whatever broken reason use nls || rm -rf ${D}usr/share/locale +} +pkg_preinst() { # Keep around old lib preserve_old_lib /usr/$(get_libdir)/libexif.so.9 }