From a070acef42cef885eba60b2a823bd56864bf18ef Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Wed, 9 Jun 2010 14:38:35 +0000
Subject: [PATCH] Use preserved_old_lib features to be nice on <portage-2.2
 guys. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

---
 app-text/poppler/ChangeLog                |  6 +++++-
 app-text/poppler/Manifest                 | 10 +++++-----
 app-text/poppler/poppler-0.14.0-r1.ebuild | 12 ++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 06b48553c490..2b8e125f4f5f 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.235 2010/06/09 14:06:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.236 2010/06/09 14:38:35 scarabeus Exp $
+
+  09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  poppler-0.14.0-r1.ebuild:
+  Use preserved_old_lib features to be nice on <portage-2.2 guys.
 
 *poppler-0.14.0-r1 (09 Jun 2010)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e4bbb2e91749..4f93c6564919 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -17,13 +17,13 @@ DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb
 DIST poppler-0.14.0.tar.bz2 887492 RMD160 a90ff77a186afa096bebc2d04af1c3d49a146898 SHA1 cd3505688435f9288bdb4b8384c60dc5adac822f SHA256 a5d64d5d0d416c7130694993acc68e3c96e4aeb070b9d12dc6ab6cb3b75cc720
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
 EBUILD poppler-0.12.4-r3.ebuild 3610 RMD160 798cc00dff52a47904db0351c2d925c74ca4604c SHA1 403f9d04211ed1562b935d3078d6ce4ed343fbd3 SHA256 c2b00c3fae994209a9de1f3adf73355294ed5a6de644a0d234e3fc70ad3b958f
-EBUILD poppler-0.14.0-r1.ebuild 2680 RMD160 c7b371f71e2e1cab759502d36999db86b157cd96 SHA1 90f450eae837b94933a994bcdce2e2ac698e85c4 SHA256 1928cddfce02595dc423a7bacc1db8adfe4aa96718124c3e5d98375eb1208e7a
-MISC ChangeLog 33990 RMD160 d36ef4a5eb476494c51e813cea7197ee6071727d SHA1 d9237546b1be67bb987a700f7c20f828dea241fe SHA256 8d0280b32e239f1baa7aa08add870b594e993e4d54a987ba86f201e5106e6823
+EBUILD poppler-0.14.0-r1.ebuild 2745 RMD160 fa037a395853ddb4320302ccefb95edd838f62ba SHA1 3ff03a31795a6db6f05d7150aacc2c671a1dbae4 SHA256 39848f08e657647902de37d8a64e4c3343452246d19ad95c077cdf0ed4e77e8a
+MISC ChangeLog 34140 RMD160 05139e8e479ee08334f5c4a80557f4f176490728 SHA1 52ce2f3c6b987df9a22bc08fbde8728cb29f28e1 SHA256 13ac66ab69c944e41360dae33c5af479446eda1f1fc9cb91b1a6fd8477a76aa1
 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwPn8oACgkQHB6c3gNBRYfOdQCgjxve8TuW5fzkD+JubnNc3I7G
-zhEAn2s7rX5FzxgW+9XFjWnp4NqTk8vS
-=u0f+
+iEYEARECAAYFAkwPp0IACgkQHB6c3gNBRYcpHQCguCvP62QJDm5M2I3w2Ra77GOR
+6K8AoLlooiGGEPZgbtxVuy0Xq93jaP5D
+=91TB
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.14.0-r1.ebuild b/app-text/poppler/poppler-0.14.0-r1.ebuild
index ca4f3a1dc5b5..b29b588d2bea 100644
--- a/app-text/poppler/poppler-0.14.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.1 2010/06/09 14:06:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.2 2010/06/09 14:38:35 scarabeus Exp $
 
 EAPI="2"
 
@@ -88,8 +88,12 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6
+}
+
 pkg_postinst() {
-	ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
-	ewarn 'depending on it. If you have gentoolkit installed, you can find those'
-	ewarn 'with `equery d poppler`.'
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6
 }
-- 
2.26.2