Preserve libpng12.so.0 as part of #323649.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 8450f559e6aaac19b1b28ef5aa57c7a4bf9f3cf3..07b9cafe1bd304e14e81e4f84ddf6dc0028973a7 100644 (file)
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.260 2010/05/16 18:25:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.261 2010/06/15 16:01:05 ssuominen Exp $
+
+  15 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> libpng-1.4.2.ebuild:
+  Preserve libpng12.so.0 as part of #323649.
 
   16 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   files/libpng-1.4.x-update.sh:

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 38a589a93184f93fc2a5d2afd1b4aba4e0167d72..85e9f8fb2827e6dc5869dc0e870f8c8f801d82a7 100644 (file)
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -3,6 +3,6 @@ DIST libpng-1.2.43.tar.xz 538832 RMD160 18e56239433f21263b90a93c6ddb941a75a3a544
 DIST libpng-1.4.2.tar.xz 527736 RMD160 3b813503b155cd9b00ba0a77f346bab8b0e82366 SHA1 d6a3ef20f5bb2c13f3d799bd23ffb9ee3dbc844f SHA256 a644469ab0620dcf19351b0739ea1ee6696feb4560b42575af7885a16dfef88e
 EBUILD libpng-1.2.43-r2.ebuild 722 RMD160 485feff086d6660ed3606a425c10920b2fd8b9be SHA1 62b5322ac426ff4860f433f378f2d85073ea2b3d SHA256 53f4b20d5fb91ca658e72e714ff6dc1d02e01632593490b148aa4c151677cc27
 EBUILD libpng-1.2.43-r3.ebuild 1045 RMD160 ea369fdc74e0cc8eaf50462c18e8b267db77618d SHA1 11caaa88d98a4e3961d1b192373ffa9688de5a33 SHA256 b1e73fe2b8c2bf945e3d147858b541ad00633a420837d12f8280f2c271a9c4aa
-EBUILD libpng-1.4.2.ebuild 1148 RMD160 89add6e5a82fd04ac2defb0264ed3cc425f1765a SHA1 49ceecedcd2ba857eec820d7cb6a2ac5d32cd14f SHA256 796a55050f7d852cbe2033833e29c2911a13379e3f63c106f480daed4c958c66
-MISC ChangeLog 34875 RMD160 d35b1085741be2f9657cf31d71e8b10c3d7e96db SHA1 f899f73050469c81f43fe31c51acdf6745a36742 SHA256 356b218a206abf4ecd66b9a1cae1c87263c22be5e79adf19023c840bbbe26e4b
+EBUILD libpng-1.4.2.ebuild 1037 RMD160 c293afc055b9186614a63b0c17486679566278c4 SHA1 6d7510be0e35cf84a6b578e608cea518131f5700 SHA256 7d379fb7abbac94a9b5497439cc2ab7f1cfaeb205e5e8dadc464aba8d5f33c15
+MISC ChangeLog 34996 RMD160 c54641b2f45759b5243c90c96d6b85a0ff323900 SHA1 dc149fdfcef7828deafe14ab1078eec464bb4df0 SHA256 0100df7fc22c098e17e480d3cb1131a67af41a90ab9eff5c0f85f33eb8276ee2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92

diff --git a/media-libs/libpng/libpng-1.4.2.ebuild b/media-libs/libpng/libpng-1.4.2.ebuild
index e7a37f5f00ae6927737903cb3705bff40d27b540..64375ed23d71531189f7c4e7aed825eec8f7d849 100644 (file)
--- a/media-libs/libpng/libpng-1.4.2.ebuild
+++ b/media-libs/libpng/libpng-1.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.4 2010/05/13 20:05:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.5 2010/06/15 16:01:05 ssuominen Exp $
 
 EAPI=3
-inherit libtool
+inherit eutils libtool multilib
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
@@ -25,19 +25,17 @@ src_prepare() {
 
 src_install() {
        emake DESTDIR="${D}" install || die
-       dodoc ANNOUNCE CHANGES README TODO || die
-       dosbin "${FILESDIR}"/libpng-1.4.x-update.sh || die
+       dodoc ANNOUNCE CHANGES README TODO
+       dosbin "${FILESDIR}"/libpng-1.4.x-update.sh
+}
+
+pkg_preinst() {
+       preserve_old_lib /usr/$(get_libdir)/libpng12.so.0
 }
 
 pkg_postinst() {
        echo
-       ewarn "Moving from libpng 1.2.x to 1.4.x will break installed libtool .la"
-       ewarn "files."
-       echo
-       elog "Run /usr/sbin/libpng-1.4.x-update.sh at your own risk only if"
-       elog "revdep-rebuild fails."
-       echo
-       elog "Don't forget \"man emerge\" and useful parameters like --skip-first,"
-       elog "--resume and --keep-going."
+       elog "Run /usr/sbin/libpng-1.4.x-update.sh to fix libtool archives (.la)"
        echo
+       preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0
 }