gentoo resync : 07.07.2018

20 files changed, 109 insertions, 12 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 35f7f65b9eb3..d8223681ec7f 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 30116ac61cf4..ad605e49266d 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -4,10 +4,12 @@ DIST c++-gtk-utils-2.0.32.tar.gz 2753596 BLAKE2B 8b3cccca9a5229084df5c929b5ec88f
 DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
 DIST c++-gtk-utils-2.2.14.1.tar.gz 2790401 BLAKE2B 14b1a90d054ffcd1fc31db61a0ec4a2aa140f1560ff5332cbf97cf179da0bce087d8602ff820fe10fe448fa14691eb8200d25e467ce0dec2114a0ca426e2a0d7 SHA512 f6ce101bdc4b10f7afe05af5d90924e5ca7999e2c3db22885666e6528ae87b35cb75a40b92af9df823e12c3fd0dbf45cb8385e3637326829b9d0bcab0f691831
 DIST c++-gtk-utils-2.2.15.tar.gz 2943272 BLAKE2B 3eae2d8d0d724e005b0843fb8124d946fc89c48ef8b4f30a5aced222106693826c0bb23ea45005eb545b09f3a45aa191f04ad2932ec56a0050d6764cc0944329 SHA512 0181fb0400173fb99f89d72b52bc2ef458d25688d5f3be064f7baafbee6586fde386b3400d90e2178bdd3228c9dc184f87a0db0a50a020db5785b50f34785acc
+DIST c++-gtk-utils-2.2.16.1.tar.gz 3034643 BLAKE2B 10da7fb712ec37d5ab8fa00ed7f17afb46bdad32d11de3b44aa5df41dde8ad657c39bc132ad3bc4ddd67a4521705f18e94b7eb6f5b49b2d07f05a61dbbe1cc99 SHA512 e63b82c6ad15c96859d0631c1d76cdd73ababe11e2231e139bd451a3845f2275f5d7a903bdf7a0ce5740deec6397904818e3b5f6650887def6233c2a3f051e7a
 EBUILD c++-gtk-utils-2.0.27.ebuild 814 BLAKE2B 9bec2efb2c1780aade415a7d1b5798ae06f5f7a974d1be5bf040e3fc36061b7e96d8df3e87cb94538995272c70b4b55f74d42ed0be041c148b41671f9a9d5bbe SHA512 7d59db175d274483e9bd6efc88ec69962a154a2c4c9efe259844a20eb0dfea0980b031fe1c609bf9a64abd846a57a0f933050eda73ac619d078058f76e337629
 EBUILD c++-gtk-utils-2.0.31.1.ebuild 816 BLAKE2B 49119d75860355531ab0a36761d3b72dcaf45e2c797e4c0e313bc43d224971096551b2960cd96c859363416b1a59da1b9144b387f138261e3916f7ee2ac7cd96 SHA512 48f36745fdf7b559e73ab9bd111a5ef12700754a4c8aeacb91cd4673048662384f088fa300ecd95bbb9bd2e1de048a3146f4fae0ffcfd4cc5f7893e40e84dce5
 EBUILD c++-gtk-utils-2.0.32.ebuild 816 BLAKE2B 519c5bc25fc8b8a75709c6f87613f4a1890d46e5cfc74cfeeaa36fb0f1f011ebccc047388e207d341e09089ecb9ad2b997f538bae423f0ddb5908e3c0e0e19e7 SHA512 5221794b86eff79d5ab6a590af081426fe9535faf00b590532cbf72ceb9e86b0b7c6da1a6a706dd8187d700c3ea42884ec76ca51ab7d6e7b99bda7c6af382476
 EBUILD c++-gtk-utils-2.2.10.ebuild 814 BLAKE2B e928b81d913cd8c4b7727b8387fcbf50d8670aa4656978eeb83cb6d237466a3f9fc28b22b19bd2ad42d1efe0ea045b5350947a6041ff9680f2e4796200983e0f SHA512 1d6525bff24df95ae55ca10e865e7b2a594a7f2ca6c193c1ca72e4b5f332eef2268762f547f626db7a97cf4fd8004c9fb2d236fcc7eea43d2af070d49af383ff
 EBUILD c++-gtk-utils-2.2.14.1.ebuild 816 BLAKE2B 31cded542be5e9727ab3cc67619a5f4ed703c9e13b556412444b3622a19d2cb57fee7a2886a620d5956d429ebabd8690a3a4f2865996b69bf324653c715e9729 SHA512 c604704df34d056c89c780d01e8558fdf3883e420044ee03e5ea0db0f929cbb314710f620ecb6021b72bf84aa84d9bc0119fd90d0678851d20116c4f973cd3af
 EBUILD c++-gtk-utils-2.2.15.ebuild 816 BLAKE2B 5ece0dbb53c79f43e05e9c337556db1ec3a8b8ecf1bca097e04bdec8e2f22e57c6fe18533fe3739a731b8d980cce1dd94cbe6362ae948794b6080d509fd058eb SHA512 a979cd070c6264909a2851c41aa0aef7cacd6c019366504d097634a3486c85a1a703bbbb404648bc7185c04edae55bf53a18e6d40d9537715f2edd72e45adbf0
