gentoo resync : 01.12.2017

26 files changed, 221 insertions, 183 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f0ac3f917478..49181b6109f0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 70d3de248ec7..a51ddcb21ad3 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,4 +5,4 @@ DIST cairo-1.14.8.tar.xz 35392464 SHA256 d1f2d98ae9a4111564f6de4e013d639cf77155b
 EBUILD cairo-1.14.10.ebuild 4250 BLAKE2B 8c986a47c5c3a4a43a795784af79a45b504edd9355573a673aa4eb3acb0a11d29dfaf6904e5c36afa3540ed819eee2ba99516095e1375350dfa0a444452a5a4b SHA512 dc27e3c4e12e755fe8b89453dcfe98b4ceeec0c45abe9f7b37bb21b08c888c91f67678a376f4447217197aedffcb33b5a0517c7531034166f290dee270ed338d
 EBUILD cairo-1.14.8.ebuild 4271 BLAKE2B 97a7a6edf3f6ea6c1a5cce25f55e517f58fe5e2688ebba1c4ef1672d4467712813d90010b8ff553246b4d9c503e53650472e93cfd1ce8f02a494a377cc218b46 SHA512 76e270f094460707128876a81156a0d22e4dd145737faecc1d5a9b6de5a58eedbfcbf385cddd9707e9a8d5a31531bae2c5e36def61f2cd52ff28dd98908622c9
 EBUILD cairo-9999.ebuild 4299 BLAKE2B c766dd0f2b13d811879326a5436353ce3396560ddad5b6d7eaabaf7c8f449f43ea5cb7a5b1bf83f3b7927a18e06e58acf6c165c8f957e61dce177723dfb828a9 SHA512 87bc9652d7b194382fe108722ba422b5e27476847b5a13234216de947b6c3c2f582076570e61b808134eeb0558c22072b320feb18378c088bb44b9c3e62906ec
-MISC metadata.xml 843 BLAKE2B 058fa139e827f48c690a92359cf525ce1c1b9cb875c77614c3364a42c798dc7ae06a1c35300bb3e02853ca548e98be82f08a6f0606b65735789261d31420c5b9 SHA512 5ac25111c8cf11d1516aee9fbc0cdf94b90bcdcb685f449ca8cf247ae873bf626b8eb41b115075f2ee89c5b833330ad25a63ffa6833f9679817bdb65b6ef6fb4
+MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 38e0470af0c2..7c19663b4c4b 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
-  <use>
-    <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-    <flag name="gles2">Build the OpenGL ES 2 backend</flag>
-    <flag name="glib">Compile with GLib Object System support</flag>
-    <flag name="utils">Build support for Cairo script and trace utilities</flag>
-    <flag name="valgrind">Built-in support to mark memory regions</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
+		<flag name="gles2">Build the OpenGL ES 2 backend</flag>
+		<flag name="glib">Compile with GLib Object System support</flag>
+		<flag name="utils">Build support for Cairo script and trace utilities</flag>
+		<flag name="valgrind">Built-in support to mark memory regions</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index b00bf8838bfa..bff4eb0af672 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,4 +1,4 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 DIST gl2ps-1.3.9.tgz 294907 SHA256 8a680bff120df8bcd78afac276cdc38041fed617f2721bade01213362bcc3640 SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb WHIRLPOOL 2ba0611daa39814a02c97ceec70c2e36b46881371a6a4790c5f5db4ea7e8b3352a25228d3aab60d2ec5b6f9e5070d9a7f331ebed2df355a6444f4e20365d7915
 EBUILD gl2ps-1.3.9.ebuild 1247 BLAKE2B ef60d1f74da711a1497ad44427e6c74b59f523ed306c3a844d4ccb0f8c2bbf2a807438b8181a46d94bc0eb784ea90d0a47a6bd318567b93051fc047a4d2583fe SHA512 02328e81109ab6dd6307174217d105f49de9dcc30fcba6ceeda219ae00927eee27e4991aff6dbf8cf5ac72344c210f3545a5cf75a7d2d445a3263d57a457b9fa
