Gentoo Archives: gentoo-commits

From: Sobhan Mohammadpour <sobhan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/
Date: Fri, 16 Feb 2018 16:11:08
Message-Id: 1518797458.52ed682456af3f1d46fa35e52289887261027be9.sobhan@gentoo
1 commit: 52ed682456af3f1d46fa35e52289887261027be9
2 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 16 16:10:58 2018 +0000
4 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 16 16:10:58 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=52ed6824
7
8 dev-libs/glib: remove gnome-meson_use
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11 Manifest-Sign-Key: 0x7DF238CF0AA182E1
12
13 dev-libs/glib/glib-9999.ebuild | 20 ++++++++++++--------
14 1 file changed, 12 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
17 index c0953b57..b5718a7d 100644
18 --- a/dev-libs/glib/glib-9999.ebuild
19 +++ b/dev-libs/glib/glib-9999.ebuild
20 @@ -18,16 +18,16 @@ if [[ ${PV} = 9999 ]]; then
21 fi
22
23 DESCRIPTION="The GLib library of C routines"
24 -HOMEPAGE="http://www.gtk.org/"
25 +HOMEPAGE="https://www.gtk.org/"
26 SRC_URI="${SRC_URI}
27 - http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
28 + https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
29
30 if [[ ${PV} = 9999 ]]; then
31 EGIT_REPO_URI="https://git.gnome.org/browse/${GNOME_ORG_MODULE}"
32 - SRC_URI=""
33 + SRC_URI="https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
34 fi
35
36 -LICENSE="LGPL-2+"
37 +LICENSE="LGPL-2.1+"
38 SLOT="2"
39 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
40 REQUIRED_USE="
41 @@ -94,6 +94,10 @@ pkg_setup() {
42 fi
43 }
44
45 +src_unpack() {
46 + git-r3_src_unpack
47 + default
48 +}
49 src_prepare() {
50 # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
51 mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
52 @@ -186,8 +190,8 @@ multilib_src_configure() {
53 gnome-meson_src_configure \
54 ${myconf} \
55 -Denable-libmount=$(usex kernel_linux yes no) \
56 - $(gnome-meson_use systemtap dtrace) \
57 - $(gnome-meson_use systemtap) \
58 + $(meson_use systemtap enable-dtrace) \
59 + $(meson_use systemtap enable-systemtap) \
60 -Dwith-pcre=system \
61 -Dwith-docs=no \
62 -Dwith-man=yes
63 @@ -226,8 +230,8 @@ multilib_src_test() {
64 virtx meson_src_test
65 }
66
67 -# FIXME completentiondir
68 multilib_src_install() {
69 + chmod +x glib-gettextize || die
70 gnome-meson_src_install completiondir="$(get_bashcompdir)"
71 keepdir /usr/$(get_libdir)/gio/modules
72 }
73 @@ -281,7 +285,7 @@ pkg_preinst() {
74
75 pkg_postinst() {
76 # force (re)generation of gschemas.compiled
77 - gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
78 + GNOME2_ECLASS_GLIB_SCHEMAS="force"
79
80 gnome-meson_pkg_postinst