gentoo resync : 07.10.2018

31 files changed, 224 insertions, 127 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1590922530f9..946b69277c84 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index d287a1edc6c6..0574f2101098 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -17,10 +17,11 @@ AUX 2.5/02_maintainer_mode.patch 590 BLAKE2B 61804fbb72b05975b1bf4470e466ae39eac
 AUX 2.5/04_no_rpath.patch 359 BLAKE2B c78f3555f371203c8355a2b8e6ac3c300b9757a1d74e14f3bfdbe58abc1332ed76f8486963b0b484a50ffd8fb48deea315a09b5cf7b44ac0156488a8b7fb251b SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e
 AUX agg-2.4-depends.patch 2154 BLAKE2B ecea231011d0779bd3fa42f8364cd31ac9d2dc17f9de2aff98045abcde5e562b04ca5da295d35ac2aef8924eb65a4bbcd42b54ce8da4453383f5b0bcac2e85e3 SHA512 22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef
 AUX agg-2.5-autotools.patch 277 BLAKE2B 9579b23d043b151f5404cd6f97586c3f1b1098b23d3aacfc1c287431c3b52b654c1c4057859f5708afc5fdfe0fd57e24538d6865f156b345c87240cf48a2ba3f SHA512 facfb36e8de3987153d988d4ff4227da6531a1508c2263d85364809b5dc3b564e76469a134084b2d020709fc32cfd319141126653b700dc38e266b68528c8f47
+AUX agg-2.5-gcc8.patch 816 BLAKE2B b959d281e57111ca74fd981a9d0a06f2ab9d0e05ef69fd2e7cd15c5385d860141400aebf2b89124022468f9c21633bc449b7802084112be68c078818503dbb0e SHA512 92cb8742068e839143094dccf77b81b37484d7a521c45d8bdb6653f2dc9055ed0b65fc2554234e1f635221f6624d4259dd86b7b3bbc5fc9edf29cc86cc58e360
 AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d933a11399c10d7c8ad63a419e44a1f8430acdcdfef5268600e088664cc8bbbc9a5513b3170f62cba86f07d4b SHA512 113ac9deb4d0992ef4bdaeb1654f5c1ab199d3865b525c573926b73b2351e9c551f2a7b77082f87fd78bcdab3036621b72bba9502028c35b28dc8f18acf11f53
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
 EBUILD agg-2.5-r2.ebuild 1414 BLAKE2B 34d9946175b2dcea675588fc74597f4e87c8e2b1f270657f49811afaac08ce9ccac721ab7f21a401c0b683209117436f9aa127fdd1b3bc7a9b5975ff9f71f482 SHA512 5d0f131ccb63c448e1a767b206f3bb98a86dfc1705962455b31a409d15edb151cec991d01b7395c7285642676f9e85eb91ed633166eb8076dded576c3708ff7d
-EBUILD agg-2.5-r3.ebuild 1310 BLAKE2B b38e25771857f92a380258ede6e816595f69944f332c3b08d347b45cd0dd2f4bf82062159a945497f2dfead1de0d545794612e0cc3ad4ecd6e5ab22489cc207a SHA512 65b75c8ada4e082900e91790e64534412d0f771be45f4ea18a5aafe022ca1fd751a1b9fb1f752f88b769bcb15ab55fc030c7c0908b75ec2002dee8d44caeec7c
+EBUILD agg-2.5-r3.ebuild 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 0925c837a906..a8beefe015cf 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune
+EAPI=7
+inherit autotools
 
 DESCRIPTION="High quality rendering engine library for C++"
 HOMEPAGE="http://antigrain.com/"
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-sdl-m4.patch
 	"${FILESDIR}"/${P}-sdl-automagic.patch
+	"${FILESDIR}"/${P}-gcc8.patch
 	"${FILESDIR}"/${PVR}
 )
 
