fixed multilib-strict, bug 93009

Package-Manager: portage-2.0.51.19

3 files changed, 40 insertions, 34 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index e2d1d8f6beb4..3e87bfea1ca8 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.113 2005/05/21 04:49:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.114 2005/05/21 10:34:29 blubb Exp $
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> openldap-2.2.26-r2.ebuild:
+  fixed multilib-strict issues
 
 *openldap-2.2.26-r2 (21 May 2005)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 4e6372c2753d..c6dbf8a86e70 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,45 +1,45 @@
-MD5 7901f04890caac3b418942143b60b284 openldap-2.1.27-r1.ebuild 7452
-MD5 47247dbac20cbf48c08404fca5b51b7f openldap-2.2.26.ebuild 9741
-MD5 ff330e41ff04f45667da2ae10aba6cb6 openldap-2.2.26-r2.ebuild 11329
+MD5 bc5d854a39c3c2d61e019a53ebdc0e63 ChangeLog 21466
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 c11fbc4ba7824ae4f171eee66dc52e85 openldap-2.1.26.ebuild 7096
+MD5 7901f04890caac3b418942143b60b284 openldap-2.1.27-r1.ebuild 7452
+MD5 7147b6711fd08405e22461185a531b7e openldap-2.1.27.ebuild 7058
 MD5 d03b4b8965dada31e3357108cce8e0a2 openldap-2.1.30-r1.ebuild 7382
 MD5 652065b4b1af04d11846fcdab7807ff8 openldap-2.1.30-r2.ebuild 7491
-MD5 89c1b232c5c53b96513eaf580cc4f5c2 openldap-2.1.30.ebuild 7368
 MD5 f0f6d95bb459a68e1af47d41c03698e0 openldap-2.1.30-r3.ebuild 7217
-MD5 7147b6711fd08405e22461185a531b7e openldap-2.1.27.ebuild 7058
 MD5 82a04d5027612ed22aebbf4b77673156 openldap-2.1.30-r4.ebuild 7322
-MD5 bda33bb3429f18d3078dd9a642021ab2 openldap-2.2.23-r1.ebuild 8792
-MD5 c11fbc4ba7824ae4f171eee66dc52e85 openldap-2.1.26.ebuild 7096
+MD5 89c1b232c5c53b96513eaf580cc4f5c2 openldap-2.1.30.ebuild 7368
+MD5 231a7a229c627e9ce2bdccb29c1a55e9 openldap-2.2.14.ebuild 7255
 MD5 b33684a7371eb8e18a8cc35c381cd469 openldap-2.2.19.ebuild 7963
-MD5 fa8ccae770cbf21ce94e285e0a6b2ba3 ChangeLog 21360
-MD5 5bd89548fb8de6b4f0fdca12617e4e0c openldap-2.2.24.ebuild 9516
+MD5 bda33bb3429f18d3078dd9a642021ab2 openldap-2.2.23-r1.ebuild 8792
 MD5 90ad9b62db369bad1f15a4401267e438 openldap-2.2.23.ebuild 7820
+MD5 5bd89548fb8de6b4f0fdca12617e4e0c openldap-2.2.24.ebuild 9516
+MD5 47247dbac20cbf48c08404fca5b51b7f openldap-2.2.26.ebuild 9741
 MD5 b230f9445ab2e9b4ae10beb130d329db openldap-2.2.26-r1.ebuild 10639
-MD5 231a7a229c627e9ce2bdccb29c1a55e9 openldap-2.2.14.ebuild 7255
-MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
-MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
+MD5 631df2ed36561da0d29b51cc4cdba967 openldap-2.2.26-r2.ebuild 11501
+MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27-r1 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30 65
-MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r1 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r3 65
-MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
-MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
-MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
-MD5 66eae9c51565619904da420475ec9ae6 files/digest-openldap-2.2.26 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
 MD5 27d2ee25b32bf4a429ae80149508ff34 files/digest-openldap-2.2.14 65
+MD5 d1db1a9bf4afc66b26e33beef17f07f4 files/digest-openldap-2.2.19 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
 MD5 f5d06782a157396faab1a04efa2c9305 files/digest-openldap-2.2.24 65
+MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
+MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
 MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
-MD5 d1db1a9bf4afc66b26e33beef17f07f4 files/digest-openldap-2.2.19 65
-MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27-r1 65
+MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
+MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
+MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
 MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
+MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
+MD5 66eae9c51565619904da420475ec9ae6 files/digest-openldap-2.2.26 65
 MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r1 130
 MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r2 130
-MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
-MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
-MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
-MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
-MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
 MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
+MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
diff --git a/net-nds/openldap/openldap-2.2.26-r2.ebuild b/net-nds/openldap/openldap-2.2.26-r2.ebuild
index ebcc687259ae..787dd4c636bf 100644
--- a/net-nds/openldap/openldap-2.2.26-r2.ebuild
+++ b/net-nds/openldap/openldap-2.2.26-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.2 2005/05/21 08:12:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.3 2005/05/21 10:34:29 blubb Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils multilib
 
 OLD_PV="2.1.30"
 OLD_P="${PN}-${OLD_PV}"
@@ -111,7 +111,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
@@ -206,7 +206,7 @@ src_compile() {
 	econf \
 		--enable-static \
 		--enable-shared \
-		--libexecdir=/usr/lib/openldap \
+		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
 
 	make depend || die "make depend failed"
@@ -251,7 +251,7 @@ src_install() {
 
 	# openldap modules go here
 	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/lib/openldap/openldap/
+	keepdir /usr/$(get_libdir)/openldap/openldap/
 
 	# make state directories
 	for x in data slurp ldbm; do
@@ -266,7 +266,7 @@ src_install() {
 
 	# manually remove /var/tmp references in .la
 	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/lib/lib*.la; do
+	for x in ${D}/usr/$(get_libdir)/lib*.la; do
 		sed -i -e "s:-L${S}[/]*libraries::" ${x}
 	done
 
@@ -285,6 +285,9 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/2.0/slapd slapd
 	newexe ${FILESDIR}/2.0/slurpd slurpd
+	if [ $(get_libdir) != lib ]; then
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
+	fi
 	insinto /etc/conf.d
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
@@ -296,7 +299,7 @@ src_install() {
 	fi
 
 	if useq kerberos ; then
-		insinto /usr/lib/openldap/openldap
+		insinto /usr/$(get_libdir)/openldap/openldap
 		doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
 		die "failed to install kerberos passwd module"
 	fi