-MISC metadata.xml 721 BLAKE2B ed7465e403dbd0645cf45fcdee9ee1ddd77621e36f065569b5979713bfd4528f4c0010afc77fd078da6d34a80e77a642d381782d4d975dbe629c2a069278c932 SHA512 272fa0b10d317453f463cde0157c28630273426351e01163d8a444848e3cb4f347b959f495f3973124281cfb9880f92e4e828abde735bfaa7b7b4e9c594ecfec
+MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
index dd1e3ccd3a3f..6577818b4308 100644
--- a/x11-libs/gl2ps/metadata.xml
+++ b/x11-libs/gl2ps/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  GL2PS is a C library providing high quality vector output for any
-  OpenGL application. The main difference between GL2PS and other
-  similar libraries is the use of sorting algorithms
-  capable of handling intersecting and stretched polygons, as well as
-  non manifold objects. GL2PS provides advanced smooth shading and
-  text rendering, culling of invisible primitives, mixed vector/bitmap
-  output, and much more.
-</longdescription>
+		GL2PS is a C library providing high quality vector output for any
+		OpenGL application. The main difference between GL2PS and other
+		similar libraries is the use of sorting algorithms
+		capable of handling intersecting and stretched polygons, as well as
+		non manifold objects. GL2PS provides advanced smooth shading and
+		text rendering, culling of invisible primitives, mixed vector/bitmap
+		output, and much more.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index e539f64f804e..f3372eeafc61 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,5 @@
-DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec
+DIST libXcursor-1.1.14.tar.bz2 311896 BLAKE2B 0317ffab4b69de9bf973c15dd81b48bda0e2226953e0f711eb4ac6d487fe75d08873e3392f99ba1478ab99eef43fcbcf319c907535db5e801a4f3e2bd01a71ae SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6
+DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
 EBUILD libXcursor-1.1.14.ebuild 909 BLAKE2B 7d2f560dca312c2ae4ab301d7a175adc9955000ca386eb2a0dd92e6d19118400712523fa30500d79e70cc487cfab9620bb80536db26cc098e73a0015ebaa63e8 SHA512 eb5fad96a13c3791257ca3a28708a81bc28ea43b33fefc9446b91b313aac2901090cb549a087f882da71b29da0f0cdfb1cd84371a6e0408066d6639d45018908
+EBUILD libXcursor-1.1.15.ebuild 914 BLAKE2B 674c6a417190ca628d620588286d5e2c83823256ba2c65fb7d1a4d562ba7498cfbf1ee0121c1a30d6634928d31709a6d84766e048fb3e4a03b73d6db4ac05f8e SHA512 d95507108c8d53896671a5f4aed695b33f8fa856543e348168efdd80c034314cdcf044a9c149c71ccd27caeace4936066507ee1fb5703c528e6dc06c56bc1863
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
new file mode 100644
index 000000000000..d4ad359d9f09
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcursor library"
+
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-icondir=/usr/share/cursors/xorg-x11
+	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index de9c32c354a4..3fb3477e92cd 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,3 +1,5 @@
-DIST libXfont-1.5.3.tar.bz2 519793 SHA256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 WHIRLPOOL 956af4caed82144124499f7d132a7dde21d738c3048e124b3007be65be6e093cb1247a4af24c36a1c6ef1cca52e96756c95d0b3db1940efd147fe8499378311b
+DIST libXfont-1.5.3.tar.bz2 519793 BLAKE2B 1c0ea6d7b14b838445239612adc18927a098905929da69978339da6dc1dbbedefefeb92028b8d704ee16c2061e2ea73bfedb3be3a7faf046ba44ec9cdd739d56 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4
+DIST libXfont-1.5.4.tar.bz2 528883 BLAKE2B d94a91dfa64e6b78bb4cb7f5ce59300b1cf31826308f3b3d29d495e166403ef57ddb8467033c08ea2b7a4fb0b160d25380f49aed79cd6b72a305eab07a0be25a SHA512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3
 EBUILD libXfont-1.5.3.ebuild 868 BLAKE2B 91e94121579fe06d3b12217efe04ab8db60176ec8543ed4363f3e851d520cad2e9c8838d874b56009ddec26ccdc1400f21955266763b323c52c86b52cd8547ea SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f
