gentoo resync : 28.04.2021

3 files changed, 7 insertions, 53 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index beb59cc6078a..aacbcbf7d440 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
-EBUILD meld-3.20.2-r1.ebuild 1413 BLAKE2B 65dff56545810e4f02a93381e4c6f63aa46d2a637d70fa92c4dd3a1dee8c6eb9235ddad0d6e5050b1263de9b65f6115a0b80fd78ccfd5e6617f3d87b3ce14d91 SHA512 41f9e42e6c9d9af7d276da34fa67c9e84b39352a86d788b12b84544a468168822689875758b6fd53ffc3b0a22fb1b5b603a2ec6ea0f6cd87a86269abdc5bb159
-EBUILD meld-3.20.3.ebuild 1424 BLAKE2B fdbd8fc82e5282a518f951e3e99d597f4bdb8448ad190eb852ffad23492d060c4bbd0a09474f50b7c9a9ba2087fa1b30219707298e1eb3ddb92b537950d9af32 SHA512 85654b5bbee1a31aacaaa08afe597fd3d7a431b7b6dd5856e4eb1a457972726d8456a931bbe053ea787a0698ccfd268a7c7f61ea4dc3609871fb33446b4d3fb2
+EBUILD meld-3.20.3.ebuild 1564 BLAKE2B b030fd9c51c5c37f32b79e5f1f6f7a773bf95b075e2bd596ea8e5846bc56eb298d4613c316e77da91abae80f9873fd088347f4b9cbea9c97cc75c5c1c9c13cf0 SHA512 cc2d17d216c78cd4bc58cf6b31752efad2b2e58cf960bd9cc416be455ca797bc5412fd1bfbe3262cfcb66cbf9b4f8b607978ee78476ed7b6bd362322d87ed2e9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.2-r1.ebuild b/dev-util/meld/meld-3.20.2-r1.ebuild
deleted file mode 100644
index 5e3097a134e4..000000000000
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	$(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
-"
-# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
-# but it's mainly needed for debian and derivatives - seems the fallback
-# works fine, as we aren't a special_case, just an annoying warning.
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
-
-python_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas build )
-	distutils-r1_python_install
-	rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
-	rmdir "${ED}"/usr/share/doc/meld-${PV} || die
-}
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
index e5b82f74a8e6..a7542f758299 100644
--- a/dev-util/meld/meld-3.20.3.ebuild
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
@@ -33,11 +33,16 @@ BDEPEND="
 	dev-util/intltool
 	dev-util/itstool
 	sys-devel/gettext
+	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
 "
 # dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
 # but it's mainly needed for debian and derivatives - seems the fallback
 # works fine, as we aren't a special_case, just an annoying warning.
 
+python_check_deps() {
+	has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
+}
+
 python_compile_all() {
 	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }