www-apache/mod_vhost_ldap: Fix license, sed, and extra inherit.

diff --git a/www-apache/mod_vhost_ldap/Manifest b/www-apache/mod_vhost_ldap/Manifest
index 39c452c588dace0c302a3a80f3a2a69ef0c6a6f2..f167172d08c63281da97756260c559060cbe3098 100644 (file)
--- a/www-apache/mod_vhost_ldap/Manifest
+++ b/www-apache/mod_vhost_ldap/Manifest
@@ -1,5 +1,4 @@
 AUX 99_mod_vhost_ldap.conf 274 SHA256 78d719363e3be8f17e83ef3af56fc5fb58e25a13d28e60c78ccddbcfee66fd46 SHA512 597fe675c63118477d8883cc53a7c21c287c0a6446392b2b96243256ebc0a9e30f758b0af5254d0be10cce91aea04bfe030cd6d8793121bebee2c445964e9885 WHIRLPOOL 94fb37d39e818296e26b1ed034cfdc52d1ec79b247ad6d8aa673bb65649dab1ccfcec3db379d273bf0c12d65a8d3e05e240bfa58d988989a8918e44237518f2d
-AUX mod_vhost_ldap-1.0.0-apache22.patch 6251 SHA256 3a921212c905a5e2139ecf9f2c5a05a985a8e4af83b8730fa05b04b174a052c2 SHA512 01f4b5744d4a86ca21c4a81f1897d09c522b2c8fd2fc6511b3cb3156ef84e529c91e960c9824268a4a97b49e837791e758dd8262a5d827e5e7f56ffb699882d5 WHIRLPOOL 5da5e8120658927e5f7c9b0c8628dbdb5bd854f9a28f04d4880c2ce9ec5eed73c162c8af3f176e3d81b95a13c94fe6bc9994f20c28a95fa87ff0407cb41cc08b
 DIST mod_vhost_ldap-2.4.0.tar.xz 9628 SHA256 5f4394bb3b6ad8c1e380ef5a7ee3a45e8310d83beea98f228ca022f196e039d3 SHA512 b9715881ca704207fd852dfa2370dd71993bc85f390b353201aaf40c4252978e720abeda8b29b6c676f3cac66e50b67989825d7a6d3992829fbbfed725c75330 WHIRLPOOL 05dc93d086fbc90e95903dda3ec9b81ec2255667455cd09cf6fb96b3bb4e6e55a6da97f290b73f298242338e91dc378347dfea0b9e9d8d5ba493f90c2c0d2bf5
-EBUILD mod_vhost_ldap-2.4.0.ebuild 1012 SHA256 d21bd95b71391bd936316d4cc52ed8af8ab0a5ee612a07b16fc8e2eef86d7d4f SHA512 85dd4b1bb0d0fa01b8a1c477de52758799202f47d54d970683243f923b28d6276975821f8c0a4d807fc6ee2d2a98ac64e39648e93acc529f9c7ac7d19ee685b0 WHIRLPOOL 653626a303d967ed92fd4686ccb7996759a43fb38f1cf1dcbe0cb1be1aef8421b25ffd126552ee2cf2988e45d447c27a2648ea3e972c4126826ccc67b1b6aca0
+EBUILD mod_vhost_ldap-2.4.0.ebuild 1066 SHA256 2253f9932f647edc3a25953cf04c5aa0ce090b3f800b53e4bfe5c1045521230f SHA512 d46b1b1a94685ea175a8ba89ce1d7b1788b1267c0659f99ab59cac384e34fbad938a0ab38e90d9fcbbcf2ac16ebf09ad1f884d30c40133f1de082b30e00ed348 WHIRLPOOL a5be90d543720caa98f3ba146e16f821f0c2b948a9e19b954e19243c549d15f25a1ea6ff8e3f2440091d05401a7fce6276ca3a4fb09c1e9baf7d5f5c652b38f1
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7

diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild
index 705814d2ffe27f67aa97642ea1a99e778cfb1870..e974eb59481f3306e8317e71198af1463f40a57a 100644 (file)
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild
+++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=5
 
-inherit eutils apache-module
+inherit apache-module depend.apache
 
 DESCRIPTION="Store and configure Apache virtual hosts using LDAP"
 HOMEPAGE="http://modvhostldap.alioth.debian.org/"
 SRC_URI="http://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -27,7 +27,8 @@ RDEPEND="=www-servers/apache-2*[ldap]"
 need_apache2
 
 src_prepare() {
-       sed -i "s/MOD_VHOST_LDAP_VERSION/\"${PV}\"/g" "${PN}.c"
+       sed -i "s/MOD_VHOST_LDAP_VERSION/\"${PV}\"/g" "${PN}.c" || \
+               die "failed to sed version string"
 }
 
 src_install() {