gentoo resync : 20.03.2022

4 files changed, 13 insertions, 116 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index b7b9a2f7c749..de9364ae7880 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,11 +1,9 @@
-DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
 DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
-DIST xterm-368.tgz 1451700 BLAKE2B 3fe939b8248e8839ba8b73b0971ab380e5f6528f51bd1993cc26d53755177fd5537cdbf2044f7fedad20663b3a7b42bc7f8b1c138233d44eb91472840f8448e1 SHA512 ea2f27722795c47a406cf4956ecdd05bae19aee621a0183aa167d188a90767a859ce41c6d1b1352b5ebd94d920360d3f26248ec0bb2068c253583d460baeafda
-DIST xterm-369.tgz 1461310 BLAKE2B 0b807b07c71af39df6b38b16b45f8f24a77e00bf41243c1109cf25c7ff448729b0ed64d62a99e954e0939e4f8ac6298afdc61b4098cf489eadbef55940e0f277 SHA512 b574e75e8bc7918f6e637534a39ebbc72cfbc74e4ff3e2b914962722b9c6e60adee49d74ebe1e778bcb35556e04098baa4465d1694fde61fbcca6434e6e706a7
 DIST xterm-370.tgz 1500208 BLAKE2B 973cda2511e761be64332746f004ed9ea716c8f5b7065cef2ef60d789e6186138b671920f23135b5c66d3226ce17c1d195db456350c94f5f0973e29610896b1a SHA512 24f1836c4f5aec175c45db77e9bc829b45ee2c93cf12c20252b22bee470392ef0637cfbbb6e90074b1c038ac023f74a4fb713bbd4abf2b5b86d064667caf38dd
-EBUILD xterm-366.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
+DIST xterm-371.tgz 1507938 BLAKE2B 4ae16885bc07e7a0feb9aae29ef724f45e1170ba1eb7660c000df9a3f903c73063569d366383e7c30546480675b3fcd6513bb824ee3a5ee05155739e858360c5 SHA512 024c2cd8ab5a9da6585999907974a917497f693a0fb8cf4519c41c7e75ef2bfcc146c7078129590a836a322f7e59a550ad741b55dcbe98be6ee7988ccebe8903
+DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
 EBUILD xterm-367.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
-EBUILD xterm-368.ebuild 2606 BLAKE2B 41f077d77771703a8e914b9c7d1b302409ba2cc9b346b4c1e54568ed5558bef5a8a281df985c0f0ffec27a52a58373c7c3af6c793ed7bba2e8c2306132dd6b06 SHA512 d2173fff97d7c3667cb3657a97122bdaeaf4629a30e0d72a808e1beb8d1e9ca513ec3c72ddc4a17b53483b5363a94ea21c337cfdf571630e755e10c5f7a0698c
-EBUILD xterm-369.ebuild 2612 BLAKE2B a252994bb9060d018b83c4aad3d25ec5730bb89dcde80814d84efdb7399af7651639f048eb211fcab759208b2ae63314ca4a1bab9ecd176639b2f925d444a49e SHA512 38f8df8d294cacaa1d6e8dea246aca2116e9263a485df7e09282265453158c104951bb6b5624675b40e417c6a94875755ce5cae7a9131d34e97dba2ac22f9be2
 EBUILD xterm-370.ebuild 2612 BLAKE2B a252994bb9060d018b83c4aad3d25ec5730bb89dcde80814d84efdb7399af7651639f048eb211fcab759208b2ae63314ca4a1bab9ecd176639b2f925d444a49e SHA512 38f8df8d294cacaa1d6e8dea246aca2116e9263a485df7e09282265453158c104951bb6b5624675b40e417c6a94875755ce5cae7a9131d34e97dba2ac22f9be2
+EBUILD xterm-371.ebuild 2602 BLAKE2B e1597c676eebf44289dadfc3cd50ae974a839f92cee438dbd2322856b2bd4a537574785d61735846b3ab3f19b45d88b31570f5f208257a2b27e099ab9d153b4e SHA512 c995b9ce3cf0e6c3e7e9524eb8a8c16b250517296c49d90dd38715ecdffb51e2af3ab601f2fe9749b8a31d97c5f7a50651f2acb0bce2aae6069af1adc5a346b4
+EBUILD xterm-372.ebuild 2595 BLAKE2B 1a8be68b373f0413897658954ab9e829902fa1113087c2f6f6671efe0d3e714d455ad878c678af487df9c52a12fbe65488b0bad26b5ca6133e7c4a6d4fe16fc4 SHA512 c87e9502a15f0183eebc6bcc323d9037c488cfa82cfba01208223b5e60784b268f036c77f264a5170acde623b976273ba8270176eda9a6702fcd3595f5c5e54f
 MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/xterm-368.ebuild b/x11-terms/xterm/xterm-368.ebuild
deleted file mode 100644
index b29486ec821a..000000000000
--- a/x11-terms/xterm/xterm-368.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-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"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-369.ebuild b/x11-terms/xterm/xterm-371.ebuild
index 57e07cc5fdd8..9a982a2d7cbb 100644
--- a/x11-terms/xterm/xterm-369.ebuild
+++ b/x11-terms/xterm/xterm-371.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -38,12 +38,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( README{,.i18n} ctlseqs.txt )
 
-pkg_setup() {
+src_configure() {
 	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
 
-src_configure() {
-	# 454736
+	# bug #454736
 	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
 	# something sane like pkg-config or ncurses5-config and stops guessing libs
 	# Everything gets linked against ncurses anyways, so don't shout
@@ -78,6 +76,7 @@ src_configure() {
 		$(use_with Xaw3d)
 		$(use_with xinerama)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-372.ebuild
index 99c8680dc55c..b98b63ca1fb5 100644
--- a/x11-terms/xterm/xterm-366.ebuild
+++ b/x11-terms/xterm/xterm-372.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -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 ~m68k ~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
@@ -38,12 +38,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( README{,.i18n} ctlseqs.txt )
 
-pkg_setup() {
+src_configure() {
 	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
 
-src_configure() {
-	# 454736
+	# bug #454736
 	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
 	# something sane like pkg-config or ncurses5-config and stops guessing libs
 	# Everything gets linked against ncurses anyways, so don't shout
@@ -78,6 +76,7 @@ src_configure() {
 		$(use_with Xaw3d)
 		$(use_with xinerama)
 	)
+
 	econf "${myeconfargs[@]}"
 }