+EBUILD libXfont-1.5.4.ebuild 873 BLAKE2B 85989ed5834102cdf429766d04d9bd699bd224ce39c681ad6abf820fa1dd3a7c851ab2fb3ec1b5502e2c64ccbf2823119116666be9fc37ea407fbf0e6493a7c0 SHA512 194bf3935c678b207fc121b2041459d132986d47682644fac2ba2e2c3b72be428c08ae7a0c08a13d37fa7186efeff9f6ef9f818454ca25212c70f3be875c965a
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont/libXfont-1.5.4.ebuild b/x11-libs/libXfont/libXfont-1.5.4.ebuild
new file mode 100644
index 000000000000..24f758113ac7
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.5.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+	x11-libs/libfontenc
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2 )
+	bzip2? ( app-arch/bzip2 )
+	x11-proto/xproto
+	>=x11-proto/fontsproto-2.1.3
+	!<x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 11b22629b675..0885f0047339 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,6 @@
-DIST libXfont2-2.0.2.tar.bz2 476173 SHA256 94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593 WHIRLPOOL 8e04eebcf81bfcbbd02af60bc047551c30379950b50b3e9d284c918f9241fa18885b5172a416d04cfa6ff44637de1b69ab5cb51e7af37354e0f23e9a052f7600
+DIST libXfont2-2.0.2.tar.bz2 476173 BLAKE2B 12a6e4b8e475d35866507e8dcf622b2727f64658cecc8e819f1d5443de6be2bd26f57588ec21dcb725b9e2e7f550800e672a5c120937cde5304a2b81758f6903 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593
+DIST libXfont2-2.0.3.tar.bz2 497085 BLAKE2B 91780c245d5e08b45fca6e940b0fe910b43417b2bed77fa600e0b8ab2b2c5a423b8a1c680349b95592a77f5bac45b1f5a7991d05df699aad080e8c3cf4d614cf SHA512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b
 EBUILD libXfont2-2.0.2.ebuild 833 BLAKE2B d470192afccde65732e1605b745c2c6eb1e3f322da11dd2ebf37e4ddbad28cc0beb5f42d94c5ff9eed97a6f24483ef8bc9c1c47fa0ed74bcb17cd16abc0d2880 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd
+EBUILD libXfont2-2.0.3.ebuild 838 BLAKE2B bff5f566e3e2af96f6dcd1146f8f6b39c1d273f2628d12cfa068296716caf2ffd48e3a62af32bff7f164c6e971bb0317df73c5e81289ef2d0d7d203c4d002d90 SHA512 263951559aefc69c17198a84479f513bbdad5b9b4bad3e422031246324a157ad3d5dc79c6a52c02b5c5fad5c977f04764384c3290cef7a9b547ce096989bea8b
 EBUILD libXfont2-9999.ebuild 708 BLAKE2B a672500d5c0e604e32bcdc29db056a727a2c505bc665633b139862850980dab34befc47ac20c7964d2c20d09aa88dfae2ab995ca597a9e659f1289d9da1feeda SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3.ebuild
new file mode 100644
index 000000000000..b4ea0fbb186c
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-2.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+	x11-libs/libfontenc
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2 )
+	bzip2? ( app-arch/bzip2 )
+	x11-proto/xproto
+	>=x11-proto/fontsproto-2.1.3"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 4408ec69bbec..943b4259df02 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,10 +1,10 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
-DIST motif-2.3.6-patches-2.tar.xz 1600 SHA256 03478b2ef5c49b9854534ac4615f56d93e589daf50d9056c1abba372e157c947 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619 WHIRLPOOL 2d59ea61e646a827b0da3d6b44b72a7d42b8e60f1defcfc00c8c9689a97c6789cfd6f91ff858ee1b8cc8443c5510507ef14d37efd4e24928c0d9dc54f87a2b8f
-DIST motif-2.3.6.tar.gz 5725456 SHA256 fa810e6bedeca0f5a2eb8216f42129bcf6bd23919068d433e386b7bfc05d58cf SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60 WHIRLPOOL 88a88dbdeefce4ff01a5018f16cc687e9ac86af67344c5c292d0508abcada17d8dc7d65df2c2e6e4904d6c8524552e2607f1a926a745fe3196f866d9c5f93294
-DIST motif-2.3.7.tar.gz 5715478 SHA256 8f7aadbb0f42df2093d4690735a2b9a02ea2bf69dfb15ae0a39cae28f1580d14 SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8 WHIRLPOOL f94a384ffdcbcd6fd289d31225822101a0cbfdf147a49e925c0b5d12fb57548177746e6da511f2f096aa1cf72b07f3a3930f5037715c784857e0679a005b4a02
-DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
-DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
-EBUILD motif-2.2.3-r12.ebuild 1796 BLAKE2B 5200f9c080a7eed0bd6f1bae65b4e98c2918537b5306dd7f5232188ba56cb99dd847a6fa19260fd41e7d9499cd4dd1e95e14def938a6cac882875c256ad32798 SHA512 d509681101969f0e25aa6525ccabd82d772d05f9bb4f8a6504fbcd68d7b6f1fd859d3ed6b54c531ceced115201364b17e06471ca13217f15b798b25ddeea534f
+DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
+DIST motif-2.3.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
+DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
+DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
+DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
+EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
 EBUILD motif-2.3.6-r1.ebuild 3468 BLAKE2B 75be1e877dd39810cc656c62935512abe527cc5e602e125dd60586ebd16256b4b4948ec952a90c4e4ca8776d8b23a45e41bd589c8c0a291373b3333e54473fcc SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828