+EBUILD c++-gtk-utils-2.2.16.1.ebuild 816 BLAKE2B 0acd03db1ca89c642d47b60b8aae272c6cec79c2f27680ce04ff328b2fcaed36b16ab53334363dbccce0f4b953473db7881971369d1bfc9bc0109de148f80dc2 SHA512 5c55114b0e8761e28281d60bfe8e69b9fe4261a687d7afde0224536356e3a5d1f01d456792d07c7143ad0b6d41830e968c32e28ab6a0761b40c170612b820125
 MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild
new file mode 100644
index 000000000000..e4e56f2c3744
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="0"
+
+RDEPEND="
+	>=dev-libs/glib-2.26
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk) \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--without-guile
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2ab32d8fb7e2..480d256b1fd7 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,9 +13,9 @@ DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5
 DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
 DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
 EBUILD gtk+-2.24.31-r1.ebuild 9847 BLAKE2B 8cbe3d26447c8ab931c65275248227ad64acc1031a4fb77145d2c59b538c88710015f2a54ebee0903329685c8a966bb93449914db73d6439312044a319d03e1f SHA512 9dbf16c997fee138a096639b6c259680495c9a8155ba12e6cf8598d46212a32f3542e4c4d04aea9ed42ac9ddd2cbf75cabb6f9677a0d17c69e4214ce966ed74a
-EBUILD gtk+-2.24.32.ebuild 10009 BLAKE2B 1644b14ebe2ef581138d7340705359dfdcde159a2c9419deeea4bec5aa493b181bc287cbe5eaa4020b1b1d7454dc867f16e5127f5ee97b60b326b33d8be83be1 SHA512 88a6c1e7b4101b9bdffa1a3ff2eb31d944ce9c175bbc5f9ab72172d73db182675ffc2f56a5d7f7a8e9dd792edfcfeaaf6de500abc1f819bb5cb1c2b8d495c681
+EBUILD gtk+-2.24.32.ebuild 10007 BLAKE2B 774688ec17740d6cf7db4ac968c12a50b0a03d7c582224fe85ca555e3890cb9e71a58418726c87b56dbddd2c6c31a17b0c1fafd3e6cdb89778657fc9a36b8e90 SHA512 883e6c7e29261ec36188c490419387d1ddc458fc19cd4407183f6d04f01b5480383fe4841ee0bd1f1298f39a97a0c13500327c5a72300e8ec83a26723a745240
 EBUILD gtk+-3.22.19.ebuild 6570 BLAKE2B 595194b0e88c2812b45d9399214eb7a436d7248572a4cb72bd742bc45e4a81e4b7e1aa8dd7eb548d410d3901bb9a439c98a12159125056084b08bcb10da11c33 SHA512 f94a69a2b44d3238211e63cf7f72e335d425b8d8d8577f963831eed39a893d558648bba9c3bae3c202c2d26278a7d124e61cc426ff4837d3c1933e9d70b99686
 EBUILD gtk+-3.22.26.ebuild 6752 BLAKE2B ad8b163360e8b06de6d14617f602c32280c624b0dcb524d3d8a5b1f130400ac2e99d664c1793c8360fd66438969f8d0b228f35d1a0e57ab1632fea6b8089583b SHA512 13acbfc400ba56edf340c159df6043c34fac8f316e565aa0dc594400a1438e8f8f2f814333d1c5d175ffc67180c8dcdeff6f958314f87841322cd7d4f0225c4d
 EBUILD gtk+-3.22.29.ebuild 6745 BLAKE2B 2bfa5e1527c0383bdcfeea71f6630fda658fc74ec4f345b0226c905ea78bee90d06f5eb8180db0e1484721500717cad853155668ba3e5bf9cbd524a669e42985 SHA512 d783eb50a899e9cbaf4b7363c46e3a660783107caf6b119c71ea727df3dfc690766d283e93d57e6747e1178a5dc9a34283d4d1b0456f4b0b1568fa9b631f7438
