gentoo resync : 30.05.2020

5 files changed, 36 insertions, 39 deletions

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 30ddfca72b4f..e5496b5f0200 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,7 +6,7 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.17.1-r1.ebuild 11492 BLAKE2B 20f9302f47087f75797131894f42c8d4503463267d44fed2bc98a7b5c291c74a452cd6c74bccf534dd8a4cffec1f4d7971ec77e7e283eed3a39641a1b51fefa3 SHA512 837ded7ecdd38bf5925bb7c907519eb890c70e0b490654b967776d55f40ec4b2b056e4644d5cd78edf07932c3780798437eada14f059289d57d5cbca8dd8db83
-EBUILD uwsgi-2.0.17.ebuild 12056 BLAKE2B f19d427823781ec885165e602c56c7d03d2efeab2e4a3f64089f8f99970300cd32d802f0df080063a82040292286f21c744223afbfcebc2720cdcaa437894c2d SHA512 cfed8ca4e578b818ecc94c71d316d68aad37d1a863be745161643589cbc29f8b1a6670f135ed0aa4e94686d2061b8600130a36499ebf9751820a19ba273d88de
-EBUILD uwsgi-2.0.18.ebuild 11517 BLAKE2B 067fc80def6e8ef151d0c7c3df3687df2472adbeaf63e8e237e41be67d6211e62ce3440a3aa1685b64f017821836c6c9d224b726ab95b3e9897ae01c2c3f47c8 SHA512 1e44c353fb6d2a7075e3a0f3ebfdc0ce50a2884e946822cc7032ba4107dd91ce564bdbd612780fd9d33c3763365566e5a68e07cb44f1609d0fa6875dbcabf010
-MISC metadata.xml 1411 BLAKE2B 5dcdf8a1555c44c0219991a8860f54a4d13a6cebf9bec5aca56644eeaf3c03fdc9f7ca8ab4c61c7119134edc4c80a4381bc2ca7fc6e09002543adb7f398643e2 SHA512 d6f1b9ac01238e1a1f2870df25961f4f5e0d4dcdeb1456c045da47d90b5a28eba0914f3f505c8d3977be5737537a47264e742c67a78d1a7d060a289a6d63bae0
+EBUILD uwsgi-2.0.17.1-r1.ebuild 11492 BLAKE2B f06c80ab1e3551dbf8e51ddc6d1cfee4493d6e78f99cc974835d45eb4eecf9704691d2115bc7129a23a81a55a37fc53fc55c8cefcb14596529662920b77a7c12 SHA512 957acb4e7234c8823373927192e66d00f488728d6437b06c074c81bd0eb82f24d435b3ac7fbc8d2f9ff901b37cb8accabf5146390a81636946f14cdb7244041c
+EBUILD uwsgi-2.0.17.ebuild 11927 BLAKE2B 8e4c61acfc1e8eb9645a9aca869d6e74ec8157cecd829805dc21c54d72c1d9927b9c1c321336c2c7a5378df640c059c870135af986859741da95c0eeee73e11a SHA512 a10f4aee73f02cf48f0412e6c69334c41c0ba8dc7de04144253a9129c6d29cb58ae318a4c55821a4a9ce7a1675c97d042a62c29c556760e758e156323fb04a47
+EBUILD uwsgi-2.0.18.ebuild 11516 BLAKE2B a1102bb82aec932a0cf6b2d9246e2fd82a09f99ef5e6783f96bd9c0c0012fda37a5c0a354300e583a5df9a25b4e4ad1f238ebee982e6ea01a1f4788e52d270bf SHA512 2ee1604303ac6321e343e797cf6d74f479926acd39315b091c1c5369bf409bf05c25071100e07fdee1fb17ab50146cfc4a4b4d39a6a7db0209f643e624893e59
+MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 8981ee1518d8..188e432b0239 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -8,8 +8,8 @@
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="go">Build the gccgo plugin to run Go applications.</flag>
 		<flag name="json">Support json as a configuration file format.</flag>
-		<flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
-		<flag name="python_gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
+		<flag name="python-asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
+		<flag name="python-gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
 		<flag name="routing">Enable routing support</flag>
 		<flag name="yaml">Support yaml as a configuration file format.</flag>
 		<flag name="yajl">Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index e0ae7ed0b2c4..4583d2826100 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
 	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
 
 LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby )
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
 
 # plugins to be ignored (for now):
 # cheaper_backlog2: example plugin
@@ -68,8 +68,8 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( $(python_gen_useflags -3) ) )
-	python_gevent? ( python )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
+	python-gevent? ( python )
 	expat? ( xml )"
 
 # util-linux is required for libuuid when requesting zeromq support
