Remove old. Version bump thanks to Dmitry Karasik (bug #302219).

(Portage version: 2.2_rc61/cvs/Linux i686)

4 files changed, 36 insertions, 39 deletions

diff --git a/net-misc/netstat-nat/ChangeLog b/net-misc/netstat-nat/ChangeLog
index f9aaefc23503..b982be2629a1 100644
--- a/net-misc/netstat-nat/ChangeLog
+++ b/net-misc/netstat-nat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/netstat-nat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.32 2009/09/23 19:41:41 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.33 2010/01/26 01:19:43 jer Exp $
+
+*netstat-nat-1.4.10 (26 Jan 2010)
+
+  26 Jan 2010; Jeroen Roovers <jer@gentoo.org> -netstat-nat-1.4.7.ebuild,
+  -netstat-nat-1.4.8.ebuild, +netstat-nat-1.4.10.ebuild:
+  Remove old. Version bump thanks to Dmitry Karasik (bug #302219).
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> netstat-nat-1.4.7.ebuild:
   Remove virtual/libc
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
new file mode 100644
index 000000000000..893afd4cb339
--- /dev/null
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild,v 1.1 2010/01/26 01:19:43 jer Exp $
+
+inherit autotools
+
+DESCRIPTION="Display NAT connections"
+HOMEPAGE="http://tweegy.nl/projects/netstat-nat/index.html"
+SRC_URI="http://tweegy.nl/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	sed -i '/^doc_DATA =/{s/ \(COPYING\|INSTALL\)//g}' Makefile.am
+	eautoreconf
+}
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.7.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.7.ebuild
deleted file mode 100644
index 33d23c856de8..000000000000
--- a/net-misc/netstat-nat/netstat-nat-1.4.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.7.ebuild,v 1.7 2009/09/23 19:41:41 patrick Exp $
-
-DESCRIPTION="Display NAT connections"
-HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
-SRC_URI="http://tweegy.demon.nl/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.8.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.8.ebuild
deleted file mode 100644
index 45b03db2817c..000000000000
--- a/net-misc/netstat-nat/netstat-nat-1.4.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.8.ebuild,v 1.4 2008/01/31 18:23:08 nixnut Exp $
-
-DESCRIPTION="Display NAT connections"
-HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
-SRC_URI="http://tweegy.demon.nl/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}