gentoo resync : 10.02.2020

3 files changed, 68 insertions, 3 deletions

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 6c5940709391..644ed61ed67c 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,5 @@
 DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
-EBUILD diffuse-0.4.8.ebuild 1206 BLAKE2B a2bc2515294bd6a6734b81f9973d11505e8f39dcb9ba5aa2abf726c4fcda2ced41100f7304526eca0b84ba90642ae41a19d66dd472114b932a0aaa9584b3d89f SHA512 f2965164c8a5823457c6923961efb955043fea45a8cfe3fb71c39ef26d9387c197697b6ab4264785277512be1d6cc4b028d8ed45693109fa5592e171844098df
+DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
+EBUILD diffuse-0.4.8-r1.ebuild 1239 BLAKE2B 8c34de327c24f6d2c376e86302ecebf020196d3c3e8aafcc8fa5367c57cc3ea2ae816eb256664436502ee708fe39dc1315811e55caca2aff56e74855de71c4e0 SHA512 b6b34b7f7609cd5aae6c0850346c99d73386ddb78dbd467ed3cd64949e10a73aa9d4c892720c53eb66c22df38ae739ce637ec1672696778812299257697470ad
+EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1416 BLAKE2B 0df539779ca60e8a2cad6e218e889439da3988307c7b95918d559d5e7220c58a9ff8faca4493985b44637a9b3839fd7ddc6fe68ac77e29164ceb746d1b0023ad SHA512 fbfc3cd53209517743dae6bea1cc5fc46acef0e64e433ed1bc6f41991097065eabd2963b205585bf2033798bed14170beec72e49d2bcda7eb49527d0d7ce3541
 MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
index 93a43809a4d2..5a0d5a3968a4 100644
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')"
 # file collision, bug #279018
 DEPEND="${DEPEND}
 	!sci-chemistry/tinker"
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
new file mode 100644
index 000000000000..1cb786be52c5
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
+inherit python-single-r1 l10n xdg-utils
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	l10n_find_plocales_changes translations '' '.po'
+
+	rm_locale() {
+		rm -f translations/${1}.po
+		rm -rf src/usr/share/man/${1}
+		rm -rf src/usr/share/gnome/help/${PN}/$1
+		rm -f src/usr/share/omf/${PN}/${PN}-$1.omf
+	}
+
+	l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}