Remove older unstable versions and fix bug #522562

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 89 insertions, 96 deletions

diff --git a/net-misc/minissdpd/ChangeLog b/net-misc/minissdpd/ChangeLog
index 193fc0e1714f..479da5f62d3a 100644
--- a/net-misc/minissdpd/ChangeLog
+++ b/net-misc/minissdpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/minissdpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/ChangeLog,v 1.12 2014/09/07 10:55:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/ChangeLog,v 1.13 2014/09/14 12:21:25 blueness Exp $
+
+*minissdpd-1.2.20140906-r1 (14 Sep 2014)
+
+  14 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/minissdpd.initd-r1, +minissdpd-1.2.20140906-r1.ebuild,
+  -minissdpd-1.2-r1.ebuild, -minissdpd-1.2.20130907.ebuild,
+  -minissdpd-1.2.20140610.ebuild:
+  Remove older unstable versions and fix bug #522562
 
 *minissdpd-1.2.20140906 (07 Sep 2014)
 
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 58b079ee17eb..cd157b6fa56d 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -5,30 +5,26 @@ AUX minissdpd-1.2-remove-initd.patch 595 SHA256 c64c8a62d4c8ccab7e6bd8016ff45869
 AUX minissdpd-1.2-respect-CC.patch 375 SHA256 c70ad6a766c7d979514e40bcc2fa8dd61cf12eafba0b227d4278ece6cd3dc7ef SHA512 8fbf4d5ddda54ed21a0ef848fb9d9cbb6461dc3bcb9f6e7a94fe691690dba817aa26a0c0ca2bad8be1aa68adce77b93f96b11d005156222d1acaaf3d3e6c5a63 WHIRLPOOL 40e6ee8168a36471cb22338dba8a865c4f4fe8090afcf700d61e49ea366f2ff50cda0302f4012bda408538c64178962ac28ab730ead69fd818474ce4e99df35c
 AUX minissdpd.confd 487 SHA256 5a31743b20198ce596a09c73abd45b747e2d087de688cd4f954626bdd1574fc6 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296 WHIRLPOOL d92909f50a2ee3b9481180f5e0c3aebe00281d597d3f4341ffab7e9c523d219ffd5d7305479923df15659edc60ea7d808f4d0853a032f22234f9d652aff63b69
 AUX minissdpd.initd 1387 SHA256 5185bc239cca278a611b3de360c4ce5e72294a528f791261f542337bb9e11e75 SHA512 2c387d61f7f228332cfaceb57100ca0145970c68b272482efd047f46aab947d1f13a30d13ab59f7d291c82b1202224d92b4ae5d3238f4b61d413403d324ec1f0 WHIRLPOOL 6163e11558eda05fcee81adbf83cb0d33b31396f3c192776309494472f3f2d33b50328c2d4b80a78b44acad99e9ea57005dcf38ef4a3310c7800f82777bd870b
-DIST minissdpd-1.2.20130907.tar.gz 20237 SHA256 18bc5b9336947d63724c85402dbb8bb134eab2a2ba8ecae4446232f01683b468 SHA512 0ce1a447c5e19d203a15e183d6af8bc845e1c0c3fdc418f45cc85134bca8eba11cb8f54e5e631b7ea6520a33aadfcf335112bc2a38768917684516c0b1641f68 WHIRLPOOL c4b806f83993d61805dd0e723d368122578e4475322661b68890b7efe0bec68870fcdff4c331210db73792331b41f3a6cbd14a8922702ae6e0f04ae810637974
-DIST minissdpd-1.2.20140610.tar.gz 21909 SHA256 5a43752b66a8c2b0eb4aad2385529fad877b168a9b9f847ab52ae5a1fe8d016d SHA512 1688a34a3031779ff99fa6ee7d9c295546fb7f9bc49cc2c11128b675ac1bf11be53b9193f3cbc219eabaa1e1ff9c6ebd5921190aef7fa13fe98538c38d6652aa WHIRLPOOL ad7a4644c7251f0c2a7413351ba590ecb73e2c518704ff41c1bbe9e09f131bf6081a3f1bd0aec0bca26ec3486ac3b1c850c0253da893ffb7178e5b52304da1fe
+AUX minissdpd.initd-r1 1367 SHA256 c3f1bf78b69966b5caf6fe2eeaa61ff9715ce6c70a16e342ed28cefc084417e2 SHA512 ebecb1a2621079063e0ecc276d72631e880c9e9f9b58f247c2a691c49e40f0c2af5c1526f064815c330a22c284b8029190959a035c19675999dd5a6c357fba77 WHIRLPOOL 3a7d6b37df0fdeae098c19e242341de5ccb111da96b2d0925c1db75fbd0edcc8b7c4bda8e68904746ae6146ffb848bd17d355996f2c0e5536014640c0f71cf3c
 DIST minissdpd-1.2.20140906.tar.gz 21956 SHA256 a2dfa507185d3cf2463c3b29ed4b946434259ac461c7b6589950344cdf792b5a SHA512 0f42cc003a164b18621fe626d3691afd645fd77b50e6c0af6c4df51523f2bcc26c5bcc1cc8707dd5b6bed594042fcf3fecc36301988de0ade02397667c9c47ed WHIRLPOOL 00c9c40a9aaf05f6754d7a3331cea881735061eea61976d73b06b273fa669c02204bfdacab6eb2fc8c0f746a70e6c05970767d70962c7d012e68e045a5444353
