8 files changed, 47 insertions, 134 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 22976bc41e78..9c2bd55e8122 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 63d56dc8c2ba..29393e5e3339 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,4 +1,4 @@
 AUX 10_mod_authnz_external.conf 987 BLAKE2B 840f46d25a51dad9614bfc1dc12f7e2362ede3c7f039e5101177689767c22bff0e05a5d65327c709e249d20fa8cac782edec3d003efbab9a732b814278e1b556 SHA512 3840a8f29c3575f700f7ad262d8fe01fe42b3273cb674c543715eb8af053cab990f08264739bac7c46dd16d54eb53cf6a8bed556376b29ad78b50e6c3031a061
 DIST mod_authnz_external-3.3.2.tar.gz 36160 BLAKE2B afc3e4b9b52628479163bf705a473edbb96b5c82ac74c43a0d15512adf59adb4a4122f83e59871a3a91d9094347287b1072e3f12b9689680acd91f4ea534cc6d SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be
 EBUILD mod_authnz_external-3.3.2.ebuild 557 BLAKE2B be9b71ac1d3c9518db7f53299c4d32c2dc8fc718cbf0c82a2ee5bb0a71a8068c7ad3bb5f3aeafda9af7b4d5941b273c9931b613b40c24a268390b5b272878c7d SHA512 13fcdfd45a9fe6e9150af4a3bf18295c446b7bad7acde88561d7187fee930ae98667d93d9a385a344d37f252b3c2789a544681ee1dd1fd34667e32e302af197c
-MISC metadata.xml 317 BLAKE2B 215a4040a6094fb051cfc77aff105228a8a480074f69daa5d7fe174230cfcc71dfed19d414fbede555b9a2b01fd2f229089121e21acdba5dcbb5991d1c1ec749 SHA512 dd0608a4624d18f25915bbbbb601013954476a62609ebe59118862428b5397893e6b4bce5d09b79eb49402ab5ae4dbac8954a8bca9a58d0121f6906d3655f367
+MISC metadata.xml 336 BLAKE2B 22bff5bdfb90a1ce3e1e02e91eb783b3ad492c042ef11c3cd4322f1a710ee44949db8dc6fd16e36378e26389c1c326655c5a58d053aaa12adfa888c425d819f0 SHA512 d70954c0d9502b0f45dfbe37e623b679fe2b2466a7d261ffed766b5111e79912be5d6c5324af0d9d43741de58d8e70058c08866486a056ae4f7a27246c451500
diff --git a/www-apache/mod_authnz_external/metadata.xml b/www-apache/mod_authnz_external/metadata.xml
index f298748b0602..38b26aa08657 100644
--- a/www-apache/mod_authnz_external/metadata.xml
+++ b/www-apache/mod_authnz_external/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">mod-auth-external</remote-id>
 		<remote-id type="github">phokz/mod-auth-external</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 00c595e720d1..6270dc0d728a 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,7 +2,9 @@ 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.5.17.tar.gz 680160 BLAKE2B 496f81cea9256622bc6ee96308b47c264479701f64bcd5bef7699211a288a45d459df8f30b014cdf1e9b911b6aeff454ca7ccb5cb8eebe8b238e903a89fd8a26 SHA512 d40fb48b654bd49d36c4a249527c9190eb7aea2bd138c035ae304a48cb6e223aa34831a2eeec8aade9ac3bafe2493f35a2359caca1e8ec9dd6aff013693de973
 DIST mod_wsgi-4.5.21.tar.gz 682330 BLAKE2B 984437becb86e1df5bb3fcdb55c441d9634c98181f3704068617773f61048ccd38ea8617409b6e64413fb3584eaf46bd2c8fe67afd86993e4e0e85076d2bd98a SHA512 3180cf19bd5238586b288a030542c779533da8a35531f5d18edd85a1143e515b0906a599d2e1fd3251e3fa19bde6469fdc5c92850d9544e115736262c083d383
+DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea257295ecae56c0d3e87c4d15743ea4bb0275ae94a6168912ff27fcfcd06eec823b8332d19895ed803ad6164da77b SHA512 5f1526b74ea59c8ef897b49b1b2f2de42d9d0144277fd74f9f8e1f3e0198735f98ec30f726883a3192d0ed33a4013232cb2adf8db9d817b4de0198890eaa7044
 EBUILD mod_wsgi-4.5.13.ebuild 840 BLAKE2B fba206d48a7abf8af94e1beedcbb8ec9b7da7073acc7df63380f4006f6de758dd7387b334202d7818920e9762d25cbebdccebbc4cf41098c5815ab46d14030cf SHA512 1cefc61081be474f07188379b81018e827832b0adfc669adc3a1682491d4a9cc090a549921b8af58f3056475614e39579c10e478543ef1a912fce523fdae2b42
 EBUILD mod_wsgi-4.5.17.ebuild 843 BLAKE2B 933c1462641f95fb028e6af3cc4cdbecb09296b6ecdcb61025a5405238db8acc3c31c8ada575656b1f9334b72ce9f6455bd7bb24ce595c686e039d30b966a438 SHA512 204bca9122b1f41ea9c99fa72a73f70e3d92d8ad19897b8254daf3a6ed20ed85b5b23db36c5a385ea6613afa9a481b8504d8b9c6a3bdd5e03fe75b6ef3c0c5c3
 EBUILD mod_wsgi-4.5.21.ebuild 843 BLAKE2B 933c1462641f95fb028e6af3cc4cdbecb09296b6ecdcb61025a5405238db8acc3c31c8ada575656b1f9334b72ce9f6455bd7bb24ce595c686e039d30b966a438 SHA512 204bca9122b1f41ea9c99fa72a73f70e3d92d8ad19897b8254daf3a6ed20ed85b5b23db36c5a385ea6613afa9a481b8504d8b9c6a3bdd5e03fe75b6ef3c0c5c3
+EBUILD mod_wsgi-4.6.5.ebuild 840 BLAKE2B 852edae8b448c159c750d695734145ae280f6dd53a04d482ddaba1ca2cd4223f1da18e1d03168ed4365405af472d3e315b6d82e33ea37d0fdf8763ac397904bd SHA512 a4e3aede25c83e4e2434e2fca7e85ce57fbaaae4f9eadd1b289c29c147fd9d8e17642cb2d6535033cbef523628ae756a1d16fdb6017b6c7c6b097d95c4e42a40
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
new file mode 100644
index 000000000000..959f38d461bb
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index be4a08aabfa4..0774078660e3 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,9 +2,7 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b
 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-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
-DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
 EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
-EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
-EBUILD passenger-6.0.2.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
+EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.1.ebuild b/www-apache/passenger/passenger-6.0.1.ebuild
deleted file mode 100644
index e9d13ce882e4..000000000000
--- a/www-apache/passenger/passenger-6.0.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-6.0.2.ebuild b/www-apache/passenger/passenger-6.0.2.ebuild
index e9d13ce882e4..2656d97c0d11 100644
--- a/www-apache/passenger/passenger-6.0.2.ebuild
+++ b/www-apache/passenger/passenger-6.0.2.ebuild
@@ -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 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"