gentoo resync : 17.02.2021

7 files changed, 4 insertions, 202 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 35507dcadf38..d681b0564815 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index fc4d0f4be4bc..cd26409fda89 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -4,8 +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-r3.ebuild 2114 BLAKE2B f7044821f133b2a65242061d857c3b701d4fa90483c3751f3ce99a1edb5c37bfce7d42a44a593746d5f6465878b619bb8e0280605eb72c87cf700e57261229c9 SHA512 58344c93a3d4bb6c85401c6f568b20ba08425233ad8a25bd6f94b7a7d0e59cc55300dc818298fbc12273a83a5f04b3fb26fbfe6b5ead83d0367e5bb498039303
-EBUILD rxvt-unicode-9.22-r6.ebuild 2730 BLAKE2B fce29694228c2ecfe5c3210f80272f697198c3c790b81d6fbf0f4c07965890ae87668dc924103e1c04fb4f8033d7fae44e0d2ac348fc81a2f74a40a4f571ef15 SHA512 ffc4617decfc6d76c1d598304935f07fb03aca55c3884ae0ec09e3f65b8fbaab851c5b875dd59f14413042e2cd172a31b28470207ed543a44e85887b88a0479d
-EBUILD rxvt-unicode-9.22-r7.ebuild 3048 BLAKE2B fce07540f9dee07a50c2b8930fb2b86fac5477cb36ca8acb2cca30515ff268e03c42cd74988b3f69a744abcd206f3f672e666f499a4f7c867d2cf92014fd0dcb SHA512 a7dd25a900b16594fd6e575fb2054c0068b8e83b4c3b893ac404ef471205ee9a0fd6566a08cf00179eab5734004a64b3f4b64b72d6fa3f1a13867c509cce198a
+EBUILD rxvt-unicode-9.22-r7.ebuild 3047 BLAKE2B c960882a0603db51f3fbe466c5d89747188d5bfd4063256c4f9942df1de5f4429bc4dab84bf625da2820853bae06c7f17047ee857546d30ce5c1dce3f73b6ab7 SHA512 8b50c9c9b2d79e774ae7a6ed0bfc0c47bc01997441091d02526a2accdf0eefb26c6fcf12381a31a687c0ed565f8e40f3c748160d1827832ea7e50736069cc9d8
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
deleted file mode 100644
index 0c0e639986f3..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="
-	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 +utmp +wtmp xft
-"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	default
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --enable-everything \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable gdk-pixbuf pixbuf) \
-		$(use_enable iso14755) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable unicode3) \
-		$(use_enable utmp) \
-		$(use_enable wtmp) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
deleted file mode 100644
index 432e448b58a0..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop systemd
-
-COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="
-	-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 +utmp +wtmp xft
-"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-	"${WORKDIR}"/${COLOUR_PATCH_NAME}
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	default
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --enable-everything \
-		$(use_enable 24-bit-color) \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable gdk-pixbuf pixbuf) \
-		$(use_enable iso14755) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable unicode3) \
-		$(use_enable utmp) \
-		$(use_enable wtmp) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	systemd_douserunit "${FILESDIR}"/urxvtd.service
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use 24-bit-color; then
-		ewarn
-		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
-		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
-		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
-		ewarn
-	fi
-}
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 55a9c03df63d..4f49bd381262 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
 
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index a031fba3e235..54e3f7885e27 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -5,5 +5,5 @@ DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a
 EBUILD xterm-351.ebuild 2616 BLAKE2B 2f09fb2709f822a8f821e8633a1383cb389f84d5e480d8d63010ff4557adf70c8d467224890a205b275bb2941f57bb59af00dbdf6433a152d893bac2718e857b SHA512 e4fdcbf2250ad5db0b9907af0b8b501f4b955808c840d0417db35e7c97a777c433d01353c02bf2161d5d9e34dea79697cab32f9240cc7466ac6aa1cab8115ab8
 EBUILD xterm-363.ebuild 2622 BLAKE2B 9d7a3c00d431f1b77289ef45e16103a6037e2897e94fefb0d14056c351f77016924508d116cec3908e4866774bc6e9ca8d2e3563fae4a091eccceb516b6faf2f SHA512 1eebedb4b17af7b044f9fa28533803b1b5720925a324154ddf0c0dfe4e88281537e0247af034fe8895f5c764796e27386d85509d2a07585d02cd8b572bd77654
 EBUILD xterm-365.ebuild 2622 BLAKE2B 9d7a3c00d431f1b77289ef45e16103a6037e2897e94fefb0d14056c351f77016924508d116cec3908e4866774bc6e9ca8d2e3563fae4a091eccceb516b6faf2f SHA512 1eebedb4b17af7b044f9fa28533803b1b5720925a324154ddf0c0dfe4e88281537e0247af034fe8895f5c764796e27386d85509d2a07585d02cd8b572bd77654
-EBUILD xterm-366.ebuild 2618 BLAKE2B 51ce6eac9631b1295da8c8586ec26edd8fe2264b87c2a0c6bddbaeff706e3f351bf4a89c70c316ae976c65a11c30b77628104b14a65175c5749caf546d225d00 SHA512 82db4dbc12fffb9a259b14e353467e0160d7b027cd9fdbcd47af0aa62f11cbc4b819642cae05a2917e48be9c8b8a1973b40e5b139a444b13444281a18bf9cb88
+EBUILD xterm-366.ebuild 2615 BLAKE2B 55f1e696e993ab61a9bfcf4a3ea2f1fcd900322dc78a66c854f8c56a73c49ce6418a1f420dc2eab550c0ca55711a0895f142ee2d99b50863d0b6acbc7137b14c SHA512 107a3784578a7a9e187815b714e38b8302b17def8e648b424dfb5a3a1c50af9f0915053854a039cf11b36e0c492a5e45d31b8390a0444f3a6e5ce571a1c1cb79
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-366.ebuild
index 5efe26d32233..75ae0d338103 100644
--- a/x11-terms/xterm/xterm-366.ebuild
+++ b/x11-terms/xterm/xterm-366.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig