gentoo resync : 27.03.2018

5 files changed, 2 insertions, 42 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index b3036cc1e0f6..cc4767cb5890 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index 216eb1bc19d5..b52c7aad5a51 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,6 +1,4 @@
-DIST pshs-0.3.2.tar.bz2 80103 BLAKE2B 884355e3cb621ce0367e3fe8f7697e68a5725e24fc4f5e977035cac1442eeecc1463cd5bccecc071d45250730a746c121d7b636a2b9db775e6ea174f1efb8406 SHA512 82eb0e0ff76ad6d5651b789ca59b654558562501f9f4b89a562773f5c60e80c6d43a86fca35a41a313952d8134b83fe6a11d1085c8c35cb9bbffd6d2a243964a
 DIST pshs-0.3.3.tar.bz2 81109 BLAKE2B c73aa8390257de4ffd616ecb08b570273075e72473a7e506a4ab4ca59a3ebf9f4c1467eabd1ef45b88d0d3422b14f55108c94d2e92222b186606b8b5cf8ab8c4 SHA512 c9c6dd854319153350a6e7ef245af8f89c0d50f783507211a34994d375f2ae442b22959e4a2fb1bcc02f976a8ff6f41545b176a32ea70174af0850cf1eaf77d9
-EBUILD pshs-0.3.2.ebuild 971 BLAKE2B 47c6acca4b27e32b7af5a334a2b02d7a71acf7e0d01c7cf54f6c326141d9d4d2ebb6f0a046531daa9a109473bb7eba1743d9a4b7a061d8549cdb4cc7d14468fb SHA512 573eea1ae593f6d0a8429c683a2f54efb90276bedc1091ed38c4bcb02ca9ed62dd8876bd78626d9c8205251931251a238a4dad97d03d3c388e38672ffeb3f544
 EBUILD pshs-0.3.3.ebuild 981 BLAKE2B 7ba4628b45d41a11abe219f66513815f4882e89b9615075bfea8480a60cc5eb4739247614a51bd19188085ce985816da7aeb44879d72ebf99d4cba2817b78771 SHA512 ff647197f62dec1c3abadb4405f04724f1cab7569d5440e07122d0161bbcde624635624540fc19140f9a70f4b29621ce002fd9fc38457b300e6cf7076902bfd5
 EBUILD pshs-9999.ebuild 1011 BLAKE2B 6b9807aabc60e93373dc2e38b15aa6877df3a42ae9791f4a6f3a92eaa0db0a618c6dd299865bb035e302b7e1a457b578ddf978240e44d4443a30e5744b4f4ea8 SHA512 831f63979c59d8aefa9d1b41f98e4eded021b437f1607218c34143687f22668dbd7dd7435bb2688d128699712ed9b5fa2e30536511dd4da9d39ab7b43d9f4b5f
 MISC metadata.xml 812 BLAKE2B 22683da13714799f768dbbf0e941ef96434d78566d3b7ee136d88214b360ef2c1d15dd4357238103bfeccc559e99e342ff3b61c3241563d816671844f2e4c23d SHA512 9e58734863a46f1f6d8d4b0c2666fc0d596d45d924a60fc5a19a173018e3ca881c20862a3e879a63b9ccfab6dc6018ba122b3537e408336db26672b02374cdb2
diff --git a/www-servers/pshs/pshs-0.3.2.ebuild b/www-servers/pshs/pshs-0.3.2.ebuild
deleted file mode 100644
index fc0cb0facdc0..000000000000
--- a/www-servers/pshs/pshs-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
-HOMEPAGE="https://github.com/mgorny/pshs/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +magic +netlink qrcode ssl upnp"
-
-RDEPEND=">=dev-libs/libevent-2:0=
-	magic? ( sys-apps/file:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	upnp? ( net-libs/miniupnpc:0= )"
-DEPEND="${RDEPEND}
-	netlink? ( sys-apps/iproute2
-		>=sys-kernel/linux-headers-2.6.27 )"
-# libnetlink is static only ATM
-
-src_configure() {
-	local myconf=(
-		$(use_enable magic libmagic)
-		$(use_enable netlink)
-		$(use_enable qrcode qrencode)
-		$(use_enable ssl)
-		$(use_enable upnp)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 3445f369e1d4..bcdea01932aa 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,5 +6,5 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.15.tar.gz 794926 BLAKE2B 0bda44697d3e5f5fedb977d757fb418bb7064e0a5995448513c2c427d2c2694cf7242f76f516208d0ed5f6d3db3b1a157bb6992a714fea3a370d3a767fc67e60 SHA512 1a2a82cf99d3e6dfe62fa18fd6f04afd1dc727d61287a1c9f47f1448e76a4858dfd59286118c94672c84ff22bcd8444c0c1568ae46993fdbdb9414ad60474bf4
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
 EBUILD uwsgi-2.0.15-r2.ebuild 12846 BLAKE2B 90fcbf6300de611aa3d7c930dd94c4a55c175656e2bbcdcc606e1b77df1b2e481fb31beedbb20b33db0bc3c4b0e8338661fd471ae7a088a5eaa386b66c4b9b39 SHA512 7940ac487b2ab57bca5790836c40e604fe5129449aac5d6de474f31a4fb1357ce0b724647e73639e2b3f062f0a9243106d352d2413424408f30c44ec9c3e59b4
-EBUILD uwsgi-2.0.17.ebuild 12848 BLAKE2B b85660cc15fcb6673389974e1dcaefef4a57169be0d216a0a862b6776f551bcd5409eb25316d8bd6a619ac305b8739c4d409ce12e71297ff5f51cecad000609c SHA512 eac54b30cb1b5caa87adc87e0c64dcb5492c15e1acb24c7fffa676e69269e752b83785e5c9c09d9ee6fc85da052e0d9cce7952fc828ef7445d47b1a7eb35373c
+EBUILD uwsgi-2.0.17.ebuild 12847 BLAKE2B ad3756ea3232a319d481d6dd6b0b08480622018280e8b4c60522709cf404a66d8a515c6843d9df7c898f7f9e613297989f7b50c1398064a94ee483dd305dcc8d SHA512 c1199bdb1a9cbb89196a5f82ffa44d4b82fcb85593969f51c44034b282974288c6c56a4e031b32153e02a07c9234bb65da2484a5c8f8e4cde32e36830ea94b11
 MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 85b336d9b687..2e05bfc22ad4 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.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 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog