fix bug #38040. cleanup all apache2 DEPENDS to block mips from ldap until they have openldap supported.

15 files changed, 92 insertions, 84 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index b5d9fac618a9..b4781e4d6bff 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.89 2004/01/13 01:23:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.90 2004/01/15 03:55:18 robbat2 Exp $
+
+  14 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28-r1.ebuild, apache-1.3.28.ebuild,
+  apache-1.3.29-r1.ebuild, apache-1.3.29.ebuild, apache-2.0.46.ebuild,
+  apache-2.0.47-r1.ebuild, apache-2.0.47.ebuild, apache-2.0.48-r1.ebuild,
+  apache-2.0.48-r2.ebuild, apache-2.0.48.ebuild:
+  fix bug #38040. cleanup all apache2 DEPENDS to block mips from ldap until they
+  have openldap supported.
 
 *apache-2.0.48-r2 (12 Jan 2004)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 9ae0d5eb81c1..7e7ca3b65d61 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,17 +1,17 @@
-MD5 fba147395b30bb1cb279d83d9089971d apache-2.0.48.ebuild 11152
-MD5 3fb7d8b8a0a43b22fdb2489da9cea9bb apache-2.0.48-r2.ebuild 11959
-MD5 6745f2b98841adfc4021ae8b3c39f971 apache-1.3.27-r3.ebuild 7652
-MD5 14cd0bbb39a338f7214fbfc93e40ff25 apache-2.0.47.ebuild 11433
-MD5 5eb4cc3cad37415a79b7d68a75bfffc4 apache-1.3.29.ebuild 7271
-MD5 6cc4fea20b0610d7f900edbf1094b5bd apache-1.3.29-r1.ebuild 7317
-MD5 6b3edbc28bad99f3285150290de9c40d apache-2.0.48-r1.ebuild 11614
-MD5 e066a43888fcc49ea39fd892cde0317c ChangeLog 17490
-MD5 1634e51ccfad635e601dfb115745c5d6 apache-1.3.28-r1.ebuild 7674
+MD5 d172e61a4129d10e6f679543bc7595b1 apache-2.0.48.ebuild 11203
+MD5 da1c08c8716b9cc1449c4d2329963898 apache-2.0.48-r2.ebuild 12008
+MD5 9ccb266dd9f8ba601a66c8d8cf7bed96 apache-1.3.27-r3.ebuild 7652
+MD5 d0008ca37363cd4cafd360564aad605b apache-2.0.47.ebuild 11472
+MD5 39da8853fb792d89c5f9504450233d8c apache-1.3.29.ebuild 7271
+MD5 6569fb1ac8a1a773e208a248e986a955 apache-1.3.29-r1.ebuild 7316
+MD5 b7737e1559b3508b5ba3dc679ae33537 apache-2.0.48-r1.ebuild 11662
+MD5 bd4595b86451f1528d6567a83f877617 ChangeLog 17945
+MD5 270184fb43d56d5dad4223e467401a64 apache-1.3.28-r1.ebuild 7674
 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503
-MD5 902cbae6f0c193503bf1e01fefab7b4d apache-2.0.47-r1.ebuild 10710
-MD5 90cd661053225c255889c2fc1a1e3aef apache-1.3.27-r4.ebuild 8681
-MD5 6422b2b91e0502b118cfbfec8b3a7cad apache-2.0.46.ebuild 11011
-MD5 f6af1d47825222ebf99575fd31345060 apache-1.3.28.ebuild 8907
+MD5 3604262d4ff6e52fbbb35796df8cd865 apache-2.0.47-r1.ebuild 10758
+MD5 3075cc9464d68a2bc0340d196b67a78a apache-1.3.27-r4.ebuild 8681
+MD5 9ad659015ff71d249e4a9b80579cb47a apache-2.0.46.ebuild 11059
+MD5 31261db697a9a39bdf079c9e4dbc7e13 apache-1.3.28.ebuild 8907
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
diff --git a/net-www/apache/apache-1.3.27-r3.ebuild b/net-www/apache/apache-1.3.27-r3.ebuild
index a99708a4093a..0ac79743ab45 100644
--- a/net-www/apache/apache-1.3.27-r3.ebuild
+++ b/net-www/apache/apache-1.3.27-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r3.ebuild,v 1.7 2003/12/26 01:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r3.ebuild,v 1.8 2004/01/15 03:55:18 robbat2 Exp $
 
 mod_ssl_ver=2.8.14-${PV}
 