-DIST minissdpd-1.2.tar.gz 19874 SHA256 de11acb04a7cc9294ff686a1774ad35b54fe2932b102b24e5467653bb93a7ade SHA512 dc997a40db4bc3e13ad00cb7551581428d3455b3615277e50f15e321ad6191af1c3f87ee0c2bb2e0f9d694eeb20674545b9d5c8b6ebdbbdca3ba912c7062ea18 WHIRLPOOL ebc58d7b22b0784239c18b3ff48842c258ef8a7b7ae157ac459696be1dd8ec0c2d7e6d8fd5bb407c5d2264c2b4a3462e51bc93bd8332b230a6525852a03fcbc0
-EBUILD minissdpd-1.2-r1.ebuild 889 SHA256 774835760b10a8413ebc988f11d61e87f90b051bc36d34dd2d2844499fe3cd75 SHA512 33fb848873f736482863810ea32461434ef9169a90e7f99f0d8218825c42d27225ee89a4131943cbef906add5bb0607143e1e7efa39fda2cd530b0faf8350b8f WHIRLPOOL adce373a975669ed57da540dc631d1880168d817a6902206f52ddb94f599359eb2249ad4c14bd2e0b99905c62245c14585921091c46e0653f6e7be9dcb1dc53a
-EBUILD minissdpd-1.2.20130907.ebuild 905 SHA256 5230a923a7df0b081e1ec3d4b41711a792fe7419a21db5d98e2364e3c27f4f5c SHA512 563167efedc92d708d637391527a275ea98502c8e701b26061ddabfc9a84bbc50960b8bae1a3fa37ab3b346c310d160e99a9bb142fe3c820478c5fc249f36a97 WHIRLPOOL 1c48709d663a858aca3b54ec86096b84c94d90ce37185b7e0f550b3bc6035347e8ac07affea977e1cbc40689f4cf473139ab8c573cf411554964689a4e6a96aa
-EBUILD minissdpd-1.2.20140610.ebuild 905 SHA256 75b9c68244135c7938d6dc515843ab23098b8f49d8d00e9db62a8429efbf0184 SHA512 325e570c2d01f7a109e3bda6290177eb785ed0720905d983384a631d571c10fae3e6c4f4a7af0930b21c2ec916809739dd8c063bfb51154eb716d69b980cc4c2 WHIRLPOOL 3e33eac21be8256075025bb4d6ffafb80fe4bdf72eaa62cf7f89688d7d5818b8a5e483eca9e6fb3e88628833d1fa852556eb898d715752aee99ffa1995967492
+EBUILD minissdpd-1.2.20140906-r1.ebuild 912 SHA256 f23eb08a9f8eff6a28ffdf3da8cbe6db2b7857a081e514fc4add97e7560dfc98 SHA512 512dc0bbdafe11259087bf2cd72198dd950230a6268616b645000522648c2f8241d2c8e9019700a2131ef78844893c8cc521ab9e2f495fb8fac5b2bf05d3fbcf WHIRLPOOL 388ff0971c2fb39e3d29f85c4b6050782426abc757964482a92d147d104736da5c1c3f4e49a56e4f25b6e063f17c8fbe1267b715e6f76fe9291bb76df06b3187
 EBUILD minissdpd-1.2.20140906.ebuild 905 SHA256 1e4805cb6d29c7a51e5a76a93f84e6354f03deb23bf39d72b18aa1e4580b3361 SHA512 817b69a0224d2551586154774eaa75c1f8dfac006044f1e6b368ced056ee3b7d626c887612e10cd3610771f1991d580417f3dbad6e9897c0b3f16e7746823d97 WHIRLPOOL f96ea6b8f757a7a6d12d6703964354a612d4d61722d3a455acfcb3b67064846d42ddf32892a09bbe32ffe557cb331886d7b3da74c9c10eb6aef481e74377d456
