gentoo resync : 30.09.2020

9 files changed, 94 insertions, 24 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0063f56a721e..ace632103007 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 72760a7ac28a..d3cdf60402d5 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -3,5 +3,5 @@ DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
 EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
-EBUILD gunicorn-20.0.4.ebuild 888 BLAKE2B 1705ce3c003863b7b5e2f5ace32e77a6dca24fbddac48da0c9d2b361f5f673b5ce82350ffce1ada7516d70bc91a601eb7ba623a4753bfe54551c90939d00c8ec SHA512 b9a719e634bd28384a5a6ee7eb4e1d7ce1b8a8cdfdfd86381a6bdf47b8700cf20b37cedce8f84d71eb4391783c4a59ea08e53aed3bdb0b06ba7e6b2b5cf752fc
+EBUILD gunicorn-20.0.4.ebuild 895 BLAKE2B 78cde1587279ce2a0eb5a70d03c51352d99c7abb66c1f1d68fa79872e59dc91ba0e068b448306d8096ebb0895d427406e6b692ec436257be027d9b10a9f63f2c SHA512 34b09643e8fde9c1cc34539d4eadf09abf0004625990e49f6eac23f1c4375cec90afdb4ae888bf45993ecf7da634ac2a7d5b2545017fb904c1a92051dc0ec72c
 MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index 03560b760187..39f4261a8dda 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index ad80c9440681..b2e81b1c359c 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,4 +1,7 @@
 DIST pshs-0.3.4.tar.bz2 81435 BLAKE2B e5a72c02efbaa95f0069d2533ce4434da88a5eaf33b7025b5d83bd0679631d6ee0b1faf31a5f3b0ed3bf2e23d4500bf6f473d997cabf99d8b769f4a2c662d32f SHA512 d264b46ad54286d5c4fac601e3353c1029af75ad59f28fea5a2970dc7e9b00327a08dfdd82141c76656f07047cfce1fa35b485b2f69f0728bcf74c835def917d
-EBUILD pshs-0.3.4.ebuild 977 BLAKE2B 35b554b7b1ab12ad32e2fcff7987892fba5e4eb66d0c5127e2d0e4e7e43380320d5d4bd08b094c7db3b1e86af95b85eeff3bba6d79b38ea7ac6226b3da30db7d SHA512 a90f6e8ccb198db874a0bce03baecbd850e7aa5c3a3cf73964e9f1837b464dc6dc4d79f58cd596505ac20f1342f36ed9af66387d89918c6c35084b19b3df7a90
-EBUILD pshs-9999.ebuild 1011 BLAKE2B 6b9807aabc60e93373dc2e38b15aa6877df3a42ae9791f4a6f3a92eaa0db0a618c6dd299865bb035e302b7e1a457b578ddf978240e44d4443a30e5744b4f4ea8 SHA512 831f63979c59d8aefa9d1b41f98e4eded021b437f1607218c34143687f22668dbd7dd7435bb2688d128699712ed9b5fa2e30536511dd4da9d39ab7b43d9f4b5f
+DIST pshs-0.3.5.tar.bz2 79871 BLAKE2B 07322ce82d80ecc0db166672d1694902a3ae743fd5d43d79261fab66a2f08e58f990d3c5a47dd39c9d041f195cacf31d5db3546336ccc3d961709d17712adf53 SHA512 5cb0cd8950f708f0c4d7b9281e2863440c579557c285fdfda1082eebf849bfb7cd25965de05c7f7b96527eed94b95c635f8cd2d397ebfd4af12195f70b3c5648
+DIST pshs-0.4.1.tar.gz 11758 BLAKE2B b3f9422c8ebd47d3de9993b93ea0438232f3ba037d7433b08875a131f449fab880a205bb62616a057328b7d6fe9c00277fbb2e886a1494d2234ab684b0a1e90f SHA512 7ecd0e5019e9778b5f2eff31b8e2f481972cf6da66e4493cff850aa1ec13a4df46e46782799ab25cecd1cc36122f797c6ae0ac2863ea604477784a79191a62d6
+EBUILD pshs-0.3.4.ebuild 976 BLAKE2B 8f24f99c604d1ef8e43adcd59f8d74d986a088d54d3413b504a0fb6c44d450aadf8d33c55c36ae220e02fca1c3bbcd5b76283300228672f8d4de10f27fbe0047 SHA512 f8313c8eaa7f13f544ac7a55469765219791906049f6efaba5918aae476e011913ec62271568c2bb556676a34e6fd03b932db78c29a448ada0a0fb86ec9ee042
+EBUILD pshs-0.3.5.ebuild 835 BLAKE2B 553fb6d15e7149c69e8f3e22d4f28eb184c42896eb63cd8fea02d912467292409837b79f020a396715a33742b3ef99bc7025ced8b3f4b408a371f7d993cb44c0 SHA512 79a7810708a6c5636c1c96b5f818e4efbef2413dac6281a8362bba16b7d1656d487e30cd0dbe9acb3cf2d22a614411a0609111d8c1f23d04e27c7c9b77d17e15
+EBUILD pshs-0.4.1.ebuild 865 BLAKE2B f40e8683e508b56eeb0031c38bf506d0dba1ccc7b7d4d58c6d28b5b8ee1ff2926fdc4502b779c924eec41d1e1660e9b48fb3bd9584c6034cea659959d9f19d2b SHA512 f67e06e743cbe8b820fe6b020d6342def6f572e353bccac3a53fe4f4cc7a9aa3ec430a81ad275ce60a505d99d814711644e3d4d0469efd6979cd394c8c2ef638
 MISC metadata.xml 812 BLAKE2B 22683da13714799f768dbbf0e941ef96434d78566d3b7ee136d88214b360ef2c1d15dd4357238103bfeccc559e99e342ff3b61c3241563d816671844f2e4c23d SHA512 9e58734863a46f1f6d8d4b0c2666fc0d596d45d924a60fc5a19a173018e3ca881c20862a3e879a63b9ccfab6dc6018ba122b3537e408336db26672b02374cdb2
