diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-07-16 06:06:59 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-07-16 06:06:59 +0000 |
| commit | 0db6c6400b3f506698820f20677a39584fc0ebd0 (patch) | |
| tree | 9b4b50059313b435d4af91b66baf8119fcc2f2ec /eclass | |
| parent | Version bump. (diff) | |
| download | historical-0db6c6400b3f506698820f20677a39584fc0ebd0.tar.gz historical-0db6c6400b3f506698820f20677a39584fc0ebd0.tar.bz2 historical-0db6c6400b3f506698820f20677a39584fc0ebd0.zip | |
Added slot dependency for openssl. Raised minimum required EAPI version to 5.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/apache-2.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index dfc8e72f1c7b..d77d6f7e9bfc 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.1710 2015/07/15 09:03:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1711 2015/07/16 06:06:59 polynomial-c Exp $ + + 16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass: + Added slot dependency for openssl. Raised minimum required EAPI version to 5. 15 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org> kde4-meta.eclass: Fix unpacking of noakonadi branch diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 9d8a48543617..03bb8d130183 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.41 2015/06/07 19:22:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.42 2015/07/16 06:06:59 polynomial-c Exp $ # @ECLASS: apache-2.eclass # @MAINTAINER: @@ -16,8 +16,8 @@ inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs ver && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" case ${EAPI:-0} in - 0|1|2|3) - die "This eclass requires >=EAPI-4" + 0|1|2|3|4) + die "This eclass requires >=EAPI-5" ;; esac @@ -106,7 +106,7 @@ DEPEND="dev-lang/perl apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) - ssl? ( >=dev-libs/openssl-0.9.8m ) + ssl? ( >=dev-libs/openssl-0.9.8m:0= ) !=www-servers/apache-1*" RDEPEND+=" ${DEPEND} selinux? ( sec-policy/selinux-apache )" |