jer 14/07/18 12:41:30 Modified: ipt_netflow-1.8-r4.ebuild ChangeLog Removed: ipt_netflow-1.8-r3.ebuild Log: make -> $(MAKE). Clean up patches. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.3 net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild?r1=1.2&r2=1.3 Index: ipt_netflow-1.8-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ipt_netflow-1.8-r4.ebuild 28 Feb 2014 11:24:01 -0000 1.2 +++ ipt_netflow-1.8-r4.ebuild 18 Jul 2014 12:41:29 -0000 1.3 @@ -1,9 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v 1.2 2014/02/28 11:24:01 pinkbyte Exp $ - -EAPI="5" +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v 1.3 2014/07/18 12:41:29 jer Exp $ +EAPI=5 inherit eutils linux-info linux-mod multilib toolchain-funcs DESCRIPTION="Netflow iptables module" @@ -19,7 +18,8 @@ RDEPEND="net-firewall/iptables" DEPEND="${RDEPEND} virtual/linux-sources - virtual/pkgconfig" + virtual/pkgconfig +" BUILD_TARGETS="all" CONFIG_CHECK="~IP_NF_IPTABLES" @@ -28,10 +28,13 @@ IPT_LIB="/usr/$(get_libdir)/xtables" src_prepare() { - sed -i -e 's:-I$(KDIR)/include::' \ + sed -i \ + -e 's:-I$(KDIR)/include::' \ + -e 's:make -C:$(MAKE) -C:g' \ -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \ - -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die 'sed on Makefile.in failed' - sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die 'sed on ipt_NETFLOW.c failed' + -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \ + Makefile.in || die + sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die # bug #455984 epatch "${FILESDIR}"/${PN}-1.8-configure.patch @@ -64,8 +67,7 @@ } src_compile() { - local ARCH="$(tc-arch-kernel)" - emake CC="$(tc-getCC)" all + emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all } src_install() { 1.14 net-firewall/ipt_netflow/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ChangeLog?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ChangeLog?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/ChangeLog?r1=1.13&r2=1.14 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ChangeLog 28 Feb 2014 11:24:01 -0000 1.13 +++ ChangeLog 18 Jul 2014 12:41:29 -0000 1.14 @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/ipt_netflow # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.13 2014/02/28 11:24:01 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.14 2014/07/18 12:41:29 jer Exp $ + + 18 Jul 2014; Jeroen Roovers <[email protected]> -ipt_netflow-1.8-r3.ebuild, + ipt_netflow-1.8-r4.ebuild, files/ipt_netflow-1.8-pax-const.patch, + files/ipt_netflow-1.8-procfs-fix.patch: + make -> $(MAKE). Clean up patches. 28 Feb 2014; Sergey Popov <[email protected]> ipt_netflow-1.8-r4.ebuild: Stable on amd64 and x86, wrt bug #502872
