Fix building against sys-libs/ncurses[tinfo]. Convert sed scripts to patch.

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

5 files changed, 50 insertions, 73 deletions

diff --git a/net-analyzer/iptstate/ChangeLog b/net-analyzer/iptstate/ChangeLog
index f7e883498b23..a0c86619955e 100644
--- a/net-analyzer/iptstate/ChangeLog
+++ b/net-analyzer/iptstate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/iptstate
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.43 2013/01/13 19:53:48 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.44 2014/07/12 18:18:03 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> -iptstate-2.2.3.ebuild,
+  iptstate-2.2.5.ebuild, +files/iptstate-2.2.5-gentoo.patch:
+  Fix building against sys-libs/ncurses[tinfo]. Convert sed scripts to patch.
 
   13 Jan 2013; Ulrich Müller <ulm@gentoo.org> iptstate-2.2.3.ebuild:
   Fix LICENSE, see LICENSE file.
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 8e041fc043be..9867e053282b 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST iptstate-2.2.3.tar.bz2 27546 SHA256 3cd38d143a9d160ca0ca462d61b67b1f338076be390e4422507484b8de87e620 SHA512 7f71762d2fd968896903d54dc04fd104d94255ff8644f847b95d0e61298ee50f71cc42e9f5b6fb44b3c9cbd6ec84cca372e4335b58e52a0f1059b9b8469d6a17 WHIRLPOOL 03863c361b2d995600148078cfab327b758ce467b127fbf87b90d9a30dfc3de222e8a6c6eff83b4eaef3e94e6e161311a42f5f8be79f460b01209b4f2d6afb63
+AUX iptstate-2.2.5-gentoo.patch 675 SHA256 9c25da2d82b6e09bd34900a187a92fecb7d3d0fe0f92c044aadacd93f1b90585 SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c WHIRLPOOL df4e5875dcfe16eecb9a45434a749b9ebbad1fdd587d4f4862970ece4012fe513f1113e2bb637c2fb21ec877403c8499c1883dc357bc010cc92c5382914ce6ef
 DIST iptstate-2.2.5.tar.bz2 28270 SHA256 4e4d881b701fc4599a252021d6ef579eb17aea711fbc07f95df61465b38e1055 SHA512 044bbcf96225cc52b82428792d685d19f964520f7f20a9d3fa7e53430c1f552c0f09338a5d347b08e2500206cd7634a6b4a3acffbfd9e59e4657afb6df461795 WHIRLPOOL 193623aeb5a082fa51613c22e01b22d7d8db83099061961ace7e753bd06e16cdc4b001f73d1b5d20e8eafeb3a1412744a95c10d3fab672c2644408ec125369d9
-EBUILD iptstate-2.2.3.ebuild 864 SHA256 c7a530914314d7a4e0bf68bd368112776aa5167aab36deb538f87cbe17ad8873 SHA512 979fcc2f317b6b445ef10c32a9d5271e7e83a598a9fac261cc394c059819e25cd16cc018a5092d4e4e1ad199f65ad1f4bc4c1809688e35f4ee452b5650ff8ee7 WHIRLPOOL d60b87087f26bd2ecfe9ca4f3859743f0a43e26ca16ff3a8a3f657f3d0eeb080d400f091e7e374cf7bd7969b22565153dbd24acff4dfa576358bfc1310e413a7
-EBUILD iptstate-2.2.5.ebuild 880 SHA256 00c47eceabaec5d8751e2e8743010471526658f6b042a0f641b94e42d39716ae SHA512 e0080681d9a858ab403576c6e134fbb906adc8b518b0c4e83d4dc034cf32135bf1992cacf2a8830b535a24a5caa36e13864a1d6af0d932c1879e7c4d684c61e3 WHIRLPOOL 6ae24258e565ff340aef0b6b50a4603bc9a966c8a101bd8b6d7bff2482e8af01975e31c1a9ecc5c7c6b76dc1a39e26b4a232049a2af72643179b678c4b0284c6
-MISC ChangeLog 4987 SHA256 b17b698905bd769e4828c6fbc34fd02f675f73825ceaa65bb89f63be407a0ad4 SHA512 302e7b7ac39dee0eb2e257abf219d5e43478376a4edbe943afc985dce454c73fad2f4bd4fd3bd485274027b8256e11a894b0c92b86ae4a7db23062f439679908 WHIRLPOOL e3b4d1ac9e46c2c464a704e4ebaebe6725f2b9c0be785c5f36ca34639a1a092c92583eabaff2cb4b00ae8fc45666aae2db27b48a9e225af4abf2a656e1731af9
+EBUILD iptstate-2.2.5.ebuild 787 SHA256 491bb9e682401af2e7d6cbc21e06848caedea25303f29d9096afaa769fec1070 SHA512 014a527bc19bab52842de3713468376e97abb789cefec96096d6243b5f03a6a29a9b23a7930dfb5cfbd6a2fb38b37f9eb6cf5ba350fc8835cc1bfd2e9064e21f WHIRLPOOL cce7d2330b9ebc1af4116a76ea4a8bc28047bed09cd76dd15d22a252dd4f5668e88523654e6beb996ef27ca82c86ce1388d0181ae314118f085bf64c0cda2248
+MISC ChangeLog 5198 SHA256 ab5c880b1da3aa11f82dd7153a68e7d8bd8ecc13e8c907d6125cb64a0a3be23f SHA512 63a9c9ba69a67be1f167e9ef3fd199fe122d40b842bbb0826d0319a4918144b91d2c33903d98699aba443da468b6d47a8cff8493049a88d9fa2c16687ce9eab0 WHIRLPOOL a4d954c5398dede6344304648cb8de9d0421f4e6bbc780d6bba7ff81a2050336785b0d6a81c478f442bb45204589e95c0ba638693408737df163b56d3d35e16e
 MISC metadata.xml 270 SHA256 30e60868058dfd581cd7d3abe9dc53d457f2142a200b931e356f5518379817cc SHA512 336b629f27353bab893fe37ca1b7b19af476a19e05f27f2a39809cc187a7f77e3e15f064c145eec50499427740a19293f18960788ed79b6c94a976bea85738ae WHIRLPOOL 6e0fa62a61390f5fe1cf9cb9916ac5a17622e054f284c16ff1fb90bcac82403c7758113cfc27a7a2d5785560d442f020d2af7d201ac48ae70fda23b1c0852f3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQ8xFyAAoJEDxpGckxwJCB2+wP/2/2V/VyCADuMkfi5JysjPCt