@@ -56,5 +57,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/agg/files/agg-2.5-gcc8.patch b/x11-libs/agg/files/agg-2.5-gcc8.patch
new file mode 100644
index 000000000000..2e43d0bf79b3
--- /dev/null
+++ b/x11-libs/agg/files/agg-2.5-gcc8.patch
@@ -0,0 +1,12 @@
+diff -uprN agg-2.5/include/agg_renderer_outline_aa.h agg-2.5-fixed/include/agg_renderer_outline_aa.h
+--- agg-2.5/include/agg_renderer_outline_aa.h	2018-08-25 02:02:52.507254241 +0800
++++ agg-2.5-fixed/include/agg_renderer_outline_aa.h	2018-08-25 02:04:15.291175316 +0800
+@@ -1375,7 +1375,7 @@ namespace agg
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
++        const line_profile_aa& profile() { return *m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }
diff --git a/x11-libs/gtef/Manifest b/x11-libs/gtef/Manifest
index 3846ae537c18..4f30a3a06512 100644
--- a/x11-libs/gtef/Manifest
+++ b/x11-libs/gtef/Manifest
@@ -1,3 +1,3 @@
 DIST gtef-2.0.1.tar.xz 429800 BLAKE2B a76484bded4355a4bf263dfb2552fd498b10d623441d14732e61d76395f28cba3ae1998bc3ddd3fae17c39e73d1301487c90dbedb8d7cddccf8ffbcbab138fda SHA512 51cec42405f41c8d3d311811f3a9f6c67ca2a6a87cb305f9becc14694683ed427bf14797d8c997f17d4a05b3048d91cb5ebde81d0db4d11048e8978ecb7e64e1
-EBUILD gtef-2.0.1.ebuild 1309 BLAKE2B ee959cffa0b9a4d4bc5e4e98613991eb6b2551a3c9e94f413dbecea55dccc5c6f7dc84d7ddf3bc3e01fcb89533aa73771e504dcb423eef5fc9a7c3067abb6108 SHA512 4af4a9a852d3f5de81d2c821d47552007f7b5d32497f9b2401c38af5fdb17d28258707bba52794431de2b55e9421b2dfb6875e0c9a2fddcb6d34919c73e422ce
+EBUILD gtef-2.0.1.ebuild 1327 BLAKE2B c6d8f774fe97638711c5e90442b0c44b74ccf4e6979b949476680b7bd3ce6da6a23fe4358138effa3ee7fc12af012c591398cbf2e4b11e3dbd64076285c5c073 SHA512 015871efc5d0940f09dd4e62215b9f184e6874e19229d190eab46de59f42d5789afeb6b78e1e070ab65d41652ad1eb3d4a4893dfd9d601627390fa3a23e320ec
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/x11-libs/gtef/gtef-2.0.1.ebuild b/x11-libs/gtef/gtef-2.0.1.ebuild
index 8be374567d7e..e674966f57aa 100644
--- a/x11-libs/gtef/gtef-2.0.1.ebuild
+++ b/x11-libs/gtef/gtef-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ DEPEND="${DEPEND}
 	test? ( dev-util/valgrind )
 	vala? ( $(vala_depend) )
 	>=sys-devel/gettext-0.19.4
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	virtual/pkgconfig
 "
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 897911d76c86..0c4065152829 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -19,7 +19,7 @@ EBUILD gtk+-2.24.32-r1.ebuild 10022 BLAKE2B f8c96cf303148709c5b0b26fc17c41f4d902
 EBUILD gtk+-2.24.32.ebuild 9991 BLAKE2B 600affbb940664dc8765af635d394ea68472a0476acb9ee63347fc6bd08fd1a9c2a30b81e92c31731176dc8b2df2301df1bc42c6bfa07b184238fd6c3bfc4bcb SHA512 559c6691daac95ec50b503f682f8eea280cf9164a3e66b14dcf91e0ba11bb9d34c266aa340655590d6a784ee0d7afa7888866ad87a880e9eb19846bd43b5cc46
 EBUILD gtk+-3.22.19.ebuild 6559 BLAKE2B 3bd0611294ee3a3811e5d99c910e48c935e32acf991a4a5bd74826cc52d710883bae68354d07ca7249bed5ef49fbb22beab8adddccca1c18fc3cf162fba373ad SHA512 179ee609778c70342ae29ef0f25da28ed506eef801da98a396b3b3a039668e416a7a16892e698507fd47fc2ec6763806ff2cd75ae319301943d727d3b47f2725
 EBUILD gtk+-3.22.29.ebuild 6734 BLAKE2B e9d0774ca24b5db57ea83e4a2df0340402814150aad1c382bc89ad3ff7fb110f462aa1920c47a477c282f7f1fc1391d9afe908d4c34bc07fc80a3d23dad736e6 SHA512 908ec9a5128cdb285ce4745dbdf72101d36fae133528c86e2864c3852f5a75ab22b7c29d12f46608030da6a92e4bf55d1f8b855af7fa36336e232a2b9fead310
