EAPI bump. Clean up patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 22 insertions, 60 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/Manifest b/net-firewall/itval/Manifest
index abb380c62b56..99c7fc4c5de3 100644
--- a/net-firewall/itval/Manifest
+++ b/net-firewall/itval/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX itval-1.1-gcc44.patch 790 SHA256 7c16d21e8272677ce43ee3b02eee8378372842dcb11a5876dba4eda8ab5e9d26 SHA512 0c9b0889d05911f7419977c6b7a2d7d8e801121b063aa27c6f9aa92dfeb248e1449ada21d945aab35a61aeb17f65bdfa811617a29de621663f70b18fcbf87da2 WHIRLPOOL 5b1b95d2f1c2ff76ee7d56fe8b14b0d2cf27a575e9563cc16d9df21b54633293066c11416f66cb8c885df17b3789dbd4061c6255951170709c20b08e82799bca
-DIST ITVal-1.1.tar.gz 423235 SHA256 d066e05c26a291fb09ae00af9095ee9f11b7cc86701478cdf2d8740c0d155796
+AUX itval-1.1-gcc44.patch 476 SHA256 1cc1d948e9c18c47fbe8df1540c4c99b923eb2d3a0ff51fbc81ffda91dc96a5e SHA512 385763f0fedd52ddf19a58a4fa82a76d367c1aad28897c291823ebff2f9db2091fd79d138957cf5550aaaa3d9c085702d97e9e32ed8c401ec94d2f50cc7de9d0 WHIRLPOOL e2f1899b264a729e770cc2d4fe8f94e4334abf62d2024249f29841b0c1d5a1eb2d2da0793267cb6e57cfcf631b74dc5eb15e6ef4bd875540677cdb3fb24d531c
 DIST ITVal-20121104.tar.bz2 71398 SHA256 dba3bcd2876b28fad4baedfd39a4d8ddd658d128e50c6f53253d321a082dcf42 SHA512 145f464154d0c88e6c43a16a6ea59f3f6f525612c99032bd5acb934975d46568a40b25996a92d63d190afbe2f129010fb7cdb843dced9eae4ec925b97ee17eca WHIRLPOOL 6c4ebb99b496988749559e83d6170e2f7c211cb9afe7e079a2591f11e01fc679dee5e94b030291bc76995f760b1ad3f056a5a64b110757f93e9d3e3cdbe8bdd2
-EBUILD itval-1.1.ebuild 749 SHA256 a2f81e8b597583471fc93d569a3f7785f6ab8f737ccc20298864584c655dc764 SHA512 360b8b026b4c31c36d2f2254e3bb4f704cf5b0c796d672d02d5800a3ba318cb7cd0dde24bcb83f8866dbda516867be4ea216f160fa164a6a1d32d64d702b3f2e WHIRLPOOL ba4ba98c481f6ef0b3eab9d42da4c59b7db19a53bfed8caf16593c7bfba27fbd2b0b64455ba40ef178c5706a43992b41b19c1e034f5a27c9e6e1fb174a6ce16c
-EBUILD itval-1.2_p20121104.ebuild 823 SHA256 e1ca341c3c0cd00951985f5d20fcec28f2d9c2202215abd73c69c1c124873863 SHA512 3cded6653e198b2f2054329b11e9a41ff7d9cea64b9eea80f2e088175d3af6837cad114144e989661dcb5e87e9f854fc4d5e781ae0cf541ef125d7774769d477 WHIRLPOOL 6639f1c5a52c53925f6076fbad1904a05404a154b88f385ba70628f9bc7f7dc990a2f4af88d9a274e03fe51d4cdae2e61d164eec20b8c556d2434182545ac133
-MISC ChangeLog 1340 SHA256 ea2df3bb0c054536f2bdde369bf73a26a3203c4be0e14c5d2c7837b4be969806 SHA512 5a70afccb01a45302dbfaa88f1c1b4c74c69eb14663728ba68f36801e8167962bdecd26899d573519f42d5949e673b72e44cf6e827e8e382d2b4113d8652433e WHIRLPOOL e42f02a74e0bc14b1c8edc66ff599993b84cf3a14664c1eb3554a15876c645c1c94a4bde1b9b051d31d6548330f3be72ffe216c178aa42be79ab141e8366e6a8
+EBUILD itval-1.2_p20121104.ebuild 807 SHA256 9b91c5700fb4811613e9cbaaf1a6c81cd9b08b33cd68036e453ac640cfe84618 SHA512 2ab579fca768d2fb43dc9ce5c3ef47112539ea33da76e77a97572cd4a2f88c5ce21bd4c89cacca54f2f9319580f5b7b7e86a6303b458e28781c869d57f7d7857 WHIRLPOOL 1dc63c6636cdf9dc1b3c0b4b7a76771ea24c97b774cacf4b9d29031a7dd04dbaa27d31a6e5cbe6bdeb7c91da2f78fae22e478ecf20593c4554ded7eb8130c1cf
+MISC ChangeLog 1492 SHA256 a59c5e0b7f8ff8f59ed446e41b475371b565bfa02c4b79195614651e31427c32 SHA512 e7d5254e7b6b07d16b311b1363c250e0f599d814613e77be247705807248b3ae82d896c2480388ac000f6359ef9dea2dca91b9469fd82267063a637f298dad45 WHIRLPOOL a27998d4693746cebb3341b297110e1720211dc9d2fcb9c9744b9b3ae482d40583351954187af77f7a0bd5d7fdc1390afb8b84f847b4fd253c62e9c943d8b07a
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCgAGBQJQ2Sg+AAoJEPUd7O0j6ekAvJwH/2CgGf+2fItcEAyOnyXsHzOL
-+dpx9akDVZsOT28So0sP9NO6JGCq+h/3DDCAAZ3L5wo88cthwBmw+ihId3JttkJE
-M3Z5yahKoqL3fy70pxnRq/+P9FDpVKeVC1TsMO7LtpGVNqaoq38o9EGf1iasc7+e
-ZqkAHb4/cXCH985zF16bHCpXwev9TC6JmTKYGxTof2Rju5lsDVHueydtcmUlyJny
-eSjXAx+znpCsMF+IBFrE9LbKjL5RIvx4pjsKje+VqRjjuYrWGU84CafGeAmTUc+x
-zOu2M4Q3aLiOW5JJ5Rwq67SiKIWQ07MgQ8OX1Z3Bz4ZhemY3b1chlVs6wVjhJyo=
-=Chmj
+iEYEAREIAAYFAlPJGVAACgkQVWmRsqeSphNVCACeIybd9c3O9+xykhSC0kfV733e
+pP4An0phKCJ7zXh9MiS4iTB+Twh/WlIR
+=6j4C
 -----END PGP SIGNATURE-----
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 )