EAPI bump. Clean up patch. Remove short <longdescription>.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 12 insertions, 44 deletions

diff --git a/net-misc/netstat-nat/ChangeLog b/net-misc/netstat-nat/ChangeLog
index 2bfe343455f9..81fa2fa36929 100644
--- a/net-misc/netstat-nat/ChangeLog
+++ b/net-misc/netstat-nat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/netstat-nat
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.40 2012/05/21 19:14:33 xarthisius Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.41 2014/07/18 19:58:26 jer Exp $
+
+  18 Jul 2014; 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,
+  metadata.xml:
+  EAPI bump. Clean up patch. Remove short <longdescription>.
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> netstat-nat-1.4.9.ebuild:
   Add missing inheritance of eutils.eclass
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
index 79cf31fd64af..f56300fb432c 100644
--- 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
@@ -1,5 +1,5 @@
---- Makefile.am.org	2005-01-01 18:02:24.000000000 +0100
-+++ Makefile.am	2010-05-11 02:21:49.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,7 +1,7 @@
  bin_PROGRAMS = netstat-nat
  netstat_nat_SOURCES = netstat-nat.c netstat-nat.h
diff --git a/net-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
index 91571c76c0ae..03aa50bab7e3 100644
--- a/net-misc/netstat-nat/metadata.xml
+++ b/net-misc/netstat-nat/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Networks status program for NAT (network address translation) connections</longdescription>
 </pkgmetadata>
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 cef3670ea82c..13ee6d3f4b1f 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.7 2012/04/15 04:04:58 heroxbd Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild,v 1.8 2014/07/18 19:58:26 jer Exp $
 
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Display NAT connections"
@@ -13,15 +12,8 @@ SRC_URI="http://tweegy.nl/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-install.patch
 	eautoreconf
 }
-src_install() {
-	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
deleted file mode 100644
index d418f3a196b9..000000000000
--- a/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
+++ /dev/null
@@ -1,28 +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/netstat-nat/netstat-nat-1.4.9.ebuild,v 1.6 2012/05/21 19:14:33 xarthisius Exp $
-
-inherit autotools eutils
-
-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_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.4.10-install.patch
-	eautoreconf
-}
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}