-EBUILD gtk+-3.22.30.ebuild 6736 BLAKE2B ebc3d6792a7507e41f5d196f77353bc1554f8239c9986e105e0b09bee58d4dd357ffd174cdce1f6f86f6aab8815a6b78117ca1dcd453f735da749b80e44eb85d SHA512 48278952460713c7bcde954b0f61f72a81ccaff1401a80fe9178e609696834daea611302762a2239e004f2aaefc4232a28a99a5eb58224cbf8236fc0852cc392
+EBUILD gtk+-3.22.30.ebuild 6735 BLAKE2B f33077d8b1411bfff2184fe84a9667e8257516301d50ee8238744d986724af1287682f0dc51241d65fc757549821230ee4dfd08defb1dced58f3ca92b3ed0d42 SHA512 00f615837f7aae0eaf0d1da586406128a5166709fa4453f40464802237afb4abc421c44b2bdcd45b013f2a86385ebb11000bfaf0d2697a8cfc54e5d78e0ae15f
 EBUILD gtk+-3.24.0.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
 EBUILD gtk+-3.24.1.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 14b9ed417faf..8d39dac9de73 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 ~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 ~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/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 7b97199c7447..d6893e722f7e 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,3 +1,3 @@
 DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
-EBUILD gtk+extra-3.3.3.ebuild 834 BLAKE2B 70567b42bb33c1e93734cddb760af3f4955db6a8f57e475adfc21a45da37f8a850558f4f8c9d8db1773472592cac207367b39c14cc706c95f5c087808dedc7ba SHA512 759b55a2acfd89c5bf799e0760029b0f3d1fa10238e95b6685dd3242bc8041c89a3c4a7dfa419b5e83b2cf0063908966c5449e3ad630f9f82bedfed7d22fe037
+EBUILD gtk+extra-3.3.3.ebuild 852 BLAKE2B aa7bd51f6e45f8a046f0a97cb5630ed581523613f0f7a6c073a434e540fe3b0bfd4686f39a9124524639f88043bf2a5cadb4ab66333c2da1fdd4b6ff14f2f5d4 SHA512 d7ddd41cd69b7f613253d1d6b43face44c9809fe0e7ac456af623667e0e0ed8849ced06d0a55a198e9d9af6bbbd260aa1d6bb96767d07312e8d8f69360c97013
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
index a072f27eba04..b91ed6667f0c 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig
 "
 # dev-libs/gobject-introspection-common needed for eautoreconf
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index f803a3ea2e05..6b024845281b 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1554 BLAKE2B a337a17177ec9a90e7218a08a20cf44469644202aa95719fd34a1223f85f3a20854c936c2a26281e05f1616389916c677b88ab416706a17fcfb7553b3eb90530 SHA512 bdd055aa81a04be324a555e501e372eb5d7640f4b7ac19b8e40107dfe3a206e7fc28ee4f11bf627d5fa9792882da0b7bb6d5a18e1dd6b26fb9247a4ffa7b3608
+EBUILD gtkglext-1.2.0-r4.ebuild 1572 BLAKE2B 9bdce738b9fee3ba626b62797cf3fa14bfcaca60a3aea101f3183cc7ef3abfc032ea8c844500000447ed3a1c8a76fcb70fe512c328eef5a85cef1f4e2f5c1dd5 SHA512 0a7644d45b01dbe3b0ab321c7cd1c41bb4be9293273e6ca782491852982ab7a6b7b5d33d2b6a3e65b8bab5b86b51de292666ab9c95ecc84c54a8d69b98930e1c
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 948cc280bb4e..d817a80ab438 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=sys-devel/autoconf-archive-2014.02.28
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index eb11a69d6b1d..4cda3fa399e2 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,3 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
 EBUILD libast-0.7-r2.ebuild 949 BLAKE2B b7dd3edb036b951690c70983d33cf01ce2fb816acb2faef09bde94cdf3681d581d87d28dee24d4e12fc4d20bad54cfe1ea57029f9bafc4c1dd98adc126bcc4da SHA512 d067d1355f62d7a8a7fc601ac1a5bef185e23a0353e7f1a960f4cff0dea39c4772af1191681d63a2c530ade60f1d0719b69f380ee8a46742940387d7ee76862b
