From 69c5f6e374df2210a68f98cd62143294f6e29f7f Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 8 Feb 2020 07:33:29 +0100
Subject: dev-util/meld: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-util/meld/meld-3.20.1-r1.ebuild | 38 +++++++++++++++++++++++++++++++++++++
 dev-util/meld/meld-3.20.1.ebuild    | 36 -----------------------------------
 2 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 dev-util/meld/meld-3.20.1-r1.ebuild
 delete mode 100644 dev-util/meld/meld-3.20.1.ebuild

diff --git a/dev-util/meld/meld-3.20.1-r1.ebuild b/dev-util/meld/meld-3.20.1-r1.ebuild
new file mode 100644
index 000000000000..7891198a1d56
--- /dev/null
+++ b/dev-util/meld/meld-3.20.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meld/meld-3.20.1.ebuild b/dev-util/meld/meld-3.20.1.ebuild
deleted file mode 100644
index 7b08ebcc80d2..000000000000
--- a/dev-util/meld/meld-3.20.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
-- 
cgit v1.2.3-65-gdbad