-EBUILD motif-2.3.7.ebuild 3484 BLAKE2B a035cf248b68a043b19eef292001b381f17bbf2df9683d4a35ef534e1c824bb8b3f5db43d373c2e34fa40ed6ea38a0e615d8d5520b32a6a6e47b23916da7147a SHA512 86c18a4e1db68c69171f480bce9c1f0260dfc15cc9894ccd0150ba17abc90f7963c3ee1bffd19db2612d836cc8ceb3a2ac2c35a655c3a2123f6581be8eeda7d5
+EBUILD motif-2.3.7.ebuild 3478 BLAKE2B 33b41f4013f40b4e81810c0e87082716d91b95ac59242e26aea881b4ac7b3926c71d25dc38bb90fe0aafad0e26e5601962fa5f6f0e00511ded974f72f05d6f7b SHA512 a11e5792b0e423b0cc9653cbc846b6cd95613f8e6c0ff35a1b64f5885a6daf5123077f7d205982aead51a361e5da6aac0234bb64163cb23d73af6de7e4532708
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
index c511707f1a96..feb4e6b11620 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
 
+	mv configure.in configure.ac || die
 	AM_OPTS="--force-missing" eautoreconf
 
 	# get around some LANG problems in make (#15119)
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
index ec09b0590406..2b2ef6c61e48 100644
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ b/x11-libs/motif/motif-2.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e7e18d89d15c..e83cc934217a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
-DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
-EBUILD qscintilla-2.10.1.ebuild 2394 BLAKE2B 026325e856fbfcc76883182673cfe3448c7aa91883d786dda570de396f04a789c4135d192c1647e4406ddbca21bd01b15cf3a112314ebc48f273add6c133fbb5 SHA512 30b19c28a963ee508f40b832bfdbbd69f284e9ffb6569d4c57cb0a451f40e6443a130e19dadcf0113c691f5ec0c2f4ddea3bf3b9058103090d144cf499449ff5
+EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
-EBUILD qscintilla-2.9.4.ebuild 1998 BLAKE2B a6aea660246162acf0f8dc4a79a8fa57523b364a16c635c28eccdea3d34fa747ad38dd6d4a32fed5730ce4a62dfe4600ca15557820d5d2b6681f2e1b6d84362a SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index bf85437f8fcd..34580af5018c 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
deleted file mode 100644
index 66c077633535..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla_gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/12"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc +qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		designer? ( dev-qt/designer:4 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	local my_eqmake=eqmake$(usex qt5 5 4)
-
-	qsci_run_in Qt4Qt5 ${my_eqmake}
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		qsci_run_in designer-Qt4Qt5 ${my_eqmake}
-	fi
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
index d94477b5ce8d..a2bcfcb38264 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -6,4 +6,4 @@ AUX qwtplot3d-qt48.patch 414 BLAKE2B bf28c8281b20b7d73f9458cdd869f69426f0f123d5e
 AUX qwtplot3d-sys-gl2ps.patch 915 BLAKE2B 8f45de13b3ae5fcbbab296bbc769a5cc61717ece7d810040fcb2ecd003ee3a9c65f64aa4b06f868f3558a479e264dcad64c15298d83cba597038e4f4e26ee4c6 SHA512 a15870bdc215145e57f1eef3bc6c56060ac2f3bc5e8cd134a72188a17088b986b843965cc81065663e72bf69b48912935c88b14babea4b28b7b4265eba86f96f
 DIST qwtplot3d-0.2.7.tgz 183836 SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c WHIRLPOOL 275287e771364080abe504657d09d1f5cb73828d76418f577beaadd8b80f0fca1fd6f82f0d5c05ca20f4c2b60e6537be78287534d73b8897e610fbeb4a147651
 EBUILD qwtplot3d-0.2.7-r2.ebuild 1185 BLAKE2B c573931f66f20e068dfa014c37be87a7de72869637cbe5b683a84c5c6e4b18b4fa47445cb9e547d748cc5d72fff26cba11a0df701268dbb1885d2ff6b995e25f SHA512 c82803d2884ea999c9be1796c9f092870275bcf7ac2fba4e63c319ab68a333dbb8f525f8623525c2680b2f179a71ed830c336ebd6c573c786bb1ee0f7c83c67e