@@ -136,10 +136,10 @@ src_install() {
 	make install-quiet root=${D} || die
 	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* ${FILESDIR}/robots.txt
 
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
+	#fowners apache:apache ${DATA_DIR}
+	#fowners apache:apache ${DATA_DIR}/htdocs
 
 	# nice support scripts..
 	for myfile in apacheaddmod apachedelmod \
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index 287a0b8863bc..8fb1799e1258 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.13 2003/12/26 01:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.14 2004/01/15 03:55:19 robbat2 Exp $
 
 IUSE="ipv6 pam"
 
@@ -153,10 +153,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
 		${FILESDIR}/robots.txt
 
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
+	#fowners apache:apache ${DATA_DIR}
+	#fowners apache:apache ${DATA_DIR}/htdocs
 
 	# nice support scripts..
 	for myfile in apacheaddmod apachedelmod \
diff --git a/net-www/apache/apache-1.3.28-r1.ebuild b/net-www/apache/apache-1.3.28-r1.ebuild
index e8939f06f68b..6e2b34b99165 100644
--- a/net-www/apache/apache-1.3.28-r1.ebuild
+++ b/net-www/apache/apache-1.3.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28-r1.ebuild,v 1.3 2003/12/26 01:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28-r1.ebuild,v 1.4 2004/01/15 03:55:19 robbat2 Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -147,7 +147,7 @@ src_install() {
 		${FILESDIR}/robots.txt
 
 	#protect the suexec binary
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	# nice support scripts..
diff --git a/net-www/apache/apache-1.3.28.ebuild b/net-www/apache/apache-1.3.28.ebuild
index b67fbd9a7393..34eaca581c0f 100644
--- a/net-www/apache/apache-1.3.28.ebuild
+++ b/net-www/apache/apache-1.3.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.10 2003/12/26 01:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.11 2004/01/15 03:55:19 robbat2 Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -160,10 +160,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
 		${FILESDIR}/robots.txt
 
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
+	#fowners apache:apache ${DATA_DIR}
+	#fowners apache:apache ${DATA_DIR}/htdocs
 
 	# nice support scripts..
 	for myfile in apacheaddmod apachedelmod \
diff --git a/net-www/apache/apache-1.3.29-r1.ebuild b/net-www/apache/apache-1.3.29-r1.ebuild
index b11727d662f5..605ca3b842c8 100644
--- a/net-www/apache/apache-1.3.29-r1.ebuild
+++ b/net-www/apache/apache-1.3.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r1.ebuild,v 1.5 2004/01/11 03:07:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r1.ebuild,v 1.6 2004/01/15 03:55:19 robbat2 Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -139,7 +139,7 @@ src_install() {
 		${FILESDIR}/robots.txt
 
 	#protect the suexec binary
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	# nice support scripts..
diff --git a/net-www/apache/apache-1.3.29.ebuild b/net-www/apache/apache-1.3.29.ebuild
index 72d391cc1989..ff8b09fbf5af 100644
--- a/net-www/apache/apache-1.3.29.ebuild
+++ b/net-www/apache/apache-1.3.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29.ebuild,v 1.2 2003/12/26 01:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29.ebuild,v 1.3 2004/01/15 03:55:19 robbat2 Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -139,7 +139,7 @@ src_install() {
 		${FILESDIR}/robots.txt
 
 	#protect the suexec binary
-	fowners root.${GID} /usr/sbin/suexec
+	fowners root:${GID} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	# nice support scripts..
diff --git a/net-www/apache/apache-2.0.46.ebuild b/net-www/apache/apache-2.0.46.ebuild
index 41ce0414dae0..0761671df7c6 100644
--- a/net-www/apache/apache-2.0.46.ebuild
+++ b/net-www/apache/apache-2.0.46.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.7 2003/09/29 13:31:40 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.8 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit eutils
 
@@ -18,9 +18,9 @@ DEPEND="dev-util/yacc
 	sys-libs/zlib
 	dev-libs/expat
 	dev-libs/openssl
-	berkdb? sys-libs/db
-	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -128,7 +128,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -183,7 +183,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#setup links in /etc/apache2
@@ -228,7 +228,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	local datadir=`getent passwd apache | cut -d: -f6`
diff --git a/net-www/apache/apache-2.0.47-r1.ebuild b/net-www/apache/apache-2.0.47-r1.ebuild
index acd065c53963..4948d797a0cb 100644
--- a/net-www/apache/apache-2.0.47-r1.ebuild
+++ b/net-www/apache/apache-2.0.47-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47-r1.ebuild,v 1.1 2003/09/25 02:20:48 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47-r1.ebuild,v 1.2 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -22,9 +22,9 @@ DEPEND="dev-util/yacc
 	sys-libs/zlib
 	dev-libs/expat
 	dev-libs/openssl
-	berkdb? sys-libs/db
-	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -119,7 +119,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -174,7 +174,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#setup links in /etc/apache2
@@ -219,7 +219,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
diff --git a/net-www/apache/apache-2.0.47.ebuild b/net-www/apache/apache-2.0.47.ebuild
index 7fc2285641e1..cfb6adf7ce5f 100644
--- a/net-www/apache/apache-2.0.47.ebuild
+++ b/net-www/apache/apache-2.0.47.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.10 2003/10/30 15:44:07 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.11 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -21,7 +21,7 @@ DEPEND="dev-util/yacc
 	dev-libs/openssl
 	berkdb? sys-libs/db
 	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	!mips? ( ldap? =net-nds/openldap-2* )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -129,7 +129,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -184,7 +184,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#setup links in /etc/apache2
@@ -229,7 +229,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	local datadir=`getent passwd apache | cut -d: -f6`
diff --git a/net-www/apache/apache-2.0.48-r1.ebuild b/net-www/apache/apache-2.0.48-r1.ebuild
index fc054c6b1414..10759bb6f9e1 100644
--- a/net-www/apache/apache-2.0.48-r1.ebuild
+++ b/net-www/apache/apache-2.0.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r1.ebuild,v 1.6 2004/01/11 03:07:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r1.ebuild,v 1.7 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -22,9 +22,9 @@ DEPEND="dev-util/yacc
 	sys-libs/zlib
 	dev-libs/expat
 	dev-libs/openssl
-	berkdb? sys-libs/db
-	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -119,7 +119,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -190,7 +190,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#setup links in /etc/apache2
@@ -235,7 +235,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
diff --git a/net-www/apache/apache-2.0.48-r2.ebuild b/net-www/apache/apache-2.0.48-r2.ebuild
index 8693465170a9..1bfdfa505a57 100644
--- a/net-www/apache/apache-2.0.48-r2.ebuild
+++ b/net-www/apache/apache-2.0.48-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r2.ebuild,v 1.1 2004/01/13 01:23:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r2.ebuild,v 1.2 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -22,9 +22,9 @@ DEPEND="dev-util/yacc
 	sys-libs/zlib
 	dev-libs/expat
 	dev-libs/openssl
-	berkdb? sys-libs/db
-	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -119,7 +119,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -190,7 +190,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#apxs needs this to pickup the right lib for install
@@ -233,7 +233,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
diff --git a/net-www/apache/apache-2.0.48.ebuild b/net-www/apache/apache-2.0.48.ebuild
index 4be299c16e61..546c0f8848e4 100644
--- a/net-www/apache/apache-2.0.48.ebuild
+++ b/net-www/apache/apache-2.0.48.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.3 2003/10/31 20:39:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.4 2004/01/15 03:55:19 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -22,9 +22,9 @@ DEPEND="dev-util/yacc
 	sys-libs/zlib
 	dev-libs/expat
 	dev-libs/openssl
-	berkdb? sys-libs/db
-	gdbm? sys-libs/gdbm
-	ldap? =net-nds/openldap-2*"
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap"
 
 src_unpack() {
@@ -119,7 +119,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use ldap && \
+	use !mips && use ldap && \
 		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
 
 	select_modules_config || die "determining modules"
@@ -184,7 +184,7 @@ src_install () {
 	#protect the suexec binary
 	local gid=`getent group apache |cut -d: -f3`
 	[ -z "${gid}" ] && gid=81
-	fowners root.${gid} /usr/sbin/suexec
+	fowners root:${gid} /usr/sbin/suexec
 	fperms 4710 /usr/sbin/suexec
 
 	#setup links in /etc/apache2
@@ -229,7 +229,7 @@ src_install () {
 	do
 		doins ${FILESDIR}/2.0.40/$i
 	done
-	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
 	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
diff --git a/net-www/mod_auth_external/Manifest b/net-www/mod_auth_external/Manifest
index 8339973f0998..3016a18a85ac 100644
--- a/net-www/mod_auth_external/Manifest
+++ b/net-www/mod_auth_external/Manifest
@@ -1,5 +1,5 @@
-MD5 af459d0ad835e94c8f1f8e92aa384a85 ChangeLog 465
-MD5 703f46e49402fe9a67ae9f4e956445ce mod_auth_external-2.2.3.ebuild 1696
-MD5 1278ef62818678b0be6fba884d8104d2 files/10_mod_auth_external.conf 1227
+MD5 63fae0adb978cd52e74f20ac28e04a4e mod_auth_external-2.2.3.ebuild 1694
+MD5 f874b5b279fa92a93491fa59bb424c1e ChangeLog 569
 MD5 a877f74ba95c1388341792c72687402b files/digest-mod_auth_external-2.2.3 156
+MD5 1278ef62818678b0be6fba884d8104d2 files/10_mod_auth_external.conf 1227
 MD5 d0cb338160e3be8790524af8071cc4df files/pwauth.pam 380