gentoo resync : 15.12.2017

4 files changed, 5 insertions, 31 deletions

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index d290ab1c9566..72356b68d457 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,7 @@
-AUX miniupnpd-conf.d 41 BLAKE2B d76232a532f47cd0003ad199a0a506ee19856c53af6a52b901703947e53118228cd454f5248993a4a9862c4c46c08eaa001f941ac10b918a2740b41d18d6db2f SHA512 81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
-AUX miniupnpd-init.d 510 BLAKE2B cd66ded91738a41027f0025fd659514729905bc2f9c8024084d3d91e8ce2beb52cec2843233d3603996c0d769ef7104b8c6d60c0516f61ac5c93dd7e996cbd66 SHA512 976304d4036a43335e893d4e30c23853834f810585c10dc93e9e8900c9057d31bfe2ecdeb1e48a5762521b8223bbdf56c3230285c9b5ab5fb1d75f4be4ddfea2
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20161216.tar.gz 218119 SHA256 9e73d50ac830b5e08b6eb1df4e4c917833a5ab54351809f615d15d0f30cdeef3 SHA512 af82f060d28033dd670fcc96c8e2895f92d249a8a79d991e0215159eeb57715d7a9152d7d751b836091f7a623ce8a194ea243d1a2fb639349e320c02ce187c27 WHIRLPOOL 478a56b137b86ba1dca70e15c7dbdef2969a2d089e1ae0bac7ff01c18e753c8c3cca8b89ef415d54c3a009b89156eb507e97ba1949223bdd37914042c5124be1
-DIST miniupnpd-2.0.tar.gz 217802 SHA256 d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7 SHA512 c88036d3f4b065fc855572db8945d921641a71a23ffe8b52cb4ccb1a7cf3e7396841c436d54d7ff5968d034d8c4bfc91630719959000436230bb8c37e5bdc8d4 WHIRLPOOL d6aec880c9ef3c70002fdf9a98a0e8f4de95d8b3c9c6a18e328bc94d7dc3b8c130829c8ea6117e27e5b0aac1cd4526bbc9d9de21bd13e7b5527db54a656a1fff
+DIST miniupnpd-2.0.20161216.tar.gz 218119 BLAKE2B 9d09f4d2b19c4f808bf527c90a73739baa0eac924f461f6cbbf20866ee851f85248efa920bd6a770173d4a3a8f9e8d771ffacdb17aa684d329295502278f7963 SHA512 af82f060d28033dd670fcc96c8e2895f92d249a8a79d991e0215159eeb57715d7a9152d7d751b836091f7a623ce8a194ea243d1a2fb639349e320c02ce187c27
+DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
 EBUILD miniupnpd-2.0.20161216.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
-EBUILD miniupnpd-2.0.ebuild 1488 BLAKE2B 9a97af1c4c427c9684befbb6646421c151d54285fd8e698af68ecda818d51aa48eb3f34700c26d9239bff2cf45969e8ee676f3992bfa876587d80e15bf236bac SHA512 35824d68869b52670b2bc69d598d1fc8724cf041e3effa796944c006eb9f94635afa37756617c88dc396a14a94b0bf78d68df169879eb6107692dc339100532a
+EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d b/net-misc/miniupnpd/files/miniupnpd-conf.d
deleted file mode 100644
index 8482ef2d185b..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-ARGS='-f /etc/miniupnpd/miniupnpd.conf'
-
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d b/net-misc/miniupnpd/files/miniupnpd-init.d
deleted file mode 100644
index 6d1ee24e3d31..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-init.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net iptables
-	use minissdpd
-}
-
-start() {
-	ebegin "Starting miniupnpd"
-	/etc/miniupnpd/iptables_init.sh
-	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --exec /usr/sbin/miniupnpd -- ${ARGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping miniupnpd"
-        start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid
-	eend $?
-	/etc/miniupnpd/iptables_removeall.sh
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
index 1347a12fbd0e..cbdc231611f5 100644
--- a/net-misc/miniupnpd/miniupnpd-2.0.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
 DESCRIPTION="MiniUPnP IGD Daemon"
 HOMEPAGE="http://miniupnp.free.fr/"