-MISC ChangeLog 2510 SHA256 a253cfbd47d3d1af6f1dc857d67a759c8f42a34505f2bf2f64f1ff100df1c7e9 SHA512 96edaa65ee7f59e58e56b7e828d84650263ef92c2aa57289f66fceaacf853c0e49ad826a2c76b2d7d4131001eccf52bf1e2b9c95f7bb2e5a495da46339a37dca WHIRLPOOL abaff1737ab1990565035fed58f346130928b4a48f9d4a12c9934397ad2463abb5e5582629ad24cf4fcff03acf2b3e1ee8cd2a76cfcabf5a624d0c6e2c7dff26
+MISC ChangeLog 2819 SHA256 7c9655e5ed192d14fcd90209d40faa651ac5afdd1274a565c55897628e7f0a35 SHA512 676cffa4d6b9e1bb08b4dd3ac92c1e36fd6ea60dd348311512eece13711d1b38b29c3d88a90370d204e01d006f22464ffdafa32687b9c189d1de99b565a1a231 WHIRLPOOL dc8102df0f3835a1093920cc82eddac683dce9e2cf9f4f6841986cef1ff4a95c92da0607b5a4c1bb602193d1ee2c7d3d72c5a17998ebb42cbbd6966f571520ef
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUDDpJAAoJEJOE+m71LUu6KwkP/j1TnhjBDcADMmBNuUBLwd+y
-G6JMsWO/84J2g7F79HqWfKW1hanzv0zrqA3dlAIeie6WXEyMTYTyu0H/IkXKYCm3
-E0SzNKL7L3/Mc76OOjcfgsYHiXc8P6JGbqsi3PyJy/v2wwennVS/4WXb+R15zlZC
-DYRUjUVws8EB4g1ZrG2ePoGMajbhsO1+uzo9SlyrbrzexOCLvcp0GuHYPlvVdIG6
-Ob5lybyFU449p/HBILFY06Z9WtD7nTOYWt7bgEi/TSYyBUJnGiXJYmtbFAkHUMUD
-RvDEvk2UCiMno/ciuy0rWVbRrZhJg8QCLijHbvtljFM7MZjEpFGvkIwzzaD8FSeT
-HL4PyrG9NBsuL3lOrPENyeFn6DaVY92s4STRqNkK9+zdHRbWEMR9MwOPLgoOEPjz
-RG53/ot01srXsX+sM6LMzHGYJOS0C+4ooFyqmteTINLqaOjT5jrjgR1j8xtnnXgL
-elC9cmjV5rA0G13fM+gm7HwXloiVxqT1JkPWrnusoBn7I0ThDrM4XFzFSi6O2CiX
-+br7rbEa7OwGv/p6NuHYGsjn4grEpTbh3Tum7qgNwh6LeqIBMhJiJ4NzGuGAbChZ
-rF2O1/QFvps62/LeZrY9cJQJuNDkB5KKwVr6h5vN+/vHWx4uBQXiiZwj8P5+BIYt
-JG7BVQa01RAdsWOLWWeA
-=OWGG
+iQIcBAEBCAAGBQJUFYjsAAoJEJOE+m71LUu6QK4P/0yVNDUkR+N9cHm27NnxVg/l
+woJCTm7thp7zeM35gHDgX6UVmWri+XuGEx2Hm6s15Oj+HAnxgeV+zETQMoLlmCpB
+o/KXVnu6a838SG8B+wcBtZlImo9eJ7o1glPUp31sVQIpRL3K4Sj3V+FwLavUk6YF
+1mYuxBCFACfO/JD/Df326dXxF/Fny8YynYpGEoLAow0KfqXbU7FCNK/QUMoj7HFS
+66X7KegRBxRqOk7NG5AiprOnNrXMP1jIymcVaflgBCW+od1QK8TDzQ5Ex+SQ7a/P
+BbUOw3O2dmrz4j11qwORI3Q6tMNFZQgEND3JIqciCmQt+gBySAPQZrWGsvrP4veM
+yeD6K8j34TrvjNhRbslrQDvO7Ufswdss+hQ2TKy2wN8xRguU5Q76tJRCivaOEQbN
+r7vk1TAAu9dyiSYfg0u0rOyX279sqZg9DqURzlWC5pD+SLvQFm5DiNdaQ4vE5rBd
+Ywct6M+kXalsX1YioSuLjaCTL0LFsx74/b6Omnd8leWWXM3VEH1a8Rsz/XhRMEen
+QXTxPAiEOeoFYNj2P6aCDGCU8leVUxquBXDsMnJGYyWOU9AhFCF51gthUDe8Pr/V
+18fzBzd/2s8bOTaCW51igBr7h7AnwobBYpKv6ieGKrhwoBxissu4lXnXtjGfC9Tz
+USjJ6H9dBuXMGBgUVEqn
+=pnUK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minissdpd/files/minissdpd.initd-r1 b/net-misc/minissdpd/files/minissdpd.initd-r1
new file mode 100644
index 000000000000..d09ed2c5a985
--- /dev/null
+++ b/net-misc/minissdpd/files/minissdpd.initd-r1
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+
+MINISSDPD="/usr/sbin/minissdpd"
+PIDFILE="/var/run/minissdpd.pid"
+
+ROUTE="/bin/route"
+IFCONFIG="/bin/ifconfig"
+
+depend() {
+	need net
+	before miniupnpd
+}
+
+checkconfig() {
+	if [ "x$MINISSDPD_IFACE" != "x" ]; then
+		interfaces=$($IFCONFIG | grep "Link encap" | awk '{ print $1 }')
+		for interface in $MINISSDPD_IFACE; do
+			hit=0
+			for available in $interfaces; do
+				if [ "$interface" = "$available" ]; then
+					hit=1
+				fi
+			done
+			if [ $hit = 0 ]; then
+				ewarn "Interface $interface not available"
+				return 1
+			fi
+		done
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting minissdpd"
+	checkconfig || return 1
+
+	if [ "x$MINISSDPD_IFACE" = "x" ]; then
+		# We assume that the default interface has an IP address
+		interface=$($ROUTE | grep default | awk -- '{ print $8 }')
+		IP="$($IFCONFIG $interface | grep 'inet' | sed 's/^.*inet \([0-9.]\+\).\+/\1/')"
+		ARGS="-i $IP "
+	else
+		ARGS=""
+		for interface in $MINISSDPD_IFACE; do
+			# An interface may not have an IP address, so don't listen if it doesn't
+			IP="$($IFCONFIG $interface | grep 'inet' | sed 's/^.*inet \([0-9.]\+\).\+/\1/')"
+			if [ "x$IP" != "x" ]; then
+				ARGS+="-i $IP "
+			fi
+		done
+	fi
+
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MINISSDPD -- $ARGS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping minissdpd"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/minissdpd/minissdpd-1.2-r1.ebuild b/net-misc/minissdpd/minissdpd-1.2-r1.ebuild
deleted file mode 100644
index dff588a6c48e..000000000000
--- a/net-misc/minissdpd/minissdpd-1.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.2-r1.ebuild,v 1.1 2012/12/25 21:03:11 blueness Exp $
-
-EAPI="4"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[old-output]
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-respect-CC.patch"
-	epatch "${FILESDIR}/${P}-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.2.20130907.ebuild b/net-misc/minissdpd/minissdpd-1.2.20130907.ebuild
deleted file mode 100644
index 6239382f7142..000000000000
--- a/net-misc/minissdpd/minissdpd-1.2.20130907.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.2.20130907.ebuild,v 1.1 2013/09/07 13:20:11 blueness Exp $
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[old-output]
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-respect-CC.patch"
-	epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.2.20140610.ebuild b/net-misc/minissdpd/minissdpd-1.2.20140906-r1.ebuild
index cdf720d70233..ad8023e48269 100644
--- a/net-misc/minissdpd/minissdpd-1.2.20140610.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.2.20140906-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.2.20140610.ebuild,v 1.1 2014/06/11 11:58:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.2.20140906-r1.ebuild,v 1.1 2014/09/14 12:21:25 blueness Exp $
 
 EAPI="5"
 inherit eutils toolchain-funcs
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[old-output]
+RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[-old-output]
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
 
 src_prepare() {
@@ -29,7 +29,7 @@ src_compile() {
 
 src_install () {
 	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	dodoc Changelog.txt README
 	doman minissdpd.1