-MISC metadata.xml 507 BLAKE2B 003d2f3ba9586ffb1dae0968203d377046e35e19bdda9bfea4ebd826ccf688bc60ebb1a4dd1e764d3f8a75e8ae0158ccf7de674682a660e57b1b94819b38ea10 SHA512 89c14aa63b5b6f7d9e0cdabc16aa5328de38ee28fb6ff26df4bc8f9cf6c313a7b545d16ca49404d6453b1f86d6c6826671741f309452076b0f357ba9c014207b
+MISC metadata.xml 505 BLAKE2B 495e3f9413a2f6c7071dfdd7ac7b8d3b227efe427ba6390761fb4810274661d58e46f43850d6ceee9e7015b69c24b82d8e9652b443a8f5091b220726ba280c21 SHA512 ab0c54c313d5ab5c70e7a559bef7ec966f45e06b278d64909d82ea76056edfe5fb1beb3840d534cb66feffdb7ab3da8af753a63042be9a648ef1a06f15c2263b
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
index 2725f60bd4c3..a63bd8a60d8b 100644
--- a/x11-libs/qwtplot3d/metadata.xml
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription>
-    QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
-	providing essentially a  bunch of 3D-widgets for programmers.
-  </longdescription>
+		QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
+		providing essentially a  bunch of 3D-widgets for programmers.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">qwtplot3d</remote-id>
 	</upstream>
diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest
index 79ca4864b95c..9a5590fcf6d9 100644
--- a/x11-libs/scw/Manifest
+++ b/x11-libs/scw/Manifest
@@ -1,4 +1,3 @@
 DIST scw-0.4.7.tar.gz 410761 SHA256 2d2e14f5c9ca9cdb0014a5fd970b29f0e50b5170ffee4376ec2de60f8453d0cc SHA512 bf042396cfeb7a4266a5e7156c618a533cbccd21ae499154c704e233b719a7031f051f421b3ed9371a60f2a1ba0ca3a86b5a665de1ef5443bbd12063ce013f8f WHIRLPOOL ea910d30bb2d986118eadcde81b8e499e91187cebf87cba9197bd1fa151d883defd0bbb7d7cb023e490d19a21385a3f4e31c9d2a5b29e7ad124b64efc945cd35
