Fixed openssl dependency for alpn patch (bug #555070)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 29 insertions, 19 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 8ceae49cdaf4..6490ff833528 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -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 <polynomial-c@gentoo.org> 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)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 784fafb12bec..fa0149480e87 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -10,25 +10,25 @@ DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce38
 DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
 DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
 EBUILD apache-2.2.29.ebuild 3105 SHA256 db3e7e9fd9663ca383e414acf04c964ab3971faf891a740285e4269332c74a45 SHA512 3a6b89e825f46c4a545c7a77840f7ebb6e1276d520789cd997cc5f43500ff1bdb8cce8aeb0ab2e4cd773c598ea3a30a21293d04757796ab495dbc088705cd76b WHIRLPOOL 16a2423411d9966bf40c259af251ddc639e9d11ab718193397ebd1b93ea00d27bb3178193531cadb0fc77f00842f6c9c9a7f3d5e41d2118006dc4bd34115f2f3
-EBUILD apache-2.4.12-r1.ebuild 7648 SHA256 a3578cde6f6c2c906c76a5df7f46bfe7854004d35ffa045c0cc080c748bb3a82 SHA512 81f616510d85ee0d48c0f34cd45ada103261952a062c3d2e5835058082b0cbd7ca56dbc51e18dd586c51c70f0f30867ad68af73e69d09ef5cd31b18a4803c004 WHIRLPOOL 7acbc7ed2e1c2c620145359e273fe341e69dd93ae795cabaa845b124b6003e043c57fe0b2b83e8e2af1569dec40a25fa176005edcbf4bf05eb7b6096f18b8496
-EBUILD apache-2.4.16.ebuild 7652 SHA256 a69b36aa027e5e80ea9fad09766b8362b0956e280878832bb3c2feb2effc5e2d SHA512 744ac27fdd52ab66b555df96198bb2e9a6b6ae361553e76579cb53f93f86f30cb9ad200604875e54f64969a78b157142cd8ba459cbbde35a7031f6f73ffd73ec WHIRLPOOL acf5d3bfc49fc4fd96919abc758ab190fbe24c03e8d2c45534f087d6423884f02b03fe1d0bae8b4e0a01386ad5b65e052ee24a5850de9544c162fd2f58d82ce6
-MISC ChangeLog 30273 SHA256 507b23a938db0a319302499b72a2c672c9571c2df2ee5e5367d1e34e7cdfc365 SHA512 c90685b078e5a949afd2c8027d5779f5603f03e698e30b5c5d258687f905aaf9834a4ccfd0fc232f12888c398e828b10a67fa3aa0015d4c2eb9d4a2dec3608a3 WHIRLPOOL fbc0122ce613785b9be104431a55a8303cd0a51e0d137d4645575b13571705633ec218dee8cdfe6f36418f87ddb1b96448483a1ca3c9d316a233a38fb5775c7c
+EBUILD apache-2.4.12-r1.ebuild 7753 SHA256 6968f5d0a12da8e6c319ac7c4565b7eeeb4e3dbf4bc2d53880959ef4c641127c SHA512 8c5cd3e0a99f699363e04b73af2828ff474fa460f1e0803e8ed49dd27ea6af5d7cbdd635d89c0fc3fc399db534800cab89fb0d33b975ab18213ee34da8cf84f0 WHIRLPOOL d2568cc2d45177433b87a8f009ef8340c96013dcf56188402f683838b9b06139f6d851b2f24d1c33076adaab4b3c8faf34204a88245aa7a1379b1825bc961d98
+EBUILD apache-2.4.16.ebuild 7750 SHA256 930b275e15d7b4492ff3afebb722695ac9fc0dc10457b6639e122546aaac2f7f SHA512 627246697ff946cb419bab961cee0566ec442460c58498ddb19ee270b5b7838c3617c6e45cb23b366b9af66f7e4276f8e660f856a566a8c6f5edd79ab8c48658 WHIRLPOOL f0955a71847de4c1d659f25095cb848ed862d90fe905009c8b5e607d4c2148377ec4cc680a3ed7cdc9c5db0566de8eaa8865e363ed406a34d6d806652f5e6f7d
+MISC ChangeLog 30434 SHA256 7788dd3cbc0c50724e4333c5316ab49c27d9b8ffa1b1ed674246e3bce9daa882 SHA512 dc7e124c68ca42e7401a1499a67c5fac4ed665e0022016a4d660732e248a554349737b7cbb01b280b902e0cfa2eeaf4d3aba922a9dd3b686a14afc4ec8048367 WHIRLPOOL f373c0df420b9dab316184be149b7035274f3ed3c16fe3598b337bf418627396e7ebeab0713030a5a7b9caab99ca50e40b6b33fcd1c13531d900231c12b77e6b
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 3082 SHA256 529415f44340c023ec4eb9208999b080b6ea10f9ed6e1f5ebeddaf4099a36ee3 SHA512 c50d30f4b6a9f2373683825cd598d0daed11a68815da8aa6ba2c42817db4b4bb63b3c6c1b31acb4d17671ba23a3c8dba7d3aa7a4bca38be7694feefc1826d8e1 WHIRLPOOL 8f227ab785226746116173b3c1d4b842c1f4ece6691957ce693bdb708f36372de2f9fdce766dd37957132d5061b74d449e6cafc23a4134e1cb258432e5177241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVp0p6AAoJEPiazRVxLXTF4c0QAJO115Ey8SpYgfAZvrq+w1RY
-HEPOuh958HEP9rKj0R7EYuIoFNdIniu2GpQOjucllA3htrI5477Q2fa815x/cW1G
-YcDb4l4Oh1Xo+l2dH5kW3u4RPRYJ/zSlZztzad6zrXMXbOkpU9iA76EQ0xHNMcmR
-55P99oretERMiVcayAGuZ0a8WEOeTy5ft73k0fIJCnZoj5amb5u4wrFegn1LOJy0
-Kwg4Gf+dxODbKq2T+Qfg9YS6fectPqsV4xWNgQDs85wL+qqWC5+OavDBssNvty4W
-a2aq+uIhJCm4Z3bog81QeaxFUbuWbYFDf9HC3g19Fyfj/SUMqBzyvGQjugMoICgS
-JWk7WTjgkvxucJPBnnEaa9VFBQQN1sDKNzX1fiMaWkJ2krTeLaV/ir80JChdwMg3
-lIFh7W5RECFRkrnJM0EGjU4TF9b+Bdv96L9tTDiWlCrv/Uty3cGJD4R9XoOumSG5
-wSXoZJQReLMszTEA3Xh7Ju4VqCMgf/10JUltxli71rWS9rgABuHv5jr6HtMnioZN
-Roq7gy0ViohYI7ztohpwXnBX5yGIUcQAUcjmW7WsAumh+sVnsd5jfkObBjFLWCyZ
-Rs45EUNPJ7GImegg81FjjnXnF3q1kgoTsW+OD2yw/+rMtsMa6MFociTyyeCq+4VW
-2Qc2I5Fk18zIBIHIdklS
-=lMEl
+iQIcBAEBCgAGBQJVp6kPAAoJEPiazRVxLXTFIBkP/j6oNqljsYIOSkD/0aT1EOaL
+AjL3qtqubholwC6R6C1IRuvgpRKdNzmGRnr8w4Jj8umAZWJIoRJHQzTPNs49DxgI
+CyUWQEBzbN0kRi/tNVtxVNHZ7lsqIver51CbdJQCVjfVgfX0BGcHTJRURXXwMVl/
+qLhTI2v3TSX4yE/G1d+cJbWJeD6nS8gQhtof0IXX5nO9I/CBd8wvSWkq7y6VIiUs
+zfVAarj3qJTjQVpR96hN1CssBpTBcOR8wY1ftC5mlBvf/RJ91Ny4jEJYXg00jhqw
+0tF8nW61kzT4bKUprBFyGxpDSOvvOdHslYfjKHEUJ2gOhP6txL6plgqF/DQOJrDi
+U2/RUbpCoPJRQ5CJBfko3nGO22ceiqgdrJbDrFhMN8rDTbBOx62fX5VBdIuORaz2
+iAOsFdckU1cSWQSsfQl9hjOdIYSvAxgm8O0D9B/e1ZlFJHw++jKuSSW283KoromL
+SeTMI9D3haKKBSyjpcbv2BlqMtML2JPedRnMZzWrS8QeTAXL53MG9AwyxHdAZou3
+TlNTUcHcMaHhumF8aWl4Fnt0+yHQ/45GQhOsYqTeBpj6jP/Lifx25Ff7KY3PU2Bn
+NF7jBBJWNevfSYxJycFHKejS5aFyxmSjCAFZG47JELWc68g1Z2B/jUkEITDUAXVg
+sS0NYhoXluYf8fsx89qV
+=I2iw
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.12-r1.ebuild b/www-servers/apache/apache-2.4.12-r1.ebuild
index 9aaee568f559..723a3ffb419b 100644
--- a/www-servers/apache/apache-2.4.12-r1.ebuild
+++ b/www-servers/apache/apache-2.4.12-r1.ebuild
@@ -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 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 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)
diff --git a/www-servers/apache/apache-2.4.16.ebuild b/www-servers/apache/apache-2.4.16.ebuild
index 34bb9f57de32..d897843ca1e8 100644
--- a/www-servers/apache/apache-2.4.16.ebuild
+++ b/www-servers/apache/apache-2.4.16.ebuild
@@ -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 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 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)