-X3OefK8+FWf+/oobEz6rbKS3ycTyKzskdWinJN0P87W9Biok2WwsNg+ebK0e9z0w
-J5YVNKssbiX16cE6fwyULZYkTtL4Nk6j/unBHb+yM1jzAo4E64LgXpu08d/ryL1B
-KVNNAb2+0em7cEquTADIA/dnNi5mO+JJ9l11LmanHw4OJE7mrUiz7voXy+sUtqGH
-FT/wcantoEbM57itL5HokwagVJMF8Nq4ncjyic4YaHauj1+gkdYgtRGF4ctCYI/D
-FVUbatY9JGVc0CRDIWnrh5Xz90+3GiF2+v4dcLjiF4W8SDiMSd1fathHWFGuuPwv
-rb+3VisuNjrsTqKE4MDmmrUvR6dxmG3SJ38dbFW6WlxdUBxSbAF2T64R/64UaQuS
-PKNxisJQ/MDg5LfFdBhYlAPuY2puRzOP4kd7m43tNPnnyZrH68ibceFHeh/o1jIr
-ONiEBZk0jBBsS5YMon3DLHdiksyDxy9oL3ilXM12zsRmLwBUgjLAGJMSYryEQ/Pi
-acU2Nw0KpyWwUIy/Mo7Y6/VX8vaGRXu8+EDYaETIan/K6Kgr/RvWfzgfQJcSsFEP
-J7/AlYbXifjnkYr0Jt9HfXXGlis1HZw5wN78dLv+j2yNajzkMz/VUva7IoRZTuJ4
-BSa4T/kP801+zjH5T7ew
-=Gu/9
+iEYEAREIAAYFAlPBe90ACgkQVWmRsqeSphP0GgCdEnm4ZeAV0lqMEIjakJlk7V/S
+5nIAniQgNEnvyq7uzDeYrwfkYkOhOr1R
+=2BHO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
new file mode 100644
index 000000000000..fdaeeb7867b2
--- /dev/null
+++ b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -17,12 +17,11 @@
+ ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS
+ 
+ CXX?= g++
+-CXXFLAGS?= -g -Wall -O2
++CXXFLAGS+= -Wall
+ CXXFILES?= iptstate.cc
+ 
+ # THIS IS FOR NORMAL COMPILATION
+-LIBS?= -lncurses -lnetfilter_conntrack
+-CPPFLAGS=
++LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
+ 
+ ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
+ 
+@@ -45,7 +44,7 @@
+ 	echo "+------------------------------------------------------------+" ;\
+ 	echo "";
+ 
+-	$(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS)
+ 	@touch iptstate
+ 
+ 	@\
diff --git a/net-analyzer/iptstate/iptstate-2.2.3.ebuild b/net-analyzer/iptstate/iptstate-2.2.3.ebuild
deleted file mode 100644
index feb32c4d8028..000000000000
--- a/net-analyzer/iptstate/iptstate-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-2.2.3.ebuild,v 1.5 2013/01/13 19:53:48 ulm Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.phildev.net/iptstate/"
-
-DEPEND="sys-libs/ncurses
-	>=net-libs/libnetfilter_conntrack-0.0.50"
-RDEPEND="${DEPEND}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's|$(CXXFLAGS)|& $(LDFLAGS)|g' \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr install || die
-	dodoc README Changelog BUGS CONTRIB WISHLIST
-}
diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
index 44e8c7b6c618..362aeefa6782 100644
--- a/net-analyzer/iptstate/iptstate-2.2.5.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# 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/iptstate/iptstate-2.2.5.ebuild,v 1.4 2012/09/20 14:00:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-2.2.5.ebuild,v 1.5 2014/07/12 18:18:03 jer Exp $
 
-EAPI=4
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
 
 DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
 HOMEPAGE="http://www.phildev.net/iptstate/"
@@ -12,23 +12,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	>=net-libs/libnetfilter_conntrack-0.0.50"
-DEPEND=${RDEPEND}
+DEPEND="
+	>=sys-libs/ncurses-5.7-r7
+	>=net-libs/libnetfilter_conntrack-0.0.50
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i \
-		-e 's:?= -g -Wall -O2:+= -Wall:' \
-		-e '/^CPPFLAGS=/d' \
-		-e 's:$(CXX):& $(LDFLAGS):' \
-		Makefile || die
-}
-
-src_compile() {
-	tc-export CXX
-	emake
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	tc-export CXX PKG_CONFIG
 }
 
 src_install() {