-EBUILD libast-0.7.ebuild 956 BLAKE2B 51ad500db03219e1860f4a20c73d283cf25632d9413660f26ef59ea71408ca2003d6b94bd21a2619fa36d70a1280443008b02479af241957e13f101d642e280f SHA512 119258ed0398b0a007795a0889a0d1f57b15dee7135db65703e722c03d58a2da85eaa155eaac2bd8f23c79ad5ec96653a0b802d986e9faa303e50becfe554c16
-EBUILD libast-9999.ebuild 1046 BLAKE2B 961ad3edf0693b6ae5339c82fa0a9410a34b050361f4d5f5d826fc1dffebbccccbc07fd89e9676a2e53246140bb17a2a1de70badaf9842c04a2b95ff624c7dea SHA512 831b2b42607f673510482a48f8a5eb4bbc3fad111945cc3f00a9e6dc578ef65f4dec03fbae504727e2cef4f841f1ba129c9d07a72238b0639be866d4799a4cfe
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
deleted file mode 100644
index c2ef2a3a112e..000000000000
--- a/x11-libs/libast/libast-0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="LIBrary of Assorted Spiffy Things"
-HOMEPAGE="http://www.eterm.org/download/"
-SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="imlib cpu_flags_x86_mmx pcre"
-
-RDEPEND="!sci-astronomy/ast
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	=media-libs/freetype-2*
-	imlib? ( media-libs/imlib2 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
-	econf \
-		$(use_with imlib) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp=${myregexp} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README DESIGN ChangeLog
-}
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
deleted file mode 100644
index 94feeb7a119c..000000000000
--- a/x11-libs/libast/libast-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
-ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
-ECVS_MODULE="eterm/libast"
-inherit eutils cvs autotools
-
-DESCRIPTION="LIBrary of Assorted Spiffy Things"
-HOMEPAGE="http://www.eterm.org/download/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="imlib cpu_flags_x86_mmx pcre"
-
-RDEPEND="!sci-astronomy/ast
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	=media-libs/freetype-2*
-	imlib? ( media-libs/imlib2 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
-	econf \
-		$(use_with imlib) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp=${myregexp} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README DESIGN ChangeLog
-}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index c280f3626208..441330329c14 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 DIST libdrm-2.4.93.tar.bz2 826579 BLAKE2B 6b2775a6bc631001be874d1337ef9607ee8ff5b86ce5e3d8ff6c6eb58182a30e2c70592cb4eb9e88c9e046d73b510f632272c57621706afd1db416acc6ce366c SHA512 ba4221e8d6a3a9872fb6d30a0ea391e30ea0e17f249c66f067bed9c2161ed1ad8083959cb2c212834c6566c3e025f4daae31e9533d77aae19bbbbb9de6c2ab3d
 DIST libdrm-2.4.94.tar.bz2 829060 BLAKE2B 99de0fb3df6ea9bb5540cf0e3bdfe182c28db9876f679030eaaed1abd873bb818586bc07e73e0499f831ccaa7ede91a5b73b2b2bf681853e14e786a4af9abd98 SHA512 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
+DIST libdrm-2.4.95.tar.bz2 820722 BLAKE2B ee12f1b9fabc0a00f5adba33fe17000d018cfd5d7fbb4e737bceadcd8e897b846fcccdc262582c4d37508738671a0fedc1a653976214327eb998dca7d5834e01 SHA512 9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631
 EBUILD libdrm-2.4.93.ebuild 2113 BLAKE2B bd75b9274d572854c30020c44ad6a59ea91c563709f2641483f18355a8b10e6780e377e8853255c761c2f967e22b230b71fc208b85a63dd59d04c22964a54835 SHA512 650a6a3dae11732881598e9af1ba7c1966128840069d1f5408d66f5d26f5ce7180e1e4f9edb0842c52cce3fc35f6f88cca5bc4dc53bb06a5be322c8a5e6eaea6
 EBUILD libdrm-2.4.94.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
