EAPI bump. Clean up patches.

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

6 files changed, 17 insertions, 87 deletions

diff --git a/net-analyzer/gnu-netcat/ChangeLog b/net-analyzer/gnu-netcat/ChangeLog
index 31b22417cd44..f7e548a2a6c6 100644
--- a/net-analyzer/gnu-netcat/ChangeLog
+++ b/net-analyzer/gnu-netcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/gnu-netcat
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.29 2013/02/17 23:20:20 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.30 2014/07/12 13:40:55 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> -gnu-netcat-0.7.1-r1.ebuild,
+  -gnu-netcat-0.7.1-r2.ebuild, gnu-netcat-0.7.1-r3.ebuild,
+  files/gnu-netcat-close.patch, files/gnu-netcat-flagcount.patch:
+  EAPI bump. Clean up patches.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org> gnu-netcat-0.7.1-r3.ebuild:
   Add ~arm-linux keyword.
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
index 5c3e4fae136d..eb1862d1fd52 100644
--- a/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
@@ -1,5 +1,5 @@
---- netcat-0.7.1.org/doc/netcat.1	2004-01-11 21:48:18.000000000 +0100
-+++ netcat-0.7.1/doc/netcat.1	2010-02-12 17:03:02.000000000 +0100
+--- a/doc/netcat.1
++++ b/doc/netcat.1
 @@ -256,6 +256,13 @@
  source address for the connecting socket.
  .Sh "Advanced Options"
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
index df029a6f15d6..765212cb0e99 100644
--- a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
@@ -1,5 +1,5 @@
---- bad/netcat-0.7.1/src/flagset.c	2003-12-10 17:18:07.000000000 +0100
-+++ good/netcat-0.7.1/src/flagset.c	2007-03-04 17:38:10.000000000 +0100
+--- a/src/flagset.c
++++ b/src/flagset.c
 @@ -134,7 +134,7 @@
  
  int netcat_flag_count(void)
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild
deleted file mode 100644
index 264653f4eec8..000000000000
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild,v 1.7 2010/08/12 19:58:16 josejx Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="the GNU network swiss army knife"
-HOMEPAGE="http://netcat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd"
-IUSE="nls debug"
-
-DEPEND=""
-
-S=${WORKDIR}/netcat-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-flagcount.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "emake install failed"
-	rm "${D}"/usr/bin/nc
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r2.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r2.ebuild
deleted file mode 100644
index bf31298d9478..000000000000
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r2.ebuild,v 1.2 2010/05/26 16:08:57 abcd Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="the GNU network swiss army knife"
-HOMEPAGE="http://netcat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls debug"
-
-DEPEND=""
-
-S=${WORKDIR}/netcat-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-flagcount.patch
-	epatch "${FILESDIR}"/${PN}-close.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm "${ED}"usr/bin/nc
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
index b24f1d1aef5d..209381d43b27 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild,v 1.8 2013/02/17 23:20:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild,v 1.9 2014/07/12 13:40:55 jer Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils flag-o-matic
 
@@ -22,7 +22,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-flagcount.patch \
 		"${FILESDIR}"/${PN}-close.patch \
 		"${FILESDIR}"/${PN}-LC_CTYPE.patch
-
 }
 
 src_configure() {
@@ -30,8 +29,9 @@ src_configure() {
 	econf $(use_enable nls)
 }
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	rm "${ED}"usr/bin/nc
-	dodoc AUTHORS ChangeLog NEWS README TODO
 }