gentoo resync : 23.06.2018

10 files changed, 70 insertions, 161 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 04d1d888520a..bbe8b8c8f0b3 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index bfc37440d01f..8b4081c87998 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,8 +1,6 @@
-AUX kitty-0.7.1-svg-icon.patch 710 BLAKE2B 6377fe8ed9e344ba61881041d9eea72304f605ad633ac2d4ee68aebe363368c9a2b93c48297aca2e4edca14b7535c1a40c81f2dce4189bbeee563d7e6c23d6b7 SHA512 9f449cbc26cc8446425be0f5945e69cef49b4602f7578559d8ddc7456e4adb3afe1edf2c580eb009d1f2e3daa3f3b087c49b3e35a35e8a0a8fb7be584d5256af
-AUX kitty-0.9.1-flags.patch 1583 BLAKE2B 0981fe541241e2265104cc8bf531abe0fb01ecc7959d11178eeeb71c39f9b88489dc8c5d721748c7af330136c276791907f38341cc0a914c662d30d5618c05c0 SHA512 90751db5b8a5ab36d02af76bc9361e73b6409804626c4a8090f9ca620600dc79c3043ac192dd2c0578552825d4fd3e73aa87716f3cd4ec67128eefff1a6c6452
-DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
-DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
-EBUILD kitty-0.10.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
-EBUILD kitty-0.9.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
-EBUILD kitty-9999.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
+AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
+AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
+DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb
+EBUILD kitty-0.11.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
+EBUILD kitty-9999.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.9.1-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
index 9c544610b6b7..44abfb669a0c 100644
--- a/x11-terms/kitty/files/kitty-0.9.1-flags.patch
+++ b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
@@ -1,6 +1,6 @@
---- kitty-0.9.1/setup.py
-+++ kitty-0.9.1/setup.py
-@@ -178,7 +178,7 @@
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -177,7 +177,7 @@
      df = '-g3'
      if ccver >= (5, 0):
          df += ' -Og'
@@ -9,7 +9,7 @@
      sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
      cppflags = os.environ.get(
          'OVERRIDE_CPPFLAGS', (
-@@ -191,7 +191,7 @@
+@@ -190,7 +190,7 @@
      cflags = os.environ.get(
          'OVERRIDE_CFLAGS', (
              '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
@@ -18,7 +18,7 @@
          ).format(
              optimize,
              ' '.join(sanitize_args),
-@@ -205,7 +205,7 @@
+@@ -204,7 +204,7 @@
      )
      ldflags = os.environ.get(
          'OVERRIDE_LDFLAGS',
@@ -27,10 +27,10 @@
      )
      ldflags = shlex.split(ldflags)
      ldflags.append('-shared')
-@@ -508,14 +508,14 @@
+@@ -505,14 +505,14 @@
  
  
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False):
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
 -    cflags = '-Wall -Werror -fpie'.split()
 +    cflags = '-Wall -fpie'.split()
      cppflags = []
@@ -40,8 +40,8 @@
          libs.append('-lprofiler')
 -    else:
 -        cflags.append('-O3')
-+    # else:
-+        # cflags.append('-O3')
-     if for_bundle:
++    #else:
++    #    cflags.append('-O3')
+     if for_bundle or for_freeze:
          cppflags.append('-DFOR_BUNDLE')
          cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
index 345ba99a89d2..97e45c677f8f 100644
--- a/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch
+++ b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
@@ -1,11 +1,11 @@
 Use SVG icon instead of PNG.
 
---- kitty-0.7.1/setup.py
-+++ kitty-0.7.1/setup.py
-@@ -507,9 +507,9 @@
-     safe_makedirs(launcher_dir)
-     build_linux_launcher(args, launcher_dir, for_bundle, sh_launcher)
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -605,9 +605,9 @@
      if not is_macos:  # {{{ linux desktop gunk
+         copy_man_pages(ddir)
+         copy_html_docs(ddir)
 -        icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
 +        icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
          safe_makedirs(icdir)
diff --git a/x11-terms/kitty/kitty-0.10.1.ebuild b/x11-terms/kitty/kitty-0.11.1.ebuild
index a458d0c67387..8bef706b26df 100644
--- a/x11-terms/kitty/kitty-0.10.1.ebuild
+++ b/x11-terms/kitty/kitty-0.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1 toolchain-funcs gnome2-utils
 
@@ -45,11 +45,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.11.0-flags.patch
+	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
 )
 
 src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
 		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
 	fi
 
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
 	tc-export CC
 }
 
