Switch to using preserve_old_lib().

(Portage version: 2.1.2_rc4-r8)

6 files changed, 27 insertions, 61 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/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
 }