-EBUILD gtk+-3.22.30.ebuild 6753 BLAKE2B ecd00ab275bcf7e8a0a1cde84b156e7667fec065f64ee2ae13aef75604a1b64365a61c8aa67df8b7c6cd01579e941c51817ab521ff3968419fcba1c31e461a3f SHA512 2b7f25b0f4d9585ed592644695e0dba51415c7929ae1b1ddba4b9dedf4741f0e94a628210f2d73f07fe8d79c03e8ad975df2b7c889e1b47d493275d2497994bb
+EBUILD gtk+-3.22.30.ebuild 6751 BLAKE2B f44c4b0da1b47f090a0773eeb74b8a2fddb6aeb5ef699c0c236d2611a0d8ceb63532a42ab1e0027c29c7d675c4d82cb10d10249a3e604f6c0b2d34a9025351ba SHA512 0720ff935c6b6e758f4030931e9b9368bcd479e18b2434c42dba7c619ec7d03b40759dc1e8e1f1e093dc00368c6567fa2462e48c3850caf72546c45b1419a9b5
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index 847e511a254a..c378616f951d 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 7661241aa30e..7f3853feafa8 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-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 ~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-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index f4a40f457910..4127a3889950 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -7,5 +7,5 @@ DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
 EBUILD gtksourceview-3.24.7.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
-EBUILD gtksourceview-3.24.8.ebuild 1331 BLAKE2B 12e4d6f54651c159eb77b492aa771a39c837bf1fcab5412d9557f36dbf896ba519f785dc9a6a228ec314a50cbf888f022132abd58c13fcd041427016759d5afd SHA512 2a323abde1e2c2ca9eb3a6f008410db0222b36f05f8bc367f7d2ae9d088e5bb8c4f65e232ee659548d4dcc78cfd6e3f12fceeeed8369338bc40204978be12b0b
+EBUILD gtksourceview-3.24.8.ebuild 1329 BLAKE2B 3ae7b83048fe9007a9ea8f16e3206f119886735ce80f871bb88674651de95b5fd7fecc8efafb2a5bb2a78e5acd064fc4dc9ba283960faa9a7141ee62a6987d59 SHA512 d745d31131a22e9fb9f94f369fe40ba49c2ab42c2497f38b7999cce5adc49ef0b4e1626d058bf83608db9c5ecee679469d3e93c151e2cf1fd9f831550b584580
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index db3725e99188..a1510fb96e97 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index a31c8d6d0d85..2800b6f23f04 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,5 @@
 DIST libXScrnSaver-1.2.2.tar.bz2 290437 BLAKE2B 051218bdfc249d7dcf3d53b3d6e7136b0215b3b445254aba27515ab4813da6b086d09d7be97e35d3f33ece78ecbc003911e671564f492e47d240e1613de5cda5 SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f
+DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
 EBUILD libXScrnSaver-1.2.2-r2.ebuild 523 BLAKE2B 03c0175b3041459c0d0ae6d050d8ea627b882aada8c0aca08a21f3a0bc3cf632b8127fed0caa553b6a6c05d8a1dfa5e715f8b32a584c15db24e2761ebdf69317 SHA512 a197a8c6ca879a84127120c5851e24ae2b2404548d4fd279d79e308dca01c578dd3a885325c80ca5efee983596437f73c398be180bf700cac6196d3da825e7e3
+EBUILD libXScrnSaver-1.2.3.ebuild 533 BLAKE2B 65220f448fbb252d074fd284de3f823bf491cf67a5d8ca737aefdf7b9141fc5e4d547c8069f6e9850e227be13fc31e6110637aa6c2d92786199f4182c0f6ea89 SHA512 1a51f372a69913015d9a6be7b738599e1be8993e896d51c5d7ce9b065c6c35eb26426e44f89040ebf0c7bcfd82f332e0af8c9e0a116293db5213cda7999f08ef
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
new file mode 100644
index 000000000000..43cd32468eab
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index a471f2b206b7..32ba3bb9e73a 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
 DIST libXdamage-1.1.4.tar.bz2 278937 BLAKE2B eff95312ae989893904fca167075c10a784222db1ba4850d941f26c4235ae39ddfa242037e48ccc4b7912c27bb5e92b58eb61d7ac1ee6185d0b872b0be3e0ed1 SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904
-EBUILD libXdamage-1.1.4-r2.ebuild 550 BLAKE2B 62674d0b749db9a760bd1ccb67b2946b9ef8e78b691fc6d2ac9f7ebddbe1029bcc85fbdf8305dbe199eb58c7061b95f201a3b7733732478faa7e13189295ae7e SHA512 2d76503d8b98dd982c9e15d2862740fd58219a8b16d0baaef633900666c81b22a33cd47b1d5fd378de53b4d47ff9295d70721953a5ef91afef76a7a118368109
+EBUILD libXdamage-1.1.4-r2.ebuild 549 BLAKE2B 61f56c6b65bef4e5925bfb1f8e1c231460fa05ea295c3605a0cda6033ace1c463e394cad19d3599a6ac536324aff4c921e5e80d3cc01a1677403e36bdb0b39ff SHA512 1f449fe3d750f6cc2e3364b21c90c18bcb607bcde908b52269b27c61a7af14e38c243efa8e6bd53be7cb84c971a7991b96524a7520a36fe2bdb771c311e08a1e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
index e174a98d2242..6ac8df3b6d1c 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdamage 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index b73088636bc5..6d714e0c576d 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,5 @@
 DIST libXinerama-1.1.3.tar.bz2 278026 BLAKE2B d44c693cee0dab38918fb4a00803430fa4bbbc985e2cd541187bdbb717a9e3d843254f76e098f415ce4ada575aa271ab7d3ca14c8b590dcc3fe31e615ee0db99 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c
+DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
 EBUILD libXinerama-1.1.3-r1.ebuild 537 BLAKE2B 9f22abefb9b32ae9c3fe5adcf6ca60e6c7691bc71646b9845a398c3c1a1e099929cb53c6372f2cff047216e60e909507de064f5169c9efb494f89e3887d4ca47 SHA512 161b7cc85ba8ed0e606a7a0b4cddfb31ddb6b9276bb654b2222fd2d0f165ec070789afded54727d05932c9435ac59c2c83784ab6eac041cb7832b3b4bd94a63a
