Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/
Date: Sat, 29 Feb 2020 20:50:26
Message-Id: 1583009284.0af2edab5cb973d98e612c98f7145c721fa1aa19.leio@gentoo
1 commit: 0af2edab5cb973d98e612c98f7145c721fa1aa19
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 20:47:49 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 29 20:48:04 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0af2edab
7
8 dev-libs/glib: drop epunt-cxx
9
10 makes no sense with meson and this live ebuild needs a huge sync
11 with in-tree version, but fix the global scope inherit failure
12 at least for now.
13
14 Package-Manager: Portage-2.3.84, Repoman-2.3.20
15 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
16
17 dev-libs/glib/glib-9999.ebuild | 6 ++----
18 1 file changed, 2 insertions(+), 4 deletions(-)
19
20 diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
21 index e5bfef19..a34029ba 100644
22 --- a/dev-libs/glib/glib-9999.ebuild
23 +++ b/dev-libs/glib/glib-9999.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2020 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
30 @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 )
31 # Completely useless with or without USE static-libs, people need to use pkg-config
32 GNOME2_LA_PUNT="yes"
33
34 -inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool linux-info \
35 +inherit bash-completion-r1 flag-o-matic gnome-meson libtool linux-info \
36 multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
37
38 if [[ ${PV} = 9999 ]]; then
39 @@ -142,8 +142,6 @@ src_prepare() {
40 -i glib/Makefile.{am,in} || die
41
42 gnome-meson_src_prepare
43 -
44 - epunt_cxx
45 }
46
47 multilib_src_configure() {