Remove older unstables, and sanitize file names in FILESDIR

(Portage version: 2.1.10.49/cvs/Linux x86_64)

9 files changed, 54 insertions, 151 deletions

diff --git a/net-misc/minissdpd/ChangeLog b/net-misc/minissdpd/ChangeLog
index e103f941ac0f..ccd71a6ccf20 100644
--- a/net-misc/minissdpd/ChangeLog
+++ b/net-misc/minissdpd/ChangeLog
@@ -1,5 +1,14 @@
 
 
+  10 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -minissdpd-1.1.20111007.ebuild, -minissdpd-1.1.20111007-r1.ebuild,
+  minissdpd-1.1.20120121.ebuild,
+  +files/minissdpd-1.1.20120121-respect-CFLAGS.patch,
+  minissdpd-1.1.20120410.ebuild, -files/minissdpd.initd-r1,
+  -files/minissdpd-remove-initd.patch, -files/minissdpd-respect-CFLAGS.patch,
+  files/minissdpd.initd:
+  Remove older unstables, and sanitize file names in FILESDIR
+
 *minissdpd-1.1.20120410 (10 Apr 2012)
 
   10 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
diff --git a/net-misc/minissdpd/files/minissdpd-respect-CFLAGS.patch b/net-misc/minissdpd/files/minissdpd-1.1.20120121-respect-CFLAGS.patch
index bc2ec9f9abbf..bc2ec9f9abbf 100644
--- a/net-misc/minissdpd/files/minissdpd-respect-CFLAGS.patch
+++ b/net-misc/minissdpd/files/minissdpd-1.1.20120121-respect-CFLAGS.patch
diff --git a/net-misc/minissdpd/files/minissdpd-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-remove-initd.patch
deleted file mode 100644
index 175416c2ec19..000000000000
--- a/net-misc/minissdpd/files/minissdpd-remove-initd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur minissdpd-1.1.20111007.orig//Makefile minissdpd-1.1.20111007/Makefile
---- minissdpd-1.1.20111007.orig//Makefile	2011-10-14 17:45:05.000000000 -0400
-+++ minissdpd-1.1.20111007/Makefile	2011-10-14 18:16:34.000000000 -0400
-@@ -37,8 +37,6 @@
- install:	minissdpd
- 	$(INSTALL) -d $(SBININSTALLDIR)
- 	$(INSTALL) minissdpd $(SBININSTALLDIR)
--	$(INSTALL) -d $(PREFIX)/etc/init.d
--	$(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
- 
- minissdpd: $(MINISSDPDOBJS)
- 	$(CC) $(CFLAGS) -o $@ $(MINISSDPDOBJS)
diff --git a/net-misc/minissdpd/files/minissdpd.initd b/net-misc/minissdpd/files/minissdpd.initd
index 8fb613d1138a..a807a6de63c3 100644
--- a/net-misc/minissdpd/files/minissdpd.initd
+++ b/net-misc/minissdpd/files/minissdpd.initd
@@ -3,15 +3,53 @@
 MINISSDPD="/usr/sbin/minissdpd"
 PIDFILE="/var/run/minissdpd.pid"
 
+ROUTE="/sbin/route"
+IFCONFIG="/sbin/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"
-	IF=$(/sbin/route | grep default | awk -- '{ print $8 }')
-	ARGS="-i $(/sbin/ifconfig $IF | grep 'inet addr' | sed 's/.\+inet addr:\([0-9.]\+\).\+/\1/')"
+	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 addr' | sed 's/.\+inet addr:\([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 addr' | sed 's/.\+inet addr:\([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 $?
 }
diff --git a/net-misc/minissdpd/files/minissdpd.initd-r1 b/net-misc/minissdpd/files/minissdpd.initd-r1
deleted file mode 100644
index a807a6de63c3..000000000000
--- a/net-misc/minissdpd/files/minissdpd.initd-r1
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-
-MINISSDPD="/usr/sbin/minissdpd"
-PIDFILE="/var/run/minissdpd.pid"
-
-ROUTE="/sbin/route"
-IFCONFIG="/sbin/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 addr' | sed 's/.\+inet addr:\([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 addr' | sed 's/.\+inet addr:\([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.1.20111007-r1.ebuild b/net-misc/minissdpd/minissdpd-1.1.20111007-r1.ebuild
deleted file mode 100644
index 429dea1788d7..000000000000
--- a/net-misc/minissdpd/minissdpd-1.1.20111007-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.1.20111007-r1.ebuild,v 1.1 2011/11/08 01:04:03 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
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-respect-CFLAGS.patch"
-	epatch "${FILESDIR}/${PN}-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.1.20111007.ebuild b/net-misc/minissdpd/minissdpd-1.1.20111007.ebuild
deleted file mode 100644
index 37cf1cd49e07..000000000000
--- a/net-misc/minissdpd/minissdpd-1.1.20111007.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.1.20111007.ebuild,v 1.1 2011/10/15 14:14:36 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
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-respect-CFLAGS.patch"
-	epatch "${FILESDIR}/${PN}-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.1.20120121.ebuild b/net-misc/minissdpd/minissdpd-1.1.20120121.ebuild
index 80a7f28cd50d..1eed0fb08544 100644
--- a/net-misc/minissdpd/minissdpd-1.1.20120121.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.1.20120121.ebuild
@@ -1,6 +1,6 @@
 # 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.1.20120121.ebuild,v 1.1 2012/01/22 12:07:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.1.20120121.ebuild,v 1.2 2012/04/10 12:25:23 blueness Exp $
 
 EAPI="4"
 inherit eutils toolchain-funcs
@@ -19,7 +19,7 @@ RDEPEND="sys-apps/net-tools
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-respect-CFLAGS.patch"
+	epatch "${FILESDIR}/${P}-respect-CFLAGS.patch"
 	epatch "${FILESDIR}/${P}-remove-initd.patch"
 }
 
@@ -29,7 +29,7 @@ src_compile() {
 
 src_install () {
 	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	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.1.20120410.ebuild b/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild
index 863cb86b3b16..6ba1f101771f 100644
--- a/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild
@@ -1,6 +1,6 @@
 # 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.1.20120410.ebuild,v 1.1 2012/04/10 12:11:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild,v 1.2 2012/04/10 12:25:23 blueness Exp $
 
 EAPI="4"
 inherit eutils toolchain-funcs
@@ -29,7 +29,7 @@ src_compile() {
 
 src_install () {
 	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	dodoc Changelog.txt README
 	doman minissdpd.1