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

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

4 files changed, 43 insertions, 55 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/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() {