Fix bug #448486, plus other changes to net-tools, remove older

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

6 files changed, 8 insertions, 56 deletions

diff --git a/net-misc/minissdpd/ChangeLog b/net-misc/minissdpd/ChangeLog
index c5e9a86178b3..dc71f1e701f2 100644
--- a/net-misc/minissdpd/ChangeLog
+++ b/net-misc/minissdpd/ChangeLog
@@ -1,4 +1,6 @@
-
+# ChangeLog for net-misc/minissdpd
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/ChangeLog,v 1.9 2012/12/25 21:03:11 blueness Exp $
 
   25 May 2012; Anthony G. Basile <blueness@gentoo.org>
   -minissdpd-1.1.20120121.ebuild,
diff --git a/net-misc/minissdpd/files/minissdpd-1.1.20120410-respect-CFLAGS.patch b/net-misc/minissdpd/files/minissdpd-1.1.20120410-respect-CFLAGS.patch
deleted file mode 100644
index 6421bfb86552..000000000000
--- a/net-misc/minissdpd/files/minissdpd-1.1.20120410-respect-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur minissdpd-1.1.20120410.orig//Makefile minissdpd-1.1.20120410/Makefile
---- minissdpd-1.1.20120410.orig//Makefile	2012-04-09 18:39:42.000000000 -0400
-+++ minissdpd-1.1.20120410/Makefile	2012-04-10 08:04:00.000000000 -0400
-@@ -12,8 +12,8 @@
- #
- # install target is made for linux... sorry BSD users...
- #CFLAGS = -Wall -g -D_GNU_SOURCE -Wstrict-prototypes -ansi
--CFLAGS = -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes -ansi
--CC = gcc
-+CFLAGS := -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes -ansi $(CFLAGS)
-+CC ?= gcc
- RM = rm -f
- INSTALL = install
- OS = $(shell uname -s)
diff --git a/net-misc/minissdpd/files/minissdpd-1.1.20120410-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
index 9a5f5966e90f..9a5f5966e90f 100644
--- a/net-misc/minissdpd/files/minissdpd-1.1.20120410-remove-initd.patch
+++ b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
diff --git a/net-misc/minissdpd/files/minissdpd.initd b/net-misc/minissdpd/files/minissdpd.initd
index a807a6de63c3..8ad872e17932 100644
--- a/net-misc/minissdpd/files/minissdpd.initd
+++ b/net-misc/minissdpd/files/minissdpd.initd
@@ -3,8 +3,8 @@
 MINISSDPD="/usr/sbin/minissdpd"
 PIDFILE="/var/run/minissdpd.pid"
 
-ROUTE="/sbin/route"
-IFCONFIG="/sbin/ifconfig"
+ROUTE="/bin/route"
+IFCONFIG="/bin/ifconfig"
 
 depend() {
 	need net
diff --git a/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild b/net-misc/minissdpd/minissdpd-1.2-r1.ebuild
index 6ba1f101771f..dff588a6c48e 100644
--- a/net-misc/minissdpd/minissdpd-1.1.20120410.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.2-r1.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.2 2012/04/10 12:25:23 blueness Exp $
+# $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
@@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="sys-apps/net-tools
+RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[old-output]
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-respect-CFLAGS.patch"
+	epatch "${FILESDIR}/${P}-respect-CC.patch"
 	epatch "${FILESDIR}/${P}-remove-initd.patch"
 }
 
diff --git a/net-misc/minissdpd/minissdpd-1.2.ebuild b/net-misc/minissdpd/minissdpd-1.2.ebuild
deleted file mode 100644
index 063faab07c71..000000000000
--- a/net-misc/minissdpd/minissdpd-1.2.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.ebuild,v 1.1 2012/05/25 14:11:04 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}/${P}-respect-CC.patch"
-	epatch "${FILESDIR}/${PN}-1.1.20120410-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
-}