Switch to using preserve_old_lib().

Package-Manager: portage-2.1.2_rc4-r8

7 files changed, 54 insertions, 88 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 272b4cac2e0c..786f5ca4c1b8 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.87 2007/01/04 19:57:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.88 2007/01/13 19:36:31 vapier Exp $
+
+  13 Jan 2007; Mike Frysinger <vapier@gentoo.org> readline-4.3-r5.ebuild,
+  readline-5.0-r2.ebuild, readline-5.1_p4.ebuild, readline-5.2.ebuild,
+  readline-5.2_p1.ebuild:
+  Switch to using preserve_old_lib().
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> readline-4.3-r5.ebuild:
   Remove gnuconfig usage.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 0d236ec2107e..0c7bd88518a9 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -72,30 +72,30 @@ DIST readline51-002 1149 RMD160 3eb4a80089d23f05d76f702952f0dbb7ef3ba24d SHA1 fb
 DIST readline51-003 707 RMD160 73d81615e92c8f6f6a4155af571361863014c5df SHA1 fba03ba37b6d9bbc6a612ec602ab1ff6d3038fc2 SHA256 939ea5fb84ff519ae50b9c2749f441a59af9f97ed0bf8fc0981af612ea720160
 DIST readline51-004 2400 RMD160 a1089571a8104ae5ba9d2c36eb600c09654a3d05 SHA1 7295f43a42d112f2de935150d7c0cb2fd3fceece SHA256 ddb050c0161c9ccdabb84c75287fc8cc76791d096ebfb3e4bdc72f531d8551d1
 DIST readline52-001 874 RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 SHA1 8de77c2de3926893cbf2688912768bed48a2456b SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5
