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-util/meld/
Date: Tue, 18 Feb 2020 12:15:41
Message-Id: 1582028058.031d98e888679aed81034894fae0307a6bb21eaa.leio@gentoo
1 commit: 031d98e888679aed81034894fae0307a6bb21eaa
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 18 09:29:27 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 18 12:14:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031d98e8
7
8 dev-util/meld: bump to 3.20.2
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-util/meld/Manifest | 1 +
14 dev-util/meld/meld-3.20.2.ebuild | 42 ++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 43 insertions(+)
16
17 diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
18 index 94ebb24ace3..a93c2b08289 100644
19 --- a/dev-util/meld/Manifest
20 +++ b/dev-util/meld/Manifest
21 @@ -1 +1,2 @@
22 DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
23 +DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
24
25 diff --git a/dev-util/meld/meld-3.20.2.ebuild b/dev-util/meld/meld-3.20.2.ebuild
26 new file mode 100644
27 index 00000000000..8c64e793921
28 --- /dev/null
29 +++ b/dev-util/meld/meld-3.20.2.ebuild
30 @@ -0,0 +1,42 @@
31 +# Copyright 1999-2020 Gentoo Authors
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI="6"
35 +PYTHON_REQ_USE="xml"
36 +PYTHON_COMPAT=( python3_{6,7,8} )
37 +DISTUTILS_SINGLE_IMPL=1
38 +DISTUTILS_USE_SETUPTOOLS=no
39 +
40 +inherit gnome2 distutils-r1
41 +
42 +DESCRIPTION="A graphical diff and merge tool"
43 +HOMEPAGE="http://meldmerge.org/"
44 +
45 +LICENSE="GPL-2+"
46 +SLOT="0"
47 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
48 +IUSE=""
49 +
50 +RDEPEND="${PYTHON_DEPS}
51 + >=dev-libs/glib-2.50:2
52 + $(python_gen_cond_dep '
53 + >=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
54 + ')
55 + gnome-base/gsettings-desktop-schemas
56 + >=x11-libs/gtk+-3.20:3[introspection]
57 + >=x11-libs/gtksourceview-3.20.0:3.0[introspection]
58 + >=x11-libs/pango-1.34[introspection]
59 + x11-themes/hicolor-icon-theme
60 +"
61 +DEPEND="${RDEPEND}
62 + dev-util/intltool
63 + dev-util/itstool
64 + sys-devel/gettext
65 +"
66 +# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
67 +# but it's mainly needed for debian and derivatives - seems the fallback
68 +# works fine, as we aren't a special_case, just an annoying warning.
69 +
70 +python_compile_all() {
71 + mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
72 +}