Do not install NEWS twice, thanks to cilly for reporting (bug #318533).

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

4 files changed, 26 insertions, 12 deletions

diff --git a/net-misc/netstat-nat/ChangeLog b/net-misc/netstat-nat/ChangeLog
index b982be2629a1..382c81bed935 100644
--- a/net-misc/netstat-nat/ChangeLog
+++ b/net-misc/netstat-nat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/netstat-nat
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.34 2010/05/11 00:28:25 jer Exp $
+
+  11 May 2010; Jeroen Roovers <jer@gentoo.org> netstat-nat-1.4.9.ebuild,
+  netstat-nat-1.4.10.ebuild, +files/netstat-nat-1.4.10-install.patch:
+  Do not install NEWS twice, thanks to cilly for reporting (bug #318533).
 
 *netstat-nat-1.4.10 (26 Jan 2010)
 
diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
new file mode 100644
index 000000000000..79cf31fd64af
--- /dev/null
+++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.org	2005-01-01 18:02:24.000000000 +0100
++++ Makefile.am	2010-05-11 02:21:49.000000000 +0200
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = netstat-nat
+ netstat_nat_SOURCES = netstat-nat.c netstat-nat.h
+ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+-doc_DATA = INSTALL NEWS README ChangeLog AUTHORS COPYING NEWS
++doc_DATA = NEWS README ChangeLog AUTHORS
+ dist_man_MANS = netstat-nat.1
+ EXTRA_DIST = netstat-nat.spec
+ SUBDIRS = 
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
index 893afd4cb339..068acde189b9 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -1,8 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild,v 1.2 2010/05/11 00:28:25 jer Exp $
 
-inherit autotools
+EAPI="2"
+
+inherit autotools eutils
 
 DESCRIPTION="Display NAT connections"
 HOMEPAGE="http://tweegy.nl/projects/netstat-nat/index.html"
@@ -16,13 +18,10 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i '/^doc_DATA =/{s/ \(COPYING\|INSTALL\)//g}' Makefile.am
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install.patch
 	eautoreconf
 }
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
index ca5f423cdafe..a4c69640a952 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.9.ebuild,v 1.4 2008/02/28 16:50:16 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild,v 1.5 2010/05/11 00:28:25 jer Exp $
 
 inherit autotools
 
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	sed -i '/^doc_DATA =/{s/ \(COPYING\|INSTALL\)//g}' Makefile.am
+	epatch "${FILESDIR}"/${PN}-1.4.10-install.patch
 	eautoreconf
 }
 src_install() {