gentoo resync : 07.10.2018

2 files changed, 41 insertions, 36 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index f8bf756dfb22..96411c8dd184 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
 DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0
+DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-331.ebuild 2612 BLAKE2B 8f1822ad662254d404c6b29984aa9d8c6e898249c728890507cbc561daafd1064f578051c6dd33509264b962d6369bb4ff57136f264252fa996cf28ad8a406a4 SHA512 c359b1f01968f0dacd9d4e566ac2e5c1e75b9e56c248b518f449d5c29e9b8365201bc28ad4c22d34822c2c218875c1b30cdbd27ec426d12a0834d00e1362708e
 EBUILD xterm-333.ebuild 2644 BLAKE2B 26ec3b74546d5c71a70e1de8264a146de15120334923f844e2c94083ba28796072cab342c3ecb1d9816d527ce7aa0188cf2633009a671c8cb806bcef125e053f SHA512 0d187ccdea85c6709a112287291b5d3f8d86b82b25689263c4127c5ead67861ebda03a71d139f8627a6931d253579695f81cd633a813b94c69bca3b94ab01bf2
+EBUILD xterm-337.ebuild 2654 BLAKE2B 00966164e3d921a1143494965c9a9de354d3002f0c4b538598f3bd4516d89c3dcaf21d4f0fb58d8be56f25d0e71c3824d1e42519676846a94274033c88754d80 SHA512 fba7b1e53e3959adce1f00f4f4f721369a9109964eb347623159f4f22c49ed38d05720193b4501880044496f4844029fe593204310f775fbe1929453bba43a5a
 MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788
diff --git a/x11-terms/xterm/xterm-331.ebuild b/x11-terms/xterm/xterm-337.ebuild
index 7df0e025fc6b..dd0e7348c83a 100644
--- a/x11-terms/xterm/xterm-331.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic multilib
+inherit desktop flag-o-matic multilib
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/"
@@ -14,10 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+BDEPEND="virtual/pkgconfig
+	x11-base/xorg-proto"
+DEPEND="kernel_linux? ( sys-libs/libutempter )
 	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 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
@@ -28,12 +32,9 @@ COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
 	unicode? ( x11-apps/luit )
 	Xaw3d? ( x11-libs/libXaw3d )
 	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
 	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
 
 DOCS=( README{,.i18n} ctlseqs.txt )
 
@@ -48,38 +49,42 @@ src_configure() {
 	# Everything gets linked against ncurses anyways, so don't shout
 	append-libs $(pkg-config --libs ncurses)
 
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
+	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 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
 
-	dohtml xterm.log.html
+	docinto html
+	dodoc xterm.log.html
 	domenu *.desktop
 
 	# Fix permissions -- it grabs them from live system, and they can