gentoo resync : 06.05.2018

4 files changed, 2 insertions, 130 deletions

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 9c4a5e462ff7..e387b84bb866 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,13 +1,9 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
-DIST miniupnpd-2.0.20180203.tar.gz 223084 BLAKE2B 14d7b1f8136be5e211ee2e5374b8ee77dfeb3e64e1308f918d9334a8600234e38581caa293b613cd3736d4a8cfc196a54839cffa8091a36961f4e0e79c727455 SHA512 ef02e33cd93225992c193a13be2320de02255610532de77cf704573384c777d82a4cb89c295982bb660ce056e38ef341223ab362bab74b2cb6954ed4e62b0219
-DIST miniupnpd-2.0.20180222.tar.gz 223697 BLAKE2B f551c9219a3a0a0eda905c953c5f9f45df3f192d3d253111cb35ce51351561ae2547351cb901b91eafc1765bd89b75760063e109bacfae625ff8090563913883 SHA512 a7ee306ccac0673e55780129b3c61de025ec63a653383ae475f08695a95647ae83e5e5978ce6ee166e8d0270a5bd08250613593acaabd0b730178ca2e52dc482
 DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6 SHA512 4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645
 DIST miniupnpd-2.0.20180422.tar.gz 224942 BLAKE2B 62ec30de6d3551b9f31ed7eb81ceffaf75eeaa91236114f5532218d748e148574fdc195447beecc5cfd6898c2fe28f3e9bf15755979cf34633388194301a51dc SHA512 338ebb03edfd9448a91277c3cc47843a45c1ee9d9e43ba52cd5f897cca8ddc5cbb53dd291056d30a906c68a5dfe0e5eb50169f7ffefab003fcf440de46b83f42
-EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
-EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
-EBUILD miniupnpd-2.0.20180222.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
+DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8 SHA512 7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
 EBUILD miniupnpd-2.0.20180410.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 EBUILD miniupnpd-2.0.20180422.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
+EBUILD miniupnpd-2.0.20180503.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
deleted file mode 100644
index cbdc231611f5..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(use igd2 && printf -- '--igd2\n')
-		$(use ipv6 && printf -- '--ipv6\n')
-		$(use leasefile && printf -- '--leasefile\n')
-		$(use portinuse && printf -- '--portinuse\n')
-		$(use pcp-peer && printf -- '--pcp-peer\n')
-		$(use strict && printf -- '--strict\n')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild
deleted file mode 100644
index 9f786c4d43a2..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild
index 9f786c4d43a2..9f786c4d43a2 100644
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild