EAPI bump. Clean up patch. Format ewarn properly.

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

4 files changed, 16 insertions, 60 deletions

diff --git a/net-analyzer/labrea/ChangeLog b/net-analyzer/labrea/ChangeLog
index cf2a1dd2e8b9..0beface7ce39 100644
--- a/net-analyzer/labrea/ChangeLog
+++ b/net-analyzer/labrea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/labrea
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/ChangeLog,v 1.16 2013/01/30 22:43:25 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/ChangeLog,v 1.17 2014/07/12 19:48:43 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> -labrea-2.5-r1.ebuild,
+  labrea-2.5-r2.ebuild, files/labrea-2.5-stable-1-incdir.patch:
+  EAPI bump. Clean up patch. Format ewarn properly.
 
   30 Jan 2013; Agostino Sarubbo <ago@gentoo.org> labrea-2.5-r2.ebuild:
   Stable for amd64, wrt bug #454012
diff --git a/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch b/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch
index 0961a37f159a..54293a64b572 100644
--- a/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch
+++ b/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch
@@ -1,8 +1,8 @@
---- labrea-2.5-stable-1/src/Makefile.am.orig	2003-01-09 21:13:19.000000000 +0300
-+++ labrea-2.5-stable-1/src/Makefile.am	2009-12-11 21:52:38.334383268 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -2,7 +2,7 @@
- ##
- ## $Id: labrea-2.5-stable-1-incdir.patch,v 1.1 2010/04/21 13:48:44 fauli Exp $
+ 
+ 
  
 -AM_CPPFLAGS = -I../inc -I- @DNETINC@ @PCAPINC@
 +AM_CPPFLAGS = -iquote../inc @DNETINC@ @PCAPINC@ -idirafter/usr/include/asm
diff --git a/net-analyzer/labrea/labrea-2.5-r1.ebuild b/net-analyzer/labrea/labrea-2.5-r1.ebuild
deleted file mode 100644
index cdab9a936953..000000000000
--- a/net-analyzer/labrea/labrea-2.5-r1.ebuild
+++ /dev/null
@@ -1,46 +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/labrea/labrea-2.5-r1.ebuild,v 1.4 2012/11/11 19:02:11 pinkbyte Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="'Sticky' Honeypot and IDS"
-HOMEPAGE="http://labrea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=dev-libs/libdnet-1.7"
-RDEPEND="${DEPEND}"
-
-MY_P="${P}-stable-1"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-stable-1-incdir.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog README TODO NEWS
-	newdoc INSTALL README.first
-}
-
-pkg_postinst() {
-
-	ewarn CAUTION:
-	ewarn Before using this package READ the INSTALL and README!
-	ewarn as the author states that it can cause serious problems on your network.
-
-}
diff --git a/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild
index 9af4414d33ad..42b8c6e1fa70 100644
--- a/net-analyzer/labrea/labrea-2.5-r2.ebuild
+++ b/net-analyzer/labrea/labrea-2.5-r2.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/labrea/labrea-2.5-r2.ebuild,v 1.4 2013/01/30 22:43:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/labrea-2.5-r2.ebuild,v 1.5 2014/07/12 19:48:43 jer Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils
 
@@ -13,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 DEPEND="net-libs/libpcap
 	>=dev-libs/libdnet-1.7"
@@ -25,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog README TODO NEWS )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-stable-1-incdir.patch"
+	epatch "${FILESDIR}"/${P}-stable-1-incdir.patch
 	eautoreconf
 }
 
@@ -35,8 +34,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn CAUTION:
-	ewarn Before using this package READ the INSTALL and README!
-	ewarn as the author states that it can cause serious problems on your network.
+	ewarn "Before using this package READ the INSTALL and README"
+	ewarn "as the author states that it can cause serious problems on your network."
 
 }