gentoo resync : 30.09.2020

4 files changed, 49 insertions, 22 deletions

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
+}