@@ -81,8 +85,6 @@ src_install() {
 	mkdir -p "${ED}"usr || die
 	cp -r linux-package/* "${ED}usr" || die
 	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
 }
 
 pkg_postinst() {
diff --git a/x11-terms/kitty/kitty-0.9.1.ebuild b/x11-terms/kitty/kitty-0.9.1.ebuild
deleted file mode 100644
index a458d0c67387..000000000000
--- a/x11-terms/kitty/kitty-0.9.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index a458d0c67387..8bef706b26df 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1 toolchain-funcs gnome2-utils
 
@@ -45,11 +45,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.11.0-flags.patch
+	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
 )
 
 src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
 		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
 	fi
 
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
 	tc-export CC
 }
 
@@ -81,8 +85,6 @@ src_install() {
 	mkdir -p "${ED}"usr || die
 	cp -r linux-package/* "${ED}usr" || die
 	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
 }
 
 pkg_postinst() {
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 13072c364de7..591acc0a20ac 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-330.tgz 1273183 BLAKE2B 5a73e251d3c19ed8591962eb280922c89ad8c67b6970d33e83a8900c6aa349e042ef911ccbdecb8d00addbd0f748bca79c34480bccc746675f837313bab3bfd3 SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62
 DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
+DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0
 EBUILD xterm-327.ebuild 2614 BLAKE2B d820ce29ccccb7dcc18cbcfd9da635fba82650c8c113b845339d65551238c84e5febb10e509ebede3cd9205e8065ddb499917c073ab895a53d04bfeedee37530 SHA512 597ada4fc3639e0211a5e01f4505617c7869b97bdaf3edee55934b68e8f9e068f0b7ce24d1088810faa48f431c71b32fdc62ee2915fa9ca84fa7990b5687bf59
-EBUILD xterm-330.ebuild 2623 BLAKE2B 984864f72ce99691a4c30e2a47d80235226397aef5783539ce0e47232aa1d4a957db008b655d23a6283f97dcf790210577964b093c166675c78a67809d6daa08 SHA512 5bcca036b43e2a8b33cc6ec86f90c51e51416f730bdf8006c92ecbb3fd07a347cc155ed4e795562264327a29057bf27fd8c577cee25b8bd4c894a987e1a419e4
 EBUILD xterm-331.ebuild 2623 BLAKE2B 984864f72ce99691a4c30e2a47d80235226397aef5783539ce0e47232aa1d4a957db008b655d23a6283f97dcf790210577964b093c166675c78a67809d6daa08 SHA512 5bcca036b43e2a8b33cc6ec86f90c51e51416f730bdf8006c92ecbb3fd07a347cc155ed4e795562264327a29057bf27fd8c577cee25b8bd4c894a987e1a419e4
-MISC metadata.xml 404 BLAKE2B 675f80c795392f88f38bde9e8cfc1a83632e830245baf8d35bc0836fb302897c0eb5065156733831e2b23da0ce916fe6353efa3aebe2b90159fc9b1e587264cb SHA512 2f6acf3970872f23aa82f12b76fce6758d579aaaf7d988b8a2b75d9d845528fef5d50faafa5de1d3e49262dda8b706107902beac035a5ff1fb171d35aaa2dd08
+EBUILD xterm-333.ebuild 2655 BLAKE2B aaf859480694c5bf7d937ec1a1156afa6356145460be8754323eed631940c3312e6471f44f761a420b589eb25e960ea307f5c041558eb2bf69beea900e0035e2 SHA512 78add9193408614fed49677ef23e945a5319051f03d1b73fa6ff31243a033f2ffff3a62074da43f793e681011cb1706766adec8fcdc7277b169bdabba776fcaf
+MISC metadata.xml 332 BLAKE2B f04ff2b116cf7da45f77cce44225667348aa9394757c8b762f588ea26cbfe262f1719851d465aebfa9ca8c4974f58d23d9573c2d2e260637cc0b090bbad2d049 SHA512 2ed5e055e0462b75c28a186e8aa4eaf4eb1fd8d8c8fba31d61b35a7847ea0a27ec28552b5e96df486476e56c5f88b4c18b70642c0abf35f6e6b72a0099b586a0
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index 717e3b6fdfa4..6563e54a2c04 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
     <flag name="toolbar">Enable the xterm toolbar to be built</flag>
diff --git a/x11-terms/xterm/xterm-330.ebuild b/x11-terms/xterm/xterm-333.ebuild
index 9682b587b223..3a2102c7e83d 100644
--- a/x11-terms/xterm/xterm-330.ebuild
+++ b/x11-terms/xterm/xterm-333.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # 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/"
@@ -48,38 +48,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