EAPI bump. Clean up patch.

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

4 files changed, 14 insertions, 46 deletions

diff --git a/net-firewall/itval/ChangeLog b/net-firewall/itval/ChangeLog
index 89950421ec16..dceb427aae91 100644
--- a/net-firewall/itval/ChangeLog
+++ b/net-firewall/itval/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/itval
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/ChangeLog,v 1.6 2012/12/25 04:14:53 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/ChangeLog,v 1.7 2014/07/18 12:55:43 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -itval-1.1.ebuild,
+  itval-1.2_p20121104.ebuild, files/itval-1.1-gcc44.patch:
+  EAPI bump. Clean up patch.
 
   25 Dec 2012; Jeff Horelick <jdhore@gentoo.org> itval-1.2_p20121104.ebuild:
   marked x86 per bug 447332
diff --git a/net-firewall/itval/files/itval-1.1-gcc44.patch b/net-firewall/itval/files/itval-1.1-gcc44.patch
index 8f88613ecea8..796b67481796 100644
--- a/net-firewall/itval/files/itval-1.1-gcc44.patch
+++ b/net-firewall/itval/files/itval-1.1-gcc44.patch
@@ -1,6 +1,5 @@
-diff -NrU5 ITVal-1.0.orig/FDDL/mdd.h ITVal-1.0/FDDL/mdd.h
---- ITVal-1.0.orig/FDDL/mdd.h	2009-06-13 14:21:51.000000000 -0600
-+++ ITVal-1.0/FDDL/mdd.h	2009-06-13 14:25:07.000000000 -0600
+--- a/FDDL/mdd.h
++++ b/FDDL/mdd.h
 @@ -29,10 +29,11 @@
  //#define BRIEF_DEBUG
  
@@ -13,9 +12,8 @@ diff -NrU5 ITVal-1.0.orig/FDDL/mdd.h ITVal-1.0/FDDL/mdd.h
  
  #   include <FDDL/mddtypes.h>
  #   include <FDDL/caches.h>
-diff -NrU5 ITVal-1.0.orig/src/structures.h ITVal-1.0/src/structures.h
---- ITVal-1.0.orig/src/structures.h	2009-06-13 14:21:51.000000000 -0600
-+++ ITVal-1.0/src/structures.h	2009-06-13 14:32:40.000000000 -0600
+--- a/src/structures.h
++++ b/src/structures.h
 @@ -28,10 +28,11 @@
  
  #ifndef __STRUCTURES_H
diff --git a/net-firewall/itval/itval-1.1.ebuild b/net-firewall/itval/itval-1.1.ebuild
deleted file mode 100644
index 8c9ebfa45b25..000000000000
--- a/net-firewall/itval/itval-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/itval-1.1.ebuild,v 1.1 2009/07/09 15:54:35 pva Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Iptables policy testing and validation tool"
-HOMEPAGE="http://itval.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/ITVal-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/ITVal-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}/itval-1.1-gcc44.patch"
-}
-
-src_install(){
-	make DESTDIR="${D}" install || die "make install failed"
-	doman man/ITVal.n || die
-	dodoc README ChangeLog RELEASE AUTHORS
-}
diff --git a/net-firewall/itval/itval-1.2_p20121104.ebuild b/net-firewall/itval/itval-1.2_p20121104.ebuild
index c82b7e98bcd9..25abae95d782 100644
--- a/net-firewall/itval/itval-1.2_p20121104.ebuild
+++ b/net-firewall/itval/itval-1.2_p20121104.ebuild
@@ -1,11 +1,10 @@
-# 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-firewall/itval/itval-1.2_p20121104.ebuild,v 1.3 2012/12/25 04:14:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/itval-1.2_p20121104.ebuild,v 1.4 2014/07/18 12:55:43 jer Exp $
 
-EAPI="4"
+EAPI=5
 
 CMAKE_IN_SOURCE_BUILD=1
-
 inherit cmake-utils versionator
 
 MY_PN="ITVal"
@@ -20,7 +19,6 @@ SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-libs/fddl"
 DEPEND="
@@ -29,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS ChangeLog README RELEASE )