gentoo resync : 05.04.2019

3 files changed, 60 insertions, 2 deletions

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 8749fe7fd3a5..f620d93765ad 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
+DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
 EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190210.ebuild 1335 BLAKE2B 534d019d5132850adef464fa7fb688ffbbfe565be9b1e5fe9d6e3bde04d1744f769dc2c80603f9e1331cae1c237a1b8c47cc383be79a1a6860aeb19d0e3eef0c SHA512 31e01b3579bcaa6fa29c536cd8ae153ba16e716f99458bf9ba3dc0e06ceeb7c40b54e20bed5bb8a261c2bc171a26e41bfba9ec80224d4bc11970ffb8387562aa
+EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
+EBUILD miniupnpc-2.1.20190403.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
index 83d64c8f44c5..bfae17481afa 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
new file mode 100644
index 000000000000..b170db612f20
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}