Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitg/
Date: Sat, 29 Dec 2018 12:41:38
Message-Id: 1546087267.8c783094ba618f2f10ddaa6dc20304c5abc8a25e.eva@gentoo
1 commit: 8c783094ba618f2f10ddaa6dc20304c5abc8a25e
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 11:42:39 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 12:41:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c783094
7
8 dev-vcs/gitg: misc build-time fixes
9
10 Drop gnome-common, build system is now meson and does not need this.
11 Upgrade requirement on gettext due to use of meson. Add missing call to
12 xdg_environment_reset. Make use of meson_use. Drop unneeded pkg_setup
13 phase. These modifications only affect build so no bump.
14
15 Package-Manager: Portage-2.3.53, Repoman-2.3.12
16 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
17
18 dev-vcs/gitg/gitg-3.30.1.ebuild | 12 ++++--------
19 1 file changed, 4 insertions(+), 8 deletions(-)
20
21 diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild
22 index 8b455c5215f..338a545b1e5 100644
23 --- a/dev-vcs/gitg/gitg-3.30.1.ebuild
24 +++ b/dev-vcs/gitg/gitg-3.30.1.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2018 Gentoo Foundation
27 +# Copyright 1999-2018 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=6
31 @@ -46,23 +46,19 @@ DEPEND="${RDEPEND}
32 $(vala_depend)
33 >=dev-libs/libgit2-glib-0.24.4[vala]
34 >=dev-util/intltool-0.40
35 - gnome-base/gnome-common
36 - >=sys-devel/gettext-0.17
37 + >=sys-devel/gettext-0.19.7
38 virtual/pkgconfig
39 "
40
41 -pkg_setup() {
42 - use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
43 -}
44 -
45 src_prepare() {
46 default
47 vala_src_prepare
48 + xdg_environment_reset
49 }
50
51 src_configure() {
52 local emesonargs=(
53 - -Dglade_catalog=$(usex glade true false)
54 + $(meson_use glade glade_catalog)
55 # we install the module manually anyway
56 -Dpython=false
57 )