-EBUILD readline-4.3-r5.ebuild 2739 RMD160 0351544f1e754848673e640fa04ba005da39d6b0 SHA1 90f827e5146d793841adc228d9ab61a000d6b8ab SHA256 8c9268d3c0ee10603b822d937c018ee3ad9a73b633e2fbc9547d62bd5853d839
-MD5 bf7234376a46a6bb0605f4a5c85bb600 readline-4.3-r5.ebuild 2739
-RMD160 0351544f1e754848673e640fa04ba005da39d6b0 readline-4.3-r5.ebuild 2739
-SHA256 8c9268d3c0ee10603b822d937c018ee3ad9a73b633e2fbc9547d62bd5853d839 readline-4.3-r5.ebuild 2739
-EBUILD readline-5.0-r2.ebuild 2781 RMD160 68667102685a9750c4b8cf5a224157d95240f5b3 SHA1 7df2075aa9d954efa93bb831a84d2d4232e5e9a5 SHA256 d57a566a03f6a2676011d998eab1329299ec9bccc79a50eea1c4f132ffdf9891
-MD5 5c962060bc5f3a5bb5935407f4fdf1a8 readline-5.0-r2.ebuild 2781
-RMD160 68667102685a9750c4b8cf5a224157d95240f5b3 readline-5.0-r2.ebuild 2781
-SHA256 d57a566a03f6a2676011d998eab1329299ec9bccc79a50eea1c4f132ffdf9891 readline-5.0-r2.ebuild 2781
-EBUILD readline-5.1_p4.ebuild 3217 RMD160 ac2e4d7fba85e6af23d73b09470eecfca7f9f2b2 SHA1 868338cd6c8b64a92e9f1bd9717d899b47a80252 SHA256 bea8f9e540dedfcff6f1f6974f49d8b23c3906bae9bd8a3559af0798406baa4a
-MD5 8706a57f2d34f34c1a5f40d6324cc5f0 readline-5.1_p4.ebuild 3217
-RMD160 ac2e4d7fba85e6af23d73b09470eecfca7f9f2b2 readline-5.1_p4.ebuild 3217
-SHA256 bea8f9e540dedfcff6f1f6974f49d8b23c3906bae9bd8a3559af0798406baa4a readline-5.1_p4.ebuild 3217
-EBUILD readline-5.2.ebuild 3093 RMD160 c90913a469769fbb4abc21588bba5ca354129804 SHA1 4be0c46f488e1faef3f554f9774d20107c6220e2 SHA256 cc67cfff6cefc658393eb145fc51398ec08ac7700de2b9cd4255f86baae51987
-MD5 1e0990dbfb38ffe6bea1ef6558788b28 readline-5.2.ebuild 3093
-RMD160 c90913a469769fbb4abc21588bba5ca354129804 readline-5.2.ebuild 3093
-SHA256 cc67cfff6cefc658393eb145fc51398ec08ac7700de2b9cd4255f86baae51987 readline-5.2.ebuild 3093
-EBUILD readline-5.2_p1.ebuild 3133 RMD160 f251de221ebb3878699ed8df5d6edf8254773af2 SHA1 94a7a8cc5c07a2ded9985109069ba64e265d7cf2 SHA256 f771610c74be202dbe2e07b17c063fc067820498e9f12d97c0cd8dda32bcd969
-MD5 57a18727324658605e30b63357ed33aa readline-5.2_p1.ebuild 3133
-RMD160 f251de221ebb3878699ed8df5d6edf8254773af2 readline-5.2_p1.ebuild 3133
-SHA256 f771610c74be202dbe2e07b17c063fc067820498e9f12d97c0cd8dda32bcd969 readline-5.2_p1.ebuild 3133
-MISC ChangeLog 11509 RMD160 abef5e3a63816b2fca18629e5b62b58ab0e367f8 SHA1 3b093d8825061662e90757988ee104eae0b4ad18 SHA256 afc6ab2fa9b0ff98919d83d8c2d75bb2b07879e309bcf069acccb1da1e1c93dc
-MD5 e5a4b54773f64fef5cc5af5a6820f3fd ChangeLog 11509
-RMD160 abef5e3a63816b2fca18629e5b62b58ab0e367f8 ChangeLog 11509
-SHA256 afc6ab2fa9b0ff98919d83d8c2d75bb2b07879e309bcf069acccb1da1e1c93dc ChangeLog 11509
+EBUILD readline-4.3-r5.ebuild 2407 RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c SHA1 2f4976717d0b98c1b5ccbe155fa3d73c9e906c08 SHA256 6169be62dbe8b3f6700173ed5322e7f9bb088d153dcfbd8a83e42d052512419b
+MD5 2bbd6bd627571922b0572ffa8912b6c0 readline-4.3-r5.ebuild 2407
+RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c readline-4.3-r5.ebuild 2407
+SHA256 6169be62dbe8b3f6700173ed5322e7f9bb088d153dcfbd8a83e42d052512419b readline-4.3-r5.ebuild 2407
+EBUILD readline-5.0-r2.ebuild 2419 RMD160 89b2f07addb978c6517c99dd68fba189fde081f2 SHA1 664d409a988004f3a393702fb3acef6263d98865 SHA256 1dd6ad405cefa5a94da040353804c205b6ac0e275fde766be90589a91c33cc5f
+MD5 4d7c86600864d6c9fdceca2391398bea readline-5.0-r2.ebuild 2419
+RMD160 89b2f07addb978c6517c99dd68fba189fde081f2 readline-5.0-r2.ebuild 2419
+SHA256 1dd6ad405cefa5a94da040353804c205b6ac0e275fde766be90589a91c33cc5f readline-5.0-r2.ebuild 2419
+EBUILD readline-5.1_p4.ebuild 2852 RMD160 0785d3b669e46555434b4fa707697034cc28f2a7 SHA1 9811a7efb797b41396f8392ff242204cd0d2b5ac SHA256 a6d27b9eb03f3780e18ce8111ad453d76f6477a2c142758e8c6221cc4f73d96c
+MD5 9b9689cfe67539e601c2717460d15a1d readline-5.1_p4.ebuild 2852
+RMD160 0785d3b669e46555434b4fa707697034cc28f2a7 readline-5.1_p4.ebuild 2852
+SHA256 a6d27b9eb03f3780e18ce8111ad453d76f6477a2c142758e8c6221cc4f73d96c readline-5.1_p4.ebuild 2852
+EBUILD readline-5.2.ebuild 2728 RMD160 9cf39029b729ead1e343424e1fc906944ff92a6b SHA1 04ebf7e4f44be523e63f176ef76915d94aac3389 SHA256 9e1256eba040f04c0c58793ac03b89140c2ca138ada34dd8321efe85c8f617e9
+MD5 39efd3ad5e90f7b5f1ef3cfbdec1911e readline-5.2.ebuild 2728
+RMD160 9cf39029b729ead1e343424e1fc906944ff92a6b readline-5.2.ebuild 2728
+SHA256 9e1256eba040f04c0c58793ac03b89140c2ca138ada34dd8321efe85c8f617e9 readline-5.2.ebuild 2728
+EBUILD readline-5.2_p1.ebuild 2770 RMD160 270cf7f1177ddd9d66aa1a6752aac28922ef494e SHA1 2e546b8e62f256f8577fce21642f40b3060ab77a SHA256 828ba981b41a66d2f250301304bf12c5275e394513fc25e197cde4761d839299
+MD5 1aa1e1b954a1e978fa35c2e8fdaaa364 readline-5.2_p1.ebuild 2770
+RMD160 270cf7f1177ddd9d66aa1a6752aac28922ef494e readline-5.2_p1.ebuild 2770
+SHA256 828ba981b41a66d2f250301304bf12c5275e394513fc25e197cde4761d839299 readline-5.2_p1.ebuild 2770
+MISC ChangeLog 11716 RMD160 f423cdb247f00f59a2b2f60b89d041cffc918927 SHA1 9b4f420b6a18dda7a0c944258efaceb65974d9e5 SHA256 5eb57e57e33cfdf92631de27d7878cf476f26c69ea28bd21fa9ffa8c261b08bc
+MD5 d7c98847253a047672791cc05d9657d3 ChangeLog 11716
+RMD160 f423cdb247f00f59a2b2f60b89d041cffc918927 ChangeLog 11716
+SHA256 5eb57e57e33cfdf92631de27d7878cf476f26c69ea28bd21fa9ffa8c261b08bc ChangeLog 11716
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -118,7 +118,7 @@ SHA256 c205562f5dbadc44dfe9349f3c796faf84fc063b10acac2be007a2d17129fd0a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqTMZ8bi6rjpTunYRAprxAKDAv9A5GdaNRD4Eihr9d8VXl9o+HgCfRTrh
-CFLdkhPNjsFosZDGgzqB4qw=
-=wq3b
+iD8DBQFFqTTY8bi6rjpTunYRApI5AKC5idsaDzwJzkX4yvuLtlsu/M32FQCdHlX0
+d2MxLz96mSdM/m5Ig2QLO4I=
+=yllu
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-4.3-r5.ebuild b/sys-libs/readline/readline-4.3-r5.ebuild
index d51b5d58f7b8..5bb85532739f 100644
--- a/sys-libs/readline/readline-4.3-r5.ebuild
+++ b/sys-libs/readline/readline-4.3-r5.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/sys-libs/readline/readline-4.3-r5.ebuild,v 1.26 2007/01/04 19:57:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.27 2007/01/13 19:36:31 vapier Exp $
 
 inherit eutils
 
