From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B35B13832E for ; Tue, 16 Aug 2016 04:11:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5542821C039; Tue, 16 Aug 2016 04:10:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E01E021C039 for ; Tue, 16 Aug 2016 04:10:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 569A8340DC6 for ; Tue, 16 Aug 2016 04:10:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88A082453 for ; Tue, 16 Aug 2016 04:10:54 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1471320260.e045c30a6e6768dc1d8fafd8e0a66288dfba6f5a.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_vhost_ldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild X-VCS-Directories: www-apache/mod_vhost_ldap/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: e045c30a6e6768dc1d8fafd8e0a66288dfba6f5a X-VCS-Branch: master Date: Tue, 16 Aug 2016 04:10:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 08715546-d73c-480f-9bdd-898e621badd7 X-Archives-Hash: dea87ef110f47c0ff32a831c13515b19 commit: e045c30a6e6768dc1d8fafd8e0a66288dfba6f5a Author: Michael Orlitzky gentoo org> AuthorDate: Tue Aug 16 04:04:20 2016 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Aug 16 04:04:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e045c30a www-apache/mod_vhost_ldap: new revision requiring apache-2.4.x. Gentoo-Bug: 558918 Package-Manager: portage-2.2.28 ...t_ldap-2.4.0.ebuild => mod_vhost_ldap-2.4.0-r1.ebuild} | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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-r1.ebuild similarity index 75% rename from www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0.ebuild rename to www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild index 182a60f..37c0dc8 100644 --- 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-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit apache-module depend.apache +inherit apache-module DESCRIPTION="Store and configure Apache virtual hosts using LDAP" HOMEPAGE="http://modvhostldap.alioth.debian.org/" @@ -20,13 +20,16 @@ APACHE2_MOD_DEFINE="VHOST_LDAP LDAP" DOCFILES="AUTHORS ChangeLog README" -# apache[ldap] is needed to run, but not to compile. -DEPEND="" -RDEPEND="=www-servers/apache-2*[ldap]" +# We need apr-util[ldap] and apache to build, but the ldap module for +# apache is only needed when we try to run the thing. +DEPEND="dev-libs/apr-util[ldap]" +RDEPEND="=www-servers/apache-2.4*[ldap]" -need_apache2 +need_apache2_4 src_prepare() { + default + sed -i "s/MOD_VHOST_LDAP_VERSION/\"${PV}\"/g" "${PN}.c" || \ die "failed to sed version string" }