www-apache/mod_ldap_user: put back the depend.apache stuff.

diff --git a/www-apache/mod_ldap_userdir/Manifest b/www-apache/mod_ldap_userdir/Manifest
index 0953c24cf421c86c4517e73a06c5c0e8456cb44b..c78915495ba3df4d6930760ce7253b4aad0eb032 100644 (file)
--- a/www-apache/mod_ldap_userdir/Manifest
+++ b/www-apache/mod_ldap_userdir/Manifest
@@ -1,4 +1,4 @@
 AUX 47_mod_ldap_userdir.conf 284 SHA256 387b836d2496489e190f9673794474300db3ddb7b802b84fdfc8bd6022b14ad3 SHA512 7651fade1a9bda54e6ea1d3c2a8b6853f91c6c43f7d914cbd8e1bfa94ef2c31b0ac1c3798d9430fa62805d4b48eb358ad8e665cb0e9c833fc622c78e4789f747 WHIRLPOOL d86a4ccd2e886dfdebc781241aa9e01180ab4a2e3c041e18405e1001e6cad166549855e2b009f00ed4951ddc2efd428212c878be8a16e2c38c9098417e52301a
 DIST mod_ldap_userdir-1.1.19.tar.gz 51483 SHA256 467c3c9e40c1a8f39fe01ffedf5b9a462e14ed2a6ce2ec493c53f081b5a99fb5 SHA512 57d75ac58ac841641050e1f6e022bd6c7df9192da29439264bbe83e938e84a474952996e53bcba1f490ab24415c98b7e972bc3af14cb46a7bc35016b6533ff28 WHIRLPOOL b41afe88159e83316bed62011e0cb1f5430c3cd5b5026ac7418d2afd6f007d2299b9414490c9f3b8e37b9061fde82117aec8816e30e8abd1a79672cc88a01e2d
-EBUILD mod_ldap_userdir-1.1.19.ebuild 789 SHA256 0873ddc08b7e092a2663414930c910decc266061fd1c445d04f3bc5e66163038 SHA512 0a09b040d2f8a819a496554f00f5c3b0cbab557d9049d89ff75910be657050edaac7a27ffe02ccafb2876b451b932d2c7c622a09702caadda707404fbbb97a0f WHIRLPOOL 7c22acfd9d8b463d2a7fca1a38c3b4abbf320f4a19608b4debf5c3954ee9e11ebc90c592f7e0bf826f4cc3c96ce0aed1eb10136d8da91fc3126f28707042beda
+EBUILD mod_ldap_userdir-1.1.19.ebuild 927 SHA256 fc96d6fc1cc52baab35e22d1a4be602530ae6fa97f112256f8a4bb9d728d7a5e SHA512 c87be762c471f123daeef2660e2b475a55d3ea94f52066f6ff86351342263ec716655df3070fb9c3fc47d39e26df3cfc29a788067c5931d61b282ae24caa4ec2 WHIRLPOOL 002e3d3d39d8c5ef55c3c418c986d1ad676aa31786bd26a14e54a569bfc8d06de9b0a010f242cb622472bee3dc1d5f1127821f939d10671c6454d721ceceba64
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7

diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
index 18cdc5eeffe5f5dec422aecf94b8dcf69ebc0bff..47cfea776c54f7b169b40ad19fd509929028b0ab 100644 (file)
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit apache-module
+inherit apache-module depend.apache
 
 DESCRIPTION="Look up Apache ~user directories in an LDAP directory"
 HOMEPAGE="http://horde.net/~jwm/software/${PN}/"
@@ -15,16 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
 
+DEPEND="net-nds/openldap
+       ssl? ( dev-libs/openssl )"
+
 # The module will compile fine without apache[ldap], but Apache will
-# crash if you try to load ${PN} without mod_ldap loaded.
-COMMON_DEPEND="net-nds/openldap
-               ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-       www-servers/apache"
-RDEPEND="${COMMON_DEPEND}
-       www-servers/apache[ldap]"
+# crash if you try to load ${PN} without mod_ldap loaded. The funny-
+# looking atom was taken from depend.apache.eclass (need_apache2).
+RDEPEND="${DEPEND}
+       =www-servers/apache-2*[ldap]"
 
 APACHE2_MOD_CONF="47_${PN}"
 APACHE2_MOD_DEFINE="LDAP LDAP_USERDIR"
 
 DOCFILES="DIRECTIVES README user-ldif"
+
+# Don't try to get away without this, even though it causes some deps to
+# be repeated.
+need_apache2