Depend on newer libtool to avoid bug with CC variable being empty still.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 49 insertions, 54 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index e5afdb296083..358dff40d8cd 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2005/07/13 15:38:48 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.127 2005/07/27 06:02:17 robbat2 Exp $
+
+  27 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.2.27-r1.ebuild:
+  Depend on newer libtool to avoid bug with CC variable being empty still.
 
   13 Jul 2005; Rob Holland <tigger@gentoo.org> openldap-2.1.30-r5.ebuild:
   stable x86. fix sec bug #96767
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 898e4e977a31..38547437e3a6 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,63 +1,53 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7901f04890caac3b418942143b60b284 openldap-2.1.27-r1.ebuild 7452
-MD5 b230f9445ab2e9b4ae10beb130d329db openldap-2.2.26-r1.ebuild 10639
-MD5 2adaddb98fafad5e590a07c8e96cf5a8 openldap-2.1.30-r4.ebuild 7316
-MD5 89c1b232c5c53b96513eaf580cc4f5c2 openldap-2.1.30.ebuild 7368
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 652065b4b1af04d11846fcdab7807ff8 openldap-2.1.30-r2.ebuild 7491
+MD5 f0f6d95bb459a68e1af47d41c03698e0 openldap-2.1.30-r3.ebuild 7217
+MD5 eccf7065578fd1850586d204d1037294 openldap-2.2.27.ebuild 12433
+MD5 64d977044e08cbf8f1f7b2138cfdcebd openldap-2.1.30-r5.ebuild 7478
+MD5 5bd89548fb8de6b4f0fdca12617e4e0c openldap-2.2.24.ebuild 9516
 MD5 7147b6711fd08405e22461185a531b7e openldap-2.1.27.ebuild 7058
+MD5 652065b4b1af04d11846fcdab7807ff8 openldap-2.1.30-r2.ebuild 7491
+MD5 8ca33d2e9e42040d47ae4119384c34fe openldap-2.2.26-r2.ebuild 11641
+MD5 47247dbac20cbf48c08404fca5b51b7f openldap-2.2.26.ebuild 9741
+MD5 2adaddb98fafad5e590a07c8e96cf5a8 openldap-2.1.30-r4.ebuild 7316
+MD5 e4f0df7225c23f84fb2b05929f5823e9 openldap-2.2.27-r1.ebuild 12643
+MD5 c69442b890a343d621a6923d0ddfd369 openldap-2.2.23-r1.ebuild 8802
 MD5 90ad9b62db369bad1f15a4401267e438 openldap-2.2.23.ebuild 7820
 MD5 b33684a7371eb8e18a8cc35c381cd469 openldap-2.2.19.ebuild 7963
-MD5 47247dbac20cbf48c08404fca5b51b7f openldap-2.2.26.ebuild 9741
-MD5 64d977044e08cbf8f1f7b2138cfdcebd openldap-2.1.30-r5.ebuild 7478
+MD5 231a7a229c627e9ce2bdccb29c1a55e9 openldap-2.2.14.ebuild 7255
+MD5 89c1b232c5c53b96513eaf580cc4f5c2 openldap-2.1.30.ebuild 7368
 MD5 c11fbc4ba7824ae4f171eee66dc52e85 openldap-2.1.26.ebuild 7096
-MD5 fcb3fc99b1b1938a685fb7919200ed40 openldap-2.2.27-r1.ebuild 12598
 MD5 d03b4b8965dada31e3357108cce8e0a2 openldap-2.1.30-r1.ebuild 7382
-MD5 8ca33d2e9e42040d47ae4119384c34fe openldap-2.2.26-r2.ebuild 11641
-MD5 231a7a229c627e9ce2bdccb29c1a55e9 openldap-2.2.14.ebuild 7255
-MD5 eccf7065578fd1850586d204d1037294 openldap-2.2.27.ebuild 12433
-MD5 f0f6d95bb459a68e1af47d41c03698e0 openldap-2.1.30-r3.ebuild 7217
-MD5 eb1825a26f41b8a9a20f3c6e80be9bba ChangeLog 23304
-MD5 c69442b890a343d621a6923d0ddfd369 openldap-2.2.23-r1.ebuild 8802
-MD5 5bd89548fb8de6b4f0fdca12617e4e0c openldap-2.2.24.ebuild 9516
-MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
-MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
-MD5 919632051f7ddeeed29b011f163d17f0 files/digest-openldap-2.2.27 130
-MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
-MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
-MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
+MD5 a61462e9e73ac291bfe14869ffb39b85 ChangeLog 23463
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 7901f04890caac3b418942143b60b284 openldap-2.1.27-r1.ebuild 7452
+MD5 b230f9445ab2e9b4ae10beb130d329db openldap-2.2.26-r1.ebuild 10639
+MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
 MD5 c16eada85fafe1c17bf0089d0ef90ae3 files/gencert.sh-2.2.27 2939
-MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r1 130
+MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
+MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27-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 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r5 65
 MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
 MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
-MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
-MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27-r1 65
-MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
+MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r1 130
 MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r2 130
-MD5 27d2ee25b32bf4a429ae80149508ff34 files/digest-openldap-2.2.14 65
-MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
-MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
-MD5 f5d06782a157396faab1a04efa2c9305 files/digest-openldap-2.2.24 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r3 65
 MD5 919632051f7ddeeed29b011f163d17f0 files/digest-openldap-2.2.27-r1 130
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
+MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
+MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
+MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30 65
+MD5 27d2ee25b32bf4a429ae80149508ff34 files/digest-openldap-2.2.14 65
 MD5 d1db1a9bf4afc66b26e33beef17f07f4 files/digest-openldap-2.2.19 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r1 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
+MD5 f5d06782a157396faab1a04efa2c9305 files/digest-openldap-2.2.24 65
 MD5 66eae9c51565619904da420475ec9ae6 files/digest-openldap-2.2.26 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r5 65
-MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
-MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
-MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
+MD5 919632051f7ddeeed29b011f163d17f0 files/digest-openldap-2.2.27 130
+MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
+MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2fw9gIKl8Uu19MoRAquIAJ9ZkfWfgRimy1j2C9BFxRzBQxKauwCaArzA
-FHhVw2c7gPBNCoVvx9qKHV8=
-=Y8gr
------END PGP SIGNATURE-----
+MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
diff --git a/net-nds/openldap/openldap-2.2.27-r1.ebuild b/net-nds/openldap/openldap-2.2.27-r1.ebuild
index 3e9d413325a8..cd00f8856d11 100644
--- a/net-nds/openldap/openldap-2.2.27-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.27-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.27-r1.ebuild,v 1.1 2005/07/03 19:14:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.27-r1.ebuild,v 1.2 2005/07/27 06:02:17 robbat2 Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -50,7 +50,7 @@ RDEPEND="${RDEPEND}
 	)"
 
 DEPEND="${RDEPEND}
-		sys-devel/libtool
+		>=sys-devel/libtool-1.5.18-r1
 		>=sys-apps/sed-4"
 
 # for tracking versions
@@ -247,7 +247,7 @@ src_compile() {
 	# now build old compat lib
 	cd ${OLD_S} && \
 	econf \
-		--enable-static --enable-shared \
+		--disable-static --enable-shared \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
 		--disable-lmpasswd --disable-spasswd --enable-modules \
@@ -327,7 +327,8 @@ src_install() {
 	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
-		newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
+		#newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
+		doexe ${FILESDIR}/gencert.sh
 	fi
 
 	dolib.so ${OLD_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \