5 files changed, 105 insertions, 6 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index bf534bd340c3..009c484d77c9 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index bd7211e9abc7..8c92595bac16 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
 DIST xterm-352.tgz 1405420 BLAKE2B 46cedc409cb174fc1901bec31e190be64a07de34d59d0e767217384761dba7e98d97728fc8976f8a432eb80256471edeb2f4b58a61f875aaaa9b2cf20999f08e SHA512 9116f78dda685af75192f2fcd0ddff5244746f0e55b5e91ced6be0f85cb3dd78287bd873cf55ccb15901e98647df9cf8083b9ad84f53e12bae5134889aef82c0
-EBUILD xterm-337.ebuild 2623 BLAKE2B 17d463f661c556a5a95883c534738ee044c5923cfbf1276eff2e6110236c20b3f7eb98bd7ed9ee99a8f82305d91277b57de976dff9f0c29efe8f1496787e8876 SHA512 a90462462c7dbc7c375a14c1d3ccc7843510a0dffa688ef4017a3d4cb87e142a7477c8a7a312e56ff8e5e67fd40092a905aab9a9e4dcfe496a4cff399c5b7531
-EBUILD xterm-351.ebuild 2639 BLAKE2B 0aed020658ae5b63f11fcdb22395a72f24153573525bc099cc316ec955f7d37c19e280dc63cefdfa796caba284ed907a92feabd1eed928751148733e3ffdc319 SHA512 a4674b958e3f3a2f92dd7735cff457941caea9c37460f24c9f79a1427f26240e978969834789225e83c178f1a970c761665256de2117bd9819ed8ba33f0f111b
+EBUILD xterm-337.ebuild 2586 BLAKE2B 67c5a5aa246f5279d89ec8ecc6d32aeab9a2b07e022fc567a0b4a4ba901fc27349e041036c2fae3be89248d7b1a0da9581a8309eaa652dabbaecc109fe5d40fa SHA512 ba7b05c70078919c7a902b829bea6a3c5b423bf90adb021b007104556e476f7c3a035b4948c6329412fbe9b45e6c39ce0112d03bd92addb3c5b3faeb296b4410
+EBUILD xterm-351.ebuild 2634 BLAKE2B 65b7ad0488d7ab5d4e5c90133134aac6275aae1c09bfbb0566c61ca57ee035084465f662471d9c29f095c3109fad54057256f77665ef9f45d15c2b36e6e1fb77 SHA512 646da488ea9ff3f32b49065c137e07e522fedc8dfcece6bb5884c46135128cfb1920089c883a624bc05a83f7754750db597fd47e6086a5e5fbe0de4f922092e7
 EBUILD xterm-352.ebuild 2639 BLAKE2B c6a6638503226412ad582323c3ed6fcf70919e5234a69cad8dc1682df83b1266a8dcfc3e0512b074d0c59d72830f0c30659b9215b67f50dd7700ca3893c1c8a5 SHA512 975e4d6a883603d2ebaa4310e52c80fdd77a046a9dc33ac7827108bcc1417858e4e2638249bf1706f543676dee78d88fea2a21274288176039be69213e6323f6
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index dde8c5aa3e43..c414f44fb277 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 BDEPEND="virtual/pkgconfig
 	x11-base/xorg-proto"
 DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	kernel_FreeBSD? ( sys-libs/libutempter )
 	media-libs/fontconfig:1.0
 	>=sys-libs/ncurses-5.7-r7:0=
 	x11-apps/xmessage
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index 017e04f57b01..e6759e862d63 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xterm/xterm-352.ebuild b/x11-terms/xterm/xterm-352.ebuild
new file mode 100644
index 000000000000..e29b43efd773
--- /dev/null
+++ b/x11-terms/xterm/xterm-352.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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
+}