summaryrefslogtreecommitdiff
path: root/www-apache
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/Manifest.gzbin7252 -> 7261 bytes
-rw-r--r--www-apache/mod_gnutls/Manifest8
-rw-r--r--www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild (renamed from www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild)44
-rw-r--r--www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild (renamed from www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild)4
-rw-r--r--www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild57
-rw-r--r--www-apache/mod_h2/Manifest6
-rw-r--r--www-apache/mod_h2/mod_h2-1.15.12.ebuild49
-rw-r--r--www-apache/mod_h2/mod_h2-1.15.13.ebuild49
-rw-r--r--www-apache/mod_h2/mod_h2-1.15.14.ebuild49
-rw-r--r--www-apache/mod_wsgi/Manifest6
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild2
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild2
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild2
-rw-r--r--www-apache/passenger/Manifest4
-rw-r--r--www-apache/passenger/passenger-6.0.6.ebuild (renamed from www-apache/passenger/passenger-6.0.2.ebuild)9
15 files changed, 209 insertions, 82 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 122bebdef439..65449c9b7edb 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
Binary files differ
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index efbd9d3d02c8..040b952feec5 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,8 +1,6 @@
AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
+DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
DIST mod_gnutls-0.8.2.tar.bz2 415903 BLAKE2B 98c96479e2419ee511ba802c99823ddaae89ddeb7a2f0660b91e2a371f8249ec4f98b2c0443389168a22dbe133b0bcc6020bfa597447507a8e4f91827b6d1d24 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d
-DIST mod_gnutls-0.8.4.tar.bz2 422811 BLAKE2B 33b992cbd42671ce0be320268f2421f167c05e62074ad538c22efc1f8b2f1a8604550f103bab579f1dc8622a78bda9e1e62826db06ff0dae21fb9dc1c2ee2bc2 SHA512 cee592f12a26894dacd6db6f25d4b1b1901579ac5cc7dee2be826aa3697bc2af55e2136ef65acd6dc4c9fac635465fbf8c06ea236651d45a2b5fd963408e6684
-DIST mod_gnutls-0.9.0.tar.bz2 435869 BLAKE2B d5c0a1846b083c469cddc0516a81ac8ef85b1b9287ad53312964f7c542ec107689f832db83a11abda178e79a2d6f2177b6093219a94cec9ded6e8eb6cef86796 SHA512 12a85a53277401648fd44ade3f27969d023ef46d1b593ed0df4284ea5421d87caedc72262fd6eb54a17f4949cf1551bfaef66f81128a060cc77064cd32d00cd2
-EBUILD mod_gnutls-0.8.2-r1.ebuild 993 BLAKE2B 8fa3ad55f2349ab8c3d0eefe011b1f1701e05217a16bb9348395f653f3952438e88b9b61b9ed98e0aaa20b4a28b53dffac2cbf9df22970a205cb4ac9afd73766 SHA512 c9b1a3fc316997fe25aa37317b367ed2bb1a055a8234eb9cfb299f2ea071ccca69e91fcd31fbda21dc097d4dffa2ff4d769186bc6ff76cc14c9054ccd0486b6c
-EBUILD mod_gnutls-0.8.4.ebuild 1158 BLAKE2B c907ed1f80155544368f43ff75381e391d8933747bba791401b2e5ef36df299e87144779df8060d019f5fbf0458d7483b489110949c6d5ead942692a4265f378 SHA512 c17fc27b2413c46cf8e7199e1aa6ef98ea61313302a08f08a2fe351b405bc811fc3a175ddf81f55071f9f7000dbef31d58428a8fd8334cebd6ba61178a6a6a3a
-EBUILD mod_gnutls-0.9.0.ebuild 1155 BLAKE2B 52980920f1681f00b7f05791e1545770b1a29b9356f177d62c98e48d05894abc7fb3929e68a3ee902e6caa3b842e0f0cc9d92abf57422e5309a7439d963c9910 SHA512 6067758a6df14a63aa8bd4a427d9d819242bb1d0c2b76a6a0fd7e36291e62331034be8b274ef07f187b425404bb7f37166b0a7561f507d5c203d75dc3bfa1223
+EBUILD mod_gnutls-0.11.0.ebuild 1815 BLAKE2B 26c1b27c1a9bd003244077cee29b3c398ab7ec991c6ca0f5b5c54abca4b7d9de50f79dc5d2e73808f4a0eb0787d9a709e59e8eeb7ee2965acfb00f74756a8bac SHA512 7a1e1bca94dbdf8ccdbaa44338cfc7503b9196cc93733dffe14ec9397080f4f6d87bb1c724af024998b8bff7b388e76eadba97c07831b0fcc90b5ea2d0bfec36
+EBUILD mod_gnutls-0.8.2-r2.ebuild 998 BLAKE2B 9da57cdaeb490427e4c9f06041366e532ac40f8f5f7e10d04c07c6c8be26bf797794c7ea10bfadfc17120c74ab94cdc2201f60c8e90b8ab0815dcdd9b26c9a8b SHA512 e6693e13d0406f047f977995b8c36281e2e4b1a397bb06c4edd2dafbf6dcb3d6c75c4de4b20f99c40e1e9aa3bbd9854d97edace2b03bdb673754d9288d82260a
MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
index 1d6985d4f075..9662e5475d78 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# WARNING! Don't switch to EAPI-6 without checking paths of installed files
# carefully. The .so file might get installed into /
-EAPI=5
-inherit autotools apache-module
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools apache-module python-any-r1
DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
HOMEPAGE="https://mod.gnutls.org/"
@@ -15,13 +18,29 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-CDEPEND=">=net-libs/gnutls-3.3.0:="
+CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
+
+TEST_REQUIRED_APACHE_MODULES="apache2_modules_proxy,apache2_modules_proxy_http"
+
DEPEND="${CDEPEND}
- test? ( app-crypt/monkeysphere )"
+ virtual/pkgconfig
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ test? (
+ app-crypt/monkeysphere
+ >=net-libs/gnutls-3.3.0:=[tools]
+ net-misc/curl
+ || (
+ www-servers/apache[apache2_mpms_worker,${TEST_REQUIRED_APACHE_MODULES}]
+ www-servers/apache[apache2_mpms_prefork,${TEST_REQUIRED_APACHE_MODULES}]
+ www-servers/apache[apache2_mpms_event,${TEST_REQUIRED_APACHE_MODULES}]
+ )
+ )"
+
RDEPEND="${CDEPEND}"
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
+RESTRICT="!test? ( test )"
APACHE2_MOD_CONF="47_${PN}"
APACHE2_MOD_DEFINE="GNUTLS"
@@ -30,6 +49,16 @@ DOCFILES="CHANGELOG NOTICE README"
need_apache2_4
+python_check_deps() {
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ _init_apache2
+ _init_apache2_late
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
default
eautoreconf
@@ -43,6 +72,7 @@ src_configure() {
--disable-doxygen-doc
--disable-doxygen-html
--disable-doxygen-pdf
+ --disable-valgrind-test
ac_cv_path_UNSHARE=no
)
econf "${myeconfargs[@]}"
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
index 3576124376cf..b0d32ce75e30 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
-CDEPEND=">=net-libs/gnutls-3.3.0:="
+CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
DEPEND="${CDEPEND}
test? ( app-crypt/monkeysphere )"
RDEPEND="${CDEPEND}"
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild
deleted file mode 100644
index 17459ae25889..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# WARNING! Don't switch to EAPI-6 without checking paths of installed files
-# carefully. The .so file might get installed into /
-EAPI=5
-inherit autotools apache-module
-
-DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
-HOMEPAGE="https://mod.gnutls.org/"
-SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND=">=net-libs/gnutls-3.3.0:="
-DEPEND="${CDEPEND}
- test? ( app-crypt/monkeysphere )"
-RDEPEND="${CDEPEND}"
-
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="CHANGELOG NOTICE README"
-
-need_apache2_4
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-apxs="${APXS}"
- --disable-strict
- --disable-doxygen-dot
- --disable-doxygen-doc
- --disable-doxygen-html
- --disable-doxygen-pdf
- ac_cv_path_UNSHARE=no
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake
-}
-
-src_install() {
- apache-module_src_install
-}
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 8acdba4e3225..2e37d4c2bcfa 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,11 +1,17 @@
AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
DIST mod_h2-1.15.10.tar.gz 699783 BLAKE2B f4457128fc77048cc3f4c394892499e555f5335ab3165ee6426cc882694e250e2eace47e38c96d12673ceba8507ad699d4c2937e50ced33aab18f81861c0bf0e SHA512 7050c216ebab05f240495dbeac86915cabee49f62a51b19d87b078469ab3733ca266cd16bd0a009e782c37d8090ccfefbb8043e1e75660f8adc7d4ecf72818e6
DIST mod_h2-1.15.11.tar.gz 701334 BLAKE2B f6ae8a71be849af53fd6931fc66f801892f055d217fd280ac42ed157e4002c6d7c9f3c5bb849d6561bc84d235d844fd0af49a39deb003dc530e477e2d13ac8cf SHA512 3fde7c2e4af25ae4e1ec3d0f9e824a68c6077953c4349b55f05712a53fff07cc615a7348b323264da75b791a18eb59cc32ca919d02b26a711b45d8cd97f92d6b
+DIST mod_h2-1.15.12.tar.gz 703071 BLAKE2B 7b692614bf1d39b8941380c0be30247ed0df7eca7b974dd18b05a20c93a59863ea64edc4ec6c29d3e9b27f1e02ce2378a062898ccd366029825ff59715744e04 SHA512 a69ddc7427057cfb90863d536846c88f0a17140b3d8555c0d5cbd6a5790c5545bbc83e8a0fed5fd4968e36dd4a22a48be5c3783b83d5be50bdd5093650d89302
+DIST mod_h2-1.15.13.tar.gz 703207 BLAKE2B bdfc178e9fdef24ed13166e8753d6f085af4e8ea4ce8b4b864d51232e416c470c38ae6b3738ccb9262791f146fc1bf8309a34c2de56fa42ca3cfb0c5a846d945 SHA512 7cd4e8b3fc4c23e35a5a0ce7c89802a987918194ac888355a9cee258045388e22a3c22988deececd97e9c01f77038e722e4acad9c56eb1de91da6d0947409daa
+DIST mod_h2-1.15.14.tar.gz 701094 BLAKE2B 10fda18471c3528c18ce140e21b59eadb2a68ebea52971c987e88f2512922c5aa7f51f9ca41f3f2b9a7f6498bed34a146e8c39e3c892e98c1c473543932327e7 SHA512 f0874f8b8aead03ae9f5942b54d033223c05165d9b8f2328497a4348234a296a579392ab71197b71cde2ec2c37c4d83c3aac43a87c4e4f0f4dc0fdff4d3cd9d2
DIST mod_h2-1.15.9.tar.gz 699712 BLAKE2B 035cc7ec8df4727abdd2cb90dfd4c0e6c94dac8a3872122bd3160a594207b7b948278662e8bbe538f736d4981cf6dde3207951f10b0525281f4547603323b604 SHA512 3743d530d2c70577142745046ddcee227b0a8c5e6d42c96d26df71c8c6234ffa20d36fd176c4e8e81a26835669409afb17df018139a7cfebb04748a84a467191
DIST mod_http2-1.15.7.tar.gz 1042030 BLAKE2B 5252e15fbc71845db557d567daba63452df0693baad18f8b83f937adbd760f1fa931fbf663f1f5ec475760e75fc132fb0de63784e046092669b1d8fb44d96e9a SHA512 effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228
DIST mod_http2-1.15.8.tar.gz 1029471 BLAKE2B 10dcbafeee8be71858f1eace6c65b31d4a06b9598ba0ed8dd0d191c6fa8eb0475e0b9bd9f52a09fdf3430b18c770f0cd41057e9661f252d11df0edab8189cb26 SHA512 47ee0ef6d5e6cdce8b5d35cdca107331378c3d3ccb6d7b6c36eea8e04dda3d5665233aa7834f122d2069d7c81a833bff08e3f0a279d4a5a0bd1ec6b366696fd3
EBUILD mod_h2-1.15.10.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
EBUILD mod_h2-1.15.11.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
+EBUILD mod_h2-1.15.12.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
+EBUILD mod_h2-1.15.13.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
+EBUILD mod_h2-1.15.14.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
EBUILD mod_h2-1.15.7.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
EBUILD mod_h2-1.15.8.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
EBUILD mod_h2-1.15.9.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
diff --git a/www-apache/mod_h2/mod_h2-1.15.12.ebuild b/www-apache/mod_h2/mod_h2-1.15.12.ebuild
new file mode 100644
index 000000000000..b158648fdb59
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.15.13.ebuild b/www-apache/mod_h2/mod_h2-1.15.13.ebuild
new file mode 100644
index 000000000000..b158648fdb59
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.15.14.ebuild b/www-apache/mod_h2/mod_h2-1.15.14.ebuild
new file mode 100644
index 000000000000..b158648fdb59
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index a36443fea9d4..76115b2b3753 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,7 +2,7 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
DIST mod_wsgi-4.5.13.tar.gz 679121 BLAKE2B 310a6a56495883439fad4a5ee7b30e749aaec4131bc039fd378018c30c9b61f1cb2c8b0ed6339c4a9cf556571e2713ff356b04007f1e2a10bcac52ddd5e5d14f SHA512 94bf6ae0d76ece67682a8ca3b7f202bb08a1f3e09e42c33f52b561a57ac8265ca2f5431f839bfe731eb014f279b0d865fd007f14a4839c934d372390d24a44a2
DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea257295ecae56c0d3e87c4d15743ea4bb0275ae94a6168912ff27fcfcd06eec823b8332d19895ed803ad6164da77b SHA512 5f1526b74ea59c8ef897b49b1b2f2de42d9d0144277fd74f9f8e1f3e0198735f98ec30f726883a3192d0ed33a4013232cb2adf8db9d817b4de0198890eaa7044
DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
-EBUILD mod_wsgi-4.5.13.ebuild 829 BLAKE2B d51fc6c41ac9e5762a90c53b166f61c12850104cc6cd84564f23983e71ff0d8e921a57f3b9c266f76127264b61645ef69018f2ad77d78d89ab16ddb7a30e091d SHA512 af12e71126137d37ee2343d3954223398c7dffbb57ba4936665f15a0af9c4bff810bd522bb8379c496f88922c0554eb7a998bc6ff2b1d12aeba963f32c13eccc
-EBUILD mod_wsgi-4.6.5.ebuild 839 BLAKE2B 715d6e2e4b756050a723f579b82a805b0cbbd0e090ed58ca5db6ac394154e1cf80849fb912101affdc2aeef4389b3a6635124926e8c58b6b5dd740b69b100458 SHA512 e12c51ef37642deb2652b71eb6f030add2e0824c603e113eab4674315daaeef6ad048b9facae2fcae4e7c309249cd4d6c358c3d3cac45ca89904b025d1cac184
-EBUILD mod_wsgi-4.7.0.ebuild 849 BLAKE2B 6a5e372095918f7e1d822b539a38ee313c36a402d5749ba7b8d5d73651714d14e200dc38a8aa1dcff03ff750ea45507caefd28645de66553b823026d4688736e SHA512 e63c20222065ceb7ec7aba012e8e1a9865459f30d10423f2a1d06c2398336ea627124ade8ad107beb0cac37fc15667f32d702cea903f7ebcfb43f03220565d78
+EBUILD mod_wsgi-4.5.13.ebuild 819 BLAKE2B 186d7c0e8d7842708b466b3ec1a450831925dd3e167393c52e1cd9a8207d852848833431e06f3febb73dd7ee6a3d501d82110aa33c47057791059fa766d7bf41 SHA512 cc25d276d9fe3937a3ae0a1d8e41d2f5eb8d439aa77c7e67a45c605aaec7ea16948fcbd5087adaab731ea8899cebc0fde3e8c035b224a01b725128261b1f011c
+EBUILD mod_wsgi-4.6.5.ebuild 829 BLAKE2B c49a4777ecfed2cae09bb02dd8813346c2bb7e662ef3eeeadb3d786cb5ea0afcca149ff251fef51cfc729cd771d79b14be2c9799897215a43c1c7c4ea857dfa9 SHA512 258d9423ee750ab1904583d3ccf3534b764986e7de9c9806f1dcff7c012f48b583efc5c265ca6557e9a4da2ad98712e8c46cba630bee9b29cbc0ed95a3ebc5c7
+EBUILD mod_wsgi-4.7.0.ebuild 839 BLAKE2B b647de594d4eaa18a99402346c3fb549d15fa474f0d8144a880bf17cf0f3d714a4cc3a7724e1db0cc78d1f845102d7b3bc2f7cca5b1937ac0352a7311a6dc2b0 SHA512 ffaacb13a03e8ebb52b138eccf2548fe6173c37c726a097798ae0cbed17c2044ae9c534aa20b8985e8aeeca09f53ac799cf13eecb8e01e031e76cff4a8455b23
MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
index 133181c02a6c..e6f016aeca98 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
@@ -3,7 +3,7 @@
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE="threads"
inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
index 932deaac9770..ff0433a90fcd 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
@@ -3,7 +3,7 @@
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE="threads"
inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
index e1a5e203bf0b..d9bc10e0b825 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
PYTHON_REQ_USE="threads(+)"
inherit apache-module eutils python-single-r1
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 5cc4cbf888aa..4f355dde3b15 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,10 +1,10 @@
AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
-DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4
-EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663
+DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
EBUILD passenger-6.0.4.ebuild 3977 BLAKE2B 136797a63538618616ce49f3b2a1082f7155b88934b38d3c9118216ee43490f4a336164def33741ac072612fff9b96bc3bb897e2d76080e7eb030a2c180159e2 SHA512 584b578239cbe18ea1866d91231f92c5b1892d9481e3c52dbf768ab81396dfb17e5b861f956e33de81ba8c3365f61e06bd1ba785f966bc74e226a453478d3c54
EBUILD passenger-6.0.5.ebuild 4078 BLAKE2B 72fffd8164aef7e98dd776ee3cc88b36e0434a540724346f6648f5960482fd4622facb310426715f12af3d1cfe7b98defd2302613d733e1542405896c8780e8b SHA512 6f2788c530920b8d8fdff8c96735de909b5bcc230cc579c0777352f23bb8a50486a982375ff70a4b68d8b903d7ed1af5fb413c0a66933490b9e2f080199a22a9
+EBUILD passenger-6.0.6.ebuild 4071 BLAKE2B 88556cba75e710275d64a50df6b2c9bc2721736240a0c6f2f611255093ce02d9b902fe14f33da152eba4069152c26d52b04b3962ed191fbc1bda82405c2d66f8 SHA512 e9e03814a511829b317f6c3c26ee6429f1dff106b80d4f1a088dfcc7ebdb615b93410ce1f8b7b5ed034956d2347bdb6e7582939c43de1168351e4f0fa5887dcf
MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.2.ebuild b/www-apache/passenger/passenger-6.0.6.ebuild
index 2656d97c0d11..70b997581603 100644
--- a/www-apache/passenger/passenger-6.0.2.ebuild
+++ b/www-apache/passenger/passenger-6.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="apache2 debug"
ruby_add_bdepend "dev-ruby/rake"
@@ -87,6 +87,7 @@ all_ruby_compile() {
HTTPD="${APACHE_BIN}" \
FS_LIBDIR='/usr/'$(get_libdir) \
USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ RANLIB=$(tc-getRANLIB) \
ruby -S rake apache2 || die "rake failed"
fi
}
@@ -99,6 +100,7 @@ each_ruby_compile() {
HTTPD="${APACHE_BIN}" \
FS_LIBDIR='/usr/'$(get_libdir) \
USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ RANLIB=$(tc-getRANLIB) \
${RUBY} -S rake native_support || die "rake failed"
}
@@ -123,5 +125,6 @@ each_ruby_install() {
FS_LIBDIR='/usr/'$(get_libdir) \
EXTRA_LDFLAGS="${LDFLAGS}" \
USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ RANLIB=$(tc-getRANLIB) \
${RUBY} -S rake fakeroot || die "rake failed"
}