diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-03-19 13:05:07 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-03-19 13:05:07 +0000 |
| commit | 36f5261e9bc467b2130dfe657557d95f527d911f (patch) | |
| tree | b22261404657a666a4fb257e5e4664979340ab3a /net-firewall | |
| parent | Damn qt4_min_version junk. (diff) | |
| download | gentoo-2-36f5261e9bc467b2130dfe657557d95f527d911f.tar.gz gentoo-2-36f5261e9bc467b2130dfe657557d95f527d911f.tar.bz2 gentoo-2-36f5261e9bc467b2130dfe657557d95f527d911f.zip | |
Clean and unmask ebuild for #213081
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-firewall')
3 files changed, 17 insertions, 39 deletions
diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog index 32009d80219d..088101ccf960 100644 --- a/net-firewall/conntrack-tools/ChangeLog +++ b/net-firewall/conntrack-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/conntrack-tools # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.7 2008/03/19 09:58:48 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.8 2008/03/19 13:05:06 cedk Exp $ + + 19 Mar 2008; Cédric Krier <cedk@gentoo.org> + -files/conntrack-tools-0.9.6-Werror.patch, conntrack-tools-0.9.6.ebuild: + Clean and unmask ebuild for #213081 19 Mar 2008; Cédric Krier <cedk@gentoo.org> conntrack-tools-0.9.6.ebuild: Mask ebuild for bug #213081 diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild index d88078d74ef7..a1bc169c6e68 100644 --- a/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild +++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild,v 1.2 2008/03/19 09:58:48 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild,v 1.3 2008/03/19 13:05:06 cedk Exp $ -inherit linux-info eutils +inherit linux-info DESCRIPTION="Connection tracking userspace tools" HOMEPAGE="http://people.netfilter.org/pablo/conntrack-tools/" @@ -10,11 +10,11 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-amd64 -hppa -sparc -x86" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" IUSE="" DEPEND=">=net-libs/libnfnetlink-0.0.32 - >=net-libs/libnetfilter_conntrack-0.0.81" + >=net-libs/libnetfilter_conntrack-0.0.89" RDEPEND="${DEPEND} !net-firewall/conntrack" @@ -22,8 +22,7 @@ src_unpack() { unpack ${A} cd "${S}" - # Remove -Werror as it actually causes the build to fail: - epatch "${FILESDIR}"/${P}-Werror.patch + sed -i -e '/-Werror \\/d' {.,src,extensions}/Makefile.in } pkg_setup() { @@ -39,6 +38,8 @@ pkg_setup() { else CONFIG_CHECK="NF_CT_NETLINK" fi + CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4 + NETFILTER_NETLINK NF_CONNTRACK_EVENTS" check_extra_config } @@ -50,9 +51,12 @@ src_install() { newconfd "${FILESDIR}/conntrackd.confd" conntrackd insinto /etc/conntrackd - doins examples/stats/conntrackd.conf + doins doc/stats/conntrackd.conf dodoc AUTHORS ChangeLog + + # Clean unnecessary .svn directories + find doc -type d -name ".svn" -print0 | xargs -0 -n1 rm -R insinto /usr/share/doc/${PF} - doins -r examples + doins -r doc } diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch deleted file mode 100644 index 470654d6f138..000000000000 --- a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.in. 2008-03-08 12:36:10.000000000 +0100 -+++ Makefile.in 2008-03-19 01:41:32.260193358 +0100 -@@ -198,7 +198,6 @@ - top_srcdir = @top_srcdir@ - INCLUDES = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS = -std=gnu99 -W -Wall \ -- -Werror \ - -Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \ - -Wno-unused-parameter - ---- src/Makefile.in. 2008-03-08 12:36:09.000000000 +0100 -+++ src/Makefile.in 2008-03-19 01:46:23.409069787 +0100 -@@ -219,7 +219,6 @@ - top_srcdir = @top_srcdir@ - INCLUDES = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS = -std=gnu99 -W -Wall \ -- -Werror \ - -Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \ - -Wno-unused-parameter - ---- extensions/Makefile.in. 2008-03-08 12:36:09.000000000 +0100 -+++ extensions/Makefile.in 2008-03-19 01:48:36.407632658 +0100 -@@ -195,7 +195,6 @@ - top_srcdir = @top_srcdir@ - INCLUDES = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS = -std=gnu99 -W -Wall \ -- -Werror \ - -Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \ - -Wno-unused-parameter - |