+EBUILD libdrm-2.4.95.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.95.ebuild b/x11-libs/libdrm/libdrm-2.4.95.ebuild
new file mode 100644
index 000000000000..ec0bdd16c350
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.95.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
index aa616bcaa6ba..845b0716b6ab 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1257 BLAKE2B 878d1b3d2c48997cf18776310e4857a8eb2a307326aa10a769c6cc67e8e0ad3d423c88da3c919623c8c9e41018577393ba0b2e735c94daedb6cf5b3f090a0244 SHA512 853cc83ea8654685cdd41467c26ff3b821260a6a150f64757696c05c0781df757a57751237786fc1ebb86566dfaabfc17d5df50dcc9963abf8616de7128b8efe
+EBUILD libgxim-0.5.0.ebuild 1304 BLAKE2B 1038604c35a9e5a980e9f22809f2d9b8a601ebd245b9cbd75e6ce03712cf30f574ab0f7187c5de50ef50341ff738f7c49389de5e89dc3ef1bdda2328ae909ac3 SHA512 5b41599875ea020c4c54ab57678dc13623bb9d779a2192c7b2bde7c756593d040674d806c32e071b0f24f228ae91128ff6b5c5634ae7ece655983c1b1984e203
 MISC metadata.xml 325 BLAKE2B 842e0838af5a3aa081c0cd65b5ffda14736b9d597c8f9117d8e61be977078741a61edec36a1eaf11d3dd8883ab9c821e664194dd298aab39ebee684e20c8e757 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index 8d4bb4e5405b..bc716195e9fe 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
-inherit autotools ltprune ruby-single
+inherit autotools ruby-single
 
 DESCRIPTION="GObject-based XIM protocol library"
 HOMEPAGE="https://tagoh.bitbucket.io/libgxim"
