Added error checking for ldap USE-flag. Fixes bug #105972.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 25 insertions, 13 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 6cd432927698..afb081f80c92 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.410 2005/09/12 03:39:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.411 2005/09/15 01:11:21 vericgar Exp $
+
+  15 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r30.ebuild:
+  Added error checking for ldap USE-flag. Fixes bug #105972.
 
   12 Sep 2005; Jason Wever <weeve@gentoo.org> apache-1.3.33-r6.ebuild,
   apache-2.0.54-r15.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 28068aa64107..658db0ccb84b 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,4 +1,3 @@
-MD5 506d9f3b9ecf76208c662d9240606be3 ChangeLog 69546
 MD5 b56779cb8460b101ad6912c8f45ff583 apache-1.3.29-r2.ebuild 7237
 MD5 3e32afd7bbab740bdce0fc0cf45d5be3 apache-1.3.31-r1.ebuild 6816
 MD5 a448a0e7566f85098cf55c54e4c6621f apache-1.3.31-r2.ebuild 6941
@@ -7,18 +6,19 @@ MD5 4972651d68219ad15fc821feda90d440 apache-1.3.31.ebuild 6760
 MD5 26a30fcfe2a6fbbf994b64756ed4f604 apache-1.3.32-r1.ebuild 6685
 MD5 71231c76a51034e85d1f116b4767fadc apache-1.3.32.ebuild 6693
 MD5 ed25e8cbac132cbbecbc3f41b43a3f51 apache-1.3.33-r1.ebuild 6951
+MD5 3ef41afa50a72857fe3c62ce5a628744 apache-1.3.33-r10.ebuild 8772
 MD5 17a8753ef203bc6d24e61967cad63421 apache-1.3.33-r2.ebuild 8637
 MD5 7ffd5d16d8cb2f8192d1fc48b75371df apache-1.3.33-r3.ebuild 6952
 MD5 2c34b40a3fe461014b19ca5e4763203e apache-1.3.33-r4.ebuild 8673
+MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
 MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
+MD5 170ac9a47fbef6414a686b59592b7470 apache-1.3.33-r11.ebuild 8773
+MD5 2ca34197e9e001fc5c11edf5a42b9c9a apache-1.3.33-r6.ebuild 7106
+MD5 2ddaadd5674de61b49fbbb0bcf859036 apache-2.0.54-r30.ebuild 12945
 MD5 8fceaab76e4f04a9e6e02babf537c35a apache-2.0.54-r15.ebuild 12613
-MD5 b5d4fed77e07a1465c1d9edab4e306db apache-2.0.54-r30.ebuild 12649
+MD5 6a878cc4073eed0a0d5449c108941980 ChangeLog 69692
 MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
-MD5 3ef41afa50a72857fe3c62ce5a628744 apache-1.3.33-r10.ebuild 8772
-MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
 MD5 6984dca404209fbedd4492e8ffdd8298 apache-2.0.54-r9.ebuild 12609
-MD5 170ac9a47fbef6414a686b59592b7470 apache-1.3.33-r11.ebuild 8773
-MD5 2ca34197e9e001fc5c11edf5a42b9c9a apache-1.3.33-r6.ebuild 7106
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -44,22 +44,22 @@ MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
 MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
 MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r1 212
+MD5 3ebdb23ee46d8cee6611fd327217c18c files/digest-apache-1.3.33-r10 287
 MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286
 MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r3 212
 MD5 0282c9d20ad05b752812c62f655b50ce files/digest-apache-1.3.33-r4 286
+MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
+MD5 81bbd0e99cf3c40a3f803533fd41370d files/digest-apache-1.3.33-r11 287
+MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
 MD5 282e8f0ae737d778a643251ad4f21122 files/digest-apache-2.0.54-r15 217
-MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 3ebdb23ee46d8cee6611fd327217c18c files/digest-apache-1.3.33-r10 287
-MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
 MD5 35d8cf2217559d96a69696d69f4c85cc files/digest-apache-2.0.54-r9 214
-MD5 81bbd0e99cf3c40a3f803533fd41370d files/digest-apache-1.3.33-r11 287
-MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
+MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-2.0.54-r30.ebuild b/net-www/apache/apache-2.0.54-r30.ebuild
index 2312128299c3..df192b9ef768 100644
--- a/net-www/apache/apache-2.0.54-r30.ebuild
+++ b/net-www/apache/apache-2.0.54-r30.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-www/apache/apache-2.0.54-r30.ebuild,v 1.2 2005/09/10 20:30:07 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.3 2005/09/15 01:11:22 vericgar Exp $
 
 inherit eutils gnuconfig
 
@@ -36,6 +36,14 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/httpd-${PV}"
 
 big_fat_warnings() {
+
+	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
+		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
+		eerror "ldap support, apr-util must be built with the ldap USE-flag"
+		eerror "enabled."
+		die "ldap USE-flag enabled while not supported in apr-util"
+	fi
+
 	if use mpm-peruser; then
 		ewarn " -BIG- -FAT- -WARNING-"
 		ewarn ""