@@ -120,8 +120,8 @@ CDEPEND="
 		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
 	)
 	python? ( ${PYTHON_DEPS} )
-	python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -244,17 +244,17 @@ python_compile_plugins() {
 
 	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
 
-	if use python_asyncio ; then
+	if use python-asyncio ; then
 		if [[ "${PYV}" != "27" ]] ; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
 		fi
 	fi
 
-	if use python_gevent ; then
+	if use python-gevent ; then
 		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
 	fi
 
-	if use python_gevent || use python_asyncio; then
+	if use python-gevent || use python-asyncio; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
 	fi
 }
@@ -352,14 +352,14 @@ pkg_postinst() {
 
 		elog " "
 		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python_asyncio ; then
+		if use python-asyncio ; then
 			if [[ ${EPYV} == python34 ]] ; then
 				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
 			else
 				elog "  (asyncio is only supported in python3.4)"
 			fi
 		fi
-		if use python_gevent ; then
+		if use python-gevent ; then
 			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
 		fi
 	}
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index f1a7b478018b..6aca5bcd7fb7 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -41,8 +41,8 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
 	sqlite ssi stats_pusher_statsd
 	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
 
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby )
+LANG_SUPPORT_SIMPLE=( cgi perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
 
 # plugins to be ignored (for now):
 # cheaper_backlog2: example plugin
@@ -68,8 +68,8 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent )
-	python_gevent? ( python )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) python-gevent )
+	python-gevent? ( python )
 	expat? ( xml )"
 
 # util-linux is required for libuuid when requesting zeromq support
@@ -107,7 +107,6 @@ CDEPEND="sys-libs/zlib
 	uwsgi_plugins_xslt? ( dev-libs/libxslt )
 	go? ( sys-devel/gcc:=[go] )
 	lua? ( dev-lang/lua:= )
-	mono? ( =dev-lang/mono-4* )
 	perl? ( dev-lang/perl:= )
 	php? (
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
@@ -115,7 +114,7 @@ CDEPEND="sys-libs/zlib
 		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
 	)
 	python? ( ${PYTHON_DEPS} )
-	python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -247,13 +246,13 @@ python_compile_plugins() {
 
 	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
 
-	if use python_asyncio ; then
+	if use python-asyncio ; then
 		if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
 		fi
 	fi
 
-	if use python_gevent ; then
+	if use python-gevent ; then
 		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
 	fi
 }
@@ -309,7 +308,6 @@ src_install() {
 	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
 	use go && dosym uwsgi /usr/bin/uwsgi_go
 	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
 	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
 
 	if use php ; then
@@ -350,7 +348,6 @@ pkg_postinst() {
 	elog "Append the following options to the uwsgi call to load the respective language plugin:"
 	use cgi    && elog "  '--plugins cgi' for cgi"
 	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
 	use perl   && elog "  '--plugins psgi' for perl"
 
 	if use php ; then
@@ -367,14 +364,14 @@ pkg_postinst() {
 
 		elog " "
 		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python_asyncio ; then
+		if use python-asyncio ; then
 			if [[ ${EPYV} == python34 ]] ; then
 				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
 			else
 				elog "  (asyncio is only supported in python3.4)"
 			fi
 		fi
-		if use python_gevent ; then
+		if use python-gevent ; then
 			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
 		fi
 	}
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 53316bf30aa2..f49a3867164b 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
@@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
 	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
 
 LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby )
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
 
 # plugins to be ignored (for now):
 # cheaper_backlog2: example plugin
@@ -68,8 +68,8 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( $(python_gen_useflags -3) ) )
-	python_gevent? ( python )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
+	python-gevent? ( python )
 	expat? ( xml )"
 
 # util-linux is required for libuuid when requesting zeromq support
@@ -121,8 +121,8 @@ CDEPEND="
 		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
 	)
 	python? ( ${PYTHON_DEPS} )
-	python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -245,17 +245,17 @@ python_compile_plugins() {
 
 	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
 
-	if use python_asyncio ; then
+	if use python-asyncio ; then
 		if [[ "${PYV}" != "27" ]] ; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
 		fi
 	fi
 
-	if use python_gevent ; then
+	if use python-gevent ; then
 		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
 	fi
 
-	if use python_gevent || use python_asyncio; then
+	if use python-gevent || use python-asyncio; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
 	fi
 }
@@ -353,14 +353,14 @@ pkg_postinst() {
 
 		elog " "
 		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python_asyncio ; then
+		if use python-asyncio ; then
 			if [[ ${EPYV} == python34 ]] ; then
 				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
 			else
 				elog "  (asyncio is only supported in python3.4)"
 			fi
 		fi
-		if use python_gevent ; then
+		if use python-gevent ; then
 			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
 		fi
 	}