-EBUILD scw-0.4.7-r1.ebuild 519 BLAKE2B 4588ba6cb32af668ef6553076e06498a45cad5742c3e6e8663719909e1fa35a5aec9ae0ebd39dee975610da94176c007ac366ce3fef1d40151cc075e7653b62e SHA512 0ede080f7fe7eacfecc12f10eec15288a878ed94c40abbb897887154a8f5efb3bb641d0548f97a16447da4526e9818a67e1b52c15f3b4bb794084df42553a03c
-EBUILD scw-0.4.7.ebuild 630 BLAKE2B 9d7b8a24712b6c076347e22f4a1db4fbaa2708da5c31c4f086e28089eb232aa15c5474dd64893823f5e3ba9baca873a4c7c0ff77fb3a2880cd1c19cff5d76c3f SHA512 b9cffc20a093b2d2f075a14d10efacbbd070db848a0d642aa1c545725afd77eb9b1209a6e267f8910eafb45fa5a255c114232eef7757ce882617d42653f58c10
+EBUILD scw-0.4.7-r1.ebuild 518 BLAKE2B 2db575825fd5c5fba67a2fae0d1c5ae22f1b671aaf11f7c85c62b8f90f1a6e3eb23a0ea6e47a779cb497e260bda80cce0e916b11a384c70938adc57c877131c7 SHA512 3ef99ed6c77daef6fb795d674e7c1312620105bc03cb160781c9cdb02a115ad02196b9fd245488d317464d0833030c25688d50f549e7a021a7b3a71e3b58f12e
 MISC metadata.xml 313 BLAKE2B e36cbf2fad338d261f015642096991ebea26e5cec6d4782cfd4c432019973e22fb3f39a2e354ed52e9d586317fd3e7aac45d6a5256ffc1a53f41ae1cf8f143e9 SHA512 88293932281dbd3587e85abe6602aed94678efd91ab737e597f30f8f16b0747c77440ed2e99389f78070aae0f89fff575879561220647e0683895ba2867c5466
diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild
index c1868e7ecc57..732ab3fd45b3 100644
--- a/x11-libs/scw/scw-0.4.7-r1.ebuild
+++ b/x11-libs/scw/scw-0.4.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/scw/scw-0.4.7.ebuild b/x11-libs/scw/scw-0.4.7.ebuild
deleted file mode 100644
index d31965b84bcf..000000000000
--- a/x11-libs/scw/scw-0.4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-DESCRIPTION="A GTK+ widget set specifically designed for chat programs"
-HOMEPAGE="http://scwwidgets.googlepages.com"
-SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable doc gtk-doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 52f889d1d861..ae7a6567cc30 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,7 @@
 DIST xapps-1.0.2.tar.gz 109067 SHA256 1443e9f319763f8b90749ea9669880005f315af060f7bbaa2b4241b4c4ca49a4 SHA512 59426a8e39af48eb6435cb649fd88601a1a324d284ed9d222f12b7e52e70a0b250235b5924af1ecb7d6f3abd6c8e53e0cf38672c94dff44193f01dbc90c35646 WHIRLPOOL 6e4f01f17c7450b246dbfbed3fa229315166f5223c051422be7fd8510df376d6e916ab5e9eaac645abd57e055ac89da81291aa73de38af6a9129497f1994201d
 DIST xapps-1.0.3.tar.gz 121490 SHA256 bb1b89b586eec67fc109140de791710c5b4ec488b01ef3ac261e288a27b4797e SHA512 1182062153fc7344f94e9a25e98a457237b54c4841e425d202f8b57751f288e460423ca7408a888aff7a2b162acd194efda332b6acbd0a5cc2c12ae9414ea3c3 WHIRLPOOL 43784ca1328d810f38a3843eb0ef9bc9ac9a30c4bbc524c4898e0f7f3c0e6bbe3ceb507be4d48e962f06be8a652ffbc4a80ac3ed76d0807cce80d1d86f87c211
+DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
 EBUILD xapps-1.0.2-r1.ebuild 1102 BLAKE2B b217f0b1eb77c992fa84f830a1754daab0ff2831e449b7963d118fa38aceed79b0edf95835487b63ddd7bb01e3bedd1962943cdb20c804ed74c11b013fda63a0 SHA512 a2e535740527a0063a1df101c89b4588af6ec7eab08e88796436dd1d91462bcb8ab2dd61dfb6b69afd9b0cda25318c6d7feedb04263b312f9e957a87c037c9a3
 EBUILD xapps-1.0.3.ebuild 1188 BLAKE2B 3a1c341688c759e9e6bb275eee36140ba29cfdc175f45775c819ca31a6b487a51bc872d0c21644bad369f53af2a2f634db352dbf71aa4461942d7529e282d38d SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7
+EBUILD xapps-1.0.4.ebuild 1188 BLAKE2B 3a1c341688c759e9e6bb275eee36140ba29cfdc175f45775c819ca31a6b487a51bc872d0c21644bad369f53af2a2f634db352dbf71aa4461942d7529e282d38d SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7
 MISC metadata.xml 332 BLAKE2B 63c6409ca74c859140b77f0075049a181a636bf7179d4d6f5ca508740ae75009d9dcd4472e33bde6c66033400670f5a730ffc975d30d798a865c6e1228686892 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2
