[patch] This fixes the depend issues between apache-1 and apache-2

mod_ldap_userdir-1.1.4.patch (text/plain), 1.92 KB, created by Andrew Williams on 2005-01-12 09:40:38 UTC

--- mod_ldap_userdir-1.1.4.ebuild	2005-01-08 19:39:57.000000000 -0500
+++ mod_ldap_userdir-1.1.4.ebuild.patched	2005-01-12 12:31:10.252153000 -0500
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild,v 1.5 2005/01/09 00:32:44 hollow Exp $
-IUSE="apache2"
+IUSE="apache2 ssl"
 
 DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
 HOMEPAGE="http://horde.net/~jwm/software/mod_ldap_userdir/"
@@ -10,8 +10,7 @@
 S=${WORKDIR}/${P}
 SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
 
-DEPEND="=net-www/apache-1*
-		apache2? ( =net-www/apache-2* )
+DEPEND="!apache2? ( =net-www/apache-1* )
 		ssl? ( dev-libs/openssl )
 		net-nds/openldap"
 
@@ -21,12 +20,12 @@
 src_compile() {
 	local myconf
 	if use apache2; then
-		myconf="${myconf} --with-apxs2=/usr/sbin/apxs2"
+		myconf="${myconf} --with-apxs=/usr/sbin/apxs2"
 	else
 		myconf="${myconf} --with-apxs=/usr/sbin/apxs"
 	fi
 
-	use ssl && myconf="${myconf} -with-tls"
+	use ssl && myconf="${myconf} --with-tls"
 
 	myconf="${myconf} --with-activate"
 	./configure ${myconf} || die "Configure failed"
@@ -38,6 +37,8 @@
 	if use apache2; then
 	  exeinto /usr/lib/apache2-extramodules
 	  doexe mod_ldap_userdir.so
+	  insinto /etc/apache2/conf/modules.d
+	  doins ${FILESDIR}/47_mod_ldap_userdir.conf
 	else
 	   exeinto /usr/lib/apache-extramodules
 	   doexe mod_ldap_userdir.so
@@ -49,6 +50,8 @@
 	if use apache2; then
 		einfo "Adjust /etc/apache2/conf/modules.d/47_mod_ldap_userdir.conf to match your setup and"
 		einfo "add '-D LDAPuserdir' to your APACHE2_OPTS in /etc/conf.d/apache2"
+	else
+		einfo "Adjust /etc/apache/conf/addon-modules/47_mod_ldap_userdir.conf to match your setup."
 		einfo "To configure the package run \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
 	fi
 }