gentoo auto-resync : 27:09:2022 - 21:10:48

5 files changed, 100 insertions, 66 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 89bc40d258d5..642590de2044 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 2621514e5f1a..1717ae4d8a7e 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -3,5 +3,4 @@ AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f9398
 DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3867531fac5129fb59b84459101f2d673e3a6699eecf1fa0d19c33d30467bb043010bd19737c2bc0461cea861c71a7 SHA512 a916b9718801bb015d14bdec2eede24c89101d5ea36d22131b7d34f8dad48b9db9e79811645ce571e3c95c9e4b2f18d6b8508f519de7ff54c4246c5f7b546af2
 DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
 EBUILD terminator-2.1.1-r1.ebuild 1713 BLAKE2B 6b91af54ae6df2e83058d653b9cf900d2a766a9761ef27194a69d13a9456603fa2e5d4005b4be56c462c36fcfce8c179350fb0da01f537fc0cb10a7381fa2801 SHA512 923097df4aabeab251db09ea7c315f4f901e444ddeec61f2d7ccdb68a7d81f70c97f8f98d8528cae3d3934a68be1290b78f6bddc835a5e5d99c9aedc754f3990
-EBUILD terminator-2.1.1.ebuild 1674 BLAKE2B 5fb09a6c2b9dc319af7e34a3fa1e6aa10ab4aeb39f856651b133ef4b594d02d1a0d09425eeb3d4e3a9e2ff5fb5aa59a3300fddb5c1f5c7e78160e5fe95673cf3 SHA512 8a223dc859dcbc9c656b92be8cb9e78979f936a830e0d1c9205b36ed036795d0c9214e3a4a4a44b8e33c1ba383c778656dddfedd717ce6fe07699f59c59c577e
 MISC metadata.xml 859 BLAKE2B 315ffd413597c4b0b5e847e4869c330be0f9092f3c272dcb362fdce1b89423a65a887a6e63b2770253aa2125cc3e6368adb058491f0fd420594d315047279c83 SHA512 2a56b28dcc37b9697c778de2482b7e191fc83907f1e8930a015b3e60a8a672faeec18a6602565ad60c0883f7857b956a1abccf06800f4a4276f72cd643449030
diff --git a/x11-terms/terminator/terminator-2.1.1.ebuild b/x11-terms/terminator/terminator-2.1.1.ebuild
deleted file mode 100644
index e477a83d58f7..000000000000
--- a/x11-terms/terminator/terminator-2.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
-
-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? ( sec-keys/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_pkg_postinst
-
-	optfeature "D-Bus" dev-python/dbus-python
-	optfeature "desktop notifications" "x11-libs/libnotify[introspection]"
-	optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]"
-}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index aef7798dfd0c..7b93f8c31044 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,3 +1,5 @@
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
+DIST xterm-373.tgz 1518059 BLAKE2B f215e6e695696cba3a0e02eac9e236fbcb50b3b99febba972bd42eb71b724ad596062ad567aaa89ff74d785c198c35ac6e99693f8231d763a4f054123863ba3b SHA512 0e1ef4165137fa5369ac2b2b93c73527a23c89a3f5e4b9de7a24dca5af78a6cb34cddb47a5aec2b16b1b302347c79447fbee87bddae3c569bbaac8765e7875f9
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
+EBUILD xterm-373.ebuild 2619 BLAKE2B f89d4634c1ea84350ed93a3afe2259812d80a1b9a5dddb7e71366db422e4a9012e305d20385d58f0cef3ce0ab1c025e3847b9acf6c362e1c294d4819ceb633f0 SHA512 5efcbcb55ea3b402b6225431c01c6b0e8dc31d42bff8a4f476030e1c5b75088e2cd293c9ead52d4765a667529140bab944a805d8c84d315c73a76c1ffda527d6
 MISC metadata.xml 619 BLAKE2B c7707d831a1438434b2efd0c84fec19032cca874e2ec00e7e53d7a2d057c2520abd48701fcf073d328dfab1c91677bbc6a261f5b77e722839f1b140d73f835c4 SHA512 d8d7e51d21f7e2e56bb7761e2383c77b0fd1c2fc7867a723256a04bfc1a49af7957564c0a554658227a571e90c44c2850f3d26e8476c4599b837b8babc42bab4
diff --git a/x11-terms/xterm/xterm-373.ebuild b/x11-terms/xterm/xterm-373.ebuild
new file mode 100644
index 000000000000..efd8182bd33e
--- /dev/null
+++ b/x11-terms/xterm/xterm-373.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~loong ~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"
+
+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"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# 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
+	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
+}