diff --git a/x11-libs/xapps/xapps-1.0.4.ebuild b/x11-libs/xapps/xapps-1.0.4.ebuild
new file mode 100644
index 000000000000..c72b5f1df5d4
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapps/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+IUSE="introspection static-libs"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	dev-libs/gobject-introspection:0=
+	gnome-base/libgnomekbd
+	gnome-base/gnome-common
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	x11-libs/libxkbfile
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-gtk-doc \
+		--enable-gtk-doc-html \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	rm -rf "${ED%/}"/usr/bin || die
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 54eda49505a1..99d9a55843c8 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -3,4 +3,4 @@ AUX xbae-4.60.4-lxmp.patch 437 BLAKE2B fcd694b2f45b3db39d23f371d396bd41a25c02e8a
 AUX xbae-4.60.4-tmpl.patch 255 BLAKE2B b7819d868def4094c36c9cc7dece319e2b96e1839b8fc000142654eb6281c82a4a2d008d5c3f6688f87f65c6d571d9bf09125661b94d23f7f49631e72c2d401b SHA512 03bb77bd5ad97b8bf38149a8421ba5cb80e7fdd6488ba69566ba74df1a8025b1078ecff1acffaf19c3d835fc23a44260ed59d2d81fbcfc7ccde5b7d5e678b433
 DIST xbae-4.60.4.tar.gz 1770938 SHA256 eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16 WHIRLPOOL 450621768a496149738511998cf6e357ad3d78684d41b4c651ebd7e389be1bd57e20e3b2c3aed156d987dbf07836dae8313f6339529ab5663f5dbe1d5f44105b
 EBUILD xbae-4.60.4.ebuild 1283 BLAKE2B fb622ebf698f47d970c9dde317661d10150896943a71ae303f0c5e5ffb849e4fe79e9b4f19ad993f581df28bf7c576e134b7974e4beffafad8d2822264f76adb SHA512 5c0b0c13bdc30fcdc7c3f18cb621424709a6366aa2e1ca6d6a4c9eb0fa75ec5c237b55949328fb08870336caddc2e84d5a10a52de34db438a3230268377b6072
-MISC metadata.xml 974 BLAKE2B c7a001d3f792e7aa795628aa9b813da2165bd1c50980f67fb54f273c8c6b271ef51c3810e3084c55794fbb1290b3a5befea68882daecf03687d509261fa4311e SHA512 e77c535823154352bf687daffb103d8e65387dcf15574dd09a3981c740eb0d3e2a0a700db01b2328c7def77f26aa0bba3f69ba388c3d7cd79f80daee2606da07
+MISC metadata.xml 965 BLAKE2B f76eac30d4f1d0ab6d41cdc26f8cb309936558efba912f56520f2f84ffad4463c8653de937dc2e6cb9757ebd7f60a5e147fea5d3c15dea1dd5f1ee0234a62604 SHA512 ecbdf447ab2b5b6c41888e8d2f7f02547de650fa1ca1bf708195753fc5e76dfc0e43a7a108c9dcc39e176b5456032b2e5d94c492075651267de4499eddc67451
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index a1dd8627a079..ff903b86644f 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -6,18 +6,18 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
-  LessTif) which presents an editable array of string data to the user in a 
-  scrollable table similar to a spreadsheet. The rows and columns of the Matrix 
-  may optionally be labelled. A number of "fixed" and "trailing fixed" rows 
-  or columns may be specified.
-  
-  The XbaeCaption widget is a simple Motif manager widget that associates 
-  a label with a child.
-  
-  In addition the XbaeInput widget is being distributed, a text input field 
-  that provides generic customised data entry and formatting for strings.
-</longdescription>
+		XbaeMatrix is a free Motif(R) table widget (also compatible with the free
+		LessTif) which presents an editable array of string data to the user in a
+		scrollable table similar to a spreadsheet. The rows and columns of the Matrix
+		may optionally be labelled. A number of "fixed" and "trailing fixed" rows
+		or columns may be specified.
+
+		The XbaeCaption widget is a simple Motif manager widget that associates
+		a label with a child.
+
+		In addition the XbaeInput widget is being distributed, a text input field
+		that provides generic customised data entry and formatting for strings.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xbae</remote-id>
 	</upstream>