summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-31 09:13:37 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-31 09:13:37 +0000
commit000ef4c8df2b10619df3517195c3d399f3b3758e (patch)
treec613d86351db00031fb8fd3f4ffce7d406b6fda8 /net-firewall/fwbuilder
parentAdd static-libs to USE, bug #394853 (diff)
downloadgentoo-2-000ef4c8df2b10619df3517195c3d399f3b3758e.tar.gz
gentoo-2-000ef4c8df2b10619df3517195c3d399f3b3758e.tar.bz2
gentoo-2-000ef4c8df2b10619df3517195c3d399f3b3758e.zip
Disable forced ccache/distcc handling (since portage has FEATURES for this), and drop the gnuconfig manual update since eautoreconf takes care of this for us.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall/fwbuilder')
-rw-r--r--net-firewall/fwbuilder/ChangeLog8
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild15
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild15
3 files changed, 17 insertions, 21 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index f23919328496..08b28570c414 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-firewall/fwbuilder
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.111 2011/12/24 19:46:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.112 2011/12/31 09:13:37 vapier Exp $
+
+ 31 Dec 2011; Mike Frysinger <vapier@gentoo.org> fwbuilder-5.0.0.3568.ebuild,
+ fwbuilder-5.0.1.3592.ebuild:
+ Disable forced ccache/distcc handling (since portage has FEATURES for this),
+ and drop the gnuconfig manual update since eautoreconf takes care of this for
+ us.
*fwbuilder-5.0.1.3592 (24 Dec 2011)
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
index 6a589087ba88..15fe9edba925 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild,v 1.1 2011/12/16 16:28:12 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild,v 1.2 2011/12/31 09:13:37 vapier Exp $
-EAPI=4
+EAPI="4"
inherit eutils base qt4-r2 multilib autotools
@@ -16,8 +16,7 @@ IUSE=""
DEPEND=">=x11-libs/qt-gui-4.3
dev-libs/openssl
- dev-libs/elfutils
- sys-devel/gnuconfig"
+ dev-libs/elfutils"
RDEPEND="${DEPEND}"
PATCHES=(
@@ -27,16 +26,12 @@ PATCHES=(
src_prepare() {
qt4-r2_src_prepare
eautoreconf
-
- # This package fundamentally changed its build system. We have to
- # manually copy config.{sub,guess} from /usr/share/gnuconfig/.
- cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/" \
- || die "failed to copy config.{sub,guess}"
}
src_configure() {
eqmake4
- econf
+ # portage handles ccache/distcc itself
+ econf --without-{ccache,distcc}
}
src_install() {
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
index 8e72f97eff3a..a117b666286d 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild,v 1.1 2011/12/24 19:46:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild,v 1.2 2011/12/31 09:13:37 vapier Exp $
-EAPI=4
+EAPI="4"
inherit eutils base qt4-r2 multilib autotools
@@ -16,8 +16,7 @@ IUSE=""
DEPEND=">=x11-libs/qt-gui-4.3
dev-libs/openssl
- dev-libs/elfutils
- sys-devel/gnuconfig"
+ dev-libs/elfutils"
RDEPEND="${DEPEND}"
PATCHES=(
@@ -27,16 +26,12 @@ PATCHES=(
src_prepare() {
qt4-r2_src_prepare
eautoreconf
-
- # This package fundamentally changed its build system. We have to
- # manually copy config.{sub,guess} from /usr/share/gnuconfig/.
- cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/" \
- || die "failed to copy config.{sub,guess}"
}
src_configure() {
eqmake4
- econf
+ # portage handles ccache/distcc itself
+ econf --without-{ccache,distcc}
}
src_install() {