gentoo resync : 11.07.2019

7 files changed, 142 insertions, 2 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7641506d41d8..9b0356c75582 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 086e0e8b3fb5..a30c20ae4be0 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,6 +1,6 @@
 DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
 DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e
-EBUILD qterminal-0.14.1.ebuild 774 BLAKE2B 8e725bee9edecc4ccfc963fb3c5e0a9f2ab00dd16af73818c195006fdadfb94259722fb8ac3f0b7ab700081a49a7d50240c29d231359f02dd9939a04ab004dc2 SHA512 8b0122458acef4851bcbbea8265030bd96d2a2e321eb29f5a8a62ca3f7c11276babe008c1a8613b5624027bad4f824d1e7ceec7fd7057fdb24a387e747ed397c
+EBUILD qterminal-0.14.1.ebuild 773 BLAKE2B 0db44210fc0e08d8257c5e4f1623de44616cd0c075294dd4c759bb7441ad5afa98e19afbf488c46e135fc2aed15efd084d14f27593f290a731538acf338a11f3 SHA512 1428c7091cf057c535ada5c2f741a495ff0b4e88b068cb8afc6808cf488b475bde3c38106f52d3340aaf550daf9cf2697323b261f1871af34d240ad588444363
 EBUILD qterminal-0.9.0.ebuild 961 BLAKE2B 3d7b9fbf831626982355f2f846e084c94df3892367a9a2f5f66b806b0e38d3f4eec1f29ae32d2c8f02ea38c26039bc432d60e0227fad3ea2551423a48b591aa2 SHA512 99a5680f1361379eeb942109c3acbbf7ced70ab9bc3388d0b094a2a715be969a6d79694c0239b6a963137fa02a7efb0897c1a93e6eb2426b4769c0f8d8c54165
 EBUILD qterminal-9999.ebuild 744 BLAKE2B 58f7cd8c04f2bc7b30b479db553ea1aee87ee94c8bc258ffb3dc307e692345602759971b391f65a6d04ae289f6cf952a106e05804bbe414187a1a2410e53dc34 SHA512 02fc0394dc70b7dfb62c6509e688a8f8f4e69bbd4bf284c0d12d2d66906bb17724aa0a8fc7068fee79ab0b9113ce9b8f093598c80f0101bebacef790921196d3
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
index a16a34b51c33..8c2668284392 100644
--- a/x11-terms/qterminal/qterminal-0.14.1.ebuild
+++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 9d355a57caff..767a19af3ff0 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-terminal-0.8.7.4.tar.bz2 884272 BLAKE2B 563223180cf781fa1723821c3851e60e15fc59473bf8608f781b8dffac052b90fbe4be672d4d878ffd00686ad992e2d5c53dbfdc80539e7197dcb631314f3370 SHA512 de56c08d5be47583484acf9aa5b3c0a0f14b1ac2790e0f6b59db61f80d71f871ff87e94f9353a0cc187cf1d9dff643e40ce15ed60a24d550843d898eee3d62dd
+DIST xfce4-terminal-0.8.8.tar.bz2 938843 BLAKE2B ae7beb611744d7f2cc168cf1c938f5c49add4fb4691f95cfd8f88959f380aa1e3ff11181f08529a9825273a5da7fd9ab5f45de6e3f78eb5b7f224d8044592c5b SHA512 0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645
 EBUILD xfce4-terminal-0.8.7.4.ebuild 913 BLAKE2B 3a07b5c1c884549f5c84387d03f524dce8fb9fc98a24db3afbb56d06b3f0ba44520e1c674123d4156ac6190992f195358ef39af9a6123943f89194870c3a3913 SHA512 cfa509487a5085b9ed28b863f4ae1df0c059ee393fc7c5da502d41858f309753fd08c7f143d8e3fb1e1efaa818e12d310d1224a5c2684102c6418f551c8676d8
+EBUILD xfce4-terminal-0.8.8.ebuild 920 BLAKE2B fbebf2d2109e913bbbbbb700df35621c99611afd30f49997677997c734ef42886bea217b280a9a4a06c06b5caa6bf8489ce41f000b253ca367025e6da64010f6 SHA512 25acb97ca95d065ad83ba87348dd0cc1725ded02ccc7fc330796e848038d5391c5b420afa12f28bfe071203542c115d3e23f83147f8c2920e0f75e0f378f4267
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
new file mode 100644
index 000000000000..4d3f4e0347d2
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="utempter"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.20.8:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.38:2.91=
+	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
+	utempter? ( sys-libs/libutempter:= )"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
+
+src_configure() {
+	local myconf=(
+		$(use_with utempter)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 4ffcfc7fd6ee..3adc8bf4576e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,9 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-346.tgz 1366363 BLAKE2B 5ff790bb94b973fe4e5fd684c782d6e36cacc769bc6b0152820c7ca7d41a5b96b347c4b015b3c8a2342601f71d1381de1de399c9dfd9ccc9bb371b5b772d3607 SHA512 ef0db8132a88b8bd980343007a61ca3c4c1b7ece23ef8e72245a17fa8305fa4dfed9cdf0613d8daf60da53fb8b03d41acd22aee04f2d51aeffb4a340268f51f7
+DIST xterm-347.tgz 1371955 BLAKE2B 8144afe48fac33ed7fec50dc8863af992440ca045fd5bef0db15176aa0b550daa26cda8f6a06fd4e340ec5aaf562a1cbdb7e9da21d0f42c0ef1966b5b2c91d93 SHA512 4b90094c21b7af3042591939308538dc767d42718e9a6112115e6df12a974f8e3b7fba8d791d7c9557863fd07d08f2365fa7f759f7797f859a6fe5fe0852ab4e
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
 EBUILD xterm-337.ebuild 2645 BLAKE2B 677ada66838e6543d96737302421fee010c5d58360f37e420d1f9350fd24e1102f805b673144fcfec9dce15845a3aa7f519b9d9a6a7f3139e6245953637874f4 SHA512 4cf2e13d654ecd92dd74ca7b017d16606a89ec22588bce037e9c988a56e50a9bce1824ef20682bcc669d3e9245bb59d69e3b6550b2a8d73c479cf14f6357f717
 EBUILD xterm-346.ebuild 2698 BLAKE2B 66c6f6965cdfe73ac490dc691f42428fa8c0b325ae78a4ef93be54ffc7c3cdbed1a3f95562752ce3a994a88defce27422702088028b32d1259f6c0f62e66991b SHA512 5b48cbf16afe390a76a9ab449805c1de304a683063e2e57b9926cd5d2c832c737f0692a947bf937f120a578f252eee39d882f38562ed9302b01155540890fdb6
+EBUILD xterm-347.ebuild 2698 BLAKE2B 66c6f6965cdfe73ac490dc691f42428fa8c0b325ae78a4ef93be54ffc7c3cdbed1a3f95562752ce3a994a88defce27422702088028b32d1259f6c0f62e66991b SHA512 5b48cbf16afe390a76a9ab449805c1de304a683063e2e57b9926cd5d2c832c737f0692a947bf937f120a578f252eee39d882f38562ed9302b01155540890fdb6
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-347.ebuild b/x11-terms/xterm/xterm-347.ebuild
new file mode 100644
index 000000000000..f915dffe05fc
--- /dev/null
+++ b/x11-terms/xterm/xterm-347.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 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-fbsd ~x86-fbsd ~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-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
+	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
+}