@@ -74,19 +74,12 @@ src_install() {
 	docinto ps
 	dodoc doc/*.ps
 	dohtml -r doc
+}
 
-	# Backwards compatibility #29865
-	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
-		[ "$(get_libdir)" != "lib" ] && dodir /lib
-		cp -pPR ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/
-		touch ${D}/lib/libreadline.so.4.1
-	fi
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
 }
 
 pkg_postinst() {
-	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
-		ewarn "Your old readline libraries have been copied over."
-		ewarn "You should run 'revdep-rebuild --library libreadline.so.4.1' asap."
-		ewarn "Once you have, you can safely delete /lib/libreadline.so.4.1"
-	fi
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
 }
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index 6874efbb04de..38adfb255a17 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.9 2006/01/03 06:34:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.10 2007/01/13 19:36:31 vapier Exp $
 
 inherit eutils multilib
 
@@ -74,17 +74,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Backwards compatibility #29865
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
-		touch "${D}"/$(get_libdir)/libreadline.so.4*
-	fi
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		ewarn "Your old readline libraries have been copied over."
-		ewarn "You should run 'revdep-rebuild --library libreadline.so.4' asap."
-		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
-	fi
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
 }
diff --git a/sys-libs/readline/readline-5.1_p4.ebuild b/sys-libs/readline/readline-5.1_p4.ebuild
index fb8790bb6fd0..567ecc90dc8e 100644
--- a/sys-libs/readline/readline-5.1_p4.ebuild
+++ b/sys-libs/readline/readline-5.1_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1_p4.ebuild,v 1.13 2006/10/17 06:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1_p4.ebuild,v 1.14 2007/01/13 19:36:31 vapier Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -94,17 +94,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Backwards compatibility #29865
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
-		touch "${D}"/$(get_libdir)/libreadline.so.4*
-	fi
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		ewarn "Your old readline libraries have been copied over."
-		ewarn "You should run 'revdep-rebuild --library libreadline.so.4' asap."
-		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
-	fi
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
 }
diff --git a/sys-libs/readline/readline-5.2.ebuild b/sys-libs/readline/readline-5.2.ebuild
index becd3f73343b..b9b38a41d953 100644
--- a/sys-libs/readline/readline-5.2.ebuild
+++ b/sys-libs/readline/readline-5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2.ebuild,v 1.4 2006/10/17 06:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2.ebuild,v 1.5 2007/01/13 19:36:31 vapier Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -91,17 +91,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Backwards compatibility #29865
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
-		touch "${D}"/$(get_libdir)/libreadline.so.4*
-	fi
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		ewarn "Your old readline libraries have been copied over."
-		ewarn "You should run 'revdep-rebuild --library libreadline.so.4' asap."
-		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
-	fi
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
 }
diff --git a/sys-libs/readline/readline-5.2_p1.ebuild b/sys-libs/readline/readline-5.2_p1.ebuild
index 4cf7db659665..754e7c33e2dc 100644
--- a/sys-libs/readline/readline-5.2_p1.ebuild
+++ b/sys-libs/readline/readline-5.2_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p1.ebuild,v 1.2 2007/01/13 19:29:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p1.ebuild,v 1.3 2007/01/13 19:36:31 vapier Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -93,17 +93,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Backwards compatibility #29865
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
-		touch "${D}"/$(get_libdir)/libreadline.so.4*
-	fi
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		ewarn "Your old readline libraries have been copied over."
-		ewarn "You should run 'revdep-rebuild --library libreadline.so.4' asap."
-		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
-	fi
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
 }