From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Aug 2021 10:30:13 +0100
Subject: gentoo resync : 14.08.2021

---
 dev-util/meld/Manifest           |  2 ++
 dev-util/meld/meld-3.20.4.ebuild | 62 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 dev-util/meld/meld-3.20.4.ebuild

(limited to 'dev-util/meld')

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 15b29e4bc912..2f886bdf7efe 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
+DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
 EBUILD meld-3.20.3.ebuild 1558 BLAKE2B 679c2847a81bdbc3c10c7d5f264b0f2a1141cb653f30ec4549735514002cb254e879928169808705909da112f0f965280bd195caa107c125091deed03e2560e4 SHA512 e4056c9e458f1fafb954df2edfe531fe23d5939b8da1837e9e4ab31be6fcd8c2ca736825d8af626cf0ff3d20d629983cb6cd50f478f5694e7e42f1bddcfef917
+EBUILD meld-3.20.4.ebuild 1724 BLAKE2B 2804ff779b37a73e6a2a0613adac2c34512274d9d7de4dd05a0b795bf5d2f858ff1732fc2e69353e199833d3d683de14d38f4ea4fadaabe627ec45fd99151195 SHA512 69fa9b9eeeef7ddd21e3933988601a1ebdaa623684750dbb4e8ddaafe5e9f51cd0671736a9d7945eb9a3c7067c1a1e1c70cd5b35a915c3a866085f84ed297cea
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
new file mode 100644
index 000000000000..5f935a31e2e4
--- /dev/null
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 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 ~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
+}
-- 
cgit v1.2.3