EAPI bump. Clean up patches.

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

7 files changed, 17 insertions, 95 deletions

diff --git a/net-analyzer/bwmon/ChangeLog b/net-analyzer/bwmon/ChangeLog
index ecb15b124f59..eba03964c306 100644
--- a/net-analyzer/bwmon/ChangeLog
+++ b/net-analyzer/bwmon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/bwmon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.27 2012/11/21 11:16:40 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.28 2014/07/10 19:51:24 jer Exp $
+
+  10 Jul 2014; Jeroen Roovers <jer@gentoo.org> -bwmon-1.3.ebuild,
+  -bwmon-1.3-r1.ebuild, bwmon-1.3-r2.ebuild, files/bwmon-1.3-build.patch,
+  files/bwmon-1.3-overflow.patch, files/bwmon-1.3-typo-fix.patch:
+  EAPI bump. Clean up patches.
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> bwmon-1.3-r2.ebuild:
   Stable for x86, wrt bug #441420
diff --git a/net-analyzer/bwmon/bwmon-1.3-r1.ebuild b/net-analyzer/bwmon/bwmon-1.3-r1.ebuild
deleted file mode 100644
index 63d7ca51de20..000000000000
--- a/net-analyzer/bwmon/bwmon-1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r1.ebuild,v 1.5 2012/11/04 20:22:33 ago Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Simple ncurses bandwidth monitor"
-HOMEPAGE="http://bwmon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-src_prepare() {
-	# Respect CC and CFLAGS
-	sed -i -e '/^CC/d' \
-	-e '/^CFLAGS/d' \
-	src/Makefile || die 'sed on CC and CFLAGS failed'
-	# Respect LDFLAGS
-	sed -i '/^LDFLAGS/s:LDFLAGS:LIBS:' src/Makefile || die 'sed on LDFLAGS failed'
-	sed -i 's:$(CC) $(LDFLAGS) -o ../$@ $(OBJS):$(CC) $(CFLAGS) $(LDFLAGS) -o ../$@ $(OBJS) $(LIBS):' src/Makefile || die 'sed on compilation string failed'
-	# Fix a typo in help wrt bug #263326
-	epatch "${FILESDIR}"/${P}-typo-fix.patch
-}
-
-src_compile() {
-	append-cflags -I"${S}"/include -D__THREADS
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
index ac76a7a74f1e..23c7a8d5ac25 100644
--- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
@@ -1,8 +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-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.6 2012/11/21 11:16:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.7 2014/07/10 19:51:24 jer Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -16,7 +16,6 @@ RDEPEND="${DEPEND}"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
 KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
diff --git a/net-analyzer/bwmon/bwmon-1.3.ebuild b/net-analyzer/bwmon/bwmon-1.3.ebuild
deleted file mode 100644
index 63c26767602f..000000000000
--- a/net-analyzer/bwmon/bwmon-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.21 2012/09/30 08:14:36 pinkbyte Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Simple ncurses bandwidth monitor"
-HOMEPAGE="http://bwmon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="amd64 hppa ~ppc sparc x86"
-IUSE=""
-
-doecho() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	append-flags -I"${S}"/include -D__THREADS
-
-	doecho $(tc-getCC) -o ${PN} \
-		${CFLAGS} ${LDFLAGS} \
-		src/${PN}.c -lncurses -lpthread \
-		|| die "build failed"
-}
-
-src_install () {
-	dobin ${PN} || die
-	dodoc README || die
-}
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-build.patch b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
index 336cf66445ec..6d4eadf15551 100644
--- a/net-analyzer/bwmon/files/bwmon-1.3-build.patch
+++ b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
@@ -1,7 +1,5 @@
-Index: bwmon-1.3/src/Makefile
-===================================================================
---- bwmon-1.3.orig/src/Makefile
-+++ bwmon-1.3/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -10,8 +10,8 @@ CC = gcc
  RM = /bin/rm
  INSTALL = install
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
index a6280ffa6c29..052d1d766351 100644
--- a/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
+++ b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
@@ -1,7 +1,5 @@
-Index: bwmon-1.3/src/bwmon.c
-===================================================================
---- bwmon-1.3.orig/src/bwmon.c
-+++ bwmon-1.3/src/bwmon.c
+--- a/src/bwmon.c
++++ b/src/bwmon.c
 @@ -408,7 +408,7 @@ bool_t
  print_uptime(float * uptime) 
  {
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch b/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch
index 4fa0be43b133..36f6af8e5ee6 100644
--- a/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch
+++ b/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch
@@ -1,9 +1,8 @@
-diff -u bwmon-1.3/src/bwmon.c.orig bwmon-1.3/src/bwmon.c      
---- bwmon-1.3/src/bwmon.c.orig	2009-03-22 00:51:12.000000000 +0100
-+++ bwmon-1.3/src/bwmon.c	2009-03-22 00:54:13.000000000 +0100
+--- a/src/bwmon.c
++++ b/src/bwmon.c
 @@ -36,7 +36,7 @@
  			"by Kimmo Nupponen (kimmoon@users.sourceforge.net)\n"
- 			"$Date: 2012/09/30 08:13:07 $\n\n"
+ 			"$Date: 2014/07/10 19:51:24 $\n\n"
  			"usage: %s [-b] [-h] [-a] [-m] [-u seconds]\n"
 -			"\t-a Print bandwidth utiliasation in Kbytes rather than Kbits. The default\n"
 +			"\t-b Print bandwidth utilisation in KBytes rather than Kbits. The default\n"