Gentoo Archives: gentoo-commits

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