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.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 33 insertions, 37 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/Manifest b/net-firewall/fwbuilder/Manifest
index ad7572e4661f..7ab3ea7b6e73 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -8,24 +8,24 @@ DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685a
 DIST fwbuilder-5.0.0.3568.tar.gz 6703816 RMD160 2248f1f01581ce16c861e041230151d367a182c6 SHA1 1cbc00daf06ec1df9eb39df06c958f1fee44ebed SHA256 dc42956bfa5a0c4f703353ace2a36ddfec985f4431ab00c00ae0ac9ca6f672c0
 DIST fwbuilder-5.0.1.3592.tar.gz 6733502 RMD160 a8bef66df683822261597e4311801ed782fae26b SHA1 d9fa64ab4e844b6f8cfaa8949524e3464aac2ef7 SHA256 22120de712844b5d89a3f2924964c16cc86f96f2156ace7c3f551bd0d713c94b
 EBUILD fwbuilder-4.2.2.3541.ebuild 1219 RMD160 0008ec9f79caadaf08049eeb0db451164a203fd9 SHA1 811d609daf9d9b993bf161f6d2c5a306d38d04ec SHA256 b28a676c7495237de6590def14c10f17aaf0b97f0d45601bce0dc288c487d315
-EBUILD fwbuilder-5.0.0.3568.ebuild 1167 RMD160 cab3e615fb6877c808e267878a3a465f95fd77fc SHA1 125fb04943292f8014c857c3fc3da3f66bd67a32 SHA256 e87277c5e1946bdb1af46b6fe90624e39c21df430ef32e1e9afbf86becdefcbd
-EBUILD fwbuilder-5.0.1.3592.ebuild 1179 RMD160 e7563637095518bc275b3010be4659cc4442005b SHA1 f8779bf65df3b58cdeacd054cdb84e0d1ac156f4 SHA256 3a5e61c7f2d1e2396c80ac563459f6bef12ec70a7986348138df5fb2dfb88d7b
-MISC ChangeLog 18309 RMD160 834df763e08b16911377e517788b103777a51f49 SHA1 a27e2a16a0353a0ad84b405f2f143ecb41a4829d SHA256 15932d1fd3d664ac089a9cd394e00e0a4f7d539d0f0728f191bbaaec56d8afa2
+EBUILD fwbuilder-5.0.0.3568.ebuild 972 RMD160 61e5fc61c4772f5026f8cb75b481c5dde99924c7 SHA1 b719e2c241213b3884816f64c078ead7812d80d7 SHA256 7c284a0bf8e19384a1030999f9f843c4c0f6f8ecd87cfa8af97541f05b16e8f6
+EBUILD fwbuilder-5.0.1.3592.ebuild 984 RMD160 fe9a35e06bc940ff43212b7e82f6ae07665dd205 SHA1 803fe44661c1a3e7eee546b941cc860bcbed20a0 SHA256 2bafadf8489d574c56c74c1bcc738588c26f14915d3a660515da2c694aabc889
+MISC ChangeLog 18586 RMD160 b9776908e9356bd8388fa8e751e74421085064f2 SHA1 bc3d50fdac4a1dfa83bd8ad9416076e3d1248278 SHA256 82ac804fe3dc2676191fa9debb3d740e96d8f5598916417fdfa1025f6f6533b9
 MISC metadata.xml 206 RMD160 b967edd506f5c81d39d3780a4aea6de552ed7dc6 SHA1 506856689ca68d1a2bea94731c288946ed1ec80a SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO9fRDAAoJENsjoH7SXZXjJFUP/RGi6gSFKZgbIKdlKyBdjUAr
-uUc6ksjs8JiwMXLvQ/2/Fibwyhm1X3nuamZSTcVUeE1tyqx4S09GL4sTR0NA4x91
-fPr5aeCb3PtsRwYS2Ep7uxLQgPp1rIjtSI4CyVkIkYm7sIuB7yuknz0mVvTK3jqT
-5oqTl0sNM7oPi3pDDZQB3hmAGN3a0/UzbpAj7ONWJyTQGQP7fW6NlCreT31CdpjT
-6QGFWPXzEFfoqtit8ephai18FMjqjPVj+3K9nhhZu7KPHujhGr3EPIXLSZyza8xN
-aUxKQCpSasVczjhm3xOt0Or4DhAFyH1NhAUqNLU41UmBA6RJJhl/A3cou9zhER4h
-X6Spsrr4P0N36fS8bTEJ80fNeeCLuK//ollHqBU+4gJtTi//+C6id3UvwKsH0vqg
-m68KO/ZHyRk3/0219zhbpWGIii/N4X11zapPQsx+LHyuf5Y/iko5E232nCHKnIYl
-/oGOJ4Y2BGNzrXRN1Reme+WH0bNJaVSI+nYuTJwzpbjhnLErEG+zNIS7M2E0X56s
-FAWeuY31nJ891tANBWLqn6wde/ksecWdBV3VNHk5blM/mIstcprVOIo4T4qVDbaL
-mPLv9GOhRtSnuW9sXAvZUInM0tNzWWzw+kQLrcNva6KR7ght7jdEUKoTfyFshQCQ
-P8UTowh3YB9br68LrZQm
-=2k0+
+iQIcBAEBAgAGBQJO/tJIAAoJELEHsLL7fEFWYn8P/3fO4zq12Zzuk//0w0XCA9j4
+M/letzPfHs1EVnQY/HRgc71nh+rN72XkLTWJVOqB1zOS3QjP2A6d4CLqJKvXFTdT
+jF4MxWLzqBd2BABoscg45iTM+ojoPTpfwa4GDLvWFYttwFpxyEE9L187N+mm1YCR
+p/HyDkzC/wQC6wKm+/YLfJtHa3+GKUaytrQaGvbhFA9r0+koOMwKhtnSISZRgZep
+BIBcr1iSOuVgrNQEHajtfrcgcJgxZ95Ew6OWPgUjQNTNoT8JUtTIwevS32ufqVMr
+Qc5ginzU+9sy79/1r5NLsS/J/YxfrnXX7kB6UerJinsFyrUCitrXlFjXnD0k6Srh
+fMs+2OFl0rfEqOwWWiNTDa3hiD4aIY0c/PFxdH/SAmJYz3NYL1izjI5asGLZICt7
+Uqz9BOIVnVn2tqVnDMs4AWD1I0jKbCEG0tj5IKDQGpky4OkwJ/b/+Vj8KMLegltm
+8117IHukQ2+vOX0zy+SXlljVyNyUs8NmGeXueiEWnuN6MrrOC8YmGIuB9reiyex2
+frmEO4RvOcwim7V0OWudMSPYwCxfAU3O5iwhM165qX3uWsp2pjmidhEFqVtfXcmR
+OUBwhhOtjgmJzM+H2DyJHXHG7bSPwDEYSdo5qbWDwV5fIkJ4VWu0l5NViJgrbAms
+2h53hncIRqj58I1yKo3H
+=IIEV
 -----END PGP SIGNATURE-----
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() {