Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: go-mono.eclass gtk-sharp-module.eclass kde.eclass poppler.eclass xfconf.eclass
Date: Sun, 03 Jan 2010 19:10:53
Message-Id: E1NRVqk-0004RP-En@stork.gentoo.org
1 scarabeus 10/01/03 19:10:50
2
3 Modified: go-mono.eclass gtk-sharp-module.eclass kde.eclass
4 poppler.eclass xfconf.eclass
5 Log:
6 Update base function calls to comply with currently in-review eclass.
7
8 Revision Changes Path
9 1.8 eclass/go-mono.eclass
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/go-mono.eclass?rev=1.8&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/go-mono.eclass?rev=1.8&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/go-mono.eclass?r1=1.7&r2=1.8
14
15 Index: go-mono.eclass
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v
18 retrieving revision 1.7
19 retrieving revision 1.8
20 diff -u -r1.7 -r1.8
21 --- go-mono.eclass 5 May 2009 12:59:13 -0000 1.7
22 +++ go-mono.eclass 3 Jan 2010 19:10:49 -0000 1.8
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.7 2009/05/05 12:59:13 loki_val Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.8 2010/01/03 19:10:49 scarabeus Exp $
28
29 # @ECLASS: go-mono.eclass
30 # @MAINTAINER:
31 @@ -86,10 +86,10 @@
32 go-mono_src_prepare() {
33 if [[ "${PV%.9999}" != "${PV}" || "${PV}" == "9999" ]]
34 then
35 - base_src_util autopatch
36 + base_src_prepare
37 [[ "$EAUTOBOOTSTRAP" != "no" ]] && eautoreconf
38 else
39 - base_src_util autopatch
40 + base_src_prepare
41 fi
42 }
43
44
45
46
47 1.26 eclass/gtk-sharp-module.eclass
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.26&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.26&content-type=text/plain
51 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.25&r2=1.26
52
53 Index: gtk-sharp-module.eclass
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
56 retrieving revision 1.25
57 retrieving revision 1.26
58 diff -u -r1.25 -r1.26
59 --- gtk-sharp-module.eclass 23 Aug 2009 00:14:31 -0000 1.25
60 +++ gtk-sharp-module.eclass 3 Jan 2010 19:10:49 -0000 1.26
61 @@ -1,6 +1,6 @@
62 # Copyright 1999-2008 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.25 2009/08/23 00:14:31 loki_val Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.26 2010/01/03 19:10:49 scarabeus Exp $
66
67 # @ECLASS: gtk-sharp-module.eclass
68 # @MAINTAINER:
69 @@ -452,7 +452,7 @@
70 # phase_hook prefix trigger: ${TARBALL}-tarball-post
71 # Is exported.
72 gtk-sharp-module_src_prepare() {
73 - base_src_util autopatch
74 + base_src_prepare
75 # @ECLASS-VARIABLE: EAUTORECONF
76 # @DESCRIPTION:
77 # If set, EAUTORECONF will be run during src_prepare.
78
79
80
81 1.225 eclass/kde.eclass
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.225&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.225&content-type=text/plain
85 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.224&r2=1.225
86
87 Index: kde.eclass
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v
90 retrieving revision 1.224
91 retrieving revision 1.225
92 diff -u -r1.224 -r1.225
93 --- kde.eclass 20 Nov 2009 19:02:05 -0000 1.224
94 +++ kde.eclass 3 Jan 2010 19:10:49 -0000 1.225
95 @@ -1,6 +1,6 @@
96 # Copyright 1999-2008 Gentoo Foundation
97 # Distributed under the terms of the GNU General Public License v2
98 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.224 2009/11/20 19:02:05 abcd Exp $
99 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.225 2010/01/03 19:10:49 scarabeus Exp $
100
101 # @ECLASS: kde.eclass
102 # @MAINTAINER:
103 @@ -82,7 +82,7 @@
104 # Unpack first and deal with KDE patches after examing possible patch sets.
105 # To be picked up, patches need to be named $PN-$PV-*{diff,patch} and be
106 # placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches.
107 - [[ -d "${KDE_S}" ]] || base_src_unpack unpack
108 + [[ -d "${KDE_S}" ]] || base_src_unpack
109 if [[ -d "${PATCHDIR}" ]] ; then
110 local packages p f
111 if is-parent-package ${CATEGORY}/${PN} ; then
112 @@ -105,7 +105,7 @@
113 fi
114 done
115 fi
116 - [[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch
117 + [[ -n ${PATCHES[@]} ]] && base_src_prepare
118 else
119 # Call base_src_unpack, which has sections, to do unpacking and patching
120 # step by step transparently as defined in the ebuild.
121
122
123
124 1.6 eclass/poppler.eclass
125
126 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/poppler.eclass?rev=1.6&view=markup
127 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/poppler.eclass?rev=1.6&content-type=text/plain
128 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/poppler.eclass?r1=1.5&r2=1.6
129
130 Index: poppler.eclass
131 ===================================================================
132 RCS file: /var/cvsroot/gentoo-x86/eclass/poppler.eclass,v
133 retrieving revision 1.5
134 retrieving revision 1.6
135 diff -u -r1.5 -r1.6
136 --- poppler.eclass 16 Sep 2009 12:58:13 -0000 1.5
137 +++ poppler.eclass 3 Jan 2010 19:10:49 -0000 1.6
138 @@ -1,6 +1,6 @@
139 # Copyright 1999-2009 Gentoo Foundation
140 # Distributed under the terms of the GNU General Public License v2
141 -# $Header: /var/cvsroot/gentoo-x86/eclass/poppler.eclass,v 1.5 2009/09/16 12:58:13 loki_val Exp $
142 +# $Header: /var/cvsroot/gentoo-x86/eclass/poppler.eclass,v 1.6 2010/01/03 19:10:49 scarabeus Exp $
143
144 # @ECLASS: poppler.eclass
145 # @MAINTAINER:
146 @@ -123,7 +123,7 @@
147 # Runs autopatch from base.eclass.
148 # Uses sed to replace libpoppler.la references with -lpoppler
149 poppler_src_prepare() {
150 - base_src_util autopatch
151 + base_src_prepare
152 sed -i \
153 -e 's#$(top_builddir)/poppler/libpoppler.la#-lpoppler#' \
154 $(find . -type f -name 'Makefile.in') || die "Failed to sed proper lib into Makefile.am"
155
156
157
158 1.4 eclass/xfconf.eclass
159
160 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.4&view=markup
161 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.4&content-type=text/plain
162 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.3&r2=1.4
163
164 Index: xfconf.eclass
165 ===================================================================
166 RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
167 retrieving revision 1.3
168 retrieving revision 1.4
169 diff -u -r1.3 -r1.4
170 --- xfconf.eclass 21 Sep 2009 17:43:08 -0000 1.3
171 +++ xfconf.eclass 3 Jan 2010 19:10:49 -0000 1.4
172 @@ -1,6 +1,6 @@
173 # Copyright 1999-2009 Gentoo Foundation
174 # Distributed under the terms of the GNU General Public License v2
175 -# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.3 2009/09/21 17:43:08 ssuominen Exp $
176 +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.4 2010/01/03 19:10:49 scarabeus Exp $
177
178 # @ECLASS: xfconf.eclass
179 # @MAINTAINER:
180 @@ -75,7 +75,7 @@
181 # @DESCRIPTION:
182 # Run base_src_util autopatch and eautoreconf or elibtoolize
183 xfconf_src_prepare() {
184 - base_src_util autopatch
185 + base_src_prepare
186
187 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
188 intltoolize --force --copy --automake || die "intltoolize failed"