Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/goocanvas/
Date: Sun, 02 Aug 2020 18:40:34
Message-Id: 1596393595.ffa4a7159ac935475108b6fc40332456790ecf7d.leio@gentoo
1 commit: ffa4a7159ac935475108b6fc40332456790ecf7d
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 2 18:39:14 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 2 18:39:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa4a715
7
8 x11-libs/goocanvas: drop python2 overrides - no consumers
9
10 Closes: https://bugs.gentoo.org/735516
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 ...canvas-2.0.4.ebuild => goocanvas-2.0.4-r1.ebuild} | 20 +++-----------------
15 1 file changed, 3 insertions(+), 17 deletions(-)
16
17 diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
18 similarity index 67%
19 rename from x11-libs/goocanvas/goocanvas-2.0.4.ebuild
20 rename to x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
21 index ebee51dd3a3..ecf7cebb117 100644
22 --- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
23 +++ b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
24 @@ -2,9 +2,8 @@
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 -PYTHON_COMPAT=( python2_7 )
29
30 -inherit gnome2 python-r1
31 +inherit gnome2
32
33 DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
34 HOMEPAGE="https://wiki.gnome.org/GooCanvas"
35 @@ -12,18 +11,13 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
36 LICENSE="LGPL-2"
37 SLOT="2.0"
38 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
39 -IUSE="examples +introspection python"
40 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
41 +IUSE="examples +introspection"
42
43 -# python only enables python specific binding override
44 RDEPEND="
45 >=x11-libs/gtk+-3.0.0:3
46 >=dev-libs/glib-2.28.0:2
47 >=x11-libs/cairo-1.10.0
48 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
49 - python? (
50 - ${PYTHON_DEPS}
51 - >=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
52 "
53 DEPEND="${RDEPEND}
54 dev-util/glib-utils
55 @@ -37,7 +31,7 @@ src_prepare() {
56 sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
57 -i Makefile.am Makefile.in || die "sed failed"
58
59 - # Python bindings are built/installed manually.
60 + # Python bindings are built/installed manually, but not at all anymore (py2).
61 sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
62
63 gnome2_src_prepare
64 @@ -54,14 +48,6 @@ src_configure() {
65 src_install() {
66 gnome2_src_install
67
68 - if use python; then
69 - sub_install() {
70 - python_moduleinto $(python -c "import gi;print gi._overridesdir")
71 - python_domodule bindings/python/GooCanvas.py
72 - }
73 - python_foreach_impl sub_install
74 - fi
75 -
76 if use examples; then
77 insinto "/usr/share/doc/${P}/examples/"
78 doins demo/*.[ch] demo/*.png