1 |
commit: 9782b57b5f5363960784efad0afb0b2927a76870 |
2 |
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 16 15:50:02 2018 +0000 |
4 |
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 16 15:50:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9782b57b |
7 |
|
8 |
dev-libs/glib: remove not working ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
Manifest-Sign-Key: 0x7DF238CF0AA182E1 |
12 |
|
13 |
dev-libs/glib/glib-2.54.2.ebuild | 304 ------------------------------------ |
14 |
dev-libs/glib/glib-2.54.3-r1.ebuild | 2 +- |
15 |
2 files changed, 1 insertion(+), 305 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild |
18 |
deleted file mode 100644 |
19 |
index 257cbe2c..00000000 |
20 |
--- a/dev-libs/glib/glib-2.54.2.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,304 +0,0 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
- |
26 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
27 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
28 |
-# then to be think very closely. |
29 |
- |
30 |
-EAPI=6 |
31 |
-PYTHON_COMPAT=( python2_7 ) |
32 |
-# Completely useless with or without USE static-libs, people need to use |
33 |
-# pkg-config |
34 |
-GNOME2_LA_PUNT="yes" |
35 |
- |
36 |
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool linux-info \ |
37 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
38 |
- |
39 |
-DESCRIPTION="The GLib library of C routines" |
40 |
-HOMEPAGE="https://www.gtk.org/" |
41 |
-SRC_URI="${SRC_URI} |
42 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
43 |
- |
44 |
-LICENSE="LGPL-2.1+" |
45 |
-SLOT="2" |
46 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
47 |
-REQUIRED_USE=" |
48 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
49 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
50 |
-" |
51 |
- |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
53 |
- |
54 |
-# Added util-linux multilib dependency to have libmount support (which |
55 |
-# is always turned on on linux systems, unless explicitly disabled, but |
56 |
-# this ebuild does not do that anyway) (bug #599586) |
57 |
- |
58 |
-RDEPEND=" |
59 |
- !<dev-util/gdbus-codegen-${PV} |
60 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
61 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
62 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
63 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
64 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
65 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
66 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
67 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
68 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
69 |
- utils? ( |
70 |
- ${PYTHON_DEPS} |
71 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
72 |
- virtual/libelf:0= |
73 |
- ) |
74 |
-" |
75 |
-DEPEND="${RDEPEND} |
76 |
- app-text/docbook-xml-dtd:4.1.2 |
77 |
- >=dev-libs/libxslt-1.0 |
78 |
- >=sys-devel/gettext-0.11 |
79 |
- >=dev-util/gtk-doc-am-1.20 |
80 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
81 |
- test? ( |
82 |
- sys-devel/gdb |
83 |
- ${PYTHON_DEPS} |
84 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
85 |
- >=sys-apps/dbus-1.2.14 ) |
86 |
- !<dev-util/gtk-doc-1.15-r2 |
87 |
-" |
88 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
89 |
- dbus? ( gnome-base/dconf ) |
90 |
- mime? ( x11-misc/shared-mime-info ) |
91 |
-" |
92 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
93 |
-# dconf is needed to be able to save settings, bug #498436 |
94 |
-# Earlier versions of gvfs do not work with glib |
95 |
- |
96 |
-MULTILIB_CHOST_TOOLS=( |
97 |
- /usr/bin/gio-querymodules$(get_exeext) |
98 |
-) |
99 |
- |
100 |
-pkg_setup() { |
101 |
- if use kernel_linux ; then |
102 |
- CONFIG_CHECK="~INOTIFY_USER" |
103 |
- if use test ; then |
104 |
- CONFIG_CHECK="~IPV6" |
105 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
106 |
- fi |
107 |
- linux-info_pkg_setup |
108 |
- fi |
109 |
-} |
110 |
- |
111 |
-src_prepare() { |
112 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
113 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
114 |
- # Copy missing gengiotypefuncs.py |
115 |
- cp "${FILESDIR}"/gengiotypefuncs.py "${S}"/gio/tests/ || die |
116 |
- |
117 |
- # We need gengiotypefuncs |
118 |
- if use test; then |
119 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
120 |
- if ! has_version dev-util/desktop-file-utils ; then |
121 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
122 |
- ewarn "think on installing it to get these tests run." |
123 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
124 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
125 |
- fi |
126 |
- |
127 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
128 |
- # other), falling back to xterm if one doesn't exist |
129 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
130 |
- ewarn "Some tests will be skipped due to missing terminal program" |
131 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
132 |
- fi |
133 |
- |
134 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
135 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
136 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
137 |
- |
138 |
- ewarn "Tests for search-utils have been skipped" |
139 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
140 |
- else |
141 |
- # Don't build tests, also prevents extra deps, bug #512022 |
142 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
143 |
- fi |
144 |
- |
145 |
- # gdbus-codegen is a separate package |
146 |
- eapply "${FILESDIR}"/${PN}-2.54.2-external-codegen.patch |
147 |
- |
148 |
- # Leave python shebang alone - handled by python_replicate_script |
149 |
- # We could call python_setup and give configure a valid --with-python |
150 |
- # arg, but that would mean a build dep on python when USE=utils. |
151 |
- sed -e '/${PYTHON}/d' \ |
152 |
- -i glib/Makefile.{am,in} || die |
153 |
- |
154 |
- gnome-meson_src_prepare |
155 |
- |
156 |
- epunt_cxx |
157 |
-} |
158 |
- |
159 |
-multilib_src_configure() { |
160 |
- # TODO is this still relevent? |
161 |
- # Avoid circular depend with dev-util/pkgconfig and |
162 |
- # native builds (cross-compiles won't need pkg-config |
163 |
- # in the target ROOT to work here) |
164 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
165 |
- if has_version sys-apps/dbus; then |
166 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
167 |
- export DBUS1_LIBS="-ldbus-1" |
168 |
- fi |
169 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
170 |
- export LIBFFI_LIBS="-lffi" |
171 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
172 |
- export PCRE_LIBS="-lpcre" |
173 |
- fi |
174 |
- |
175 |
- # These configure tests don't work when cross-compiling. |
176 |
- if tc-is-cross-compiler ; then |
177 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
178 |
- case ${CHOST} in |
179 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
180 |
- *) export glib_cv_stack_grows=no ;; |
181 |
- esac |
182 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
183 |
- export glib_cv_uscore=no |
184 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
185 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
186 |
- fi |
187 |
- |
188 |
- local myconf |
189 |
- |
190 |
- # FIXME multilib automagic for libelf |
191 |
- # FIXME set systemtap/tapse/static-lib install dir and test it. |
192 |
- # FIXME no selinux, fam, xattr for now. |
193 |
- # FIXME is this still valid. |
194 |
- # libelf used only by the gresource bin ?? |
195 |
- # FIXME enable docs if possible. |
196 |
- |
197 |
- use static-libs && myconf="-Ddefault_library='static'" |
198 |
- use debug && myconf="$myconf -Dbuildtype='debug'" |
199 |
- |
200 |
- gnome-meson_src_configure \ |
201 |
- ${myconf} \ |
202 |
- -Denable-libmount=$(usex kernel_linux yes no) \ |
203 |
- $(gnome-meson_use systemtap dtrace) \ |
204 |
- $(gnome-meson_use systemtap) \ |
205 |
- -Dwith-pcre=system \ |
206 |
- -Dwith-docs=no \ |
207 |
- -Dwith-man=yes |
208 |
- |
209 |
- if multilib_is_native_abi; then |
210 |
- local d |
211 |
- for d in glib gio gobject; do |
212 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
213 |
- done |
214 |
- fi |
215 |
-} |
216 |
- |
217 |
-multilib_src_compile() { |
218 |
- gnome-meson_src_compile |
219 |
-} |
220 |
-# FIXME |
221 |
-multilib_src_test() { |
222 |
- export XDG_CONFIG_DIRS=/etc/xdg |
223 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
224 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
225 |
- export LC_TIME=C # bug #411967 |
226 |
- unset GSETTINGS_BACKEND # bug #596380 |
227 |
- python_setup |
228 |
- |
229 |
- # Related test is a bit nitpicking |
230 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
231 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
232 |
- |
233 |
- # Hardened: gdb needs this, bug #338891 |
234 |
- if host-is-pax ; then |
235 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
236 |
- || die "Hardened adjustment failed" |
237 |
- fi |
238 |
- |
239 |
- # Need X for dbus-launch session X11 initialization |
240 |
- virtx meson_src_test |
241 |
-} |
242 |
- |
243 |
-# FIXME completentiondir |
244 |
-multilib_src_install() { |
245 |
- gnome-meson_src_install completiondir="$(get_bashcompdir)" |
246 |
- keepdir /usr/$(get_libdir)/gio/modules |
247 |
-} |
248 |
- |
249 |
-multilib_src_install_all() { |
250 |
- einstalldocs |
251 |
- |
252 |
- if use utils ; then |
253 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
254 |
- else |
255 |
- rm "${ED}usr/bin/gtester-report" |
256 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
257 |
- fi |
258 |
- |
259 |
- # Do not install charset.alias even if generated, leave it to libiconv |
260 |
- rm -f "${ED}/usr/lib/charset.alias" |
261 |
- |
262 |
- # Don't install gdb python macros, bug 291328 |
263 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
264 |
-} |
265 |
- |
266 |
-pkg_preinst() { |
267 |
- gnome-meson_pkg_preinst |
268 |
- |
269 |
- # Make gschemas.compiled belong to glib alone |
270 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
271 |
- |
272 |
- if [[ -e ${EROOT}${cache} ]]; then |
273 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
274 |
- else |
275 |
- touch "${ED}"/${cache} || die |
276 |
- fi |
277 |
- |
278 |
- multilib_pkg_preinst() { |
279 |
- # Make giomodule.cache belong to glib alone |
280 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
281 |
- |
282 |
- if [[ -e ${EROOT}${cache} ]]; then |
283 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
284 |
- else |
285 |
- touch "${ED}"/${cache} || die |
286 |
- fi |
287 |
- } |
288 |
- |
289 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
290 |
- # file due to inability to create it and GIO might not look at any of the modules there |
291 |
- if ! tc-is-cross-compiler ; then |
292 |
- multilib_foreach_abi multilib_pkg_preinst |
293 |
- fi |
294 |
-} |
295 |
- |
296 |
-pkg_postinst() { |
297 |
- # force (re)generation of gschemas.compiled |
298 |
- gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force" |
299 |
- |
300 |
- gnome-meson_pkg_postinst |
301 |
- |
302 |
- multilib_pkg_postinst() { |
303 |
- gnome2_giomodule_cache_update \ |
304 |
- || die "Update GIO modules cache failed (for ${ABI})" |
305 |
- } |
306 |
- if ! tc-is-cross-compiler ; then |
307 |
- multilib_foreach_abi multilib_pkg_postinst |
308 |
- else |
309 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
310 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
311 |
- ewarn "your final image for performance reasons and re-run it when packages" |
312 |
- ewarn "installing GIO modules get upgraded or added to the image." |
313 |
- fi |
314 |
-} |
315 |
- |
316 |
-pkg_postrm() { |
317 |
- gnome-meson_pkg_postrm |
318 |
- |
319 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
320 |
- multilib_pkg_postrm() { |
321 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
322 |
- } |
323 |
- multilib_foreach_abi multilib_pkg_postrm |
324 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
325 |
- fi |
326 |
-} |
327 |
|
328 |
diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild b/dev-libs/glib/glib-2.54.3-r1.ebuild |
329 |
index cfa92591..3f54b53e 100644 |
330 |
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild |
331 |
+++ b/dev-libs/glib/glib-2.54.3-r1.ebuild |
332 |
@@ -26,7 +26,7 @@ REQUIRED_USE=" |
333 |
test? ( ${PYTHON_REQUIRED_USE} ) |
334 |
" |
335 |
|
336 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
337 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
338 |
|
339 |
# Added util-linux multilib dependency to have libmount support (which |
340 |
# is always turned on on linux systems, unless explicitly disabled, but |