gentoo resync : 12.03.2021

8 files changed, 88 insertions, 7 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index dfc26f77340e..b8d37540e619 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index db8b52653ea3..3107e2934e47 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -8,5 +8,5 @@ DIST gnome-terminal-3.38.3.tar.xz 2574916 BLAKE2B c7bc17da2be607d15437b5f2965901
 EBUILD gnome-terminal-3.36.2.ebuild 2681 BLAKE2B 3cb3036588d23f1603ff351fc532435bed4065d07570c34b7d83617e710d4a567b7ec02a4dd573a4991418175ff2f758c49da1e02eebfdddeb42e84e2be55458 SHA512 a59edfa79e634005873e8b748cf3eb1498beb854964caf28b72f6491c61fb71c98e21d5808f7863220596e5f8c1bf2ae52819d4b2d5bbad0b1103380ddd3e8f5
 EBUILD gnome-terminal-3.38.1.ebuild 2695 BLAKE2B d2cbdd8c07d6b56481e016b58012be7a8957e1dcf95b428492d3b161839a7d36a646f18ed384433feb7cf1651311f46f322afc23b726acb02b7b8dfce90f9961 SHA512 8ce041a97956426cc3c11a912b6b218c2b88e3afc26b57a0cccf073339874bccd64b0ce31d20ace6b47f3f5114b046082656282cd9460bd735fd8dc2c93cd240
 EBUILD gnome-terminal-3.38.2.ebuild 2711 BLAKE2B cd265a670487aad448caa77ee1a4ff5cdf2a4198153604dac95e1d3414086fad1c07049526381580a2aea384b0b902b6bb75ee9d5521e9cf40fc506bac2b8568 SHA512 0f49b57db70acc021c94ae53876a7abdc7b36c86037e56772f16909f50e309da1d26ff0e898bfa555cb5a632e99435e0cb116c59d4eeb4aaf863133b856923c2
-EBUILD gnome-terminal-3.38.3.ebuild 2711 BLAKE2B cd265a670487aad448caa77ee1a4ff5cdf2a4198153604dac95e1d3414086fad1c07049526381580a2aea384b0b902b6bb75ee9d5521e9cf40fc506bac2b8568 SHA512 0f49b57db70acc021c94ae53876a7abdc7b36c86037e56772f16909f50e309da1d26ff0e898bfa555cb5a632e99435e0cb116c59d4eeb4aaf863133b856923c2
+EBUILD gnome-terminal-3.38.3.ebuild 2710 BLAKE2B 7206c1bab1a8116c3caa639a4c93c8e68b74df3260d85d87aee6cac1a4f2bbdfae0858091c6b2947f530ca31849b8643c33c74bec7d7478060da6e8e8f1e06a0 SHA512 83e69116cea1090bda25bd5aae55772b44756a4b2c3132cdaf4619bf64e4db6a00fd0716b3b8393e59589cda36e1228f5038a6a63f842d88899633b1c992bcef
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild
index 8d0bfaf9d0af..078e460c6a9e 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.38.1-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index cd26409fda89..1696649fab2e 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -4,6 +4,6 @@ AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba25
 AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
-EBUILD rxvt-unicode-9.22-r7.ebuild 3047 BLAKE2B c960882a0603db51f3fbe466c5d89747188d5bfd4063256c4f9942df1de5f4429bc4dab84bf625da2820853bae06c7f17047ee857546d30ce5c1dce3f73b6ab7 SHA512 8b50c9c9b2d79e774ae7a6ed0bfc0c47bc01997441091d02526a2accdf0eefb26c6fcf12381a31a687c0ed565f8e40f3c748160d1827832ea7e50736069cc9d8
-EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
+EBUILD rxvt-unicode-9.22-r7.ebuild 3140 BLAKE2B de179cfae6299e8caa55965a355dca2ee3aacb97b6b2b1ebfd2b74bc15621bde8ae5ca3b0b39aa74373b742bc634d2d61fabda32ebcbe83beb12e88df5058748 SHA512 bd6e25d607d34d7eed8c7fa53074ab0b60a996109ac290477fda8796156bd68b2d938a41f92cbc7c9c89bde4a73621e96d9446f5494946b23794665f7b76c945
+EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
index 4f49bd381262..d72cdf336d7b 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop systemd
+inherit autotools desktop systemd prefix
 
 COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
 
