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

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/net-misc/netstat-nat/ChangeLog b/net-misc/netstat-nat/ChangeLog
index b982be2629a17db100982a1d4a3939228bcb1ec4..382c81bed935812537c7ffb0d356164b8d0d5234 100644 (file)
--- 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/Manifest b/net-misc/netstat-nat/Manifest
index 31fbb409c4080efd4334131d8f23a604d0a60fda..24953ac385cbe0b5c5ca7dfec795f48ed501df3d 100644 (file)
--- a/net-misc/netstat-nat/Manifest
+++ b/net-misc/netstat-nat/Manifest
@@ -1,6 +1,7 @@
+AUX netstat-nat-1.4.10-install.patch 434 RMD160 2c3b0ce250adddd4ea37c738563f1b232970a58b SHA1 a373b5bf0c944efe61190f04fe4686bcaf6e8e72 SHA256 20ac45a44c75aea9152cc90e33de7e0e9cffa050962e4d7e1f508b1901f7eaae
 DIST netstat-nat-1.4.10.tar.gz 83865 RMD160 9de334758d6996de215487c40591a590cdcd577f SHA1 665b4aff9939d124b055e34a89838e309b745c50 SHA256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca
 DIST netstat-nat-1.4.9.tar.gz 84292 RMD160 06852bc50d1009eaf785477dbebb6fc03af6cefd SHA1 3eb770517f9f978b41888f0fd55c7b341f84c1ef SHA256 95da25629e68b65dda4b1f960bbcd3586d7eca38cd9864be1efaa083ecf200de
-EBUILD netstat-nat-1.4.10.ebuild 678 RMD160 7dde01934277cd86aaf7f4663e35fdbd7dff8463 SHA1 9e70adfa799dd55c40478f1834868a0677ee454f SHA256 bfb504c1755872ef7a7b07e0612a494629cba502a0980fa341be3119ab17bc76
-EBUILD netstat-nat-1.4.9.ebuild 688 RMD160 37d6d2841c5eab64a2795692a54840429a33face SHA1 70ff449ca94492d846a43976efa3fcded1fa4cfc SHA256 bfcfebac2104a2d7088c16ea72a0da9473300043d3eadce506ef2aca58316178
-MISC ChangeLog 4414 RMD160 77f1dc5b1459bc61fd26a80dff8bbb84c478db7b SHA1 12820f8d6c0f1acb9828e3792770660d1892d803 SHA256 f4cfc41efe32be4fed7c25e771856bdef91fcbd3eedfca73fd232d91ea0f06ce
+EBUILD netstat-nat-1.4.10.ebuild 649 RMD160 94799eac1081e74cbf7f904c4d5d5c644d134427 SHA1 a60c54ea722644b40f16cb916f78091e361bc4fc SHA256 b36cd09691fefebe55327a9d44c03b7efb446d76cf51fbba90ad2669c5f91185
+EBUILD netstat-nat-1.4.9.ebuild 670 RMD160 84ed54c86f5f5acac5d1e8b9a40c6da0b4c904a1 SHA1 33460aea114f0c0c41ba69f6eef4c7139d58ecc4 SHA256 f41ee055685fdddf18a10fa7d5623e0a23830c448ea41a03231cc10d9a7735a0
+MISC ChangeLog 4632 RMD160 654bd658c4bc48f1b1dd94b976be380d2bc77b6b SHA1 e04b9a4d48562bd4e12d718ecab937da43894fd5 SHA256 96da3acdbaa816530ba1138f3cda1d4b0e561e3ca948ef6ee3e6f3ed9a2d513e
 MISC metadata.xml 268 RMD160 58c1c00b18730e6aadbcaecc865ec5c223e1c97f SHA1 25b7eb392c148174d888879d63213b1e2c0cdddf SHA256 c1506eeb13c63b55f0636c8e17b6f15617c8c1598777f01cd28b92650db27b45

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 (file)
index 0000000..79cf31f
--- /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 893afd4cb339e0e3d90d34063d4b51129f08deba..068acde189b9b00a898f965dd0ba926cd6303827 100644 (file)
--- 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 ca5f423cdafe7401ac2712e0d3abd777bed07899..a4c69640a9528c4dd7bc42de267a816b0b10956e 100644 (file)
--- 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() {