diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-06-07 19:22:36 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-06-07 19:22:36 +0000 |
| commit | 604392ae4155c9066392af1a23daaaa3b9f987df (patch) | |
| tree | 3ddbcfffb87ac4cebcefbe4cc6146b85fcf0e2d6 /eclass | |
| parent | Add github to remote-id in metadata.xml (diff) | |
| download | gentoo-2-604392ae4155c9066392af1a23daaaa3b9f987df.tar.gz gentoo-2-604392ae4155c9066392af1a23daaaa3b9f987df.tar.bz2 gentoo-2-604392ae4155c9066392af1a23daaaa3b9f987df.zip | |
mod_macro is now provided by apache itself (#477702)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/apache-2.eclass | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0b5c95a1767b..121b259b9279 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1642 2015/06/07 12:55:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1643 2015/06/07 19:22:36 pacho Exp $ + + 07 Jun 2015; Pacho Ramos <pacho@gentoo.org> apache-2.eclass: + mod_macro is now provided by apache itself (#477702) 07 Jun 2015; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Remove deprecated remove_libtool_files() function. diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index b9fe6c6e1562..9d8a48543617 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.40 2015/05/30 14:11:49 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.41 2015/06/07 19:22:36 pacho Exp $ # @ECLASS: apache-2.eclass # @MAINTAINER: @@ -25,7 +25,8 @@ esac case $(get_version_component_range 1-2) in 2.4) DEFAULT_MPM_THREADED="event" #509922 - RDEPEND=">=dev-libs/apr-1.5.1" #492578 + RDEPEND=">=dev-libs/apr-1.5.1 + !www-apache/mod_macro" #492578 #477702 ;; *) DEFAULT_MPM_THREADED="worker" |