+EBUILD libXinerama-1.1.4.ebuild 547 BLAKE2B 485fa3c177fde63416a481d927cb395952fb71e7d061cdcdf569dd8ed23b3eff20412e2dcf0a85940d12c2293a64e5ef08e4b0b1d4d4cea532655bf840ba924d SHA512 3b18fbc0570cbf03d6b010444ef3a428a798ba042c157323260e2f896e0c2d5d6218f00add504848eedf9ccd8742a5c31d2176c82c3a225ea45b98b7ed0df04d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
new file mode 100644
index 000000000000..9bbaca5198d0
--- /dev/null
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index d6bd402062bc..86d3a3e0e2c3 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
 DIST libXvMC-1.0.10.tar.bz2 313887 BLAKE2B f5440e60c29e83be8945d215e484a995547411fa8e96b2fbf757b93bc618b5d1083f41ccc770c9e8f4b0e13e6230968575aa7054f036ed2443b85b6301078930 SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19
-EBUILD libXvMC-1.0.10-r1.ebuild 563 BLAKE2B 9e9a39b429783064baa83e890c5c625e76d5050eb953133d8e28f55c73629bf644862d7fc2378e27903b3fc61d8c120287f36d0e5df96b559d245685b9e018d0 SHA512 cffe63bf5e0f2a8762ab4112059bc8bfb3e5a39237c704de4decf472e2e39215ee3ef54b930459e0a3883096e2058032f98fc3d0b2966b27befdbbb4ac89deca
+EBUILD libXvMC-1.0.10-r1.ebuild 562 BLAKE2B d414cbce81c1f625685b9684d17e6c568b659222ad12bdda3469c193ec6d7472305d1f0db8133a2b3fb4684a9e2351e6f775fd2d3679fc266a30c412dfa68f3d SHA512 5b9daa16cf33ca27e14219a81d83222c644c2ca6938ba2e2d2c20e7ce1dac32e1aa6fdf44299e0c40435dbca00770d3742c1fe90e3bcd032177b4bea3ac2c8d3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild b/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
index a80dc54532df..8202d43fea00 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index 25669ba34945..04601c1d75cb 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,3 +1,5 @@
 DIST libXxf86misc-1.0.3.tar.bz2 255831 BLAKE2B 3e9fc6cc8853fb74facdbb9183111a513de7fdbc484679561def89af46a99b2cf6fd49fe66cd6b7ad9bf95cc96aeb09207bcaa46094fdebcf373198db10f9a68 SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f
+DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb
 EBUILD libXxf86misc-1.0.3-r2.ebuild 462 BLAKE2B 9d6283f7af5d246898cdd56a689ea391989adcd7e545d1dbcaff20b4c2c0c024c14628ab38372ec2245df41ec3af8deb2db9c9b497f2f060eca2cc5b675d8b72 SHA512 490a206c66a00c7f10573c29b88b82ae444e6a8e65fc8f6fc256134ae0ac50d9302e9d1e2b692d75a0010d9b2245242c2f6a2d92f2772124c4189fc76b0a2404
+EBUILD libXxf86misc-1.0.4.ebuild 473 BLAKE2B e8edabd09a5ab6b1e0d5d6a9f9fcb333d44d7309d9d99afe58f943d7e9b0ecb0e2f176e4e42d19a744e05fd36054aae33307494e7e42257a56799b2c392db94c SHA512 8982b872785b21cce5f1f446a7b28207fd91e508e27fff8c17d038d258248cee9a7127e78207f51334706b92c88ccf8de5868f1b70a50f1dd5aa540288e9ab0c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
new file mode 100644
index 000000000000..e8c14407c2ba
--- /dev/null
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86misc library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index bdf5f254d815..d36e21bc3877 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.4.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
+EBUILD qscintilla-2.10.4.ebuild 1794 BLAKE2B a5243bc6a5134aa5486859fcd16a2b99f58063bcb3fba5363174218898ce8d6b54e0f88900b027d0e3204e595f69cfbf5d89f6fb1629d893d7bc87296c7af19e SHA512 cbd2d7a6098a7c43ef560b82361bef6da484b966437df0139071755974846d1873fa9bfca658d040ffd2a0b67fca6048e3b5158875f85bb6206faf244a82679c
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 1b74d6e22141..e21f66bf7606 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="