gentoo auto-resync : 04:12:2022 - 09:02:03

2 files changed, 0 insertions, 64 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 29c3e2e71c2e..80ebb13f6484 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
-EBUILD meld-3.20.4.ebuild 1732 BLAKE2B 011373c0cb2155e968c762e1132fff049a6f34f6027b41f24352ea13cf5d603d374d754ff7008fb91ec1f332002f18e7cb7538edeedc4b15c65fe213557f4957 SHA512 1de351b39e4c3d47c7205bfaba733197960c1cc7e1709082e79cfc71a1ee2148d41654843a492bd4eeec708e8ee464fa36c366f08c638cd88cd8a7a3334f36c3
 EBUILD meld-3.22.0-r1.ebuild 1651 BLAKE2B 6d3c91c56a3c6c136c2fd23dc0912ae25351bd400117e40db6ce93ba883369af9c18b28c2a87c4dbbf921299694e158310fd99df5bb15c762c436c3d8df88463 SHA512 efc918121afa280470d7dcaaf9331412078c6828137cff8e648cabaf1320f6aa832e8d1eee70cfc70a46117f6c461a1ad3862084d34702053cc20c79e1300f8a
 MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89
diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
deleted file mode 100644
index 1a416d7610fc..000000000000
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome2 distutils-r1 virtualx
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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_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}"
-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.
-
-distutils_enable_tests pytest
-
-python_check_deps() {
-	has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-python_test() {
-	# test_gutterrendererchunk.py needs a GdkScreen for Gtk.IconTheme.get_default() to work
-	virtx epytest
-}