1.1.12 stable on amd64 & x86; version bump

(Portage version: 2.2_rc40/cvs/Linux i686)

3 files changed, 23 insertions, 18 deletions

diff --git a/www-apache/mod_ldap_userdir/ChangeLog b/www-apache/mod_ldap_userdir/ChangeLog
index d4316eb77eb7..689f821eb410 100644
--- a/www-apache/mod_ldap_userdir/ChangeLog
+++ b/www-apache/mod_ldap_userdir/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_ldap_userdir
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.9 2008/04/25 12:20:46 hollow Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.10 2009/09/17 10:57:17 hollow Exp $
+
+*mod_ldap_userdir-1.1.16 (17 Sep 2009)
+
+  17 Sep 2009; Benedikt Böhm <hollow@gentoo.org>
+  -mod_ldap_userdir-1.1.11.ebuild, mod_ldap_userdir-1.1.12.ebuild,
+  +mod_ldap_userdir-1.1.16.ebuild:
+  1.1.12 stable on amd64 & x86; version bump
 
   25 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
   mod_ldap_userdir-1.1.12.ebuild:
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
index ab3ad56f7874..e32eec41a199 100644
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild,v 1.2 2008/04/25 12:20:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild,v 1.3 2009/09/17 10:57:17 hollow Exp $
 
 inherit apache-module
 
@@ -10,7 +10,7 @@ SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.11.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.16.ebuild
index 93dfaef9cfd9..95de8864d143 100644
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.11.ebuild
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.11.ebuild,v 1.3 2008/01/29 16:37:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.16.ebuild,v 1.1 2009/09/17 10:57:17 hollow Exp $
 
 inherit apache-module
 
@@ -10,30 +10,28 @@ SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )
 		net-nds/openldap"
 RDEPEND="${DEPEND}"
 
-DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
+need_apache2_2
 
-APACHE2_MOD_CONF="47_mod_ldap_userdir"
+APACHE2_MOD_CONF="47_${PN}"
 APACHE2_MOD_DEFINE="LDAP_USERDIR"
 
-need_apache2_2
+DOCFILES="DIRECTIVES README user-ldif"
 
 src_compile() {
-	local myargs="-lldap -llber"
-	use ssl && myargs="${myargs} -DTLS=1"
-	myargs="${myargs} -c ${PN}.c"
-	APXS2_ARGS="${myargs}"
-
-	apache-module_src_compile
+	econf --with-apxs="${APXS}" \
+		$(use_enable ssl tls) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	apache-module_src_install
-	fperms 600 "${APACHE_MODULES_CONFDIR}"/47_mod_ldap_userdir.conf
+	fperms 600 "${APACHE_MODULES_CONFDIR}"/47_${PN}.conf
 }