diff --git a/www-servers/pshs/pshs-0.3.4.ebuild b/www-servers/pshs/pshs-0.3.4.ebuild
index 249f38ca2e23..1cba5442a194 100644
--- a/www-servers/pshs/pshs-0.3.4.ebuild
+++ b/www-servers/pshs/pshs-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +magic +netlink qrcode ssl upnp"
 
 RDEPEND=">=dev-libs/libevent-2:0=
diff --git a/www-servers/pshs/pshs-9999.ebuild b/www-servers/pshs/pshs-0.3.5.ebuild
index 7f31015204b0..6b3e64295963 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-0.3.5.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-inherit autotools git-r3
+EAPI=7
 
 DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
 HOMEPAGE="https://github.com/mgorny/pshs/"
-SRC_URI=""
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="libressl +magic +netlink qrcode ssl upnp"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic qrcode ssl upnp"
 
 RDEPEND=">=dev-libs/libevent-2:0=
 	magic? ( sys-apps/file:0= )
@@ -24,20 +20,11 @@ RDEPEND=">=dev-libs/libevent-2: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_prepare() {
-	default
-	eautoreconf
-}
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local myconf=(
 		$(use_enable magic libmagic)
-		$(use_enable netlink)
 		$(use_enable qrcode qrencode)
 		$(use_enable ssl)
 		$(use_enable upnp)
diff --git a/www-servers/pshs/pshs-0.4.1.ebuild b/www-servers/pshs/pshs-0.4.1.ebuild
new file mode 100644
index 000000000000..e20baa15b0c6
--- /dev/null
+++ b/www-servers/pshs/pshs-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://github.com/mgorny/pshs/"
+SRC_URI="
+	https://github.com/mgorny/pshs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic 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}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature magic libmagic)
+		$(meson_feature qrcode qrencode)
+		$(meson_feature ssl)
+		$(meson_feature upnp)
+	)
+
+	meson_src_configure
+}
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index f9f3d4c3ee0d..325ad8c9b837 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,4 +1,6 @@
 AUX servefile-0.4.4_p20200211-ipv6-absent-tests.patch 776 BLAKE2B db36dc2c79bd5551b539f71493472c88b258333f3493bf42d6c4323e06a223dfc07c8930662583fc91bbd2325c35da13f87b411a7fa2c32eb7e0c5237683f858 SHA512 e7e6d11c86efff0a8d0eb51e687686cbb962130a6c3d5117d863876337a49349500f9330ac6c865b871db80b0ed989585f9d01a386782b209841f6ce5092f654
 DIST servefile-0.4.4_p20200211.tar.gz 18304 BLAKE2B 2bbd6534d7fb787a0b85d594bd0a2bc235c859f80618be24dea144ef2adaa6188a29efdffc2e9109229301b9d3ee09df6a9d746a15ae6b01fed44a21307df78e SHA512 ef4edb4c92d9f804970087fc1c3d59775740642516a06704258de6d972cb807123f309991a5e22469b7619aff2304e265d5749485a4f74e75f2c80c279a23c33
+DIST servefile-0.5.1.tar.gz 19390 BLAKE2B 4443471870650f03564d6f574b633630fac4e1f9f6e6a9807b1baa4d3aaa6284f803fa9dc0c7c07f53cc343f89687db5f6b5a4ebf09e9fd327369e2b3aecddc5 SHA512 2502f3072522a8f460d3711dccbaa3fa57e34915313aaad475e5831962adc92c0728c2598f9f78ee99e60731cdc2d3026488ce8050369ab0c967246cd9372f44
 EBUILD servefile-0.4.4_p20200211.ebuild 853 BLAKE2B d87ccc93c478aaa6aa48194b5ded2af1b84f63ff7ae26e95811c1061393c1d7437766c4a79418339111c5e0b6308e6b3689b877eca071dabeb21a54da3c90d98 SHA512 59d729b25a13ef1d692887a5da11c0a9a0cb879ac338bd2232493a147a04d55774bc6430c92fc8ef2e2f20c538834115f7e59cc9bc82e83f730b0764c972ce21
+EBUILD servefile-0.5.1.ebuild 832 BLAKE2B b9f178ee6d55b0cb2bd2972f4292ff20347b1a8feb4180da28b481c3a9391e94fd090a07172020ba2996b0064980b420a3ffb01c17eb7463f6a70c7cfcd19543 SHA512 5dfa69edb8a7fb0ee85643aea9809e6bbe70adddb7b85336bcbe6cb557644c847291daa5bc70a235e14d10216a96b2b090f4f5398abca5378204ab186579b5f3
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/www-servers/servefile/servefile-0.5.1.ebuild b/www-servers/servefile/servefile-0.5.1.ebuild
new file mode 100644
index 000000000000..7d34a67b34de
--- /dev/null
+++ b/www-servers/servefile/servefile-0.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Serve a single file via HTTP"
+HOMEPAGE="https://github.com/sebageek/servefile"
+SRC_URI="https://github.com/sebageek/servefile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	sys-apps/grep
+	sys-apps/iproute2
+	sys-apps/net-tools
+	sys-apps/sed"
+DEPEND="test? (
+		${RDEPEND}
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4_p20200211-ipv6-absent-tests.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}