@@ -54,6 +54,9 @@ src_prepare() {
 	# kill the rxvt-unicode terminfo file - #192083
 	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
 
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+
 	eautoreconf
 }
 
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
index f58563238431..71119ddbc14a 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools cvs desktop vcs-clean
+inherit autotools cvs desktop vcs-clean prefix
 
 DESCRIPTION="rxvt clone with xft and unicode support"
 HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -56,6 +56,9 @@ src_prepare() {
 	# kill the rxvt-unicode terminfo file - #192083
 	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
 
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+
 	eautoreconf
 }
 
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 6318a26e554f..c2b05cd88e09 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,8 @@
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
 DIST terminator-2.0.1.tar.gz 934263 BLAKE2B b3b74f513f50f53bd9d6c0909daebb6912b20fd19cfb4ebcded443d2118a4608c3377e0498604ffec61e4d4ee48eb573a4e59ebef9a2b5708f52afb6949238cf SHA512 d0159ba966a10e51d18374ce2c9f700a2b9cc981496804948ed8d13b2896ad2c2a621337b6e5da8abee59616c16a64ac267e02b8ecd55d40c35d503397a9f50b
+DIST terminator-2.1.0.tar.gz 1030864 BLAKE2B 2fb92644b1e5a79f9f9d307e50889d8741e5dc5c9e15f10d29b9c0ecb8a5c07839fd3018034435815f5dbf8f387122c18fcc71d7c82a8a250ea4449673a7054d SHA512 0406b0542d5b4498084968b4e49a5ae3ff10db394907930923ad76ac5edf459c976a0a5b8617fd3a14dcde464b563ae137beb33e04b5b82ae856c497abf3fd04
+DIST terminator-2.1.0.tar.gz.asc 866 BLAKE2B de8580504665943677eff710418c587f9da1618f2a79c8af76f53c1dae1a5d458be6489e5fd4c8fc7cd89d87d38d7546b1932b9c9c4876a7c3fed3be8fcec930 SHA512 bc5562cf75bb4e890e98e3f3d52f385d357ad97ccca3584da3ea0e5b383f30558ca99808af20c3b5d479d98beed3e69a31a9fe43d289e55d949976843f09ae31
 EBUILD terminator-2.0.1.ebuild 1606 BLAKE2B 1b3272472d14dfd65ae31580ed3243b927dd9a725562676075d39b617a7922e1bd2a2e0acc77d64be76fd5d9359522aac24edf430f96c08cdf55e03f1e5fdb66 SHA512 19cdcb5c8ab1408283ff33263fcf6ac426c8458033cfb286b1484605940ae534476559c2d2259e38c84bcceee9f5972eeebd1ed200b38fac59505f600ef3941b
+EBUILD terminator-2.1.0.ebuild 1854 BLAKE2B 3da53742c988787fa4af97ad62e584f8aa2ecedf0d7c8c4c3fa0016804ee78cf624d1583b4437220e17552842a03681098c25cfd245abe3f3ba35551393a4fba SHA512 1e3d7efcf6d443c8cf1a88409df332b05f07f7e81170b7c7ff55720d7bd5bba946d097c4a4fd78c1f9600a7039fa433088637b4c8fe8503d923c36999bf88d5d
 MISC metadata.xml 828 BLAKE2B a77c4067e727d814842b41f529d5a1f90bfeab0ab4425bb071ccb9ab043d7c3a97ee8b6e7ac7dc596d0573c35e4c67c8903a284bc5924eac909b9a29eb703890 SHA512 8ecd094dd314e3174163a86d91f67bc01ab4b2047f9ecb8d11cb39525f1b35cdf142d0a73938813f905aec734281a5542eed94540106d829b903cd95ca0193a2
diff --git a/x11-terms/terminator/terminator-2.1.0.ebuild b/x11-terms/terminator/terminator-2.1.0.ebuild
new file mode 100644
index 000000000000..50543f700755
--- /dev/null
+++ b/x11-terms/terminator/terminator-2.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1 optfeature verify-sig 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
+	verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-python/configobj[${PYTHON_USEDEP}]
+	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]
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		x11-libs/libnotify[introspection]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-terminator )
+"
+distutils_enable_tests pytest
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc
+
+PATCHES=(
+	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
+	"${FILESDIR}"/terminator-1.91-desktop.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}