1 |
commit: 58270e36e89481ec1ad929a5a5d0f6f289f28aa5 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 1 22:07:47 2016 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 23:57:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58270e36 |
7 |
|
8 |
dev-libs/glib: version bump 2.50.0 → 2.50.1 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
dev-libs/glib/Manifest | 1 + |
13 |
dev-libs/glib/glib-2.50.1.ebuild | 281 +++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 282 insertions(+) |
15 |
|
16 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
17 |
index 1d68f11..76c63ce 100644 |
18 |
--- a/dev-libs/glib/Manifest |
19 |
+++ b/dev-libs/glib/Manifest |
20 |
@@ -5,4 +5,5 @@ DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f |
21 |
DIST glib-2.48.1.tar.xz 7441032 SHA256 74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 SHA512 5bbea7d07ba6d75c35c6be8f1ebc685aa2549bd20030741b2d6e2c30e9b2d476c2afa50a974bbdad98c305666c8b04357b51619c97fe50d3e9965700088aad9b WHIRLPOOL 2f08854815fee79b6246accedb62a714845b7f0bc67bcd6cde48aa0147a957e6c9cbbc424100d651ee5573f31a3db89ee1935e3ffdc97c5bf1d5711a85545eb2 |
22 |
DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b |
23 |
DIST glib-2.50.0.tar.xz 7513808 SHA256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 SHA512 ad711cac11bb4e3a2c5cfa315f67ea252f2f91249bb00daf708653ad50895f0ebe874d491e6052b67c8e13bd153910105358964d0b7f86463b512a3ee2967b3c WHIRLPOOL a7a0010b8949744b2410a5ea47b7975e960246294c6947d4804dc504c0509aefa0fb883e20f889d08a238c39ab1e2626e2d71bc5947f9bebfefe42bf1d00d61e |
24 |
+DIST glib-2.50.1.tar.xz 7521832 SHA256 2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd SHA512 68c327179a786eb50f6f2c036dd71415143604bc12787be992e0b25bd691cd480aca4b2c284802bbcf94865ccef8776b03f98a45db3463b008adb602c208c090 WHIRLPOOL 818f76ba2ad58ff9a8e3b78ce4a2ea15e94e65518704729f1b425da6a465331e1b4f82136883455ae54cab1b48c9536566d281d0e74e27bc2d2bd431d31a6aa1 |
25 |
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 |
26 |
|
27 |
diff --git a/dev-libs/glib/glib-2.50.1.ebuild b/dev-libs/glib/glib-2.50.1.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000..b40c2d7 |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/glib/glib-2.50.1.ebuild |
32 |
@@ -0,0 +1,281 @@ |
33 |
+# Copyright 1999-2016 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+# $Id$ |
36 |
+ |
37 |
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
38 |
+# adding new dependencies end up making stage3 to grow. Every addition needs |
39 |
+# then to be think very closely. |
40 |
+ |
41 |
+EAPI=6 |
42 |
+PYTHON_COMPAT=( python2_7 ) |
43 |
+# Completely useless with or without USE static-libs, people need to use |
44 |
+# pkg-config |
45 |
+GNOME2_LA_PUNT="yes" |
46 |
+ |
47 |
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2 libtool linux-info \ |
48 |
+ multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
49 |
+ |
50 |
+DESCRIPTION="The GLib library of C routines" |
51 |
+HOMEPAGE="http://www.gtk.org/" |
52 |
+SRC_URI="${SRC_URI} |
53 |
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
54 |
+ |
55 |
+LICENSE="LGPL-2+" |
56 |
+SLOT="2" |
57 |
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
58 |
+REQUIRED_USE=" |
59 |
+ utils? ( ${PYTHON_REQUIRED_USE} ) |
60 |
+ test? ( ${PYTHON_REQUIRED_USE} ) |
61 |
+" |
62 |
+ |
63 |
+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" |
64 |
+ |
65 |
+RDEPEND=" |
66 |
+ !<dev-util/gdbus-codegen-${PV} |
67 |
+ >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
68 |
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
69 |
+ >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
70 |
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
71 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
72 |
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
73 |
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
74 |
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
75 |
+ utils? ( |
76 |
+ ${PYTHON_DEPS} |
77 |
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
78 |
+ virtual/libelf:0= |
79 |
+ ) |
80 |
+" |
81 |
+DEPEND="${RDEPEND} |
82 |
+ app-text/docbook-xml-dtd:4.1.2 |
83 |
+ >=dev-libs/libxslt-1.0 |
84 |
+ >=sys-devel/gettext-0.11 |
85 |
+ >=dev-util/gtk-doc-am-1.20 |
86 |
+ systemtap? ( >=dev-util/systemtap-1.3 ) |
87 |
+ test? ( |
88 |
+ sys-devel/gdb |
89 |
+ ${PYTHON_DEPS} |
90 |
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
91 |
+ >=sys-apps/dbus-1.2.14 ) |
92 |
+ !<dev-util/gtk-doc-1.15-r2 |
93 |
+" |
94 |
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
95 |
+ dbus? ( gnome-base/dconf ) |
96 |
+ mime? ( x11-misc/shared-mime-info ) |
97 |
+" |
98 |
+# shared-mime-info needed for gio/xdgmime, bug #409481 |
99 |
+# dconf is needed to be able to save settings, bug #498436 |
100 |
+# Earlier versions of gvfs do not work with glib |
101 |
+ |
102 |
+MULTILIB_CHOST_TOOLS=( |
103 |
+ /usr/bin/gio-querymodules$(get_exeext) |
104 |
+) |
105 |
+ |
106 |
+pkg_setup() { |
107 |
+ if use kernel_linux ; then |
108 |
+ CONFIG_CHECK="~INOTIFY_USER" |
109 |
+ if use test ; then |
110 |
+ CONFIG_CHECK="~IPV6" |
111 |
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
112 |
+ fi |
113 |
+ linux-info_pkg_setup |
114 |
+ fi |
115 |
+} |
116 |
+ |
117 |
+src_prepare() { |
118 |
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
119 |
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
120 |
+ |
121 |
+ if use test; then |
122 |
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
123 |
+ if ! has_version dev-util/desktop-file-utils ; then |
124 |
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
125 |
+ ewarn "think on installing it to get these tests run." |
126 |
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
127 |
+ sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
128 |
+ fi |
129 |
+ |
130 |
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any |
131 |
+ # other), falling back to xterm if one doesn't exist |
132 |
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
133 |
+ ewarn "Some tests will be skipped due to missing terminal program" |
134 |
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
135 |
+ fi |
136 |
+ |
137 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
138 |
+ sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
139 |
+ sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
140 |
+ |
141 |
+ ewarn "Tests for search-utils have been skipped" |
142 |
+ sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
143 |
+ else |
144 |
+ # Don't build tests, also prevents extra deps, bug #512022 |
145 |
+ sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
146 |
+ fi |
147 |
+ |
148 |
+ # gdbus-codegen is a separate package |
149 |
+ eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
150 |
+ |
151 |
+ # Leave python shebang alone - handled by python_replicate_script |
152 |
+ # We could call python_setup and give configure a valid --with-python |
153 |
+ # arg, but that would mean a build dep on python when USE=utils. |
154 |
+ sed -e '/${PYTHON}/d' \ |
155 |
+ -i glib/Makefile.{am,in} || die |
156 |
+ |
157 |
+ # Also needed to prevent cross-compile failures, see bug #267603 |
158 |
+ eautoreconf |
159 |
+ |
160 |
+ gnome2_src_prepare |
161 |
+ |
162 |
+ epunt_cxx |
163 |
+} |
164 |
+ |
165 |
+multilib_src_configure() { |
166 |
+ # Avoid circular depend with dev-util/pkgconfig and |
167 |
+ # native builds (cross-compiles won't need pkg-config |
168 |
+ # in the target ROOT to work here) |
169 |
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
170 |
+ if has_version sys-apps/dbus; then |
171 |
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
172 |
+ export DBUS1_LIBS="-ldbus-1" |
173 |
+ fi |
174 |
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
175 |
+ export LIBFFI_LIBS="-lffi" |
176 |
+ fi |
177 |
+ |
178 |
+ # These configure tests don't work when cross-compiling. |
179 |
+ if tc-is-cross-compiler ; then |
180 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
181 |
+ case ${CHOST} in |
182 |
+ hppa*|metag*) export glib_cv_stack_grows=yes ;; |
183 |
+ *) export glib_cv_stack_grows=no ;; |
184 |
+ esac |
185 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
186 |
+ export glib_cv_uscore=no |
187 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
188 |
+ export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
189 |
+ fi |
190 |
+ |
191 |
+ local myconf |
192 |
+ |
193 |
+ case "${CHOST}" in |
194 |
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
195 |
+ *) myconf="${myconf} --with-threads=posix" ;; |
196 |
+ esac |
197 |
+ |
198 |
+ # libelf used only by the gresource bin |
199 |
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
200 |
+ $(usex debug --enable-debug=yes ' ') \ |
201 |
+ $(use_enable xattr) \ |
202 |
+ $(use_enable fam) \ |
203 |
+ $(use_enable selinux) \ |
204 |
+ $(use_enable static-libs static) \ |
205 |
+ $(use_enable systemtap dtrace) \ |
206 |
+ $(use_enable systemtap systemtap) \ |
207 |
+ $(multilib_native_use_enable utils libelf) \ |
208 |
+ --disable-compile-warnings \ |
209 |
+ --enable-man \ |
210 |
+ --with-pcre=system \ |
211 |
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
212 |
+ |
213 |
+ if multilib_is_native_abi; then |
214 |
+ local d |
215 |
+ for d in glib gio gobject; do |
216 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
217 |
+ done |
218 |
+ fi |
219 |
+} |
220 |
+ |
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 |
+ python_setup |
227 |
+ |
228 |
+ # Related test is a bit nitpicking |
229 |
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
230 |
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
231 |
+ |
232 |
+ # Hardened: gdb needs this, bug #338891 |
233 |
+ if host-is-pax ; then |
234 |
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
235 |
+ || die "Hardened adjustment failed" |
236 |
+ fi |
237 |
+ |
238 |
+ # Need X for dbus-launch session X11 initialization |
239 |
+ virtx emake check |
240 |
+} |
241 |
+ |
242 |
+multilib_src_install() { |
243 |
+ gnome2_src_install completiondir="$(get_bashcompdir)" |
244 |
+ keepdir /usr/$(get_libdir)/gio/modules |
245 |
+} |
246 |
+ |
247 |
+multilib_src_install_all() { |
248 |
+ einstalldocs |
249 |
+ |
250 |
+ if use utils ; then |
251 |
+ python_replicate_script "${ED}"/usr/bin/gtester-report |
252 |
+ else |
253 |
+ rm "${ED}usr/bin/gtester-report" |
254 |
+ rm "${ED}usr/share/man/man1/gtester-report.1" |
255 |
+ fi |
256 |
+ |
257 |
+ # Do not install charset.alias even if generated, leave it to libiconv |
258 |
+ rm -f "${ED}/usr/lib/charset.alias" |
259 |
+ |
260 |
+ # Don't install gdb python macros, bug 291328 |
261 |
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
262 |
+} |
263 |
+ |
264 |
+pkg_preinst() { |
265 |
+ gnome2_pkg_preinst |
266 |
+ |
267 |
+ # Make gschemas.compiled belong to glib alone |
268 |
+ local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
269 |
+ |
270 |
+ if [[ -e ${EROOT}${cache} ]]; then |
271 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
272 |
+ else |
273 |
+ touch "${ED}"/${cache} || die |
274 |
+ fi |
275 |
+ |
276 |
+ multilib_pkg_preinst() { |
277 |
+ # Make giomodule.cache belong to glib alone |
278 |
+ local cache="usr/$(get_libdir)/gio/giomodule.cache" |
279 |
+ |
280 |
+ if [[ -e ${EROOT}${cache} ]]; then |
281 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
282 |
+ else |
283 |
+ touch "${ED}"/${cache} || die |
284 |
+ fi |
285 |
+ } |
286 |
+ |
287 |
+ multilib_foreach_abi multilib_pkg_preinst |
288 |
+} |
289 |
+ |
290 |
+pkg_postinst() { |
291 |
+ # force (re)generation of gschemas.compiled |
292 |
+ GNOME2_ECLASS_GLIB_SCHEMAS="force" |
293 |
+ |
294 |
+ gnome2_pkg_postinst |
295 |
+ |
296 |
+ multilib_pkg_postinst() { |
297 |
+ gnome2_giomodule_cache_update \ |
298 |
+ || die "Update GIO modules cache failed (for ${ABI})" |
299 |
+ } |
300 |
+ multilib_foreach_abi multilib_pkg_postinst |
301 |
+} |
302 |
+ |
303 |
+pkg_postrm() { |
304 |
+ gnome2_pkg_postrm |
305 |
+ |
306 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
307 |
+ multilib_pkg_postrm() { |
308 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache |
309 |
+ } |
310 |
+ multilib_foreach_abi multilib_pkg_postrm |
311 |
+ rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
312 |
+ fi |
313 |
+} |