Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/fwbuilder: ChangeLog fwbuilder-5.0.0.3568.ebuild fwbuilder-5.0.1.3592.ebuild
Date: Sat, 31 Dec 2011 09:13:47
Message-Id: 20111231091337.AE8372004B@flycatcher.gentoo.org
1 vapier 11/12/31 09:13:37
2
3 Modified: ChangeLog fwbuilder-5.0.0.3568.ebuild
4 fwbuilder-5.0.1.3592.ebuild
5 Log:
6 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.
7
8 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.112 net-firewall/fwbuilder/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/ChangeLog?rev=1.112&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/ChangeLog?rev=1.112&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/ChangeLog?r1=1.111&r2=1.112
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v
20 retrieving revision 1.111
21 retrieving revision 1.112
22 diff -u -r1.111 -r1.112
23 --- ChangeLog 24 Dec 2011 19:46:50 -0000 1.111
24 +++ ChangeLog 31 Dec 2011 09:13:37 -0000 1.112
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-firewall/fwbuilder
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.111 2011/12/24 19:46:50 kumba Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.112 2011/12/31 09:13:37 vapier Exp $
30 +
31 + 31 Dec 2011; Mike Frysinger <vapier@g.o> fwbuilder-5.0.0.3568.ebuild,
32 + fwbuilder-5.0.1.3592.ebuild:
33 + Disable forced ccache/distcc handling (since portage has FEATURES for this),
34 + and drop the gnuconfig manual update since eautoreconf takes care of this for
35 + us.
36
37 *fwbuilder-5.0.1.3592 (24 Dec 2011)
38
39
40
41
42 1.2 net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild?rev=1.2&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild?rev=1.2&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild?r1=1.1&r2=1.2
47
48 Index: fwbuilder-5.0.0.3568.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild,v
51 retrieving revision 1.1
52 retrieving revision 1.2
53 diff -u -r1.1 -r1.2
54 --- fwbuilder-5.0.0.3568.ebuild 16 Dec 2011 16:28:12 -0000 1.1
55 +++ fwbuilder-5.0.0.3568.ebuild 31 Dec 2011 09:13:37 -0000 1.2
56 @@ -1,8 +1,8 @@
57 # Copyright 1999-2011 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $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 $
60 +# $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 $
61
62 -EAPI=4
63 +EAPI="4"
64
65 inherit eutils base qt4-r2 multilib autotools
66
67 @@ -16,8 +16,7 @@
68
69 DEPEND=">=x11-libs/qt-gui-4.3
70 dev-libs/openssl
71 - dev-libs/elfutils
72 - sys-devel/gnuconfig"
73 + dev-libs/elfutils"
74 RDEPEND="${DEPEND}"
75
76 PATCHES=(
77 @@ -27,16 +26,12 @@
78 src_prepare() {
79 qt4-r2_src_prepare
80 eautoreconf
81 -
82 - # This package fundamentally changed its build system. We have to
83 - # manually copy config.{sub,guess} from /usr/share/gnuconfig/.
84 - cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/" \
85 - || die "failed to copy config.{sub,guess}"
86 }
87
88 src_configure() {
89 eqmake4
90 - econf
91 + # portage handles ccache/distcc itself
92 + econf --without-{ccache,distcc}
93 }
94
95 src_install() {
96
97
98
99 1.2 net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild?rev=1.2&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild?rev=1.2&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild?r1=1.1&r2=1.2
104
105 Index: fwbuilder-5.0.1.3592.ebuild
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild,v
108 retrieving revision 1.1
109 retrieving revision 1.2
110 diff -u -r1.1 -r1.2
111 --- fwbuilder-5.0.1.3592.ebuild 24 Dec 2011 19:46:50 -0000 1.1
112 +++ fwbuilder-5.0.1.3592.ebuild 31 Dec 2011 09:13:37 -0000 1.2
113 @@ -1,8 +1,8 @@
114 # Copyright 1999-2011 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 -# $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 $
117 +# $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 $
118
119 -EAPI=4
120 +EAPI="4"
121
122 inherit eutils base qt4-r2 multilib autotools
123
124 @@ -16,8 +16,7 @@
125
126 DEPEND=">=x11-libs/qt-gui-4.3
127 dev-libs/openssl
128 - dev-libs/elfutils
129 - sys-devel/gnuconfig"
130 + dev-libs/elfutils"
131 RDEPEND="${DEPEND}"
132
133 PATCHES=(
134 @@ -27,16 +26,12 @@
135 src_prepare() {
136 qt4-r2_src_prepare
137 eautoreconf
138 -
139 - # This package fundamentally changed its build system. We have to
140 - # manually copy config.{sub,guess} from /usr/share/gnuconfig/.
141 - cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/" \
142 - || die "failed to copy config.{sub,guess}"
143 }
144
145 src_configure() {
146 eqmake4
147 - econf
148 + # portage handles ccache/distcc itself
149 + econf --without-{ccache,distcc}
150 }
151
152 src_install() {