polynomial-c 15/07/16 12:52:29
Modified: apache-2.4.12-r1.ebuild ChangeLog
apache-2.4.16.ebuild
Log:
Fixed openssl dependency for alpn patch (bug #555070)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
981CA6FC)
Revision Changes Path
1.3 www-servers/apache/apache-2.4.12-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.12-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.12-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.12-r1.ebuild?r1=1.2&r2=1.3
Index: apache-2.4.12-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.12-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apache-2.4.12-r1.ebuild 7 Jun 2015 19:25:58 -0000 1.2
+++ apache-2.4.12-r1.ebuild 16 Jul 2015 12:52:29 -0000 1.3
@@ -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/www-servers/apache/apache-2.4.12-r1.ebuild,v 1.2
2015/06/07 19:25:58 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.12-r1.ebuild,v 1.3
2015/07/16 12:52:29 polynomial-c Exp $
EAPI=5
@@ -126,6 +126,9 @@
IUSE="alpn"
REQUIRED_USE="alpn? ( ssl )"
+DEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
+RDEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
+
pkg_setup() {
# dependend critical modules which are not allowed in global scope due
# to USE flag conditionals (bug #499260)
1.306 www-servers/apache/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.306&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.306&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.305&r2=1.306
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- ChangeLog 16 Jul 2015 06:08:57 -0000 1.305
+++ ChangeLog 16 Jul 2015 12:52:29 -0000 1.306
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/apache
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.305
2015/07/16 06:08:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.306
2015/07/16 12:52:29 polynomial-c Exp $
+
+ 16 Jul 2015; Lars Wendler <[email protected]> apache-2.4.12-r1.ebuild,
+ apache-2.4.16.ebuild:
+ Fixed openssl dependency for alpn patch (bug #555070).
*apache-2.4.16 (16 Jul 2015)
1.2 www-servers/apache/apache-2.4.16.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild?r1=1.1&r2=1.2
Index: apache-2.4.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-2.4.16.ebuild 16 Jul 2015 06:08:57 -0000 1.1
+++ apache-2.4.16.ebuild 16 Jul 2015 12:52:29 -0000 1.2
@@ -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/www-servers/apache/apache-2.4.16.ebuild,v
1.1 2015/07/16 06:08:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild,v
1.2 2015/07/16 12:52:29 polynomial-c Exp $
EAPI=5
@@ -126,6 +126,9 @@
IUSE="alpn"
REQUIRED_USE="alpn? ( ssl )"
+DEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
+RDEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
+
pkg_setup() {
# dependend critical modules which are not allowed in global scope due
# to USE flag conditionals (bug #499260)