gentoo resync : 28.04.2021

5 files changed, 8 insertions, 210 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 54e3f7885e27..39f2543f2b6e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,5 @@
-DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
-DIST xterm-363.tgz 1442520 BLAKE2B f63efde533f9d495c3d6b744544e592608d2731f04af58a9d799f8ca7d705c81c507d9012fc4a1bd04b3e4c0a76fc00557d1a61cd9954f5fb2bf7b5ec624764f SHA512 e9148f144e5e38597c84ccd82033f4fb83a9dd222c4cecf7498e31065e7d0148c89631290e5f804fcd9d2d55f59f4fd271aaf220eb636fbe38ae245ea6537871
-DIST xterm-365.tgz 1444367 BLAKE2B efb4ce024b7a196955c160e10aadc54d97da1df6e53b9ca79184382a1db939583e52f66ed4df1f586a33b9febda6ac51dc66a9f2cd69bb04296c934aae7e7571 SHA512 3f6571d09cd3fa94e9133494a2893e804ea0f0c76289d4a7e46e3ea267278042f0e78231ff4b06ee6d7ba5936dc3e2e6c81a8f52c36d79a8ddf3cfaa59376970
 DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
-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 2615 BLAKE2B 55f1e696e993ab61a9bfcf4a3ea2f1fcd900322dc78a66c854f8c56a73c49ce6418a1f420dc2eab550c0ca55711a0895f142ee2d99b50863d0b6acbc7137b14c SHA512 107a3784578a7a9e187815b714e38b8302b17def8e648b424dfb5a3a1c50af9f0915053854a039cf11b36e0c492a5e45d31b8390a0444f3a6e5ce571a1c1cb79
+DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
+EBUILD xterm-366.ebuild 2640 BLAKE2B b9422e9dc2c57d90ab5a5ae47d54feeea8db2e01efb3e81e7e898205724de7991e5d46342acfbcb68cdfb758aa285674707cc0965eff58734065620eb989e40f SHA512 ccaa7c345810608208a5d72414598c9bfe03ce6e4a2b34667dcac977288f1c651ef5f89d96466f8ad0529038177090be0fcf1687416d5e4ddf2b8089f247929b
+EBUILD xterm-367.ebuild 2641 BLAKE2B 47f7d85a6f61bdcb447cbc450ca4ae7a63b4da9c8e13c9d8210ae76a518a378a9e1ccb870941f465ade5092bb6eed6000d1abb4433a71d4d1dd08c76c0351f32 SHA512 6615d65531fe6ed77796f3de5eb0f3bdd90f03193f935557d78634c243d022fbbdb62c9aecbf5a9576b7df5d29793cdb13781a9fbb431d5918e09f323e5b8624
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
deleted file mode 100644
index 33587fde888b..000000000000
--- a/x11-terms/xterm/xterm-351.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic multilib
-
-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 ~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 )
-	kernel_FreeBSD? ( 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 $(pkg-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-365.ebuild b/x11-terms/xterm/xterm-365.ebuild
deleted file mode 100644
index 0102172747d3..000000000000
--- a/x11-terms/xterm/xterm-365.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic
-
-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 )
-	kernel_FreeBSD? ( 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 $(pkg-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:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-366.ebuild
index 75ae0d338103..ea017d32b723 100644
--- a/x11-terms/xterm/xterm-366.ebuild
+++ b/x11-terms/xterm/xterm-366.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/"
@@ -47,7 +47,7 @@ src_configure() {
 	# 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 $(pkg-config --libs ncurses)
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
 	local myeconfargs=(
 		--disable-full-tgetent
diff --git a/x11-terms/xterm/xterm-363.ebuild b/x11-terms/xterm/xterm-367.ebuild
index 0102172747d3..7dcc4b83336a 100644
--- a/x11-terms/xterm/xterm-363.ebuild
+++ b/x11-terms/xterm/xterm-367.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/"
@@ -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
@@ -47,7 +47,7 @@ src_configure() {
 	# 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 $(pkg-config --libs ncurses)
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
 	local myeconfargs=(
 		--disable-full-tgetent