modify the order of preserve_libs call so that a user that follows the instructions to the T doesn't do needless rebuilds of openldap

(Portage version: 2.1.7.16/cvs/Linux x86_64)

10 files changed, 37 insertions, 29 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index e640ae329b17..90ce00e36092 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/openldap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.366 2009/12/04 20:46:19 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.367 2010/01/12 20:05:41 cardoe Exp $
+
+  12 Jan 2010; Doug Goldstein <cardoe@gentoo.org> openldap-2.3.41.ebuild,
+  openldap-2.3.41-r1.ebuild, openldap-2.3.43.ebuild,
+  openldap-2.3.43-r1.ebuild, openldap-2.4.16.ebuild, openldap-2.4.17.ebuild,
+  openldap-2.4.17-r1.ebuild, openldap-2.4.19.ebuild,
+  openldap-2.4.19-r1.ebuild:
+  modify the order of preserve_libs call so that a user that follows the
+  instructions to the T doesn't do needless rebuilds of openldap
 
   04 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
   openldap-2.4.19-r1.ebuild:
diff --git a/net-nds/openldap/openldap-2.3.41-r1.ebuild b/net-nds/openldap/openldap-2.3.41-r1.ebuild
index c52cfecc1687..32f82efc2c65 100644
--- a/net-nds/openldap/openldap-2.3.41-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.41-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41-r1.ebuild,v 1.4 2009/05/08 01:16:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41-r1.ebuild,v 1.5 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="1"
 
@@ -482,7 +482,7 @@ pkg_preinst() {
 	# keep old libs if any
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
+		for each in libldap libldap_r liblber ; do
 			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
diff --git a/net-nds/openldap/openldap-2.3.41.ebuild b/net-nds/openldap/openldap-2.3.41.ebuild
index d1b7e0598fae..1f2e3d34aaa0 100644
--- a/net-nds/openldap/openldap-2.3.41.ebuild
+++ b/net-nds/openldap/openldap-2.3.41.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.12 2009/05/08 01:16:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.13 2010/01/12 20:05:41 cardoe Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -469,7 +469,7 @@ pkg_preinst() {
 	# keep old libs if any
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
+		for each in libldap libldap_r liblber ; do
 			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index 59696c75d5b9..367ec02c0684 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.6 2009/05/08 01:16:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.7 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 
@@ -484,7 +484,7 @@ pkg_preinst() {
 	# keep old libs if any
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
+		for each in libldap libldap_r liblber ; do
 			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
diff --git a/net-nds/openldap/openldap-2.3.43.ebuild b/net-nds/openldap/openldap-2.3.43.ebuild
index eb50a2a60072..c3ddaca7898a 100644
--- a/net-nds/openldap/openldap-2.3.43.ebuild
+++ b/net-nds/openldap/openldap-2.3.43.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.12 2009/05/08 01:16:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.13 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 
@@ -482,7 +482,7 @@ pkg_preinst() {
 	# keep old libs if any
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
+		for each in libldap libldap_r liblber ; do
 			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
diff --git a/net-nds/openldap/openldap-2.4.16.ebuild b/net-nds/openldap/openldap-2.4.16.ebuild
index 86d9f58bc651..48a3b2d56380 100644
--- a/net-nds/openldap/openldap-2.4.16.ebuild
+++ b/net-nds/openldap/openldap-2.4.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.16.ebuild,v 1.2 2009/04/16 22:28:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.16.ebuild,v 1.3 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -430,7 +430,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+	preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
 }
 
 pkg_postinst() {
diff --git a/net-nds/openldap/openldap-2.4.17-r1.ebuild b/net-nds/openldap/openldap-2.4.17-r1.ebuild
index c18e69fb4196..e9345b973a66 100644
--- a/net-nds/openldap/openldap-2.4.17-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.4 2009/11/24 23:31:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.5 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -505,7 +505,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+	preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
 }
 
 pkg_postinst() {
diff --git a/net-nds/openldap/openldap-2.4.17.ebuild b/net-nds/openldap/openldap-2.4.17.ebuild
index 19d3783f97ff..7a33f976a076 100644
--- a/net-nds/openldap/openldap-2.4.17.ebuild
+++ b/net-nds/openldap/openldap-2.4.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17.ebuild,v 1.2 2009/11/24 23:31:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17.ebuild,v 1.3 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -430,7 +430,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+	preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
 }
 
 pkg_postinst() {
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index 5fbc410c19e5..fb6c5598509c 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.10 2009/12/04 20:46:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.11 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -563,7 +563,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+	preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
 }
 
 pkg_postinst() {
diff --git a/net-nds/openldap/openldap-2.4.19.ebuild b/net-nds/openldap/openldap-2.4.19.ebuild
index 50ba15df9d64..3ed7b0ab9e6a 100644
--- a/net-nds/openldap/openldap-2.4.19.ebuild
+++ b/net-nds/openldap/openldap-2.4.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19.ebuild,v 1.11 2009/12/03 20:03:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19.ebuild,v 1.12 2010/01/12 20:05:41 cardoe Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -507,7 +507,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+	preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
 }
 
 pkg_postinst() {