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: Thu, 03 Jan 2019 20:15:40
Message-Id: 1546546433.d1d9af6071917d1bed877c053ea6102dbc398792.leio@gentoo
1 commit: d1d9af6071917d1bed877c053ea6102dbc398792
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 3 20:13:53 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 3 20:13:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d9af60
7
8 dev-libs/glib: remove old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-libs/glib/Manifest | 1 -
14 dev-libs/glib/glib-2.56.2.ebuild | 297 ---------------------------------------
15 2 files changed, 298 deletions(-)
16
17 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
18 index da752322e9e..81581ccb1f0 100644
19 --- a/dev-libs/glib/Manifest
20 +++ b/dev-libs/glib/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
23 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
24 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
25 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
26
27 diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
28 deleted file mode 100644
29 index 9ccdbdf98d3..00000000000
30 --- a/dev-libs/glib/glib-2.56.2.ebuild
31 +++ /dev/null
32 @@ -1,297 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
38 -GNOME2_EAUTORECONF=yes
39 -
40 -inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
41 - multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
42 -
43 -# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
44 -# adding new dependencies end up making stage3 to grow. Every addition needs
45 -# then to be think very closely.
46 -
47 -DESCRIPTION="The GLib library of C routines"
48 -HOMEPAGE="https://www.gtk.org/"
49 -SRC_URI="${SRC_URI}
50 - https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
51 -
52 -LICENSE="LGPL-2.1+"
53 -SLOT="2"
54 -IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
55 -
56 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
57 -
58 -# Added util-linux multilib dependency to have libmount support (which
59 -# is always turned on on linux systems, unless explicitly disabled, but
60 -# this ebuild does not do that anyway) (bug #599586)
61 -
62 -RDEPEND="
63 - !<dev-util/gdbus-codegen-${PV}
64 - >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
65 - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
66 - >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
67 - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
68 - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
69 - kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
70 - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
71 - xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
72 - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
73 - utils? (
74 - >=dev-util/gdbus-codegen-${PV}
75 - virtual/libelf:0=
76 - )
77 -"
78 -DEPEND="${RDEPEND}
79 - app-text/docbook-xml-dtd:4.1.2
80 - >=dev-libs/libxslt-1.0
81 - >=sys-devel/gettext-0.11
82 - >=dev-util/gtk-doc-am-1.20
83 - systemtap? ( >=dev-util/systemtap-1.3 )
84 - ${PYTHON_DEPS}
85 - test? (
86 - sys-devel/gdb
87 - >=dev-util/gdbus-codegen-${PV}
88 - >=sys-apps/dbus-1.2.14 )
89 - !<dev-util/gtk-doc-1.15-r2
90 -"
91 -# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
92 -# python depending package, which can be buildtime depended in packages that
93 -# need these tools, without pulling in python at runtime.
94 -RDEPEND="${RDEPEND}
95 - >=dev-util/glib-utils-${PV}"
96 -PDEPEND="
97 - dbus? ( gnome-base/dconf )
98 - mime? ( x11-misc/shared-mime-info )
99 -"
100 -# shared-mime-info needed for gio/xdgmime, bug #409481
101 -# dconf is needed to be able to save settings, bug #498436
102 -
103 -MULTILIB_CHOST_TOOLS=(
104 - /usr/bin/gio-querymodules$(get_exeext)
105 -)
106 -
107 -pkg_setup() {
108 - if use kernel_linux ; then
109 - CONFIG_CHECK="~INOTIFY_USER"
110 - if use test ; then
111 - CONFIG_CHECK="~IPV6"
112 - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
113 - fi
114 - linux-info_pkg_setup
115 - fi
116 - python-any-r1_pkg_setup
117 -}
118 -
119 -src_prepare() {
120 - # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
121 - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
122 -
123 - if use test; then
124 - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
125 - if ! has_version dev-util/desktop-file-utils ; then
126 - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
127 - ewarn "think on installing it to get these tests run."
128 - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
129 - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
130 - fi
131 -
132 - # gdesktopappinfo requires existing terminal (gnome-terminal or any
133 - # other), falling back to xterm if one doesn't exist
134 - if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
135 - ewarn "Some tests will be skipped due to missing terminal program"
136 - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
137 - fi
138 -
139 - # https://bugzilla.gnome.org/show_bug.cgi?id=722604
140 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
141 - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
142 -
143 - ewarn "Tests for search-utils have been skipped"
144 - sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
145 - else
146 - # Don't build tests, also prevents extra deps, bug #512022
147 - sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
148 - fi
149 -
150 - # Less max runs in network monitor race test to avoid hitting timeout limits
151 - eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1
152 -
153 - # gdbus-codegen is a separate package
154 - eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
155 -
156 - gnome2_src_prepare
157 - epunt_cxx
158 -}
159 -
160 -multilib_src_configure() {
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 - case "${CHOST}" in
191 - *-mingw*) myconf="${myconf} --with-threads=win32" ;;
192 - *) myconf="${myconf} --with-threads=posix" ;;
193 - esac
194 -
195 - # libelf used only by the gresource bin
196 - ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
197 - $(usex debug --enable-debug=yes ' ') \
198 - $(use_enable xattr) \
199 - $(use_enable fam) \
200 - $(use_enable kernel_linux libmount) \
201 - $(use_enable selinux) \
202 - $(use_enable static-libs static) \
203 - $(use_enable systemtap dtrace) \
204 - $(use_enable systemtap systemtap) \
205 - $(multilib_native_use_enable utils libelf) \
206 - --with-python=${EPYTHON} \
207 - --disable-compile-warnings \
208 - --enable-man \
209 - --with-pcre=system \
210 - --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
211 -
212 - if multilib_is_native_abi; then
213 - local d
214 - for d in glib gio gobject; do
215 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
216 - done
217 - fi
218 -}
219 -
220 -multilib_src_test() {
221 - export XDG_CONFIG_DIRS=/etc/xdg
222 - export XDG_DATA_DIRS=/usr/local/share:/usr/share
223 - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
224 - export LC_TIME=C # bug #411967
225 - unset GSETTINGS_BACKEND # bug #596380
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 - emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
244 - keepdir /usr/$(get_libdir)/gio/modules
245 -}
246 -
247 -multilib_src_install_all() {
248 - einstalldocs
249 -
250 - # These are installed by dev-util/glib-utils
251 - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
252 - rm "${ED}usr/bin/glib-genmarshal" || die
253 - rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
254 - rm "${ED}usr/bin/glib-mkenums" || die
255 - rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
256 - rm "${ED}usr/bin/gtester-report" || die
257 - rm "${ED}usr/share/man/man1/gtester-report.1" || die
258 -
259 - # Do not install charset.alias even if generated, leave it to libiconv
260 - rm -f "${ED}/usr/$(get_libdir)/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 - # Completely useless with or without USE static-libs, people need to use pkg-config
266 - find "${ED}" -name '*.la' -delete || die
267 -}
268 -
269 -pkg_preinst() {
270 - gnome2_pkg_preinst
271 -
272 - # Make gschemas.compiled belong to glib alone
273 - local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
274 -
275 - if [[ -e ${EROOT}${cache} ]]; then
276 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
277 - else
278 - touch "${ED}"/${cache} || die
279 - fi
280 -
281 - multilib_pkg_preinst() {
282 - # Make giomodule.cache belong to glib alone
283 - local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
284 -
285 - if [[ -e ${EROOT}${cache} ]]; then
286 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
287 - else
288 - touch "${ED}"/${cache} || die
289 - fi
290 - }
291 -
292 - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
293 - # file due to inability to create it and GIO might not look at any of the modules there
294 - if ! tc-is-cross-compiler ; then
295 - multilib_foreach_abi multilib_pkg_preinst
296 - fi
297 -}
298 -
299 -pkg_postinst() {
300 - # force (re)generation of gschemas.compiled
301 - GNOME2_ECLASS_GLIB_SCHEMAS="force"
302 -
303 - gnome2_pkg_postinst
304 -
305 - multilib_pkg_postinst() {
306 - gnome2_giomodule_cache_update \
307 - || die "Update GIO modules cache failed (for ${ABI})"
308 - }
309 - if ! tc-is-cross-compiler ; then
310 - multilib_foreach_abi multilib_pkg_postinst
311 - else
312 - ewarn "Updating of GIO modules cache skipped due to cross-compilation."
313 - ewarn "You might want to run gio-querymodules manually on the target for"
314 - ewarn "your final image for performance reasons and re-run it when packages"
315 - ewarn "installing GIO modules get upgraded or added to the image."
316 - fi
317 -}
318 -
319 -pkg_postrm() {
320 - gnome2_pkg_postrm
321 -
322 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
323 - multilib_pkg_postrm() {
324 - rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
325 - }
326 - multilib_foreach_abi multilib_pkg_postrm
327 - rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
328 - fi
329 -}