Remove older unstable versions and fix bug #522562

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

5 files changed, 73 insertions, 76 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/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