gentoo resync : 25.11.2020

4 files changed, 21 insertions, 79 deletions

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index ac650ff863fe..8ef8836f6f75 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,7 +2,6 @@ AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
 AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
 AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
-DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
-EBUILD terminator-1.92-r1.ebuild 1420 BLAKE2B 827d5ad4eac2daff26c5d2d332fa2c81041e64fc4493d916f0c9a02325782260646b3e7c366f16164c62470193225bd55929fc1a3abf5db40901f7c9b303eef1 SHA512 026c09e3cc734279d61ecf362b76ed8e60b2f18d4d0ecc9c844c95ec7d9b5ba55abeafce60de7957409e55782ad6af1f6057f23eac63fc80ae6b7205eab4f886
-EBUILD terminator-1.92-r2.ebuild 1417 BLAKE2B ab8ce10e6c8e4f846dde75e9ac881d9d1e0a384310d5120cb039517c7aa0f25ef8e6e4116bded4a69069171334d6e52aa867e25c3a11c7d9ad509964effe8c0b SHA512 58b79bb577754383f0717373b26c271704bb90bb5964267bc02cd7b17a65ebc2ce63f635a06e7fea53e837a36c1e0dabc293601f1e6091302c122b48576dcccb
-MISC metadata.xml 939 BLAKE2B 0dec2029cc408e41758176cbd24d54ab9d729e6d362e51eb4c853f58d42be8122806ce940322938c9da996bcfe14552aea6840c923e74da55603147b10f9c36c SHA512 d676119cf2e888e24e53ec42c9027ea3ed27b67abf73a3b483345f15578f9afb19ff65ec4ce59a53bfb6d7429764e3f0450ff219bb61e2b21ed0e680c3418dd3
+DIST terminator-2.0.1.tar.gz 934263 BLAKE2B b3b74f513f50f53bd9d6c0909daebb6912b20fd19cfb4ebcded443d2118a4608c3377e0498604ffec61e4d4ee48eb573a4e59ebef9a2b5708f52afb6949238cf SHA512 d0159ba966a10e51d18374ce2c9f700a2b9cc981496804948ed8d13b2896ad2c2a621337b6e5da8abee59616c16a64ac267e02b8ecd55d40c35d503397a9f50b
+EBUILD terminator-2.0.1.ebuild 1606 BLAKE2B 1b3272472d14dfd65ae31580ed3243b927dd9a725562676075d39b617a7922e1bd2a2e0acc77d64be76fd5d9359522aac24edf430f96c08cdf55e03f1e5fdb66 SHA512 19cdcb5c8ab1408283ff33263fcf6ac426c8458033cfb286b1484605940ae534476559c2d2259e38c84bcceee9f5972eeebd1ed200b38fac59505f600ef3941b
+MISC metadata.xml 828 BLAKE2B a77c4067e727d814842b41f529d5a1f90bfeab0ab4425bb071ccb9ab043d7c3a97ee8b6e7ac7dc596d0573c35e4c67c8903a284bc5924eac909b9a29eb703890 SHA512 8ecd094dd314e3174163a86d91f67bc01ab4b2047f9ecb8d11cb39525f1b35cdf142d0a73938813f905aec734281a5542eed94540106d829b903cd95ca0193a2
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index bc4c0c962e21..ee4d746c1c88 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -16,9 +16,6 @@
 		sysadmins and other users. If you have any suggestions, please file
 		wishlist bugs! (see below for the address)
 	</longdescription>
-	<use>
-		<flag name="libnotify">Enables desktop notifications via <pkg>x11-libs/libnotify</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">gnome-terminator/terminator</remote-id>
 	</upstream>
diff --git a/x11-terms/terminator/terminator-1.92-r1.ebuild b/x11-terms/terminator/terminator-1.92-r1.ebuild
deleted file mode 100644
index f93f12e81492..000000000000
--- a/x11-terms/terminator/terminator-1.92-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="no"
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="https://github.com/gnome-terminator/terminator"
-SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus +libnotify"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/keybinder:3[introspection]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.16:3
-	x11-libs/vte:2.91[introspection]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	libnotify? ( x11-libs/libnotify[introspection] )
-"
-BDEPEND="
-	dev-util/intltool
-"
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
-	"${FILESDIR}"/terminator-1.91-desktop.patch
-	"${FILESDIR}"/terminator-1.92-make-tests-fail.patch
-	"${FILESDIR}"/terminator-1.92-metainfo.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/terminator/terminator-1.92-r2.ebuild b/x11-terms/terminator/terminator-2.0.1.ebuild
index 9e0fe53f6b38..b4f2d5d860e5 100644
--- a/x11-terms/terminator/terminator-1.92-r2.ebuild
+++ b/x11-terms/terminator/terminator-2.0.1.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="no"
-inherit distutils-r1 virtualx xdg-utils
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1 optfeature virtualx xdg-utils
 
 DESCRIPTION="Multiple GNOME terminals in one window"
 HOMEPAGE="https://github.com/gnome-terminator/terminator"
-SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/gnome-terminator/terminator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus +libnotify X"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="test"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -22,26 +21,28 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas[introspection]
 	x11-libs/gtk+:3
 	x11-libs/vte:2.91[introspection]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	libnotify? ( x11-libs/libnotify[introspection] )
-	X? ( dev-libs/keybinder:3[introspection] )
 "
 BDEPEND="
 	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		x11-libs/libnotify[introspection]
+	)
 "
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
 	"${FILESDIR}"/terminator-1.91-desktop.patch
-	"${FILESDIR}"/terminator-1.92-make-tests-fail.patch
-	"${FILESDIR}"/terminator-1.92-metainfo.patch
 )
 
 src_prepare() {
 	xdg_environment_reset
+	sed -i -e '/pytest-runner/d' setup.py || die
 	distutils-r1_src_prepare
 }
 
@@ -52,6 +53,11 @@ src_test() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	elog "Consider installing the following for additional features:"
+	optfeature "D-Bus" dev-python/dbus-python
+	optfeature "Desktop notifications" "x11-libs/libnotify[introspection]"
+	optfeature "Global keyboard shortcuts" "dev-libs/keybinder:3[introspection]"
 }
 
 pkg_postrm() {