gentoo resync : 17.02.2021

3 files changed, 55 insertions, 3 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index ac435a6a14cf..9933fbad812f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-EBUILD meld-3.20.2-r1.ebuild 1411 BLAKE2B 9f8ca38cd71aadff4a95cd3c45b007c2b2e5fc4e08ed2badd0d937b53c1038a897b72dbcdfe791fb6e688a52feae5548a75517283870d71a8951ebd019dc59e9 SHA512 0ab7e5b54c56bed1ab80cc7702c02c374ce760513fbf407daae1b6b8e334c31adaea01896c5c5ed6f162131a6355edf25de8d49ad3b12dd51a3049a9b6a1eaea
+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 1425 BLAKE2B a650c3941ccb0a6840aca833e0355fcaf5be13dfe1291104686c2f9bb757c4060cb28fb128f33fde54ec50f241e80fb989e6f637774ed182947df94491523035 SHA512 9b2afa73f5550bb7f9efd00d0689d50229b21fe0b4fc577afe06fef735cf7313b91aa10671bb8fc1ba9fd63769f0c49ba45a339e667c85ea83d09b7d14e6a960
 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
index 2238ffdef30b..5e3097a134e4 100644
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
new file mode 100644
index 000000000000..f398fdb8b2f2
--- /dev/null
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -0,0 +1,50 @@
+# 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_{7..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}"
+BDEPEND="
+	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
+}