@@ -19,9 +19,11 @@ RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	${RUBY_DEPS}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
@@ -57,5 +59,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index e846c1d2f40b..9bda6d76788f 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.6.tar.xz 280388 BLAKE2B 89b5853f940be94884f6e50b1114bbc3428a5ee1645fc0b72cbfd2ca0f0bb574353ca0b379f0ded077022a478713419654598fdc603652f00c2d772a58666a40 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
-EBUILD libnotify-0.7.6-r3.ebuild 1586 BLAKE2B b60ab68e2d7e9d84fec352a730f79d4e48f980c952376312ae493d2f31c4109c33f851cd9941b712d4d557ae28057c6e3ef1e988517b4376e3e296c0045dee2f SHA512 2a1978fb2ce23e223d7ab38cc985b389d08170ca9c51dc293f98035ccb2b5e40ca9a16aabb132b23c21ccf9e643a7ed39ba29a019a8285da384052f6828f2523
-EBUILD libnotify-0.7.7.ebuild 1472 BLAKE2B afdb6d7ff092e58d1167d91239fafd34c75fe92dd6e054de77f235f05afd6184acd7a14c2f85e3f880fedb312e0482b77214eac864992916cd6d77c3353a5385 SHA512 18a6a46bfffff277a239ae11a6d8cf2f0c8063ea577fa527f903edea984c6b1a18ee562b04e7e9625a6d7ac693f9b6201a51095223f9d12af05e50860de84591
+EBUILD libnotify-0.7.6-r3.ebuild 1604 BLAKE2B f32ab469583abf5e62f6ee4cda0fa93397d7da8d4f050d014db0ec401b7370b5a1abecf3a4812bad09b128b185afd33e89630fce013c64aeeb9fbab32062c863 SHA512 7fee9407a9e5aae59ea94cc58c797d888992f754b3e17090de2b59b047a70aa7c962aa55788640d23d89d92efbf90a4c7cf82dd08842f0a845c69fca6494e339
+EBUILD libnotify-0.7.7.ebuild 1490 BLAKE2B 24679e740e217b1d79ff2e116eb1d270ca817875914f32f3d21f86fc5304dd5fe042c380fd55a2c2db7f5dabca426a4e0c21553e8e9f6511ff6c6f3107b7afbb SHA512 75911e883870aa6c9f41bd98e922e35cc18480f9e7f5fd6562e3ff69962622af54a4cd679ea13889962d6b3db9f36342da69c2eb68091bbe7930fbcec0849cb5
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
index 9eef580869b9..ade915f3dd37 100644
--- a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7.ebuild
index 7616626ccace..b281671c8f6a 100644
--- a/x11-libs/libnotify/libnotify-0.7.7.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 5ada7a874317..ed7702235903 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,7 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
+EBUILD libwnck-2.31.0.ebuild 1277 BLAKE2B 521bf8ecde7f1c5907a6c82fa76c6262aa01b1dc0d47c61d58a36b8738fc95c8cc953c25d3f181cebbcfe565b9ea2d03c650e741c9f67f7f8cdb78d6e7681716 SHA512 df4fb078670c4ccafac707d6987a1a681cd2b3e6567b093b6ecdf7550d9bd097852738502757347fc761f3d6488d261625b91204b6228b73410a6114efad8779
 EBUILD libwnck-3.24.1.ebuild 1155 BLAKE2B bf5a92d122bceea6c1a781a5fe882abd4cf68186ea1c2fb6d261480a94fbcd10db6d288e4c92c6834ac7ce103246ef90802cce1efa46a0aba0d940321cbc7841 SHA512 202d37dcaeeb54994965ad51de9c3b9b193b9f295af116a258e711e022c09a403f3e45f51c0bc3ef62e7e64c6912cb235a9fd7a0428d3ade6499efc005ebe8c1
 EBUILD libwnck-3.30.0.ebuild 1163 BLAKE2B 4bd2ab5fcf3815f3dc9d043b50d0544d9b5dcbd3cfab9aadabdb5254c19cccd57917d4e2202e314812a1c919e870cbb328e16be048f56448becf3cc00f700c22 SHA512 7cf96b245530a0b2f6f1eb3e2627e139322b8d3915c9453b8df7ab4ca587c83e6630158541a46ea971ed4c6d0fe80850fb12650dc3333ed235df18dc2e0fc7ef
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 5a6db92b21ff..ef06538442c4 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ RDEPEND="
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 072120e0fb3d..3d7d0c9491d6 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1346 BLAKE2B 71ef2427c8fe252fb71acda1cdaa58a7da4e41fac6ff5cb7e8bc092f91ef3a74b2e86be37126237db0545b2b37196a3328a42c4569c3b585d761da0439071dd9 SHA512 41abdfbe34824733a3c3dafdc44de6340c9d05fc3b96cae2b39724e7f79bc4701131d437a4effe2f65f196a4e2cd141b264a1d46f2c837c6dec34125c8e1bc9a
+EBUILD libxklavier-5.4.ebuild 1367 BLAKE2B 2bf6ca8f1c4b355df387a8bd61344768909beb1b150662ab6509efd0186696d9c1675f0d2c68434ace6522bcee8e19fa45f80740a58c128dc3190a1395f44cda SHA512 3d89b0905d08fad3db0e259025ed2346ae17edd58313d848a3fed7df55d2524b3ee00e5fec193c7b09d1ce2c68d777250fe25c04fcb517b34713353201eafb56
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index a22a09bb1107..3004befeac46 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.4
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e361342e11a9..04ea218d1cd1 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,8 +8,11 @@ DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b17
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.53.91-command-notify.patch.xz 3336 BLAKE2B f1eb7ce8ae5a975028474e0d31b14a35722cc32578dcb68905ec92b0ca048c8e1b7c903c7195248435db58a6cc60afce7376b38a3606b8ec88c8f28a7c127f71 SHA512 aab84dd050b5b9f59e9dc5e17a41a27f4650aecbd3fcb847b63b9bb79c84d3e544212e6cf6b4693424a44e14f8576c4f54eaea70a211dc0c40ae5887ca6114e8
 DIST vte-0.54.0.tar.xz 1082032 BLAKE2B 6349a7d7d04df26be3fca3c414aecd00e8a25b912af39446a412cd86c8b0165977933945786e840e2ed39d0f2fa8d51f2fc8052f00f56e47b4f1d62ffa00b968 SHA512 69dd0caae4eacc179f84eccf98625a31140286beca4244a8f06420bd36ac62dcaddf9e9d8b114549ca97927e94b562df3e7daa9fad971484f05ebdd1c0f7b787
+DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
+DIST vte-0.54.1.tar.xz 1083552 BLAKE2B 1e52275c953b5fbf51a1cc727dfca0bde3cc8f51a18055cd0c65c949479d0b4d926466016fa7d6f6dbebc9117c1b6fbde9a4bde38c5d82bb44ecce8612290de6 SHA512 5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
 EBUILD vte-0.36.5.ebuild 1684 BLAKE2B 8e5a971eaeb84f198cda7ef9a853c1917dfe646002e5206652d3447881e7d30ad3f47bdc6131e671dc6175c9c86cede3ce7c537c3e5b912526faa549fd22c993 SHA512 f776c181fbea6dd5c27e6d9a4c8ca55859fae513ef3fb6fc7a98db638c61a5df4a45770e18c032ec191a652365a1840e1f8834b485c559e7e5f82022f7447af6
 EBUILD vte-0.48.4.ebuild 2311 BLAKE2B ab8a4a1113f242af86b006aa1030c7225df44639b3e1c4247b8f66584bbaf9b62db42969ca60d5b39df62da3c508aee1760f7c7023c033365d09fa6ef1796705 SHA512 0af0a71e7796cc2dfc60390800e8d8b8e3184533fdc0e091cd3567fb0496b38668d96c63548066d1f5ba5246de530570ea24157d07ffd9be8c6b367640fa94e5
 EBUILD vte-0.54.0.ebuild 2356 BLAKE2B 7598b5ddc72a905f9fc0ef009dbe3299476665ce460252f0dc7681f08f03e68fe9c5aa32a80515d95d12ee8f49e21d3e94ab6fdf8b864c88b2a33b7ea085189f SHA512 77db835f20a655e29cf1e3a68ff61ed667d8f82aca4c262de6a313e7ccb269535c0f7a793646762577c6a69852e1b29911231885ddc311759387d02e58ef7919
+EBUILD vte-0.54.1.ebuild 2219 BLAKE2B 848523f5a310b0356c6475cfc7490220599a461a9ad2e545a9c917dc95bb2484f12756132a48e2c591005d738d865fc6cada08b2d624adc536b6f255810ff3ff SHA512 3a09c4180e067b24f9ac7a84f695ea71fe124cc27ce2124254cb3e8e743fe953b3185cc4ec733f61531a1f2084930a8cc09dc70579c26131ed3f1e2f0f501b04
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.1.ebuild b/x11-libs/vte/vte-0.54.1.ebuild
new file mode 100644
index 000000000000..f8c6fcc8b2f8
--- /dev/null
+++ b/x11-libs/vte/vte-0.54.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${P}-command-notify.patch
+	fi
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 47e8f9310423..fac3089b3fb3 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -8,6 +8,6 @@ DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
-EBUILD wxGTK-3.0.4-r300.ebuild 5204 BLAKE2B b7d741d315a1091eb1ebc59e410991bf5311ee23366c71977ea23d5573d96496fe853de25860b24e990becb24995c61d5dbaa2f178097f22781600efcb6961b4 SHA512 13e00e1e0435a9be0e521373b59a0760755bdb26b8e7644976a3df7253fe8eed320ac7b8b4a1356d344b51339521f48661ce563d5806e907e5031f89e2b5e687
-EBUILD wxGTK-3.0.4.ebuild 3984 BLAKE2B 335dbfe8bfdd5e6fee7a35d9553436f9cc3572f53a46e51f86efe929ebf339499e536e406ac3a3e68a6f44c1301757fa2ffe3be3c59c9d1c0000d7c85dd535b3 SHA512 e9e39fc7c106a244c219443ba4a90150832f9bebe80456e004693d5440f3b3f9dc80603e394c40784c803190383973c435ba2092990db58cf08d9fc9e20bfcea
+EBUILD wxGTK-3.0.4-r300.ebuild 5200 BLAKE2B bc4cfe6fe8ff393323d6695611b126a476dc414ef35e56748f09417e3483e9b7a314300b413e88172d300adcc3d4c9b3faa188ac61feff6f0b8b92d2869a184a SHA512 adde834493c288b350e10c12ca0531a7fbdff479f4970ee04f5cfaf73b4e43f522a9b7227ed4fdfb065a67686f8bf3ba80dca8f6cefaaa265fdbe981f1ccab1d
+EBUILD wxGTK-3.0.4.ebuild 3980 BLAKE2B 2eaa5964205dcb93da849879abb060bde0f6b04c07fb5122797de5881492106461c838fa999edf26ae794071eee39a6577123fb8eacfdb7a00049fe503f89eb4 SHA512 0ea8c93932d70059f2623f96047a9fb0d89c8419ebc886c8b193e4feb1b39feb98f6266682a31638b14e7193c467a56b473d7a644bf53cdb3afba3ecf9015534
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 68a8c1fa35fb..8675e0098d98 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index fd106604fa08..fcfff9af0b8a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"