reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-libs
705 files changed, 26523 insertions, 0 deletions
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
new file mode 100644
index 000000000000..8e75820a8122
--- /dev/null
+++ b/x11-libs/agg/Manifest
@@ -0,0 +1,7 @@
+AUX 2.5/02_maintainer_mode.patch 590 SHA256 354eb06466f2f6d5dee100e3fa3b3aaa9d9fe331170f675b6d4dbedc569c9b17 SHA512 150640e2eaa1ef764071759b09f25adaf2653d9f97b8a938e47e1cc0d221d441054d460d48819995ebea7d311c97b480caf83f135c3da188733230405cc9bf9e WHIRLPOOL 2df9fa6b0747f47527705bf447ec39c22be429d4c59279921d6defb03eaa8153ab96ec95b1eb7b4a76ac43cdde242a20dd38c46169441baf954dd96e8fdf2472
+AUX 2.5/04_no_rpath.patch 359 SHA256 f38e5aab003ccbb9e67c69618e154f51b8698e28b3f74f2b414931af9da032df SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e WHIRLPOOL 96f9c4e4185aea89aca338de2f9041a4acdb0f34b6bdd63e2dff47d3529c82d6222a57f82b3baa8cb78fc01067d49d13589f7df64fc244589f7524fc4fc24e4f
+DIST agg-2.5.tar.gz 564313 SHA256 ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf WHIRLPOOL aeadbd18d6f5a1af6d10fabe48eaaeabe20c4215c8da4236cb4084a10af59f223814963b43fa01ae280efad2db3789837c0e14a4e43f068a05d1e59739cf996d
+EBUILD agg-2.5-r2.ebuild 1454 SHA256 e330c26e903e0208f4796cb0180022c170a9587961d0e8193acbb7deb733175d SHA512 5d7061a7fd9bc19a37e6a249fb1019ed1801f2e18efe796188a83f868e79f8d29e052088d853485aba1f82db6113087ae257a67abf13d3774f21d681fd915743 WHIRLPOOL e57deb8d85f3598e8fcb77caac683cc7cd1c2591749c01a737bb09bf9277246706700fac29329f0dbb700c6bf07e82c0d24e5b288fb5f6f8ba7a97e5f8692d71
+MISC ChangeLog 2235 SHA256 1a33c533bfc50245fb3ecb9c39b9efbe24a3c17287fc0fd0c607464398d0264d SHA512 68a518706e1f856e240aa248c1a5ecc927f9e3de58dd3832b1021fe2ec33c2bd47bec826cb91332608e9d61aabb5bef584ba0f1d6f1fe6b7181b5d21322878e1 WHIRLPOOL 584b629b94dbbdcc65ae0185940f2ab84bc91dafd488617b1d786f11eba62f078f95016e0ddad131bd81ea12290a9dcc6fd7ce89ad28ed75921a5d46fd0043bb
+MISC ChangeLog-2015 4522 SHA256 08deb6ee2c9d623e1ab4a5279407c7df817d5a61d84e269aca619c282bd0b235 SHA512 0fafca549fa1c37a4a3b314b67de6ec8212928d43b09e9efcbe587d6ed3781522752da27722b09e1698ac5dbc1296ad17640337baa9a583fb635459fd1ca531a WHIRLPOOL 53c1182ce518e257ae220de2207d15df1844b7ef9e8b53a5110a9ffdc2845b1864a43c1b676ceee6004e57324ba9dc2ae4d59106b67b7362fcf69b9abf8e0297
+MISC metadata.xml 335 SHA256 aae813fcfa351017630960388b635e22dd3b4dce63d7906070346a111eeb7956 SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f WHIRLPOOL dea68c6eea9e9fcffaa9a37fac90cf368eadeba4cf616a48a34359cc81dec0abd13a26db55ce0a62d5e69d2cb782e69f34487ae0551acd428f334f66477b7186
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
new file mode 100644
index 000000000000..caba9c1a146d
--- /dev/null
+++ b/x11-libs/agg/agg-2.5-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils autotools base
+
+DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
+HOMEPAGE="http://antigrain.com/"
+SRC_URI="http://antigrain.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE="+gpc +truetype +X"
+
+# preffer X with enabled xcb, really
+RDEPEND="
+	media-libs/libsdl[X?]
+	X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# taken from debian
+PATCHES=(
+	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
+	"${FILESDIR}/${PV}/04_no_rpath.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	sed -r -i \
+		-e 's:^(.*)  -L@.*:\1:' \
+		src/platform/X11/Makefile.am || die "Failed to sed"
+	# fix building against automake-1.12, bug 420701
+	sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	# examples are not (yet) installed, so do not compile them
+	# sdl is harddep only sdl-tests are optional so we enable them anyway
+	econf \
+		--enable-ctrl \
+		--enable-sdltest \
+		--disable-examples \
+		--disable-dependency-tracking \
+		$(use_enable gpc gpc) \
+		$(use_enable truetype freetype) \
+		$(use_with X x)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc readme authors ChangeLog news
+}
diff --git a/x11-libs/agg/files/2.5/02_maintainer_mode.patch b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
new file mode 100644
index 000000000000..4c65c9723e34
--- /dev/null
+++ b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
@@ -0,0 +1,21 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_maintainer_mode.dpatch by  <rodrigo@nul-unu.com>
+##
+## DP: Use AM_MAINTAINER_MODE, to avoid re-running autotools
+## DP: except when explicitely called in debian/rules
+
+@DPATCH@
+diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in
+--- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500
++++ agg-2.5+dfsg/configure.in  2007-07-21 19:58:33.595695250 -0500
+@@ -2,7 +2,7 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_HEADERS(include/config.h)
+ AM_INIT_AUTOMAKE(agg, 2.5.0)
+-
++AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+
diff --git a/x11-libs/agg/files/2.5/04_no_rpath.patch b/x11-libs/agg/files/2.5/04_no_rpath.patch
new file mode 100644
index 000000000000..76582e332738
--- /dev/null
+++ b/x11-libs/agg/files/2.5/04_no_rpath.patch
@@ -0,0 +1,10 @@
+--- agg-2.5.orig/libagg.pc.in	2006-07-10 11:27:16.000000000 +0200
++++ agg-2.5/libagg.pc.in	2006-07-10 11:28:51.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
+
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml
new file mode 100644
index 000000000000..7c6740158c47
--- /dev/null
+++ b/x11-libs/agg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>chithanh@gentoo.org</email>
+	<name>Chí-Thanh Christopher Nguyễn</name>
+</maintainer>
+<use>
+	<flag name="gpc">Enable gpc polygon clipper library</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
new file mode 100644
index 000000000000..85e84127f834
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -0,0 +1,23 @@
+DIST c++-gtk-utils-2.0.27.tar.gz 2608722 SHA256 218b518d0945212d1dc40cf3ee420e4c51993bc0f8e9f8acbe03c099c9f940f7 SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc WHIRLPOOL c8a19fdef5c6a7cf15615aad5083d666b487d1ebb2443977853822c97a991f5da8b461d8cb1c6bfc986325954b78a2129bdf328a4fdc0e4d8f2739ceffd79aeb
+DIST c++-gtk-utils-2.0.29.tar.gz 2704000 SHA256 279fcf0cf22ea4494eef7f690ae8722f30160bf7bf78b8e97d3803bbedce9368 SHA512 500002a74609eee41c53b91de119533c67627f68900509763717c7c8738bcdab0747a0f0f62b4b25110a311ad0951bdb5670bf13898787a576438663face967d WHIRLPOOL d6e01457f4bbfb62832aeeb21eaa5d3e28cc807b8775d0ec2ce6f615c5c2a3d1651024dc6441ecd08400d413fef9b6f883c77e9c426be1896d7c91001295366c
+DIST c++-gtk-utils-2.0.30.tar.gz 2707580 SHA256 4684662d217b75dfdc2cf6a199c99d3b46de50564f7a7c39b8a094c3251330fa SHA512 220048b2ad1121c0cface6fd8bceaa86f1c228a1156ef5a4b1d13af421583fd6dfefe6309259f4f23125578b80fe945625b089dad272041d9681ac032d18b6a7 WHIRLPOOL 1bdecda46c9b80a1d243e3c7b31e8c0608ca9c7fcb4c319c2b0b893478ae0994fe0f8b01a3af9bb3931e47ea1ca2ab5643488aa08adc652f68f1b0b930dffbec
+DIST c++-gtk-utils-2.0.31.1.tar.gz 2749035 SHA256 dd6f4e76ac2e5b2c335734482f6a2793b4713fad006410e8f7631634d515f439 SHA512 592397fcfcb8b2b8f479fac432c5d8974706487a121e5a8cee877472bd764d702035380f52a6f520325d7393afa4971fe6beab56818ab3d23c1ffa42a3f752fc WHIRLPOOL eedc49bd7f8d32f6860ba8a91231061d408e17ca72427cf7f5e2db4ff607057a4cc32ec76ec99d4560aa7a02f2e8047d8195778a2b231379557f1ffa7cf37f4a
+DIST c++-gtk-utils-2.0.31.tar.gz 2756583 SHA256 e7a80292f4d7f93059a5047a6b1cf339295519998d04cfd5ad04fb2341177979 SHA512 688e738c2433838ea8eaa6f51f34d201f93b186b3689ac7ff93b1467fa178a17fd31884a7fe2f1358cbfc0cc7001c0c95ce8aaadaaf9b84f11e476b94f777311 WHIRLPOOL 719a0990b12b02bf571b585d686b46d7777a4c0298b8e2de66bba99614cc9f5a27fe51c988d04638c752675c3f4e6cb53fb62f190955a690db8ca3c13b53855d
+DIST c++-gtk-utils-2.2.10.tar.gz 2643918 SHA256 e898bf19455706ebe593e6d795584e9a8ed26046c0928597a94c89fa33321191 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31 WHIRLPOOL c4901315da82e7633b8e860628c69aad5451e6ff9a2da8eeb5adc245b0b6f5ca6bc703666f4cb3ae169823605c94d445742b2f9790c9b6cec0040cebb2ca7081
+DIST c++-gtk-utils-2.2.12.tar.gz 2738884 SHA256 3e69fd4dc952bf305c95f37417edc2c387ec84e0aebeffa49c2828725e2d76e9 SHA512 c2edca67104b304a0cdbceb9903f6060594e80024a7e156db9abc0a8a9360361467bf356860197a0d1eb9549e2452c5e5075d0a1a34cedc3e29760783b82f270 WHIRLPOOL e21d265bcde114a2d7d91af383ae507675b3c2a10bbd9f333008fbd675a0681cd898b4c0ef07a5ca866b73e29f472cc285dd73346e8f4bb65cf79ff9eaed6017
+DIST c++-gtk-utils-2.2.13.tar.gz 2742099 SHA256 b46db4b656a3b921ff229291fd981a5dbb828e289f5294acb81db7441634971b SHA512 42b4f92722e3e03546311702ed233e248d39fcb38b51c687e34ce48e57abe31078c31a99d199aeb3c8de68ae0cf280b606a2585c43898d4a003f962bbe132c2f WHIRLPOOL 8ce2bfeb993659dfd7a52d4deb1b11f36578c81d219a979b6fa13426403a63bf7cc00cdd13490ca45868e4ec8e342d36e098bccf067a621896fbbaa2e2b5b8eb
+DIST c++-gtk-utils-2.2.14.1.tar.gz 2790401 SHA256 ab747cd5331842affb5d60a8c1de0368329cc51b629f6281350dafbfeed0e2b5 SHA512 f6ce101bdc4b10f7afe05af5d90924e5ca7999e2c3db22885666e6528ae87b35cb75a40b92af9df823e12c3fd0dbf45cb8385e3637326829b9d0bcab0f691831 WHIRLPOOL 76e75d07d5b5f7ea54c29d9ce2c65a3e254b30b6e27b926e81ddbe101c487a66730e89195c04883c23f45f70c37fc545e40e4bca7297f27b683d3ed5d2ef8067
+DIST c++-gtk-utils-2.2.14.tar.gz 2797320 SHA256 ac345abc190b45a110be274059afb11ad108035e9821cc558bc1dd4f0cc83972 SHA512 c32de0023f6e1bf0c32cc9b2ee4a38394f938e8ae631ed702f3a5b941cda024594dc147924239e24d94462393cc49e408a1cbafc06f9a31006b639165600941e WHIRLPOOL 49b651c20151cd0f8cfe6af81a9e39b9c64854289781d2aa59ffaf3b4e79a88388416f539065ad9d636c47d234f3c4ae854af10b13eb5748a3a57134da324c1a
+EBUILD c++-gtk-utils-2.0.27.ebuild 814 SHA256 f3dbe3c3e971bcaeed0dd082f9f9e2b9aa796b42215f746ff70fa9bc28387369 SHA512 7d59db175d274483e9bd6efc88ec69962a154a2c4c9efe259844a20eb0dfea0980b031fe1c609bf9a64abd846a57a0f933050eda73ac619d078058f76e337629 WHIRLPOOL 12ec4385d6c93d5013c14da3b112f3281ec7a299e880770b692ea18b5d8e178884fb559ebbd760398d31343e20ceb1e5a363ea5fa439ff71cb000135cf44146d
+EBUILD c++-gtk-utils-2.0.29.ebuild 816 SHA256 b32af6a7038cf797092bfb16cf203e219c84b0e19c2dd33ac34bc39b054ea3c1 SHA512 ab1c52473ba9a1d850edd411236a85feb98412e1e8c1d58f1b1ba9024c53179f4e981dc91289beba87e3cad7fb788ba440f746f659e1c578153408710a0808c0 WHIRLPOOL 378b13800af78a480832b4de555316c36dd1618213c86755baaa14f99dc0deff38eab48ca0d53e9d0a1d27b0de785d69be42f8e72ff23e6c63b56e475c3dd2a7
+EBUILD c++-gtk-utils-2.0.30.ebuild 816 SHA256 b32af6a7038cf797092bfb16cf203e219c84b0e19c2dd33ac34bc39b054ea3c1 SHA512 ab1c52473ba9a1d850edd411236a85feb98412e1e8c1d58f1b1ba9024c53179f4e981dc91289beba87e3cad7fb788ba440f746f659e1c578153408710a0808c0 WHIRLPOOL 378b13800af78a480832b4de555316c36dd1618213c86755baaa14f99dc0deff38eab48ca0d53e9d0a1d27b0de785d69be42f8e72ff23e6c63b56e475c3dd2a7
+EBUILD c++-gtk-utils-2.0.31.1.ebuild 816 SHA256 c9beea661b75abe68a437a9082e4da35accfa90c7789b548eb96e95ca8d7978e SHA512 48f36745fdf7b559e73ab9bd111a5ef12700754a4c8aeacb91cd4673048662384f088fa300ecd95bbb9bd2e1de048a3146f4fae0ffcfd4cc5f7893e40e84dce5 WHIRLPOOL 3587fe460c8568f380d0cf26287927e62433fcb97cedf18b61f8516db62b883ee5e389e70f137a791526a5481f7d234a2c2b7ed7fa65a911d96787ef4f474da0
+EBUILD c++-gtk-utils-2.0.31.ebuild 816 SHA256 c9beea661b75abe68a437a9082e4da35accfa90c7789b548eb96e95ca8d7978e SHA512 48f36745fdf7b559e73ab9bd111a5ef12700754a4c8aeacb91cd4673048662384f088fa300ecd95bbb9bd2e1de048a3146f4fae0ffcfd4cc5f7893e40e84dce5 WHIRLPOOL 3587fe460c8568f380d0cf26287927e62433fcb97cedf18b61f8516db62b883ee5e389e70f137a791526a5481f7d234a2c2b7ed7fa65a911d96787ef4f474da0
+EBUILD c++-gtk-utils-2.2.10.ebuild 814 SHA256 ec289169463c2570303ff186d309e2bda542703152dea33db69baf528fa3226c SHA512 1d6525bff24df95ae55ca10e865e7b2a594a7f2ca6c193c1ca72e4b5f332eef2268762f547f626db7a97cf4fd8004c9fb2d236fcc7eea43d2af070d49af383ff WHIRLPOOL 3bc54b6e724a9c2069d289cad2b5e9058010e2999daa56a0967e33f2569c084a3c7e940eaa842799ed3cc59f16f282c60032b10acc06c0df010cdf735926c21b
+EBUILD c++-gtk-utils-2.2.12.ebuild 816 SHA256 540d03bde4e5a826d722c86a9e427ed8fc19aadb9b2ec3a6de9a397b7e1d0e14 SHA512 3cdbb1f5d8f9cc5070fca90d1e9fe1f9ad94a9c946fa7cb14121e4d672a1f6005caa8acde19052ae81bf855cfed98dd6ff1e86cb4800e5f4e23e4836e3e49889 WHIRLPOOL 514b17bb293468fcdd691d42ceb53604cf94b27d29b0a3e22cb137329faa61d8da212b54e064d863ffee03fae67e8ed84c2353ebd74e4abff1548c7574e53f36
+EBUILD c++-gtk-utils-2.2.13.ebuild 816 SHA256 540d03bde4e5a826d722c86a9e427ed8fc19aadb9b2ec3a6de9a397b7e1d0e14 SHA512 3cdbb1f5d8f9cc5070fca90d1e9fe1f9ad94a9c946fa7cb14121e4d672a1f6005caa8acde19052ae81bf855cfed98dd6ff1e86cb4800e5f4e23e4836e3e49889 WHIRLPOOL 514b17bb293468fcdd691d42ceb53604cf94b27d29b0a3e22cb137329faa61d8da212b54e064d863ffee03fae67e8ed84c2353ebd74e4abff1548c7574e53f36
+EBUILD c++-gtk-utils-2.2.14.1.ebuild 816 SHA256 bc2571266f6b5acde577d1936b7d8d30418da709260ee18ff9c52c153e52b9ab SHA512 c604704df34d056c89c780d01e8558fdf3883e420044ee03e5ea0db0f929cbb314710f620ecb6021b72bf84aa84d9bc0119fd90d0678851d20116c4f973cd3af WHIRLPOOL f7ff31b6b05316b08e514d6150dc6f5bbe7ce21f711e0c2947253bc52ae4937e0a3288703e2221ec6478e7e2a117a67b85cbf70a5be1049f5a30fdad726cdc40
+EBUILD c++-gtk-utils-2.2.14.ebuild 816 SHA256 bc2571266f6b5acde577d1936b7d8d30418da709260ee18ff9c52c153e52b9ab SHA512 c604704df34d056c89c780d01e8558fdf3883e420044ee03e5ea0db0f929cbb314710f620ecb6021b72bf84aa84d9bc0119fd90d0678851d20116c4f973cd3af WHIRLPOOL f7ff31b6b05316b08e514d6150dc6f5bbe7ce21f711e0c2947253bc52ae4937e0a3288703e2221ec6478e7e2a117a67b85cbf70a5be1049f5a30fdad726cdc40
+MISC ChangeLog 3906 SHA256 a8a887701202597b2ffddfb228eb3e46668f957abb4811b97f9c856d674eb29c SHA512 615256b7c3a98f1e20f071c832f8ee96ba4ce3d4b89f6462689516791d136edc046136734f66b99cf6021a9a6b97868697cf76190d712f274145595b7737ba43 WHIRLPOOL 41d6730274ab3167a5fbd3b5dcdb273fcaa32268f7183e1596bb624e4d8039deffff942f3c215a75dd2b7c10e6ab0890641d0288b4a2eac600095bf8da89a4ee
+MISC ChangeLog-2015 4528 SHA256 44c8acb4c76411e7ad77b849ea88defa394ad19d4f7ec33a2def5224bf902b2f SHA512 37ac9737f794f19df2aa664a59f97c7c4b265b80b010055ec830227d9904164f303dcc29048e39513912cab387fcdb0840c8f223463681f1df9294e842c5ceb2 WHIRLPOOL efda61e576110759b965a04657241eb42a9be5eb4c110c2ba26501357b693c268cbf9fa2e036112f03cc1bd01d10e603a1f2b5c52b17cc56f9e3fc86976bfc28
+MISC metadata.xml 359 SHA256 00abf9864ae4dbb5030b71ec034743c5abe6bcb3f31181cbe942b769114b64b1 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de WHIRLPOOL 009a65ebfaffc403bdaed3e9620dfeea9dbb7243d4e61954f892008629bbae829023fa93a3354c78f639e03b54551d84aeb39af72ce889bdafefa1800afdff55
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
new file mode 100644
index 000000000000..de9f1bb3ede2
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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="3"
+
+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/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
new file mode 100644
index 000000000000..dbd301d79cb7
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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="3"
+
+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/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild
new file mode 100644
index 000000000000..dbd301d79cb7
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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="3"
+
+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/c++-gtk-utils/c++-gtk-utils-2.0.31.1.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.1.ebuild
new file mode 100644
index 000000000000..39e01a5069b5
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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="3"
+
+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/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
new file mode 100644
index 000000000000..39e01a5069b5
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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="3"
+
+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/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
new file mode 100644
index 000000000000..90f351d52262
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
new file mode 100644
index 000000000000..6ce05b0095d5
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild
new file mode 100644
index 000000000000..6ce05b0095d5
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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/c++-gtk-utils/c++-gtk-utils-2.2.14.1.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.1.ebuild
new file mode 100644
index 000000000000..667bb7c4d976
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
new file mode 100644
index 000000000000..667bb7c4d976
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
new file mode 100644
index 000000000000..9378e9d7e25b
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
new file mode 100644
index 000000000000..181f2b6c1722
--- /dev/null
+++ b/x11-libs/cairo/Manifest
@@ -0,0 +1,10 @@
+AUX cairo-1.12.18-disable-test-suite.patch 390 SHA256 3ec119ac2380f8565cebbcea4f745e89eeb78686e76e6b15345a76f05812c254 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783 WHIRLPOOL 5d28d10da94b4d5ea6d90f7eddacf382cfb7307fd312d8029b633cbf5b0cdcaba54148bed100aeab20920974a5bac74fee2b03a7e7893c79360d4ec7f20c13b7
+AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2
+DIST cairo-1.14.10.tar.xz 36251788 SHA256 7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09 SHA512 a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852 WHIRLPOOL f79c4c0f957ae6e5adabed305a0eb3ca793b884d689b2a652d680a9e1bab20ccf7bd3955abfe4fa14f1bf0947bee08037962f2daddb3005d1d3dc23a875934b2
+DIST cairo-1.14.8.tar.xz 35392464 SHA256 d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2 WHIRLPOOL dd4088b8610cac7c9fe9c7dd2135830f423276aaa98fc52c94f6540778c2d43d8dfae9844fd1ecba920ac9eb96500d01bb09bedc3867287ad38c9e1adf067549
+EBUILD cairo-1.14.10.ebuild 4250 SHA256 a886c3df2c6866c616cd9b967024ff667d4bdca1481317d3cd79f3bf0991f893 SHA512 dc27e3c4e12e755fe8b89453dcfe98b4ceeec0c45abe9f7b37bb21b08c888c91f67678a376f4447217197aedffcb33b5a0517c7531034166f290dee270ed338d WHIRLPOOL f0badfdaf63c07284661f69fa8626327b4e0cdff922623151f57ea0e8b27116cf3d25376d6afc3d604f7a4732273e420fbbbba3382ed3e659c3ff08ea656c91b
+EBUILD cairo-1.14.8.ebuild 4271 SHA256 9e48761db19baa8db189818c23c6e9623ea84e330e0a2f957514744b58a63289 SHA512 76e270f094460707128876a81156a0d22e4dd145737faecc1d5a9b6de5a58eedbfcbf385cddd9707e9a8d5a31531bae2c5e36def61f2cd52ff28dd98908622c9 WHIRLPOOL 01327287c28efb26f3d2fbcf5a4d446e7fd680d9bfd01109a1556e3cda16a6b2985ed1b6e14db2c060ade4f9ef46d46b1f724621c0a89570931bd53cb4fbf449
+EBUILD cairo-9999.ebuild 4299 SHA256 025b4d62d2ac5385bad77b1686ac03f7e6d3b8087be3822e52217e0f31944c8d SHA512 87bc9652d7b194382fe108722ba422b5e27476847b5a13234216de947b6c3c2f582076570e61b808134eeb0558c22072b320feb18378c088bb44b9c3e62906ec WHIRLPOOL 79f45befe4a38c4982a788c9c817326db7bd3181d70d379623938b679c604d628c82c5985d61bd1fdbbfddcddc0fc6cb710f0fbd51a1b52a57260f75b05cebbc
+MISC ChangeLog 5087 SHA256 9dcefd529b90cb54f1152dd33f23c4c4ddd5c76264b31a81dcbb9131bece49b0 SHA512 0b47fe70439070756984a1f53dae0a29724c7956dfd6df0f9a8823b1b9e8f0348b9a4e4949341345ef7319550ace002dbf32f5559461277d725de64f5373ffef WHIRLPOOL 85195912a19014778d9aca8a2eacc901b5ff6aefef64fb9a002d5315c8dbdfa3a007a5ae32bbff50551fd892155aa8d21e6e8b1e0138808af2c812f9328f0297
+MISC ChangeLog-2015 64641 SHA256 30d317273971e5715d6811c4a658d1cfa8eab9536dad67e2b1a458efe6fa1b9c SHA512 fc13038ad2e7270d3630a5662b0531721199d283a1629a2684361991706bcddcf002289db615231e69a0ed9ce435e7b58e72c7c93f6bd6f1b5bbc8f1bb69d96d WHIRLPOOL e9515386519772dc8ee1d31a21b3494cf2b4ac1eabbd7f23eebaba224cf3f89c9cc220dbb59ae25720e64f8a5fc8937746787f4b2f436f4b1fc69351c9f77ba4
+MISC metadata.xml 843 SHA256 bc55b7dcf0dce835e23f40e3ce209dd7a66c183eed077f1d57a327ea46a7a7bd SHA512 5ac25111c8cf11d1516aee9fbc0cdf94b90bcdcb685f449ca8cf247ae873bf626b8eb41b115075f2ee89c5b833330ad25a63ffa6833f9679817bdb65b6ef6fb4 WHIRLPOOL 84b57fd1fb1980022e4f06a55192819c8407fae19eb7c475acb9c8b126af5250d07372cc649839dc6a75ff14caee5c60444c380a3fd60a1c463929874d29896a
diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
new file mode 100644
index 000000000000..396118fc0619
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.10.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? (
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-directfb.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+	[[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
+
+	# TODO: remove this (and add USE-dep) when DirectFB is converted,
+	# bug #484248 -- but beware of the circular dep.
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-directfb"
+	fi
+
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
new file mode 100644
index 000000000000..e36dbac0a735
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? (
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-directfb.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+	[[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
+
+	# TODO: remove this (and add USE-dep) when DirectFB is converted,
+	# bug #484248 -- but beware of the circular dep.
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-directfb"
+	fi
+
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
new file mode 100644
index 000000000000..9e0f4f744bfa
--- /dev/null
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? (
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-directfb.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# TODO: remove this (and add USE-dep) when DirectFB is converted,
+	# bug #484248 -- but beware of the circular dep.
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-directfb"
+	fi
+
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable utils interpreter) \
+		$(use_enable utils script) \
+		$(use_enable utils trace) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
new file mode 100644
index 000000000000..6822121ce495
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 03fa352..7e11d24 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+ 
+ DIST_SUBDIRS = src doc util boilerplate test perf
+ SUBDIRS = src doc util
+-# libpng is required for our test programs
+-if CAIRO_HAS_PNG_FUNCTIONS
+-SUBDIRS += boilerplate test perf
+-endif
+ 
+ configure: cairo-version.h
+ 
diff --git a/x11-libs/cairo/files/cairo-respect-fontconfig.patch b/x11-libs/cairo/files/cairo-respect-fontconfig.patch
new file mode 100644
index 000000000000..b0a1b2963502
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-respect-fontconfig.patch
@@ -0,0 +1,13 @@
+--- cairo-1.7.6-orig/src/cairo-ft-font.c	2008-09-29 21:43:13.000000000 +0100
++++ cairo-1.7.6/src/cairo-ft-font.c	2008-09-29 21:52:19.000000000 +0100
+@@ -1705,7 +1705,9 @@
+ 	options->base.subpixel_order = other->base.subpixel_order;
+     }
+ 
+-    if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
++    options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
++
++    if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
+ 	options->base.hint_style = other->base.hint_style;
+ 
+     if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
new file mode 100644
index 000000000000..38e0470af0c2
--- /dev/null
+++ b/x11-libs/cairo/metadata.xml
@@ -0,0 +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>
+</pkgmetadata>
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
new file mode 100644
index 000000000000..64e070aec791
--- /dev/null
+++ b/x11-libs/colord-gtk/Manifest
@@ -0,0 +1,7 @@
+DIST colord-gtk-0.1.25.tar.xz 271192 SHA256 bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a SHA512 858a95630109ebbcc1e75f6ccdd73af28f9f0739a797d23ea6eadc1447518652925383e61940f0181c7361956a7250b209c63be2107b7f696bb471a122989611 WHIRLPOOL 95fc0aa6e56cadcfb98b13561826d856fb1a5e2a8d0804a7f00c461bf590662c566e9d1213afd91012db0231f9ab65e78286422f8af84f4d9b953f3ed011f6cc
+DIST colord-gtk-0.1.26.tar.xz 280380 SHA256 28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45 SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d WHIRLPOOL 47eb1f5988a7404381bd8ca426ae7be595f4bb104785d97d16c3afa2d20b60c61b757eba6c2df94e1004e667a17848b17ac21095ae1bcfe482eeeeb2f01f007c
+EBUILD colord-gtk-0.1.25.ebuild 1484 SHA256 fd9e41d6664bf955ebcf80f6ec1d9af41a711dbf00842afca8330b296274664d SHA512 9b7dccc543f4bc9ac9e24514d32399eb7d7e8d5d1245977e3ac951b253f6261dd7443b6da5efdcbac39d017e7c6586145b61902408f2bab0759cd8884bb7c8ee WHIRLPOOL 4fd56ba1459018068391c067427c364d8cad33882f12f034fe52949455df50bd072654a9391e68542619d583af0032643fa9dac0cacbe54a264e5689b5fc2a54
+EBUILD colord-gtk-0.1.26.ebuild 1667 SHA256 e07a641257f8414afcdababcd1b4e06da01390194a914054a8cef5b25e91020b SHA512 ef8afb956784a65ccc40711764db0bb978937dfdecd8291451548d76addbd23938088ff19c0f8992f6ba13ed3deddbdf33bd406ddc2f813fd9e3e5bf0a46a753 WHIRLPOOL 3eeaad9205ee0b6cacce0a69b6cdfe3fa029cc04b87a8dc1cc450f28874d6b9f96da0b0cff73f9f2a1807c1d23b9064a6ba38d9129a62ddf2cee2378760d7c27
+MISC ChangeLog 3319 SHA256 9c38ccb030263000e0622700f20f671d613a933346601b372a7e73aa623f8644 SHA512 79bc976204b3d253261d9d81212a8db23467f598cea22cf582ed7a448627f708b1cdf20f2675aec98406eabd456ca10964fccee49b7a499a5e53d349e3b92317 WHIRLPOOL fa87b9e34cde9ff1ea6437c7457bdcf7e9e59aec1dffbdac5d0bb23fa66e7d9c81c470e0e8340257c707084fd5b0ab3b16bec65f03e832241c23846c6337824a
+MISC ChangeLog-2015 4421 SHA256 9d1922699122e409a35c364ccfe7fbfe5ab9cf0edf4091f631f264dbd35aef6c SHA512 6e7ee1c27b7ae66d6e99804c44f68c8c4616f699c365cc9ae62e999c8aa011d4d3153d2bdbca40a27d9a49605bb3ac00372df17ad219889788d76c6db442acab WHIRLPOOL a0ada90f7091078c989be8f577a37721e30352d8f926dfe59ce22803342daaa856e5a095ad8b56f02c2abd36468a29be94e4b085434e8382923b22d19f3c8f11
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild
new file mode 100644
index 000000000000..0a997ed96384
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="https://www.freedesktop.org/software/colord/"
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=media-libs/lcms-2.2:2=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	x11-libs/gtk+:3[X(+),introspection?]
+	x11-misc/colord:=[introspection?,vala?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+	!<x11-misc/colord-0.1.27
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
new file mode 100644
index 000000000000..ea830dad04d5
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="https://www.freedesktop.org/software/colord/"
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=media-libs/lcms-2.2:2=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	x11-libs/gtk+:3[X(+),introspection?]
+	x11-misc/colord:=[introspection?,vala?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+	!<x11-misc/colord-0.1.27
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gtk2 \
+		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_compile() {
+	if use doc; then
+		MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #482542
+	else
+		gnome2_src_compile
+	fi
+}
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/compiz-bcop/Manifest b/x11-libs/compiz-bcop/Manifest
new file mode 100644
index 000000000000..af437b22e6ff
--- /dev/null
+++ b/x11-libs/compiz-bcop/Manifest
@@ -0,0 +1,5 @@
+DIST compiz-bcop-0.8.8.tar.bz2 75886 SHA256 0c6eb97f47012c2d621953962df8bf9338d535c546bf2e8088860ba574efb436 SHA512 6b24400d6a347adbdf2f8d2a3c63f1371101d8dc6d4119547079b8a554d4ac9d5ff46cdeecd486886b4c5afe56a881111d877c73f4dde85978442ac45b539b7c WHIRLPOOL 8c1a83e1f7e1c40cbaec6fec99647d152aa14a6172feff08a25802ab7ec32f80b82e6f1a18278315f16cc50f237fe383ef9fadffdc9f8c9667c094783783f5a6
+EBUILD compiz-bcop-0.8.8.ebuild 431 SHA256 5f2ec90b285dcef360430cf34c1f5fec1c363652ebd09cf38530c83d550131bf SHA512 399cb69a24ba3a47196a0c69c0937ba6e27d8f579dccb3c9f22561ae71e8f783bc545302a4e2a236d49f1875c38d73cc9206eac2b1a8723154b3903f66ff0daf WHIRLPOOL 5efd5004d24acb21405cffd141cffe4e3ca99a032a3617ea9c1edf39781f281e2be1f5f27ba7f496e88863393975cec59a24eac1f4be69c5a5963fd58d997949
+MISC ChangeLog 2832 SHA256 1e97fdaa37c8c4afd3258999d441d881244b7d06197cbf866e44c7b3f857cc0a SHA512 70d374f9ca589804d457b173311a64762acec01839c49fecaa15aa141b5ce86b25d614183ef739202c6b8d759822b3b05a77dfc6c78d0815aaf014f29c2f7baa WHIRLPOOL b45f886049ead9e8a3f9b442f0b5688f42b319f33153d887e6c3433381b6e3326def5e57d99a63483ea3d23d2848530dc2afb70fb9374fdf0e8af532b408f58d
+MISC ChangeLog-2015 3034 SHA256 8b35db83b21a8199c46209ccc2ccd32dfb609e0ba17c14804bb1a4d3f9f2d509 SHA512 148568b8bd5bce2c9749f91bae8918ee8cbd12011cfb5aaa15f90be17a8ce654c56d0a062eb7e85c5ebfd37be34f7c7c66757a6b123004f76d09fab7cc5a1f2c WHIRLPOOL 9a26feb349c67e4cc96c58cfaa20717d6945da56ed4aef16bdb55c375a2258f77cd2fa2a3caa9a5a92f28749796a4d3c4c4f021ca2308ff966b449e84c7def21
+MISC metadata.xml 364 SHA256 6d9a162504e5688df3252ef9e08e2a2b9147e04ddf23cd0e5f81c850d99444b5 SHA512 1b5e72aca80016149fa21e56fa2bb93dc58748e91472a591aa3544d5dd9a5a5b9296ae9fc07d537f0e2c8dd00c672a63601c9392aaed2216b6d1016d07a44a85 WHIRLPOOL fe75f8f4f2ecde84df293d1a1302099cbfecf60c1bd5af4a5b543c14fddc3fc9c13dceb69ecb733b902b1faffd7f3d50c1dd1d123229fd7a1ccc3cf1ef2cdb79
diff --git a/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild b/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
new file mode 100644
index 000000000000..71c4cf713133
--- /dev/null
+++ b/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Compiz Option code Generator"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
new file mode 100644
index 000000000000..512bda99f2f5
--- /dev/null
+++ b/x11-libs/compiz-bcop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!--maintainer-needed-->
+<longdescription lang="en">
+BCOP is a code generator that provides an easy way to handle plugin options by
+generating parts of the plugin code directly from the xml metadata file. 
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-gconf/Manifest b/x11-libs/compizconfig-backend-gconf/Manifest
new file mode 100644
index 000000000000..a2cb390af5d2
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/Manifest
@@ -0,0 +1,5 @@
+DIST compizconfig-backend-gconf-0.8.8.tar.bz2 248650 SHA256 19a8df7f417535db80945cabb9a09c532241e6308406352d12cb5cbc6a1322cc SHA512 b8405660dfc93d7615b491523e7dd07c585e14f51f5de8237a88dbdefbf5fc8a338ceecc5ab10daef262add8a98fb4db5f3b9658d42b833b76fc0f486be51b92 WHIRLPOOL 77a99df02899f0dbcb90a6c41842dcf62031923a479544eda009050b331f57dcb36073a03e7f42c8057d6c35d6b72e8a61224d67c334ca0459a42dad6d761a9f
+EBUILD compizconfig-backend-gconf-0.8.8.ebuild 619 SHA256 54f460671469632c6f8a57abcae3cb5ba30a211f4eedeae97a91534f60c0165d SHA512 30ff37cfe10771594b3c6af6c284b33b0d8fd9541e5499354e5a46fb78df9eadbcbbb03c54fabf7e374749681c951839800084f607988b43eaeac3b54145d9ec WHIRLPOOL 4c12ca5cb5821d15434b66794a2624f3731932fa1864380e1282eff34c79f20af945ce93c45b46f17d8c61a9a3df5108aea61a5d243caa3c1203953428a59e85
+MISC ChangeLog 2484 SHA256 a41ca59c93bdb7a4179d2a75f29913da46ad135775c9fc2f86030740dfeb9465 SHA512 1b7eb75dcc928fb77a158a2bc85a91595ef5bce6150e56d526a3805b6aa1d1a28b406cc399fa8e2c557d61fc41d318a2397bb31742f0ee30718ae17d8272f4b6 WHIRLPOOL f505652f40881c5206ce3e62f9b1a86e7f82820763a332cd952bedb482a74300971a9fae4d16b772041bef58596cd60b0694cb4a458c5c24478f89e1e236ddb1
+MISC ChangeLog-2015 3641 SHA256 52e39e8e627c412f5edb88710bc8a09e3bb2d1bc02be81df36751ee8c3595dda SHA512 88b79cd1c0e136fca12084a9e4ead764b5bf5381462fb91935cd95c6b2a2ce29f99e161aafcd01caa2f183edaa4988376179a336e6513e87043dd0f7755f808b WHIRLPOOL 22af9bb365fd4edcfbece65130f0614a3f0f508cc5c1b0351cb4575aea9be01f68c55b954284b94fb57a6d10e80ab7a4da86d3506dd49903fd0a20078fa55a3a
+MISC metadata.xml 249 SHA256 65f247d11325f8eb3eca5f4736d77003199fba495038b2acbacdf973c0a451be SHA512 482ef543c7b1ede05705e00771ef3b47b6c3d62fe96c2418f188923b24d2090594667fcca493829c6e420700b2b852897cf65f5256997cac0fd0021cd346aa65 WHIRLPOOL 87576b5abcddb5db80681f2a3bc7dbade7b030cc950dc5a3d9057b26fc40bdb2c9744862fdadd68f1a84bf5aa2bdf06abae83622182ca038e8c90975646d36d7
diff --git a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
new file mode 100644
index 000000000000..a47d6c4b4e52
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Compizconfig Gconf Backend"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=gnome-base/gconf-2.0:2
+	>=x11-libs/libcompizconfig-${PV}
+	>=x11-wm/compiz-${PV}
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+
+src_configure() {
+	econf \
+		--enable-fast-install \
+		--disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
new file mode 100644
index 000000000000..2a469e3b0c68
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-kconfig4/Manifest b/x11-libs/compizconfig-backend-kconfig4/Manifest
new file mode 100644
index 000000000000..8512423d1116
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/Manifest
@@ -0,0 +1,5 @@
+DIST compizconfig-backend-kconfig4-0.8.8.tar.bz2 21632 SHA256 90c3a4a0fdcbee21479dd56685bb101f9a5f70a57c953dfb4fa372e99fceb767 SHA512 241612da39f88ff3c129be96f8f81f9dafc82943d5ce303cd7ef8f5e6aa4418a680e6f5f18c6ee2259d501c73791276a7ab1405c800070c60d8b9f71c18ccefd WHIRLPOOL 9687c02a73ae3d9f2d79e5331a68b23673c2804cc1f3038298978ab38cd5ad290d16d77816a0267c6a2778fb5f0656f2d267496c2dc69c1ff707152bc7ef1946
+EBUILD compizconfig-backend-kconfig4-0.8.8.ebuild 422 SHA256 36e80c9f57a7d77e11386fa0bd765e5f7f20b38d6c8cef50de88fd803718a230 SHA512 23d7e8eace796d6fbdb68564d5c84778605c4abef7309bfd8da52a9c3df7dd9597fd28086680293a4f00748dcad90804655f1b7a8bf0233a696d5b2903ff8473 WHIRLPOOL cbdd21817b9010c8aef836d66da3fc24c34535a4827c49284b3ebd9cb74321418c26ae8da6e7b53ea02f5cf587804ff492276dd5e79cd7213807266973d31871
+MISC ChangeLog 2493 SHA256 2bfa9136bd1bd0d71e682ac9ff27fd73cf5a79989712a854ba1dbad185057299 SHA512 61cf1160ce77dfaad5a036bad95e0a073cc0c36ec6852c4ebebb79d9918cec77aab278c2fbc0791eb1ecced0fd0865f41ad4e3cd5d24d360687c8516f41db1cf WHIRLPOOL 0c75680421b7a193bc57708caea3a13522d6f2d2a7d0e220b8778c51235f47de3337a55a84279fc1f686fae2f44f8ebf6b63a76214a25b04d4fa3c136adf5e11
+MISC ChangeLog-2015 4463 SHA256 79a99034f731c21a21b5688de7ddc5a0ae09981f7b8cc7566363830ccc7173ee SHA512 538fffd35f4b5649246cb5c3d90ace55873e9b598f12da5a44924fd9eeddd1305fc54146038a5df611f58ecd983eb5d00f897ba088368aa698c49d973ef64e18 WHIRLPOOL 69edb5da4d4b8fddfca08266d61d3215ada164b9964000669ce096f9bcc82009f642c228d76b1c597b4dedef04d04af59e530ea022fec43c16100e58853b957c
+MISC metadata.xml 251 SHA256 2eb475f8b237935f12ddaa1b781e1ab86c0351c857ed020c11a8c0ae7bfefec1 SHA512 831a8aa6923d6564f2c2bfe49ca4f197f08befa5c8530ef65071507e4e0a9bd1a584583a00f09f9c6131852bd2b3f4a875e7c2f4abf20fe517e25f31c0710104 WHIRLPOOL 5c61d47056dda0e6857ae5041c3048763e7c537d30ebddf93cdf78dadac9cedb96cb55eae6337e1d45226ef3cb65d13221f6e78a00c4d46b2f3199ac49beee42
diff --git a/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild b/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
new file mode 100644
index 000000000000..87358c15f0a3
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Compizconfig Kconfig Backend"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtdbus:4
+	>=x11-libs/libcompizconfig-${PV}
+	>=x11-wm/compiz-${PV}"
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
new file mode 100644
index 000000000000..d191429cf7b6
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
new file mode 100644
index 000000000000..5179ac8ea963
--- /dev/null
+++ b/x11-libs/dnd/Manifest
@@ -0,0 +1,8 @@
+AUX Makefile-fix.patch 1139 SHA256 b563dbc082492be9458a51c39a5b2152446bb476fcf2876bebd376510d8c0d4d SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26 WHIRLPOOL 22fda9dc77b3343e6f2d17004087bba7d52007dfae86dc257a57548b0309944434c02eac54a6e666a68d614cd01118049c80981b9294bcbef2eec06c7d827e3a
+AUX dnd-1.1-gentoo.diff 1532 SHA256 1868b437bbd58eeb6747738695b8e8fa1dd3f2ac2df515514fe3af6e92adf429 SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f WHIRLPOOL 789283afb1849e6331a7c1f6c8c13f5f4033dce0873d93d89e1242f69636706b1bdaf23811907737c3e78af4d37d993f6b1d38d753aaccb7e355117adfaf618b
+DIST dnd.1.1.tgz 227598 SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804 SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8 WHIRLPOOL 4fdd0d9d4bd9b42499565172878941d38819fe6810452d4262d6735ba57f47d4c5ccbd7e51290d28e3bcfd84c336996267b3198189820e9a9fd3f9a3b5e2a877
+EBUILD dnd-1.1-r1.ebuild 857 SHA256 6940f7161efd387be337c6e5cf20069b31b2e5d0281a457d0acf69648208e3fc SHA512 5151812e7f8843ac5d9e7fca6c1dd80596727c7978cca424828cf84ee7302bfeb9a0c1c4b85fdca8556e81011396602859d63cfec33ea61ddf02892babf47c8c WHIRLPOOL 8c6f87db0936dc9acac9672d599c51b6fd73cf3ce79f674aafa9e5443e2033d1667b0748a76506f140f80ee0837bd48a21a95fb5666739edfa5c7020b2b59394
+EBUILD dnd-1.1-r2.ebuild 742 SHA256 8d69826ce185e7257e8a81a2201e1e0111866df3f0ec7643920035f71e2ecc2a SHA512 431312b492e1a888d14508ba36eaec184ca1db4224a2e8e01d4eafed817f157e22927db5aba59cd03724fd5606cc230d0872dcc2481378b5ca409a54970ffc3f WHIRLPOOL 18b807d78885839aca864752d0a694e5fe9717cb7d36aab8a3eccdc94c2edd6274a22662b46d76dc5b16d7857ae714cf1a1b7095e1144f0b2c659f42fa375b5a
+MISC ChangeLog 2567 SHA256 1d6da1270883bb1a48a7d7e50a60d08d1a483b10c2d9351966b0882cbfe0518b SHA512 933af7b03b8041a4153b16753439f78ea8b026d6ce0c0b0d2f8224d4c171d567e79a5f74c2dbe8df353b0ad8ed68db41a02144a0c371251d42af75446d0dd80d WHIRLPOOL 8cc076a2af4663b0455ee0f00942a705ace72613d2e8e0615852ddbd76f98254356e06ab6c2dd1e734e37789673ff2ff18076ea09196a8bb44370039d42a8c6b
+MISC ChangeLog-2015 3324 SHA256 7c209215b000fed6a88cff83e11ca16536004a9d6308690c9b7b03a3a683ff80 SHA512 d5d3ed57d8e6984f26b1c2a66915b1f62ebb0de3de801bbc762443ca8522247114b34c265b877eb1cac1e3c9f37d60cba2eda4fe01f5dfc435b77df708991aeb WHIRLPOOL e9d2a42677002ff916bc48c3d138c3c1888bcf2e618c0ba615f3249c07f5799d07789e8e6165d5002688f010a38f437df93d50ed4a1086df4d998c3d659ec876
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
new file mode 100644
index 000000000000..d1f2510ba884
--- /dev/null
+++ b/x11-libs/dnd/dnd-1.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs eutils
+
+S=${WORKDIR}/DND/DNDlib
+DESCRIPTION="OffiX' Drag'n'drop library"
+HOMEPAGE="http://leb.net/offix"
+SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+
+RDEPEND=">=x11-libs/libX11-1.0.0
+	>=x11-libs/libXmu-1.0.0
+	>=x11-libs/libXt-1.0.0
+	>=x11-libs/libICE-1.0.0
+	>=x11-libs/libSM-1.0.0
+	>=x11-libs/libXaw-1.0.1
+	>=x11-proto/xproto-7.0.4"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff || die
+	epatch "${FILESDIR}"/Makefile-fix.patch || die
+}
+
+src_compile() {
+	tc-export CC CXX RANLIB AR
+	econf --with-x || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+}
diff --git a/x11-libs/dnd/dnd-1.1-r2.ebuild b/x11-libs/dnd/dnd-1.1-r2.ebuild
new file mode 100644
index 000000000000..aa9c65770057
--- /dev/null
+++ b/x11-libs/dnd/dnd-1.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="OffiX' Drag'n'drop library"
+HOMEPAGE="http://leb.net/offix"
+SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libICE
+	x11-libs/libXaw
+	x11-proto/xproto"
+
+DEPEND="
+	${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/Makefile-fix.patch
+)
+
+S="${WORKDIR}/DND/DNDlib"
+
+src_configure() {
+	tc-export CC CXX RANLIB AR
+	econf --with-x
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+}
diff --git a/x11-libs/dnd/files/Makefile-fix.patch b/x11-libs/dnd/files/Makefile-fix.patch
new file mode 100644
index 000000000000..3a11282d1ccc
--- /dev/null
+++ b/x11-libs/dnd/files/Makefile-fix.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.in	1997-05-22 22:18:22.000000000 -0400
++++ a/Makefile.in	2004-06-16 14:41:19.673035936 -0400
+@@ -16,7 +16,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-LIB_DIR = @libdir@
++LIB_DIR = $(DESTDIR)@libdir@
+-INC_DIR = @includedir@/OffiX
++INC_DIR = $(DESTDIR)@includedir@/OffiX
+ 
+ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c
+@@ -42,19 +42,22 @@
+ 	$(COMPILE) dndtest.c
+ 	$(LINK) dndtest.o -L. -lDnd $(LIBS)
+ 
+-libDnd.a: DragAndDrop.c
+-	rm -f DragAndDrop.o
+-	$(COMPILE) DragAndDrop.c
++libDnd.a: DragAndDropC.o
+ 	rm -f libDnd.a
+-	$(AR) cru libDnd.a DragAndDrop.o
++	$(AR) cru libDnd.a DragAndDropC.o
+ 	$(RANLIB) libDnd.a
+ 
+-libDnd++.a: DragAndDrop.c
+-	rm -f DragAndDrop.o DragAndDrop.cxx
+-	ln -s DragAndDrop.c DragAndDrop.cxx
+-	$(CXXCOMPILE) DragAndDrop.cxx
++DragAndDropC.o: DragAndDrop.c
++	rm -f DragAndDropC.o
++	$(COMPILE) DragAndDrop.c -o DragAndDropC.o
++
++DragAndDropCpp.o: DragAndDrop.c
++	rm -f DragAndDropCpp.o
++	$(CXXCOMPILE) DragAndDrop.c -o DragAndDropCpp.o
++
++libDnd++.a: DragAndDropCpp.o
+ 	rm -f libDnd++.a
+-	$(AR) cru libDnd++.a DragAndDrop.o
++	$(AR) cru libDnd++.a DragAndDropCpp.o
+ 	$(RANLIB) libDnd++.a
+ 
+ clean:
diff --git a/x11-libs/dnd/files/dnd-1.1-gentoo.diff b/x11-libs/dnd/files/dnd-1.1-gentoo.diff
new file mode 100644
index 000000000000..4857b709aa93
--- /dev/null
+++ b/x11-libs/dnd/files/dnd-1.1-gentoo.diff
@@ -0,0 +1,35 @@
+--- a/DragAndDrop.c	Tue Sep 25 21:14:11 2001
++++ b/DragAndDrop.c	Tue Sep 25 21:14:16 2001
+@@ -81,23 +81,23 @@
+ 
+ static CursorData DndCursor[DndEND]={
+   { 0,0,NULL,NULL,0,0,0 },
+-  { grey_width,	grey_height,grey_bits,grey_mask_bits,
++  { grey_width,	grey_height,(char*)grey_bits,(char*)grey_mask_bits,
+     grey_x_hot,grey_y_hot},
+-  { file_width,file_height,file_bits,file_mask_bits,
++  { file_width,file_height,(char*)file_bits,(char*)file_mask_bits,
+     file_x_hot,file_y_hot},
+-  { files_width,files_height,files_bits,files_mask_bits,
++  { files_width,files_height,(char*)files_bits,(char*)files_mask_bits,
+     files_x_hot,files_y_hot},
+-  { text_width,text_height,text_bits,text_mask_bits,
++  { text_width,text_height,(char*)text_bits,(char*)text_mask_bits,
+     text_x_hot,text_y_hot },
+-  { dir_width,dir_height,dir_bits,dir_mask_bits,
++  { dir_width,dir_height,(char*)dir_bits,(char*)dir_mask_bits,
+     dir_x_hot,dir_y_hot },
+-  { link_width,link_height,link_bits,link_mask_bits,
++  { link_width,link_height,(char*)link_bits,(char*)link_mask_bits,
+     link_x_hot,link_y_hot},
+-  { app_width,app_height,app_bits,app_mask_bits,
++  { app_width,app_height,(char*)app_bits,(char*)app_mask_bits,
+     app_x_hot,app_y_hot },
+-  { url_width,url_height,url_bits,url_mask_bits,
++  { url_width,url_height,(char*)url_bits,(char*)url_mask_bits,
+     url_x_hot,url_y_hot },
+-  { mime_width,mime_height,mime_bits,mime_mask_bits,
++  { mime_width,mime_height,(char*)mime_bits,(char*)mime_mask_bits,
+     mime_x_hot,mime_y_hot }  
+ };
+ 
diff --git a/x11-libs/dnd/metadata.xml b/x11-libs/dnd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-libs/dnd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-libs/flowcanvas/Manifest b/x11-libs/flowcanvas/Manifest
new file mode 100644
index 000000000000..c214f9294795
--- /dev/null
+++ b/x11-libs/flowcanvas/Manifest
@@ -0,0 +1,8 @@
+AUX gv234.patch 1572 SHA256 f8dd70b5f732316e6e464fd48e1f742003b6dc61998021ed66aa6f27226efff1 SHA512 8dbc97c0fbd8c47bc8c37e430c7d9b04af8449088d5f20972c723d604da08d27a13378e392d94007ec1baac00118b58fd6081e699e0916c830c6395a046dfacf WHIRLPOOL 6befc9f9de980a8aef73f42d779d05ab369dc9c2aa94cf2e1d5492eef78cd9399a6361e572c3a1648d0b42cf088fe2c50cd1ca0ca09873c7633c466572e05ea4
+AUX ldconfig2.patch 329 SHA256 bcfa699e3b8af11e4fa63fa1fc69d95e217887dafee876f507e14a3525ec420a SHA512 156cf9bee8a6d736ce4f51d8fde79dec0f0eb8594ae2f5c7d1aee6d9d29d46200a5f8a228fba99c7066c26c784d391d0a3389d009e29fc1e1fe8a16fceec024c WHIRLPOOL 4ab650e21343858185f895622a1b8920f2d50b647701cbcf37e730b61e0f476d465339d1fc5835383adca71de91e6a82cb0799c0ac71c1e2cc47d0194ed8ce25
+DIST flowcanvas-0.7.1.tar.bz2 139471 SHA256 047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596 SHA512 e9c7ee9693c6b78e44a0611a8d73c1b7ffa1ae0f3e36c9b0bbc88d5a293c3e5183c17e14b2079d611c988f30cb292caee52ab37f8a13da96b5c8c8261e408410 WHIRLPOOL 97ecfcd3131c5f931d57ff2c5a396971839513cd4ec0ef0d2e83c8e27be79bbde7385f07cd231199656128c4c319e9e52788486b2f539ca74b5033c1233b6476
+EBUILD flowcanvas-0.7.1-r1.ebuild 959 SHA256 3f64c3768b9786c0069eaf583546ce1efd70b5a43dbbd5f27c3d303fd2601904 SHA512 2bf702ead6ce595595066691af556aedc24d2def93fcf79ec3691afbeb7221859bea0e599e46aa1ee617283f36e2fd30a99a6a41001e1304bf729fe38fc502ee WHIRLPOOL d3bc8a85e713351f0f8478ba5b0d1b0d2a80ca56a545f58ecee15ad5897f0badc733daa52f4537f76a683b20c2dce0f2b2aa9a3e62eec73e1f26000b0292e2c9
+EBUILD flowcanvas-0.7.1-r2.ebuild 1000 SHA256 2350338954d427cf5c56d8885ab1015eedf67aba7b31564bdfc37a8eeb1378a5 SHA512 f9c8c3db640d745b5f55702ee4cb1d84f3d1f121934649ef70f2cd0819ba54d4926fb0af60a80f6ba27e2adc27f1967aa3b7a2a362f726c624cc0276ab736c49 WHIRLPOOL 95df3a5cfb0d3b01f70d38555399c25c7badf4993302cdcda6deef1737199e7efdc424ad1e61610198105ea8cf7759f6c2e32c86fe0f108c27e06ed4efb2f364
+MISC ChangeLog 3052 SHA256 2f70d4d306e3e079412573fd28b522f2620f9e004d8eec62f60ed710a2a90b46 SHA512 396ae728795c5e97022138c58edd81d9346ce7903c26c6a921cf2b0f0b23c776db44486893a7a78d0de9e0a35ba8e6a1671959c1ee58d89c9355e1be029ca88d WHIRLPOOL b752de2884dc4401336396da33b38ed35dc2c970f75504afcea3cd79ad23c45bce62ff9a6f312f647db2f78b332c93a3b4969014944c59f69356ded6c2f3470a
+MISC ChangeLog-2015 3212 SHA256 88baa12b25fca59a0e599b9ecd48ef3238544579bfce8003e3520f9160be60a2 SHA512 653e8269434bfadb994b4165efcc81be0317f36a6e637b25f8e800ac51032eca13afc807da07adc0328494e534ad229cdc3c5121c7c9ef04bc557e5ee54a1c66 WHIRLPOOL f4d1bfd3a808c87f96a4169d92ab713cdfe72e60ac72766755a7351e148ea8c23e2f3b35617e6383f7a06eeee52dbea00ceca1926bc7585e3863fe95bd4f24e6
+MISC metadata.xml 463 SHA256 8eb567239821b3194f52e5f7ec0016f9fa18d9c1a48bded0e51aeba62750215b SHA512 94b79488b0d2fff96a3a3207cc23c014dc6739e5f020c6459fe09e5c8b20563172fafbbbb8e5f1781f8bb0392bb25fe8c79eb30019ecbd0d5db15ba1485b8b32 WHIRLPOOL ff195db1e5a3b3e06f9e8b313cb1204e109536aaf3f5c3bc7083f1a3f4ec658cd368758fe2a2781d55ea5ca71f641177dc9bde9bad47dea5ed0b23166f1da6bc
diff --git a/x11-libs/flowcanvas/files/gv234.patch b/x11-libs/flowcanvas/files/gv234.patch
new file mode 100644
index 000000000000..ec03696135c0
--- /dev/null
+++ b/x11-libs/flowcanvas/files/gv234.patch
@@ -0,0 +1,48 @@
+Index: flowcanvas-0.7.1/src/Canvas.cpp
+===================================================================
+--- flowcanvas-0.7.1.orig/src/Canvas.cpp
++++ flowcanvas-0.7.1/src/Canvas.cpp
+@@ -1253,21 +1253,21 @@ Canvas::layout_dot(bool use_length_hints
+ 	 */
+ 
+ 	GVC_t* gvc = gvContext();
+-	Agraph_t* G = agopen((char*)"g", AGDIGRAPH);
++	Agraph_t* G = agopen((char*)"g", Agdirected, 0);
+ 
+ 	nodes.gvc = gvc;
+ 	nodes.G = G;
+ 
+ 	if (_direction == HORIZONTAL)
+-		agraphattr(G, (char*)"rankdir", (char*)"LR");
++		agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR");
+ 	else
+-		agraphattr(G, (char*)"rankdir", (char*)"TD");
++		agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD");
+ 
+ 	unsigned id = 0;
+ 	for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+ 		std::ostringstream ss;
+ 		ss << "n" << id++;
+-		Agnode_t* node = agnode(G, strdup(ss.str().c_str()));
++		Agnode_t* node = agnode(G, strdup(ss.str().c_str()), 1);
+ 		if (boost::dynamic_pointer_cast<Module>(*i)) {
+ 			ss.str("");
+ 			ss << (*i)->width() / 96.0;
+@@ -1310,7 +1310,7 @@ Canvas::layout_dot(bool use_length_hints
+ 
+ 		assert(src_node && dst_node);
+ 
+-		Agedge_t* edge = agedge(G, src_node, dst_node);
++		Agedge_t* edge = agedge(G, src_node, dst_node, NULL, 1);
+ 
+ 		if (use_length_hints && c->length_hint() != 0) {
+ 			std::ostringstream len_ss;
+@@ -1325,7 +1325,7 @@ Canvas::layout_dot(bool use_length_hints
+ 		if (partner) {
+ 			GVNodes::iterator p = nodes.find(partner);
+ 			if (p != nodes.end())
+-				agedge(G, i->second, p->second);
++				agedge(G, i->second, p->second, NULL, 1);
+ 		}
+ 	}
+ 
diff --git a/x11-libs/flowcanvas/files/ldconfig2.patch b/x11-libs/flowcanvas/files/ldconfig2.patch
new file mode 100644
index 000000000000..d86e65eaf179
--- /dev/null
+++ b/x11-libs/flowcanvas/files/ldconfig2.patch
@@ -0,0 +1,10 @@
+Index: flowcanvas-0.7.1/wscript
+===================================================================
+--- flowcanvas-0.7.1.orig/wscript
++++ flowcanvas-0.7.1/wscript
+@@ -85,5 +85,3 @@ def build(bld):
+ 
+ 	# Documentation
+ 	autowaf.build_dox(bld, 'FLOWCANVAS', FLOWCANVAS_VERSION, top, out)
+-
+-	bld.add_post_fun(autowaf.run_ldconfig)
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..f1135245ec69
--- /dev/null
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils
+
+DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments"
+HOMEPAGE="http://wiki.drobilla.net/FlowCanvas"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/boost
+	>=dev-cpp/gtkmm-2.4:2.4
+	>=dev-cpp/libgnomecanvasmm-2.6:2.6
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/ldconfig2.patch"
+	has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch"
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use debug && echo "--debug") \
+		$(use doc && echo "--doc")
+}
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..8f2514c32e14
--- /dev/null
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils flag-o-matic
+
+DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments"
+HOMEPAGE="http://wiki.drobilla.net/FlowCanvas"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/boost
+	>=dev-cpp/gtkmm-2.4:2.4
+	>=dev-cpp/libgnomecanvasmm-2.6:2.6
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/ldconfig2.patch"
+	has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch"
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use debug && echo "--debug") \
+		$(use doc && echo "--doc")
+}
diff --git a/x11-libs/flowcanvas/metadata.xml b/x11-libs/flowcanvas/metadata.xml
new file mode 100644
index 000000000000..9077960e2f25
--- /dev/null
+++ b/x11-libs/flowcanvas/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+<longdescription lang="en">
+	FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes and
+	lines" environments (ie modular synths or interactive finite state automata
+	diagrams).
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
new file mode 100644
index 000000000000..6f9db6d5dda5
--- /dev/null
+++ b/x11-libs/fltk/Manifest
@@ -0,0 +1,21 @@
+AUX FLTKConfig.cmake 1217 SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e SHA512 11fab963f33db7a7c86a10f9f5ddbfa99e718603e9338c23bc078ebdcc4e82f8fc4869a664f9eba9648ee22e5874471f9e7b45c92c8a1b7b72b8ce8ca084941e WHIRLPOOL bf2254205286f34196b3a26a4e8f2b06fe9f159beaa8303aa54325f97a8cd5110dd04347febee4efc00d26ac87af1b0deb9f6982fecc72e0e609ccd44990e68b
+AUX fltk-1.3.0-share.patch 1843 SHA256 78b5a3f1914753e258794fdc734327897d5b795ceba48d30dc27324dbb1da36e SHA512 d6c60614bc92125675758c1dbc635bd336282cef56844fe5c9de61c006a35359e521e01cda3ae20788f37f964d35b802e7ab286f4d5e10ca7e65a02955067af4 WHIRLPOOL ffbf275632ffc410ac0fae1b3ee26962a5002429899764c04ef5986717590994b811723ee969491b324ee133eca2bcc5ed8a34324697c4d38a4585e75c99b13d
+AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb48878c830aada0d8264aae3d9abbde6 SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459 WHIRLPOOL c56189507b1b81aa87c520de4ac01915c5de9a12412b54ca7d5ab8f30f7f4ae3270171fdb66e3608ce514328958cef820d4271d9570037d77512286205e3c697
+AUX fltk-1.3.2-desktop.patch 420 SHA256 f662a516a7ca5ff13b0eb17be5b547822667b736e7f245a6c4503eada74c61a6 SHA512 be286fa414d9d7f411176f788e05f6ba43f6bccce2567430f42d2cd848b47aab6aaa9d0a7fb4453a30bc1a193c6c74e893a99311f6d73799259ea7faa042771c WHIRLPOOL 4fada0f5a5b3ff27854e81cd5c05ac29d736a2593929ba6f5cdf13bdcf6968fb1199414d3572944999cc6b0e2d6edd31614ec3315b4ef2124593c2ee211ad8ca
+AUX fltk-1.3.2-jpeg-9a.patch 587 SHA256 8704bb20df325da07da79c68af2b6c81ce3310cce5885c007e71154cac031678 SHA512 dd7e2c53cd9f114308be8098980de181d06a230f784ba494d13c9122fd46684dd234188c43d941d3f50c34a8f1f96f19f279bbab19954ed7c257d20a1d14eab1 WHIRLPOOL 5a3dcba626761c8182b22683035d02f8294f4f5626c3f4dbdbd1230cb410ab8b1833c12a2db667d97c1825e8a964ed30846391ac1315e1b395838dd8bdb3b8c7
+AUX fltk-1.3.3-fl_open_display.patch 210 SHA256 11eed0cdbd45e458f1bee8394fe3bc0280599b7bf5d2f7919976614c032325f1 SHA512 902d69af29fa08dbb85ecadc709ea4c5999bee5d0acbb6338b62e2f561ae3baa90350fbd92c16791a58858635ffbdf9cc6512c54712abd1e2700f633122e082d WHIRLPOOL 946d06fd2d7acd6888f897da5d854b510c3d22bb2d88efecc75118580c652fa6df00c2b912b9a891cf00db7e367aa4eccb2215caf394315cfeaffa7efb012bc9
+AUX fltk-1.3.3-fltk-config.patch 374 SHA256 17761c16c4e552cc85ed64b75d32d0c58121a9311b6eeb9ea6a37e50b17c7593 SHA512 1e7bc815aed18708d7e7450079c9cb8d972b5d0f306bd665e0b89c4d108a7e8a21375e5ec1a5ef11114995d6a7997071040a76c4bfbb7b61a3e22f34be73b914 WHIRLPOOL 1fbf33ef88f4193f1668c07281b732119f9eebc71202ba80f00b7bdb05b9b62122b25da2bc895efbb5adf0dd89caf3b07fda5af26e67f58dc5bacb1761fd53f8
+AUX fltk-1.3.3-makefile-dirs.patch 230 SHA256 81a874da394c2cfda5dc8986687be83e72b37610be553e65feb3cb5c8286a9ac SHA512 725cdbfa46b691a2adb55bb76fa44dc62cc1d8b83ad79c272bfee9dec9ec116cd1f974eba880e8f2a0d68365639cc4b65c40ca92304080f9cb73ce34a7f5df90 WHIRLPOOL ec8c4be1b24ec21de1634623f38cad9254421269b8ddf479fe9add6074372a9bb3d770cfbcdb5927fc766e75296468486547cb6358c31d64c6a26556b98b5b2b
+AUX fltk-1.3.3-visibility.patch 781 SHA256 c54ce62b3b80837a422d938358c361082e7d006b5f3da21e344aa891ebfacc03 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df WHIRLPOOL ece85f4d9789a80ea43dd6c9bc387dce0394bcdc80c94ed203f29f849a44a4ca637b90c7de72d0ce410ff879ce28b04e0815b77a3ce623211f2a07c446ef201d
+AUX fltk-1.3.3-xutf8-visibility.patch 4557 SHA256 b60f372e22e139219caf0a2d11a099b83f3cfbbad0edfac033e1452798d26b9e SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d WHIRLPOOL 9d4b92f67e29756cf8382a917f3ff1bd96b879033ece5195bf7d6dbf9c93bebd953136a77594b2a24463566124b524d4b91851eda4a8df2a57d46e93551ad56c
+AUX fltk-1.3.4-conf-tests.patch 2259 SHA256 a1b1851c403ee77750508dd811a8d55916c96eb1c2c684915ea76b1c0c9026e5 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e WHIRLPOOL df16b3238e9b724ccf85ae59c039a3ed24019bcb2809f13524d06c216f054dc508afaa80a1bc48e231d3cd70c991c4943b802b9c772387b68ca9b270030aac21
+DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
+DIST fltk-1.3.4-source.tar.gz 5284217 SHA256 c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 WHIRLPOOL 6824c69615cd268d5f75cf65ee7f789d3e42ebda18cfe40b7d6444f4c4b1d8706dece616fbdb43341b492f2dd8019483e82677e9efe8828391532687994a945a
+EBUILD fltk-1.3.3-r3.ebuild 3803 SHA256 74e05be39e4991ff5bd33421fcf454d3dcf6a9c6e2b2f9e56d00794ca0d38ec0 SHA512 ec258a6c44d4f791892c493f21ce315c57c7a55d2120c643c50de72d035c1d34e2c054d6d4384185d0575440b1d160e5035b3c3964fae8347b21b2a383ecb857 WHIRLPOOL 64ad87c10cdba034e8bbe6ce6a8765b10fa8f1873da0198493a64a568654a8d5e5b093240bcd76fb16d82805fd755af4be947a019c6011275480332f8750016c
+EBUILD fltk-1.3.3-r5.ebuild 4433 SHA256 3cf12c7a78c0dd3611f0e0e9011266e0afb1e2134133830aee8c6fcbb6bbdff8 SHA512 c9b5ee046d515e15f6459570c9c730e31202bea50d5405ae39e1ba7cb9ea93b1674f1f919eea0047f20f4c1dcd448f3aefaac563411a8238dffa4a2143d29bb9 WHIRLPOOL 354be2a6d2c69a031abc10908f080c3b28584100f20c49ebf5e901eaded7f11d4964382d1c03c16127eaa3192f88f01215bb9aef4157ee459210725fb37ad96d
+EBUILD fltk-1.3.4.ebuild 4273 SHA256 5160096dd0106cd812c7486ac272481a414bbbde711bca68d05b4d1917932c46 SHA512 9b5eadd348a133dff01cd0f8babe55e3084a880039286cd425203dbc8290310f91ed393ccfd540e742e70a13a09e0cf1e1e0e97cbf5b67ede5e65625289da434 WHIRLPOOL 3420e676cacbf9c48a7300fed22d27b22ca52dafe3d499ad1de8b6f9d5cb3a45f77445b7bead25e83ffcf22adadb463600dbafdebe5777351b8ed87b8c4ea265
+EBUILD fltk-1.3.9999.ebuild 4311 SHA256 8ed07e63ae658e6bb87c7ff0df05dc30801a3ed04e54714dac38f4782f94b857 SHA512 3a4086c31ddd8d965f0f6b745a523c93a913afddbed8b6a2dd6b31b5188c42d87520288387042529d9f7bc675b48b3327bce63e823aae7492e28d46623818656 WHIRLPOOL 001aa43071e66d6d82184909b124f7c2c3eb45d930e04a7e759bfce6671dff918c9c000451f783119920737760e3d45e4e0de895f2f43f195f569ea3becf8608
+EBUILD fltk-1.4.9999.ebuild 4267 SHA256 1659af45a5eaa23e0b609de2805cd1baa0de45bd86fc4f20f7a86cbe60b7d4fe SHA512 fcfc3465905b18cb65cd4a83ec0ffe67b4a5093877db48c8647b98a9cef512213a05b71ee0b8b0e8b8fc89cda928147ee9f23c97e9893b13e7facb21e09628b8 WHIRLPOOL 00795056d90f58bbd0710161dcf6696e8db7df34e3e015ee48866f2b6ca5b746a8fc6a1ff769bd407bdae24e36180c5491e30a2d7fc18428ee4d9a810f8be20e
+MISC ChangeLog 6219 SHA256 40ae42140a97ed27a94cb44ebafca9951740dea6be6002ee6150c287f33fd4e2 SHA512 cd393db3ca17dcc155614b35a4e7a3e47c9f62276466b045317adc35a8a8976e76dc7af326fad8b84ae4f952775c709409cab709a8bb2c864fe294387764b864 WHIRLPOOL a06b82694639c22915fb011f850d0a288a3bb5991d144ba7e9fd13af88604394e8d61f9a326b3fa0fa2d17740f965377428af8ab07f89e6162bff22fff42fdb2
+MISC ChangeLog-2015 34960 SHA256 7b3d26e71182ec7e55f02fc1c724fcc18655c97c7061a7c6441f15f1a0c095fd SHA512 d2b9dddf6624e8c432db3ff22ec317054642ba7e3e9ec093bb8b35564f5a21def4158199ca4056b8dd773da957b60381099b2f40db2b33f6118b9100b3e1311e WHIRLPOOL 177b17b673199bd6b93d128c718d7c4f541f842e97d79cbca28e5aa70c6f170c105229cca3a35740635a067995969838e8bc84a9582070f4ed64a831ea44d7f9
+MISC metadata.xml 698 SHA256 cb439844f5d1ab2672a80746ca86f8c2339da770ea366acf10df1e7fe10786a4 SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f WHIRLPOOL d64fa0d57232ca2617eb5203ee7aa31ecedb7e01003505ffc51656ac27c5e1947ef3c7acf286b1462f7a339e6e8ea45550c281f75fc118739edc01dd0c9f7555
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
new file mode 100644
index 000000000000..09427aac2aa5
--- /dev/null
+++ b/x11-libs/fltk/files/FLTKConfig.cmake
@@ -0,0 +1,37 @@
+#-----------------------------------------------------------------------------
+#
+# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
+#
+# This file is configured by FLTK and used by the UseFLTK.cmake module
+# to load FLTK's settings for an external project.
+
+# The FLTK source tree.
+# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
+
+# The FLTK include file directories.
+SET(FLUID_COMMAND "/usr/bin/fluid")
+SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
+SET(FLTK_LIBRARY_DIRS "/usr/lib")
+SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
+SET(FLTK_INCLUDE_DIRS "/usr/include")
+
+# The C and C++ flags added by FLTK to the cmake-configured flags.
+SET(FLTK_REQUIRED_C_FLAGS "")
+SET(FLTK_REQUIRED_CXX_FLAGS "")
+
+# The FLTK version number
+SET(FLTK_VERSION_MAJOR "1")
+SET(FLTK_VERSION_MINOR "1")
+SET(FLTK_VERSION_PATCH "7")
+
+# Is FLTK using shared libraries?
+SET(FLTK_BUILD_SHARED_LIBS "ON")
+# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
+
+# The location of the UseFLTK.cmake file.
+SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
+
+# # The ExodusII library dependencies.
+# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
+#   INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
+# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch
new file mode 100644
index 000000000000..af2092abc894
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -0,0 +1,39 @@
+--- a/fluid/Makefile
++++ b/fluid/Makefile
+@@ -82,16 +82,16 @@ install: all
+ 	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ install-linux:
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
+-	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)/usr/share/applications
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
++	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)$(datadir)/applications
+ 	for size in 16 32 48 64 128; do \
+-		if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
+-			$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
++		if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
++			$(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ 		fi; \
+-		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
++		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ 	done
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
+-	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
++	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)$(datadir)/mimelnk/application
+ 
+ install-osx:
+ 	echo Installing Fluid in $(DESTDIR)/Applications...
+@@ -109,9 +109,9 @@ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ uninstall-linux:
+-	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
+-	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
+-	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
++	$(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
+ 
+ uninstall-osx:
+ 	$(RM) -r $(DESTDIR)/Applications/fluid.app
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
new file mode 100644
index 000000000000..74022a72ffb9
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ 	touch config.h
+ 	chmod +x fltk-config
+ 
+-configure: configure.in
+-	autoconf
+-
+ config.guess config.sub:
+ 	-automake --add-missing 2> /dev/null
+ 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ 	fi
+ 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -96,10 +91,6 @@
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ install-linux install-osx:
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
+@@ -108,17 +99,11 @@
+ 
+ uninstall:
+ 	$(RMDIR) $(DESTDIR)$(docdir)
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
+-	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ uninstall-linux uninstall-osx:
+-	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
new file mode 100644
index 000000000000..ef72ba9c3ec2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -0,0 +1,19 @@
+--- a/fluid/fluid.desktop
++++ b/fluid/fluid.desktop
+@@ -6,5 +6,5 @@
+ Icon=fluid
+ Terminal=false
+ Type=Application
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Categories=Development;GUIDesigner;
+--- a/fluid/x-fluid.desktop
++++ b/fluid/x-fluid.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Icon=fluid.png
+ Patterns=*.fl
+ Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
new file mode 100644
index 000000000000..ed487e7dc24d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/479774
+
+--- a/src/Fl_JPEG_Image.cxx
++++ b/src/Fl_JPEG_Image.cxx
+@@ -155,7 +155,7 @@
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_stdio_src(&dinfo, fp);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
+@@ -337,7 +337,7 @@
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_mem_src(&dinfo, data);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
new file mode 100644
index 000000000000..562f1157038f
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
@@ -0,0 +1,10 @@
+--- a/src/Fl_x.cxx
++++ b/src/Fl_x.cxx
+@@ -2211,6 +2211,7 @@
+   static int result = -1;
+
+   if (result == -1) {
++    fl_open_display();
+     result = 0;
+     unsigned long nitems;
+     unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
new file mode 100644
index 000000000000..ca7607afa4fc
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
@@ -0,0 +1,14 @@
+--- a/fltk-config.in
++++ b/fltk-config.in
+@@ -42,9 +42,8 @@
+ 
+ # flags for C++ compiler:
+ ARCHFLAGS="@ARCHFLAGS@"
+-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-LDFLAGS="@LDFLAGS@"
++CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
++CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
+ LDLIBS="@LIBS@"
+ OPTIM="@OPTIM@"
+ CAIROFLAGS="@CAIROFLAGS@"
diff --git a/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
new file mode 100644
index 000000000000..089855cefa6f
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR)
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/files/fltk-1.3.3-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
new file mode 100644
index 000000000000..491e0a18876d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
@@ -0,0 +1,22 @@
+--- a/src/Fl.cxx
++++ b/src/Fl.cxx
+@@ -928,7 +928,7 @@
+ 
+ ////////////////////////////////////////////////////////////////
+ 
+-Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
++FL_EXPORT Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
+ 
+ /**
+     Sets the widget that will receive FL_KEYBOARD events.
+--- a/FL/x.H
++++ b/FL/x.H
+@@ -114,7 +114,7 @@ FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.
+ // With Xlib / X11 fonts, fl_xfont will return the current selected font.
+ // With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most
+ // similar to (usually the same as) the current XFT font.
+-class Fl_XFont_On_Demand
++class FL_EXPORT Fl_XFont_On_Demand
+ {
+ public:
+   Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
new file mode 100644
index 000000000000..f30105e18c06
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
@@ -0,0 +1,165 @@
+--- a/src/xutf8/utf8Input.c
++++ b/src/xutf8/utf8Input.c
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -53,7 +54,7 @@ typedef struct {
+ #include "lcUniConv/jisx0212.h"
+ #include "lcUniConv/ksc5601.h"
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucTwToUtf8(char* buffer_return, int len) {
+   /* FIXME */
+ #if HAVE_LIBC_ICONV
+@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucKrToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertBig5ToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertCp936extToUtf8(char* buffer_return, int len)
+ {
+   int i = 0, l = 0;
+@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertGb2312ToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucCnToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucJpToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucToUtf8(const char*	locale,
+ 		  char*		buffer_return, 
+ 		  int		len, 
+@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char*	locale,
+   return len;
+ }
+ 
+-int
++FL_EXPORT int
+ XUtf8LookupString(XIC                 ic,
+ 		  XKeyPressedEvent*   event,
+ 		  char*               buffer_return,
+--- a/src/xutf8/utf8Utils.c
++++ b/src/xutf8/utf8Utils.c
+@@ -21,6 +21,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+ 
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ 
+ /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
+ 
+@@ -29,7 +30,7 @@
+  * Returns the byte length of the converted UTF-8 char 
+  * Returns -1 if the UTF-8 string is not valid 
+  */
+-int
++FL_EXPORT int
+ XConvertUtf8ToUcs(const unsigned char     *buf,
+ 		  int                     len,
+ 		  unsigned int         	  *ucs) {
+@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int 	ucs,
+  * returns the byte length of the first UTF-8 char 
+  * (returns -1 if not valid) 
+  */
+-int
++FL_EXPORT int
+ XUtf8CharByteLen(const unsigned char     *buf,
+ 		 int                     len) {
+   unsigned int ucs;
+@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char 	*buf
+ /* 
+  * Same as XConvertUtf8ToUcs but no sanity check is done.
+  */
+-int
++FL_EXPORT int
+ XFastConvertUtf8ToUcs(const unsigned char     *buf,
+ 		      int                     len,
+ 		      unsigned int            *ucs) {
+--- a/src/xutf8/utf8Wrap.c
++++ b/src/xutf8/utf8Wrap.c
+@@ -20,6 +20,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+ 
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/Xlib.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -705,7 +706,7 @@ XUtf8_measure_extents(
+ /*****************************************************************************/
+ /** returns the pixel width of a UTF-8 string				    **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8TextWidth(XUtf8FontStruct 	*font_set,
+ 	       const char 	*string,
+ 	       int 		num_bytes) {
+@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct 	*font_se
+ /*****************************************************************************/
+ /**  get the X font and glyph ID of a UCS char                              **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XGetUtf8FontAndGlyph(XUtf8FontStruct  *font_set,
+ 		     unsigned int     ucs,
+ 		     XFontStruct      **fnt,
+@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct  *f
+ /*****************************************************************************/
+ /** returns the pixel width of a UCS char				    **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8UcsWidth(XUtf8FontStruct  *font_set,
+ 	      unsigned int     ucs) {
+ 
diff --git a/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch
new file mode 100644
index 000000000000..994df56ad361
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ 	touch config.h
+ 	chmod +x fltk-config
+ 
+-configure: configure.ac
+-	autoconf
+-
+ config.guess config.sub:
+ 	-automake --add-missing 2> /dev/null
+ 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ 	fi
+ 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -96,10 +91,6 @@
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ install-linux install-osx:
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
+@@ -108,17 +99,11 @@
+ 
+ uninstall:
+ 	$(RMDIR) $(DESTDIR)$(docdir)
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
+-	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ uninstall-linux uninstall-osx:
+-	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..8f4919272d66
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime flag-o-matic
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	cairo? ( x11-libs/cairo[X] )
+	opengl? ( virtual/glu virtual/opengl )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	rm -rf zlib jpeg png || die
+	epatch \
+		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
+		"${FILESDIR}"/${PN}-1.3.0-share.patch \
+		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
+		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
+		"${FILESDIR}"/${PN}-1.3.3-visibility.patch \
+		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
+		"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
+		"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	# some fixes introduced because slotting
+	sed -i \
+		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+		src/Makefile || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.in || die
+
+	use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+}
+
+src_configure() {
+	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C documentation html
+	fi
+
+	if use games; then
+		emake -C test blocks checkers sudoku
+	fi
+}
+
+src_test() {
+	emake -C test
+}
+
+src_install() {
+	default
+
+	emake -C fluid \
+			DESTDIR="${D}" install-linux
+	if use doc; then
+		emake -C documentation \
+			DESTDIR="${D}" install
+	fi
+
+	local apps="fluid"
+	if use games; then
+		emake -C test \
+			DESTDIR="${D}" install-linux
+		emake -C documentation \
+			DESTDIR="${D}" install-linux
+		apps+=" sudoku blocks checkers"
+	fi
+
+	for app in ${apps}; do
+		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
+	done
+
+	dodoc CHANGES README CREDITS ANNOUNCEMENT
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.3-r5.ebuild b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
new file mode 100644
index 000000000000..a548bc7fb1e7
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+FLTK_GAMES="
+	blocks
+	checkers
+	sudoku
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.2-desktop.patch
+	"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch
+	"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
+	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
+)
+
+pkg_setup() {
+	unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+	default
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.in || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test ${FLTK_GAMES}
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid DESTDIR="${D}" install-linux install
+
+		use doc && \
+			emake -C documentation DESTDIR="${D}" install
+
+		use games && \
+			emake -C test DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
new file mode 100644
index 000000000000..c31768f6fb41
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+FLTK_GAMES="
+	blocks
+	checkers
+	sudoku
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.ac || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	cp fluid/{,x-}fluid.desktop || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset FLTK_LIBDIRS
+
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test ${FLTK_GAMES}
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid DESTDIR="${D}" install-linux install
+
+		use doc && \
+			emake -C documentation DESTDIR="${D}" install
+
+		use games && \
+			emake -C test DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
new file mode 100644
index 000000000000..f98e30fbf2cd
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
+ESVN_USER=""
+ESVN_PASSWORD=""
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS=""
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+
+FLTK_GAMES="
+	blocks
+	checkers
+	sudoku
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+)
+
+pkg_setup() {
+	unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+	default
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	sed -i \
+		-e '/x-fluid/d' fluid/Makefile || die
+	sed -i \
+		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+		-e '/^LDFLAGS=/d' \
+		"${S}/fltk-config.in" || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.in || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test ${FLTK_GAMES}
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid \
+			  DESTDIR="${D}" install-linux
+
+		use doc &&
+			emake -C documentation \
+				  DESTDIR="${D}" install
+
+		use games &&
+			emake -C test \
+				  DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
+		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+			  /usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
new file mode 100644
index 000000000000..9eff8eea2f90
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/"
+ESVN_USER=""
+ESVN_PASSWORD=""
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS=""
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+
+FLTK_GAMES="
+	blocks
+	checkers
+	sudoku
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+)
+
+pkg_setup() {
+	unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+	default
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	sed -i \
+		-e '/x-fluid/d' fluid/Makefile || die
+	sed -i \
+		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+		-e '/^LDFLAGS=/d' \
+		"${S}/fltk-config.in" || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.in || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test ${FLTK_GAMES}
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid \
+			  DESTDIR="${D}" install-linux
+
+		use doc &&
+			emake -C documentation \
+				  DESTDIR="${D}" install
+
+		use games &&
+			emake -C test \
+				  DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
+		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+			  /usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
new file mode 100644
index 000000000000..19be30c1abeb
--- /dev/null
+++ b/x11-libs/fltk/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>desktop-misc@gentoo.org</email>
+  <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<longdescription>
+  The Fast Light ToolKit is a cross-platform C++ user interface
+  toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
+  functionality and supports 3D graphics via OpenGL and its built-in
+  GLUT emulation. FLTK also includes a UI builder called FLUID that
+  can be used to create applications.
+</longdescription>
+<use>
+  <flag name="games">Builds and installs some extra games</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
new file mode 100644
index 000000000000..cd87ae84dfe6
--- /dev/null
+++ b/x11-libs/fox-wrapper/Manifest
@@ -0,0 +1,7 @@
+AUX fox-wrapper-2.sh 1905 SHA256 d170c5efaccb09a1f566fece4eb54014874dfc7ad775d098c324769d1c74ead4 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35 WHIRLPOOL 0ab0107decf9c042b67955964ed998f06aaa1321e99a1575967b3710aad7cc2a0d301fdc9248c36dce87e822981110abc42acb7d596a695d14cbf2995dda7a01
+AUX fox-wrapper-3.sh 1901 SHA256 033e8960391fe232aa5d6571c3163303af717a67bc0670cf090d1ef09dba0762 SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5 WHIRLPOOL 6e9b741603596dcfc23b22067b623704c18aff95f11b7c9ab58192ccfe3b8b0d2599e2aa8ff8697e2e685302d8c5ee35537c13a95b78c2833f1ebc1efc07de42
+EBUILD fox-wrapper-2.ebuild 520 SHA256 9e826bba2b8b3f2304a2772984dc5b4ca6666567951ecd6ef604a3ae14d5a595 SHA512 a8606b8f0a715d5610b4b7079cece44828f2ba9407f3289456ba08dfe54f3e6be87021aba407ab0917f27c10db5c5a5d0bc53b0be009d3e64c54e455a7ca9d89 WHIRLPOOL 042a89292bb5746bff6767c5df6b4b80a0249db46ec66513ac772a8faf8e4801be23ac20730fb1de50fb4e3d36cba3c7d41fd874070e592d9c0cefabd2a285db
+EBUILD fox-wrapper-3.ebuild 541 SHA256 9b3e0eeb3c27b891274ccfe4d1c2431ac00b8ffb84f386915bbd9cd856138fc8 SHA512 616722fe511af3799534a30e9b36770c98e48e54d1295fd45b15e948bd6fa0b7510f511dadfbfcc989b5a217d95a725ddbf5656f613d5669814e853b1e47e858 WHIRLPOOL 2bf4981389ed497e185b517a4752fb4ba9de4a1f80842a7f719c12ae364fde1a5836e109a71c8a704cc047d094e312874e7859d1d646dc52c60284d9da953da9
+MISC ChangeLog 2869 SHA256 e0dc97a66948ed89c1411b9dbf55ac49e4d247e06a5a1133e9fe53640d2edca7 SHA512 8a7f539751d43de5939e5441db733ccd90d9c2d45ef49677adb553d0e027cebe221f71358d54da08c2ddad61764fdd6c3376b347c2ff4f46d6ea81eba0121482 WHIRLPOOL a4727de459c5d26998625165c0808343bd70fab653c3fd29ee2b15dee3af9f3b34e9367f01e998532f406ff54e86ce710c32a8927198492e1cf3a451bcaa8f96
+MISC ChangeLog-2015 2587 SHA256 cb8739f09b04f70b155fd7d33f79c28a143f56324735dd2c8fa393c6016a8c82 SHA512 38d589b45b159c5758108f82c8e1ff4101de78e3f00b6d6fdc7a821eaf59d8c409040fc32e31285ce6dd7b7026ccdf1e7988f4d719caad577e8436a2232f71d6 WHIRLPOOL f101e30c5443ced2483461f500dc3a11a33180ac4697576357d9ec61e8eec0da6aedf780b2feca378f2380adb7f9f947c4bd34445eca9b397472e9ce701d2f4a
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
new file mode 100644
index 000000000000..19d09b5b9ca6
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.6 1.4 1.2 1.5"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+	echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+	exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+	echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+	echo "             WANT_FOX=\"1.2\" fox-config $@"
+	exit 1
+fi
+
+for v in ${vers} ; do
+	eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+	if [ "${v}" = "x" ] ; then
+		echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+		echo "             Valid values of WANT_FOX are: ${vers// /, }"
+		exit 1
+	fi
+
+	if [ "${WANT_FOX}" = "${v}" ] ; then
+		binary="binary_${v/./_}"
+		binary="${!binary}"
+		break
+	fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+	echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+	echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+	mybin="binary_${v/./_}"
+	if [ "${binary}" = "${!mybin}" ] ; then
+		export WANT_FOX="${v}"
+	fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+	echo "fox-wrapper: $binary is missing or not executable." >&2
+	echo "             Please try emerging the correct version of fox, i.e.:" >&2
+	echo "             emerge '=x11-libs/${binary/-config/}*'" >&2
+	exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-3.sh b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
new file mode 100644
index 000000000000..3d6871e5f188
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.6 1.4 1.7"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+	echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+	exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+	echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+	echo "             WANT_FOX=\"1.6\" fox-config $@"
+	exit 1
+fi
+
+for v in ${vers} ; do
+	eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+	if [ "${v}" = "x" ] ; then
+		echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+		echo "             Valid values of WANT_FOX are: ${vers// /, }"
+		exit 1
+	fi
+
+	if [ "${WANT_FOX}" = "${v}" ] ; then
+		binary="binary_${v/./_}"
+		binary="${!binary}"
+		break
+	fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+	echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+	echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+	mybin="binary_${v/./_}"
+	if [ "${binary}" = "${!mybin}" ] ; then
+		export WANT_FOX="${v}"
+	fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+	echo "fox-wrapper: $binary is missing or not executable." >&2
+	echo "             Please try emerging the correct version of fox, i.e.:" >&2
+	echo "             emerge '=x11-libs/${binary/-config/}*'" >&2
+	exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
new file mode 100644
index 000000000000..f5662434b399
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/lib/misc
+	newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+
+	dodir /usr/bin
+	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
+}
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
new file mode 100644
index 000000000000..82cc948f070c
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/lib/misc
+	newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+
+	dodir /usr/bin
+	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
+}
diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
new file mode 100644
index 000000000000..33f03bad0ca9
--- /dev/null
+++ b/x11-libs/fox/Manifest
@@ -0,0 +1,14 @@
+AUX jpeg-9.patch 908 SHA256 164e0a65bd9d4b5d0795884867ee139675c7bec2bffe640eade24de1e0ba9fa0 SHA512 cdb662f6440acc91de0bed860708c2c3cc7f7cae8247e2d79617180b73adc9bb75496ab03a12e6edc5ec4d8bec9df2412a30d95a24bdadd63480b793c1868344 WHIRLPOOL f63d81ebb9b8e6e9a42d0cbb50bded64fda49f9fe99ae3fe2ec29a47d1d7c7d975a529bfe482add6a23bb8aba42d60d05ca326ccc0f7dec9c216f3a7054ff80f
+DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
+DIST fox-1.6.50.tar.gz 4381855 SHA256 342c751d2a7edab136ad26cb4483329da3c16c7abf2f283f318d666ef12d0887 SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae WHIRLPOOL e1b0d855f5b2105c3739f64dd4aac5388450cc9fa36f1739e2a917e6d7bec4ab5273f2d227bb14b3db78b6a58d0088d2bfff9d8cf37c47b33d1f8e7257d282c9
+DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
+DIST fox-1.7.53.tar.gz 5366794 SHA256 2cde33d1e72c731ff2f31a8d55769536c5494376f8922833ba57b3f9c8f37340 SHA512 835117497e48fe66790be6e985bb8ef80ae1b34966585355b0d72f907863610de9d89792062ae91297488f0e24e77c08102afe253a59e67ca65a071b2a5890c4 WHIRLPOOL 508d25ba996aa5ea8be7e43b0771df32af2ea04bb37d84a7dc80362bc685032ac6f42d0c3b7eb36a4a9408a75c68bc927c00b1cb50a36375195b741fca6c0e5f
+DIST fox-1.7.54.tar.gz 5384000 SHA256 c6b749b1392d13e60b20525ed2e2107b40b4d25e757b2ee1e3fb96f59db9f053 SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795 WHIRLPOOL bb2829e16921e9171c6dd7f24be76803485c7f884f16c8e45f4adbbe91b0128a0024617a6f35c705149aeac921f891042605cff3499c200ba916de114547fca3
+EBUILD fox-1.6.49.ebuild 998 SHA256 01590af456b723622c25896e84d2015332314f450828e7639bb5edf7c5c25365 SHA512 0b5b7c86cdb3c1c78aea52e30544e049e2943c2e985ca33328bdfa5902f35d78e0d1356be9a0c7c72a6f323ab55da02bf77da0c16133d54dbf4df16918424f44 WHIRLPOOL 2f5ef6aef00e76b16bc1c35640b0dcb24bb51b1725ae8b43a7133950e100dbe6482bd7ef99f122ee83afac8bbfc780e11e104ea49b59538e8b8a4c1ec7511224
+EBUILD fox-1.6.50.ebuild 1012 SHA256 25f2263ccf250c76a42d0950a48e17548099a14c8581be81478c480ea19de49d SHA512 26685d23bd3b085e5e8912792b0ffdb5ffa9b9ef23d3be458bfb236e4ac272167ecc9cf330abc4413fb8f5795b710842359fffad41d91d31f8a4834d8731d8fa WHIRLPOOL b898b4e9ae7c86ff259d342d114a660f3f8efad25166a790538ce671122a4133780ca7b9b7c0f614c897c66007ba9e250d91cb5834b933b1c44629c5582bae46
+EBUILD fox-1.7.49.ebuild 1361 SHA256 fdc00c8b32a4df32213db6017ea78c082ea7723d2ddf794ce44642269dd84672 SHA512 0c9d04c5fa6db5e05fc4b6e052c27643bec4d48857150bf0fc94eb4da940b0f11469829752f1ab5a3ef80c6d556f7dc23005374b0d70b5cefe33fd77e9aa3f97 WHIRLPOOL cbcfafe238ce55c28aff9c1e2252565bca6cba83c25bc14be8db0d28c2aafcd81d06591b0ca560d6e12535996e6c2b61608f20130dd820428a54aff93cfc2591
+EBUILD fox-1.7.53.ebuild 1301 SHA256 db229ac295cfe80ca0b773763f64f0db9118aa37797b812973ae99b727a075f0 SHA512 4ae1ed69411398066c59aae49298ec130e6351d6a63f067d5f1ab0f24616ffe2331903f03e9696e042dfb931b9e0429d835e516858e01fb1b56ed4d57bdcd2e7 WHIRLPOOL 3c81583fa66a4635f128fac868914e8cd726a56d674cc02a4fada4a3fddc41853b7f8b6fb16f8a7c1a329f100aa79bef17ac1d1aba0fac071e7c8568f4ef4f5f
+EBUILD fox-1.7.54.ebuild 1297 SHA256 a1e4887844c44c839407dbb8d53b2c5fa51d8b254f4b60a6a10a06d4e2c48b24 SHA512 f69ae87abf51831780362bc2f42f8519ea88f09ff26b7adbdd8ca94ace392a67b307a843eccb43b324100d5f7d0b17082fcf0e8f9e0466c0f1cbae31f96b9c29 WHIRLPOOL 15707b4d54699d3b0a4cb85e0dd9df140f422f3b27df547754953db1ac3d69048841be180a25736618a11fe71d2559ffcaa5df1c2c95c82cea4870fa28f67775
+MISC ChangeLog 3285 SHA256 6f88a1aec66f5d6b773ee6b7ac9174e19d3e38a161727c2ee2d93e6a65a2a95e SHA512 0b67084953bb9cf25ccb4fd45891628a6a46cdccb9f158e010cc985d3579b70e14264c94630171e19dd545e08bd6a8df08366153111915fbc59c4e035bd9492f WHIRLPOOL 50c297e11768d0db7b3f1a6aa4d58cf0317ecd1c4caa28f1ea748f12095bf6264a5e291084066e237bf241945e22ad7aaa9649c9538c2b5840b76f041fece3f0
+MISC ChangeLog-2015 23632 SHA256 3f616be81af1416a5e890fb6dea86b89a32799194856afd8a19bc5a2ea87b52e SHA512 d4dbf6819f82be4ae91182b88086a3b65f173aa501dfec72951486ab194461a0276796dc2cd332dac9a082d663feb8ddf821137ffce9c661a0342dde9a516ec9 WHIRLPOOL 98c95db1bd4149baf668caf95e19b1c4d6d9e79b64b27db4d3977477a75e86db76a3dc83dc937c91b18f27f318032fb54b1cf5f5a0cc682f4b6b0a0db4f0af96
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/x11-libs/fox/files/jpeg-9.patch b/x11-libs/fox/files/jpeg-9.patch
new file mode 100644
index 000000000000..8075f03251c1
--- /dev/null
+++ b/x11-libs/fox/files/jpeg-9.patch
@@ -0,0 +1,40 @@
+--- a/lib/fxjpegio.cpp
++++ b/lib/fxjpegio.cpp
+@@ -138,7 +138,7 @@
+     src->pub.next_input_byte=src->buffer;
+     src->pub.bytes_in_buffer=1;
+     }
+-  return true;
++  return TRUE;
+   }
+ 
+ 
+@@ -216,7 +216,7 @@
+   srcinfo.src=&src.pub;
+ 
+   // read the header from the jpg;
+-  jpeg_read_header(&srcinfo,true);
++  jpeg_read_header(&srcinfo,TRUE);
+ 
+   // make sure the output is RGB
+   srcinfo.out_color_space=JCS_RGB;
+@@ -279,7 +279,7 @@
+   dest->stream->save(dest->buffer,JPEG_BUFFER_SIZE);
+   dest->pub.free_in_buffer=JPEG_BUFFER_SIZE;
+   dest->pub.next_output_byte=dest->buffer;
+-  return true;
++  return TRUE;
+   }
+ 
+ 
+@@ -336,8 +336,8 @@
+   dstinfo.dest=&dst.pub;
+ 
+   jpeg_set_defaults(&dstinfo);
+-  jpeg_set_quality(&dstinfo,quality,true);
+-  jpeg_start_compress(&dstinfo,true);
++  jpeg_set_quality(&dstinfo,quality,TRUE);
++  jpeg_start_compress(&dstinfo,TRUE);
+ 
+   // Write the jpeg data
+   pp=data;
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
new file mode 100644
index 000000000000..40e756906bdc
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.49.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( >=media-libs/libpng-1.2.5 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( =media-libs/freetype-2*
+		x11-libs/libXft )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_prepare() {
+	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
+	fox_src_prepare
+}
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
new file mode 100644
index 000000000000..557b42fffffd
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.50.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	jpeg? ( virtual/jpeg:= )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( >=media-libs/libpng-1.2.5:0= )
+	tiff? ( >=media-libs/tiff-3.5.7:0= )
+	truetype? ( =media-libs/freetype-2*
+		x11-libs/libXft )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_prepare() {
+	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
+	fox_src_prepare
+}
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
diff --git a/x11-libs/fox/fox-1.7.49.ebuild b/x11-libs/fox/fox-1.7.49.ebuild
new file mode 100644
index 000000000000..9350cae9bbe5
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.49.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	>=sys-devel/autoconf-2.67
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2
+		x11-libs/libXft )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_prepare() {
+	fox_src_prepare
+	epatch "${FILESDIR}/jpeg-9.patch"
+}
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+	fox_src_install
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+			die "Failed to install ControlPanel"
+	fi
+}
+
+pkg_postinst() {
+	fox_pkg_postinst
+
+	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+	einfo "with other packages."
+}
diff --git a/x11-libs/fox/fox-1.7.53.ebuild b/x11-libs/fox/fox-1.7.53.ebuild
new file mode 100644
index 000000000000..e381f53882dd
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.53.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	>=sys-devel/autoconf-2.67
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg:= )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2
+		x11-libs/libXft )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+	fox_src_install
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+			die "Failed to install ControlPanel"
+	fi
+}
+
+pkg_postinst() {
+	fox_pkg_postinst
+
+	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+	einfo "with other packages."
+}
diff --git a/x11-libs/fox/fox-1.7.54.ebuild b/x11-libs/fox/fox-1.7.54.ebuild
new file mode 100644
index 000000000000..ee53653b75a4
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.54.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	>=sys-devel/autoconf-2.67
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg:= )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2
+		x11-libs/libXft )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+	fox_src_install
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+			die "Failed to install ControlPanel"
+	fi
+}
+
+pkg_postinst() {
+	fox_pkg_postinst
+
+	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+	einfo "with other packages."
+}
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/x11-libs/fox/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf-loader-webp/Manifest b/x11-libs/gdk-pixbuf-loader-webp/Manifest
new file mode 100644
index 000000000000..e4ba12d89d45
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-loader-webp/Manifest
@@ -0,0 +1,3 @@
+EBUILD gdk-pixbuf-loader-webp-20160328234507.ebuild 767 SHA256 d3a9442c97164d9bd72d4b4e2ecfe1e0724d56b693144f18c44222cc87628d67 SHA512 0232872cbbf2b1faa1adca1b4a562aee13d16bd637013ff271b49bfaa05afd99bfa8ebca99d08010d72c32a0a86d364e6ccd84e7208d6ebcfd80b9bd0c38e23b WHIRLPOOL 034c7a23713de589b031dc4b217a0b9b2b81accf9d3e978116f4514e804ec5594b2f09fe9b3fe3445e35c761460b56d2366f5a6e67da94e4268085ffe889a5cd
+MISC ChangeLog 638 SHA256 f3f3c725a9086a7c7b4acd206dea7d40da03d6e9db9dfc0ed1dd32bd2fc3a420 SHA512 bb498c91ddfc08114352dbbe668ef80d437be33b688262dcafd5b99c79e3117a6baf72eb69ee705983e987ab2189cf72e579a6bf00d799079dc2221c88ec7a8d WHIRLPOOL 61064870bd0791ef122d5924925fd895ad664506c8272281bd415779960f83342972e63fb2161f9287e7804478dca4351c438a9786222c8d55ac1bd9727b7608
+MISC metadata.xml 697 SHA256 9bfadd254768d4deb8f40c20cc813ccc967f23292cc0b3940e920ea2191676e5 SHA512 6a7253f9eb7b46f8de174963e5cb30d5b9b1d4d7ef915fa2fa210e792b3b8927039d325aa5be03042998023f98508becc40f6f92b4b002ff5021dd8c49c7228a WHIRLPOOL c36b04869b0063dec53fa4fbfc4707567f8df4ee654556a7642fa7b201ee5142faef0b8c48d89718ccf897f778a957607e2ec88a749d66cf6d8957aaa4d0641c
diff --git a/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild b/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild
new file mode 100644
index 000000000000..8ec1d797cd9a
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/aruiz/webp-pixbuf-loader"
+EGIT_COMMIT=9b92950d49d7939f90ba7413deb7ec6b392b2054
+
+inherit git-r3 cmake-multilib gnome2-utils
+
+DESCRIPTION="WebP Image format GdkPixbuf loader"
+HOMEPAGE="https://github.com/aruiz/webp-pixbuf-loader"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=">=media-libs/libwebp-0.4.3
+	>=x11-libs/gdk-pixbuf-2.22"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DINSTALL_LIB_DIR:PATH=$(get_libdir) )
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
diff --git a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
new file mode 100644
index 000000000000..00f1f8a2cff9
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy.kittner@gmail.com</email>
+		<name>Andy Kittner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A gdk-pixbuf plugin that allows GTK applications to view webp images.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">aruiz/webp-pixbuf-loader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
new file mode 100644
index 000000000000..828793f58228
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -0,0 +1,10 @@
+AUX 2.36.10-fix-tiff-loader.patch 2300 SHA256 2fc0318b0d4375d09ad1b9cd619ab2a6a0d45dd6eb001e19b851c8c0eeb65541 SHA512 e1c04c53b74cc62c63f144b3f9b1ac4246709c809d92ac29dda973ce17232c87fdde6dbceb1295b87d1dad93eb1b2dcf55038c6072bdaac021d96cef3129bd59 WHIRLPOOL e15594e52accd0a994097c2872832baab4ce6e8191b9bd9de64e5e8b6676ae5f3421d380b765b5443b1c1828cf3dd4e9ee26fb7887f9c278bbfb1835e6e3ad4a
+AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 SHA256 3914db89c10f60bda2d5a3f7d94ddc36a29b67d6f34a18a724d4b4164df2affd SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d WHIRLPOOL 52f5e28307571cb846e471997cea491c709adc41607788be2af3826782558659c8431f4c379ba43add271cda25baecb13e33fea99ec8d007b7bc5a44bbd6a0f1
+DIST gdk-pixbuf-2.36.10.tar.xz 5772196 SHA256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35 WHIRLPOOL 3b2328f9bf47ce26f810a9d7629044c3e9c4ac0519afb0d3c4986dc6d2820301f60ad9e1218fc23bc2ac32e35eca78ed468e6356a208244cdcff7d95ab83be27
+DIST gdk-pixbuf-2.36.9.tar.xz 5769124 SHA256 8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 WHIRLPOOL 13422ecffde49445e4c81e4d7e244a2511811fa85d55261420f8ac4e2a373eab08e7adab64c6ea5b2997ed4e6a888630e03a378d04a0c6b2a652fc34d2996a87
+EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3804 SHA256 866fc97ff9b1e0ca0045be3650780733ea2179979a3468d2c5ab200eca6b4556 SHA512 ef4f6ea4c684c09fa4387b40e10f0070227e8ef37b5246fda34cf4a05ec9a6be681daf1d504d514a33f41d52263bd1ae5685c6ca38d9a22611d8dff8df5a3f70 WHIRLPOOL 372c1b14ac96699364fcbabc1b07b00d9196f39cdae1f33c9ea538f8a12761b149a9a4164320c03f1ccc3bd72acadebdfc2aaf0e9ab4193e08a1029359862dc8
+EBUILD gdk-pixbuf-2.36.10.ebuild 3671 SHA256 e013ddb16399d82676232cb5ed3f7e4842189bbec50d5be31b04f23ece801d60 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e WHIRLPOOL f1f852248a2dd2526d02b67f33e6a334bde42fa56c54270d9154295f3ee332cc5d3fc144ddb94dd022fa4349c663277928b719bd5ed3bed332872fa27c40cecb
+EBUILD gdk-pixbuf-2.36.9.ebuild 3662 SHA256 2b05840d0f37b5cd4e71978cac95821e6ea108b52c582d0e4bf4b86d2549bb56 SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694 WHIRLPOOL 017a0b9ba465bbbe6af051b9738df34c7a616114e711f63bdfa7b6abfad8204af694c168ab64c13f016655677003818a420e520ec0ee5e0e25a4d5847e1086fc
+MISC ChangeLog 12972 SHA256 5957820711d0f8756c395ec32bfc37486d2010f6d6549a392bc3306f4c19649e SHA512 2076c689ab9680d0c030772d0a1662fb486cf999e62dea4961b9cc846cafd2f47e0e3b93dfb505b8723584fcf82e1f6c67157018448a08e0faac1e0db4dd4ddf WHIRLPOOL b05bca635bfc0ee26e1d80c97575146e579047109abd21d57f30d6cbcf245e024468a124e787609e0001237d8ea2afaadd9fe80e3bfa928e41320890e02cc9f0
+MISC ChangeLog-2015 20964 SHA256 c817885b0c0581948133df12c0334907a270597dbdcefef9a38764035d9f3c1d SHA512 3ca7e987ff65de43ed767ceb2fabc2ef3bbe22bae6283487780216ff4e4ab276c69c676675b47de713e17673d1f3ca6b67d77b4539fdae66ecad0934f657cb09 WHIRLPOOL e1678696aa9217e0f7dcd917ee632ef9b5a266813dee6bf47d784e5fd23451ecebb1200c0c20c0ba87d1d8f61b7a6a648fdda1f42f9f00c0ac60d4d5f603b0ed
+MISC metadata.xml 342 SHA256 832f68eb31a663c4c19d3515f2cc35a97868e2930d54df956688f2a253694e8a SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a WHIRLPOOL 0a1e5f7feadaca7e4b9e763311dd7601a5d1bfe914356ec8a65401f93669426d7eed495364494c3be9a819938d1e2a953766d41039a8ddf3e0085ed0a7c88c43
diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
new file mode 100644
index 000000000000..80ed32f83f3c
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
@@ -0,0 +1,66 @@
+From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 11 Sep 2017 19:11:50 +0200
+Subject: build: Fix TIFF loader compilation with autotools
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786342
+---
+ configure.ac           | 7 +++----
+ gdk-pixbuf/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0abe5ce..c07bd6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -564,7 +564,6 @@ dnl Test for libjasper
+ *** --without-libjasper to configure])
+   fi
+ 
+-AC_SUBST(LIBTIFF)
+ AC_SUBST(LIBJPEG)
+ AC_SUBST(LIBPNG)
+ AC_SUBST(LIBJASPER)
+@@ -676,7 +675,7 @@ if test x$gio_can_sniff = x; then
+   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+ fi
+ 
+-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
+ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+ if $dynworks ; then
+   STATIC_LIB_DEPS=
+   if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
+-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS"
+   fi
+   if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
+@@ -698,7 +697,7 @@ if $dynworks ; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+   fi
+ else
+-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
++  STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
+ # Checks to see whether we should include mediaLib
+diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
+index 01b693c..720a058 100644
+--- a/gdk-pixbuf/Makefile.am
++++ b/gdk-pixbuf/Makefile.am
+@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs)
+ libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
++libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs)
+ 
+ #
+ # The XPM loader
+-- 
+cgit v0.12
+
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
new file mode 100644
index 000000000000..77ea7e75521e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
@@ -0,0 +1,34 @@
+From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Wed, 14 Oct 2015 16:18:19 -0400
+Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on
+ uClibc
+
+pixbuf-lowmem.c depends on GNU libc internals and does not build
+on musl or uClibc.  Commit e1fd25a fixes this issue for musl by
+testing if __GLIBC__ is set.  However, uClibc sets __GLIBC__ and
+so this check is insufficient there.  We expand the check so that
+we run pixbuf-lowmem on glibc, while avoiding it on both musl and
+uClibc.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ tests/pixbuf-lowmem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index 9e9571f..ec7504f 100644
+--- a/tests/pixbuf-lowmem.c
++++ b/tests/pixbuf-lowmem.c
+@@ -24,7 +24,7 @@
+ #include <time.h>
+ #include <string.h>
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 100000
+ 
+-- 
+2.4.9
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
new file mode 100644
index 000000000000..b56eb7ce2666
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	# Fix TIFF loader compilation, bug #629716 (from master)
+	"${FILESDIR}"/2.36.10-fix-tiff-loader.patch
+)
+
+src_prepare() {
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
new file mode 100644
index 000000000000..a0c235ef3cb6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
new file mode 100644
index 000000000000..8a32dc232fb3
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
new file mode 100644
index 000000000000..6c6d2ea40eb5
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
new file mode 100644
index 000000000000..789c85736542
--- /dev/null
+++ b/x11-libs/gksu/Manifest
@@ -0,0 +1,9 @@
+AUX gksu-2.0.2-format_security.patch 1341 SHA256 f65ecbd3c15f9eaa63a377b9e54a90f9add9c846b130a20a82419b053e1e70a4 SHA512 77ca1a3cdfdbe405869cc5a7375391c316552437c99accb1a2999d3d83f8a7d4b6915b62129f3e35e47d348d9ae6b8dae01958333e6f4a0f1b2b22161495cc39 WHIRLPOOL 5b9a700e8de5011fa89a2928e37dab2b2167696aeb1cfe96964ae78b4037e319dc4189980ca7908d1530d4b8c6f855ac40a68f6f65531e6a30551e987c518c2a
+AUX gksu-2.0.2-glib-2.31.patch 870 SHA256 028fc1396265d51e90c209c4b3959e2f645f51c3104987ef08339821271d995c SHA512 1ba77b6eef71629c6552766ebdf42271826b63bd124f38086187be4b8756ccfbd985127f10b35a4628d25f41fbaa7be89895a20241282476131da9486a0dbcbe WHIRLPOOL 63462cca2a6f7e8c8fa42ff28ca0a2ef42b9b0ee15432db6ee9aa3c802bd13b9ade6a90f58c155ca66fc6642b0ca30e76233d9f8a28e2ab4b48ed2fea452790c
+AUX gksu-2.0.2-nautilus-dir.patch 2640 SHA256 e37d1259a6a0c807369585417ceb661c2b00f4960921e80bf8d43fc5d51a6a11 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b WHIRLPOOL 4a4693e7b3d7d8e32eef7d68dd95db18f867620d93bab4ee225e774cbc8c14ecaed24ceb54e796bdeeda02feb08c61bfbcb5c0769c7d43e2991d7bdb331d735e
+DIST gksu-2.0.2.tar.gz 468121 SHA256 a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75 WHIRLPOOL 46cd5a966669b365c4c586a559dfeecac38536f4bf82964b28a01c65dda2ecb0d32842fd697ce74e80d6cad8fcc2c7ba217303be3cb16186d5e5a7509991e74c
+EBUILD gksu-2.0.2-r1.ebuild 2258 SHA256 72b6b8c1440937b527bc1cdedec7c8217e2f92a1227a47a01f9c40cbbab0f455 SHA512 08064d119d87d09c591e475daed04f7b3eefa36b0e0e69d695545c230aae5da045e13bcf391841d7818b9fbd18ecb3433ce61727c329a0788deff0d621a710e9 WHIRLPOOL f3b32b51fe53a8fd64ee8a66d47482e27d806267dc514fedfea520afbbba2aed451119d4c2ecbefde322c9984b55c285bd13b6c998882e96528f433d576ff5bf
+EBUILD gksu-2.0.2-r2.ebuild 2297 SHA256 f5209ed99095fcb000bccacd925bd6546f91c871aedf828f018cccf0eb6c07b5 SHA512 d01fa6dacd91180b9f549781c349672b88049045cf79e5a8b1ac73dddfb1d60a974c3b8eeae1e16ade34e7c8a9e9fcc8d6feccada09c6cb1d998aecf0fb3c7f9 WHIRLPOOL 26fd4e75e88968761bc3ef14df759011fc9c8090820d1340179e11b3d18256e57cc7ff80eff2e75dcb10ebcf28b3af870fa76d8a93ff121c3df9a236e3260b26
+MISC ChangeLog 2499 SHA256 0bc90006c553e064a5a90457eae941684ab84c1dd01ed6c6d7b1c0e10cd463cb SHA512 1030b04729a025886b8d695e8a9dd44dedf5883a9ba75960d95c0c03524614ddcc38a3dd0b26080b80b389e9cc20166b74128a6286d2e023715bb89d9fe40496 WHIRLPOOL 8f120b25250bcffaf1b0497b08e49f7524d4e9c223b1b0fc1e1930ed1e73f8c1525c393dcee46ac598147bf3dfaeb355349e2577863d5eb5dc607727d79022d8
+MISC ChangeLog-2015 9732 SHA256 7e46770008540d0299d69b051bea9bcee2b8814f70fa2b48dc4f76cf4a902204 SHA512 5ff3924c973c4f6f9df91e118640e9484956f50edd77ee490922c49b2a3a788fb0f5b2a3ddb94fab82928a023f0ee2acfc6f74b5f9feaf447adf895b2316b5ec WHIRLPOOL 922304d8ebe543c56c6f3661bb7239a61178b7f5777c305e0b55c80e436ddf0f2715050c3c35e9070ea734c7a5fd5ffd3d90da195cae09147bd1dfdad5ea8396
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/gksu/files/gksu-2.0.2-format_security.patch b/x11-libs/gksu/files/gksu-2.0.2-format_security.patch
new file mode 100644
index 000000000000..ca87e9af9952
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-format_security.patch
@@ -0,0 +1,37 @@
+Description: Fix possible format string vulnerabilities
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643389
+Index: gksu-2.0.2/gksu/gksu.c
+===================================================================
+--- gksu-2.0.2.orig/gksu/gksu.c	2009-03-04 19:25:32.000000000 +0100
++++ gksu-2.0.2/gksu/gksu.c	2011-10-10 18:31:04.599677143 +0200
+@@ -146,9 +146,12 @@
+   msg = g_strdup_vprintf(format, ap);
+   va_end(ap);
+ 
+-  diag_win = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL,
+-						 type, GTK_BUTTONS_CLOSE,
+-						 msg);
++  diag_win = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
++				     type, GTK_BUTTONS_CLOSE,
++				     NULL);
++
++  gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(diag_win),
++				 msg);
+ 
+   gtk_signal_connect_object (GTK_OBJECT(diag_win), "delete_event",
+ 			     GTK_SIGNAL_FUNC(gtk_main_quit),
+@@ -176,12 +179,7 @@
+   g_key_file_load_from_file (desktop, file_name, G_KEY_FILE_NONE, &error);
+   if (error)
+     {
+-      gchar *error_msg;
+-
+-      error_msg = g_strdup_printf ("Could not load desktop file: %s",
+-				   error->message);
+-      g_warning (error_msg);
+-      g_free (error_msg);
++      g_warning ("Could not load desktop file: %s", error->message);
+       g_error_free (error);
+       g_key_file_free (desktop);
+       return;
diff --git a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
new file mode 100644
index 000000000000..fd711a321acf
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
@@ -0,0 +1,29 @@
+From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 17:57:36 -0400
+Subject: [PATCH] Fix glib includes for building with >=glib-2.31
+
+glib-2.31 and newer no longer allow most glib subheaders to be included
+directly.
+
+https://savannah.nongnu.org/bugs/index.php?36127
+---
+ nautilus-gksu/libnautilus-gksu.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
+index 8e44d29..4acf3f8 100644
+--- a/nautilus-gksu/libnautilus-gksu.c
++++ b/nautilus-gksu/libnautilus-gksu.c
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
+-- 
+1.7.8.5
+
diff --git a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
new file mode 100644
index 000000000000..bc21b56c663f
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
@@ -0,0 +1,58 @@
+From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 19:39:03 -0400
+Subject: [PATCH] Fix nautilus extensions directory for nautilus-3
+
+The gksu nautilus extension works with both nautilus-2 and nautilus-3,
+so we should not assume that the extension is always installed in
+/usr/lib/nautilus/extensions-2.0
+
+https://savannah.nongnu.org/bugs/index.php?36129
+---
+ configure.ac              |   14 +++++++++++++-
+ nautilus-gksu/Makefile.am |    2 +-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 21d33bb..d65c586 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes)
+ 
+ AC_ARG_ENABLE(nautilus-extension, [  --enable-nautilus-extension  Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes)
+ AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes)
++AC_ARG_WITH(nautilus-extensions-dir,
++  AS_HELP_STRING([--with-nautilus-extension-dir=DIR],
++    [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)]))
+ 
+ if test x$enable_nautilus_extension = xyes; then
+-   PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++  PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++  if test "x$with_nautilus_extension_dir" = x; then
++    AC_MSG_CHECKING([for Nautilus extensions directory])
++    with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension`
++    if test "x$with_nautilus_extension_dir" = x; then
++      AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR])
++    fi
++    AC_MSG_RESULT($with_nautilus_extension_dir)
++  fi
++  AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir])
+ fi
+ 
+ AC_CONFIG_FILES([
+diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am
+index 3a70c78..cbe4d00 100644
+--- a/nautilus-gksu/Makefile.am
++++ b/nautilus-gksu/Makefile.am
+@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+-nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
++nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
+-- 
+1.7.8.5
+
diff --git a/x11-libs/gksu/gksu-2.0.2-r1.ebuild b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..6032ee3cb1a8
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 fixheadtails
+
+DESCRIPTION="A gtk+ frontend for libgksu"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="doc gnome"
+
+RDEPEND=">=x11-libs/libgksu-2.0.8
+	>=x11-libs/gtk+-2.4:2
+	>=gnome-base/gconf-2
+	gnome? (
+		>=gnome-base/nautilus-2
+		x11-terms/gnome-terminal )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable gnome nautilus-extension)"
+}
+
+src_prepare() {
+	ht_fix_file "${S}/gksu-migrate-conf.sh"
+
+	# https://savannah.nongnu.org/bugs/index.php?36127
+	epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch"
+
+	if use gnome ; then
+		sed 's/x-terminal-emulator/gnome-terminal/' \
+			-i gksu.desktop || die "sed 1 failed"
+
+		# Conditional patch to avoid eautoreconf
+		# https://savannah.nongnu.org/bugs/index.php?36129
+		epatch "${FILESDIR}/${PN}-2.0.2-nautilus-dir.patch"
+
+		sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467024
+		eautoreconf
+	else
+		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	einfo 'updating configuration'
+	"${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
+	einfo ""
+	einfo "A note on gksudo:  It actually runs sudo to get it's work done"
+	einfo "However, by default, Gentoo's sudo wipes your environment."
+	einfo "This means that gksudo will fail to run any X-based programs."
+	einfo "You need to either add yourself to wheel and uncomment this line"
+	einfo "in your /etc/sudoers:"
+	einfo "Defaults:%wheel   !env_reset"
+	einfo "Or remove the env_reset line entirely.  This can cause security"
+	einfo "problems; if you don't trust your users, don't do this, use gksu"
+	einfo "instead."
+}
diff --git a/x11-libs/gksu/gksu-2.0.2-r2.ebuild b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..13bd353f9724
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2 fixheadtails
+
+DESCRIPTION="A gtk+ frontend for libgksu"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome"
+
+RDEPEND="
+	>=x11-libs/libgksu-2.0.8
+	>=x11-libs/gtk+-2.4:2
+	>=gnome-base/gconf-2
+	gnome? (
+		>=gnome-base/nautilus-2
+		x11-terms/gnome-terminal )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	ht_fix_file "${S}/gksu-migrate-conf.sh"
+
+	# https://savannah.nongnu.org/bugs/index.php?36127
+	eapply "${FILESDIR}"/${PN}-2.0.2-glib-2.31.patch
+
+	if use gnome ; then
+		sed 's/x-terminal-emulator/gnome-terminal/' \
+			-i gksu.desktop || die "sed 1 failed"
+
+		# Conditional patch to avoid eautoreconf
+		# https://savannah.nongnu.org/bugs/index.php?36129
+		eapply "${FILESDIR}"/${PN}-2.0.2-nautilus-dir.patch
+
+		sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+			-i configure.ac || die #467024
+
+		eautoreconf
+	else
+		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	# Fix build with format-security, bug #517664
+	eapply "${FILESDIR}"/${PN}-2.0.2-format_security.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable gnome nautilus-extension)
+}
+
+src_install() {
+	gnome2_src_install
+	chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	einfo 'updating configuration'
+	"${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
+	einfo ""
+	einfo "A note on gksudo:  It actually runs sudo to get it's work done"
+	einfo "However, by default, Gentoo's sudo wipes your environment."
+	einfo "This means that gksudo will fail to run any X-based programs."
+	einfo "You need to either add yourself to wheel and uncomment this line"
+	einfo "in your /etc/sudoers:"
+	einfo "Defaults:%wheel   !env_reset"
+	einfo "Or remove the env_reset line entirely.  This can cause security"
+	einfo "problems; if you don't trust your users, don't do this, use gksu"
+	einfo "instead."
+}
diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/gksu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
new file mode 100644
index 000000000000..d1486521a86e
--- /dev/null
+++ b/x11-libs/gl2ps/Manifest
@@ -0,0 +1,6 @@
+AUX gl2ps-1.3.8-cmake.patch 2410 SHA256 cbf849f8a68223a10802cac332fdf6af38a34f075d3b8f6e5957942df30d2f0d SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd WHIRLPOOL 4342f59cf14c4fac95e62772d6ce0619b7a6edc930c7dcd6b27fb6e41e6a42c9e7286c21790a9da3375fd0311976c9e7854f5e01804e8be4f8a7ab7754259bb7
+DIST gl2ps-1.3.9.tgz 294907 SHA256 8a680bff120df8bcd78afac276cdc38041fed617f2721bade01213362bcc3640 SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb WHIRLPOOL 2ba0611daa39814a02c97ceec70c2e36b46881371a6a4790c5f5db4ea7e8b3352a25228d3aab60d2ec5b6f9e5070d9a7f331ebed2df355a6444f4e20365d7915
+EBUILD gl2ps-1.3.9.ebuild 1247 SHA256 45e568b1ef7d6569f402c9539c26f8ab537de3efd91d5b70e3a357a2d129165d SHA512 02328e81109ab6dd6307174217d105f49de9dcc30fcba6ceeda219ae00927eee27e4991aff6dbf8cf5ac72344c210f3545a5cf75a7d2d445a3263d57a457b9fa WHIRLPOOL e9ab95daa1f0e6f96226b8d61156e12c53de2b56335f65f1f4c33319845fd9ba5b35eb154351688a30eee432e10e2c457cd7566a731509c9d8cb163944baf22a
+MISC ChangeLog 2834 SHA256 a425775c827a9a27bb52268491257a9e1c174f53562cd2b72d1b211951e1f1dc SHA512 b9cb23a761d8b55146be25a9db89af1ff7da951b87a958ac0d3dfec2ffc0edae71dd0e515e45a29416ffdb3595be98e1e0837cf089c72d60eb9ab3839c95f2b1 WHIRLPOOL d74c97f320a77fff93497db5cea7a18e0185249ce1f2ad3e6636df4f7227882190b9c2fbc03b945b9fc9ade45c740b23beebe605ec6f189e2c28e9c294fe7f93
+MISC ChangeLog-2015 4046 SHA256 f3677fe19561e4cf4e65f9e3e4a633cb79a0a94847c686669abbfc6591b69dcf SHA512 17eecae47ac3714cd476fefd9a4d694931d05e0a77719c8dbee633bafe34903fb7d73cd5a868429767a478e889048dcf20a9bbad71267cb95adc4eddfecb8385 WHIRLPOOL da8ca2fa2f41d43e406c6d2bf37a8dc49210778a4d279d387bc466231cf6d89290c58261820ba2fc8e98bcd30ec189454ad808eb8e9e0caee2a51839fb2049dc
+MISC metadata.xml 721 SHA256 22151bdca524b72b74f092b6a1df445b66b49073f438d040367b2e6e51993ffb SHA512 272fa0b10d317453f463cde0157c28630273426351e01163d8a444848e3cb4f347b959f495f3973124281cfb9880f92e4e828abde735bfaa7b7b4e9c594ecfec WHIRLPOOL 04969199c5867a910520986a8d272d970bb06dfc2b95abba72ae367d0a0c19e71ceb188598c0ad5f6ee0ac781c6cf60b63c31a812e2771b8d6898a8a0234e770
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
new file mode 100644
index 000000000000..f22760fd6eca
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
@@ -0,0 +1,74 @@
+From: Sebastien Fabbro <bicatali@gentoo.org>
+
+Patch to add various enhancements to cmake:
+* use GNU standard CMAKE_INSTALL_DOCDIR
+* optional documenation building
+* optional examples building
+* do not install static libraries
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,8 @@
+ 
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
+ 
+ set(GL2PS_MAJOR_VERSION 1)
+ set(GL2PS_MINOR_VERSION 3)
+@@ -103,8 +105,6 @@
+ include_directories(${EXTERNAL_INCLUDES})
+ 
+ if(OPENGL_FOUND)
+-  add_library(lib STATIC gl2ps.c gl2ps.h)
+-  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+ 
+   add_library(shared SHARED gl2ps.c gl2ps.h)
+   target_link_libraries(shared ${EXTERNAL_LIBRARIES})
+@@ -116,29 +116,32 @@
+     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+   endif(MSVC)
+ 
+-  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
++  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
+ endif(OPENGL_FOUND)
+ 
+ if(WIN32)
+   set(GL2PS_DOC .)
+ else(WIN32)
+-  set(GL2PS_DOC share/doc/gl2ps)
++  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
+ endif(WIN32)
+ 
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++
++if(ENABLE_EXAMPLES)
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+-
+ if(GLUT_FOUND)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
++endif(ENABLE_EXAMPLES)
+ 
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
+@@ -157,6 +160,7 @@
+     add_custom_target(html DEPENDS gl2ps.html)
+   endif(TTH)
+ endif(PDFLATEX_COMPILER)
++endif(ENABLE_DOC)
+ 
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
new file mode 100644
index 000000000000..d46ef9b88279
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng:0= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DUSE_ENABLE_DOC="$(usex doc)"
+		-DUSE_ENABLE_PNG="$(usex png)"
+		-DUSE_ENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+	fi
+}
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
new file mode 100644
index 000000000000..dd1e3ccd3a3f
--- /dev/null
+++ b/x11-libs/gl2ps/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<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>
+</pkgmetadata>
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
new file mode 100644
index 000000000000..74664d3a7ed8
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -0,0 +1,9 @@
+DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca
+DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
+DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
+EBUILD gnome-pty-helper-0.36.3.ebuild 833 SHA256 e3646c5469c67ad5701fa7edf49d8a899c7eb08d35a3f22acdda1a2bb471ea39 SHA512 db0ba67fe276fecc3128a08dfa39d9aa705f291fc41c624f2b53f461f9a9b3631d3605a3db112bd5965be47de8ba8b4efc8c057e33021c43fa41bfc57b652952 WHIRLPOOL 24504e6af7e5d438df7c0903386d099082a6a9cace023b59bcc1520e5ec2ac53bff549e3f95a1c76cd0bafc51fe5084df016b3dc8bf0389cc41d392c8d4bccaf
+EBUILD gnome-pty-helper-0.38.3.ebuild 840 SHA256 8ce7b0564bb56aa78eeb0386066fa8c7d32f37b3e17e3b306d7a72d669ccd8d9 SHA512 8c78445d301c13d1a60c4659aa41eaf88317a32441e372da2e1fa2faeb012d6c2e3cf1115c599ea9c919f77c9457d5aaa3961f2a70082c4e1651b2aeb59ed88c WHIRLPOOL 89aad18bd085d531a93177ea3a22f8dde24b5e3db5d037843525a36d4cf9e2f94ad377897b63217b6bc48f41792a8db90cd38615901f345aa4e0e31297c383f9
+EBUILD gnome-pty-helper-0.40.2.ebuild 840 SHA256 8ce7b0564bb56aa78eeb0386066fa8c7d32f37b3e17e3b306d7a72d669ccd8d9 SHA512 8c78445d301c13d1a60c4659aa41eaf88317a32441e372da2e1fa2faeb012d6c2e3cf1115c599ea9c919f77c9457d5aaa3961f2a70082c4e1651b2aeb59ed88c WHIRLPOOL 89aad18bd085d531a93177ea3a22f8dde24b5e3db5d037843525a36d4cf9e2f94ad377897b63217b6bc48f41792a8db90cd38615901f345aa4e0e31297c383f9
+MISC ChangeLog 4213 SHA256 a7f75f53b4903e61c2672fb69b1b02c3b2d86f49f29b255f12f314aec91072d2 SHA512 ff23ab7420eea915ff50347b8a0ce9da45cc4c8ee14836228428595d1c614cc5ef6095acc67938fdd93f41553c8112477b2524a279547edd9eb115e686718580 WHIRLPOOL 56f5ac09e7e25ce81239b57625a6d9d892fa4185b2b061038aca048bdaedba7881a97a47b33df855aa011c49ed50d10378d6bd8ea6c15b726dcafe7debd415f0
+MISC ChangeLog-2015 10978 SHA256 6abc68483560f3e297d257f8fefbb6d2d1bb9f6bb93e16fdc77a5b06960daf00 SHA512 338e240aff0950bbe59f7a9b24cc1941b053f49b80bb82fff0d2b4ad68096a4a4dfae8ebd4de25e2d025b998874c10439f0cb5a3fcabf8d661c5f31e7fef7b48 WHIRLPOOL 5d3b8f3400c6abf71d93db1288f28fa8b81f70161723518ce8d9bc16cf20d589384afff559f2eeba80876e0ef09c9071e697a02d1ffd680cfb2c61517359c81e
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
new file mode 100644
index 000000000000..806af6dfc093
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+	# As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+	if use hardened; then
+		export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+		export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+	fi
+	gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
new file mode 100644
index 000000000000..7acc2a4586df
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+	# As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+	if use hardened; then
+		export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+		export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+	fi
+	gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
new file mode 100644
index 000000000000..7acc2a4586df
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+	# As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+	if use hardened; then
+		export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+		export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+	fi
+	gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
new file mode 100644
index 000000000000..26e84e0b3869
--- /dev/null
+++ b/x11-libs/goffice/Manifest
@@ -0,0 +1,10 @@
+AUX goffice-0.8.17-no-pcre.patch 6490 SHA256 dd22ff8ffdea5618ff7357b9a36d68522f0bd4a9236d40e578182f8a6c2049d5 SHA512 70af548433fed3f95b4b64cd7debf0cef0b8b7f7796c155be5d29a060ec2f3883d06703fc42e6dae40d4eb6933f45f2eef1c0d9f2088b5fc2e89ef580fc79b13 WHIRLPOOL ed84effb61cc08076245871e16172de1eceba0c063bf92351e95ba37e8f23e5094db7d7a67ba572d2bd5648877a5b86eb22beb7e260455f9ea0a84aa516267ea
+DIST goffice-0.10.32.tar.xz 2366700 SHA256 02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3 SHA512 96bdeb4f7771db2da7e89fd89d737d0935507b2b4bbc27de6f8a5126ffd1e8f37816131ecaed26cba5b14aba358f49a5c04273beb8279476ae47331cd838de26 WHIRLPOOL b1a4d68bd3659dcf6fbff985536c5be6898a57bd85329182b8c1e88b10e66c86a7f2ba2035d18ca2b4349e9c53360b4f7d71c64522b430473b88232043e138a2
+DIST goffice-0.10.35.tar.xz 2370332 SHA256 c19001afca09dc5446e06605a113d81a57124018a09c5889aeebba16cf1d5738 SHA512 68a274e73b8c237966ff300f129362d5a7a861e0281ca0dca9a0850f0ea30644f16de0eb5480ac8a399e7ff40699af5ddfcd79593c42f06d296ab3e778c368d2 WHIRLPOOL 5b255ccbadb1441f531452110e0fc1c9c8e29833d4c6a7f1577cbab5935ecc1f7ec4bb1c998cefe101ca1e7f36e0238ee5e1905110a288266d1d72429c79df99
+DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
+EBUILD goffice-0.10.32.ebuild 1237 SHA256 39f0281e670802ae6c4a5db08b6e8cf58f8f2031442b382a08391f0e31a429e2 SHA512 7009c8f8715a210c6abb13fdd069dcb5e25a3550c96461903feedb757ccb20f7bbb19af1b386297a2e395466bcc60a266835064d64174ac0cf603b280ee1cdc4 WHIRLPOOL 03227a2f50574b78834b61837e2edc35328d229d223f7637ad1561af4b89fb1997d824bf1ef1eef6e63c6be98d065df5cc6a1fc32089d3794b2509ba7bdc2e0a
+EBUILD goffice-0.10.35.ebuild 1239 SHA256 8829019ce7e030b61d415be6d58a39efa66042338535757d656f353f5713adba SHA512 a48dd15089633a875a8f7aca1ad06e7eaa634be5ecc9206c22fe14db348fe91aa338910cdf052b0dda9654b239161cfdf1d603ad54d9d722c2d717144b100a9d WHIRLPOOL ca01e5c19a738da7246cfc087d34c0414e5ccf02f81d60756698d089dccacee633b9b758c7f9b539cd0d89068393768eb0f44760afecc44fa08de29c46337b2b
+EBUILD goffice-0.8.17-r2.ebuild 1426 SHA256 18c5dcf212be64e814d3c3bc71ec1605d64f7132be51f10ed345a797fa01119b SHA512 f674210aa851730d911b7893b30c069b9fca3b79baa5f1dd018c024f366a756ef3487cd0d262edcae7ea0085afe9c40b86b73110e40556c3c62d6da43b3413e6 WHIRLPOOL f02f04b6f988a65fc81018f5386ff5ed67a793a72be6aedbed03e30b959254b6cc77655232d22b925a7f082be9bd88c8cfa114fd2d125abdc9f0e33c1f18e063
+MISC ChangeLog 7572 SHA256 b564e3590580f2d9a8e3a433824033948dc8f72f296527847f7b3e31853c80d7 SHA512 a8e3f36909cd231176cf2994159900b35f7a2d631492619008df017cb3e06c865e4aae22ee4147d9f2cbbc106b527581095bf1e347cb24dfb765ea87758beb3c WHIRLPOOL 6d352c769533c6be4dd3161599de41ed414b2f5e4ac83fbe51c19a2345700ea377ebc030c3e2d16d153f2e2916909e83ca09ab8d9a519d5ed6f6f6785179dcf6
+MISC ChangeLog-2015 23354 SHA256 afe6276e6bf792b103685771ec2d03980d925634e43883fa91e62a1b13ce33f2 SHA512 84be945d45ca895743f54a3f1c6d0c66bb40bd2d56893290155d339290ab1c10eff61ad81047701ed6f7f2f92706f42ac778fa1405d9eba1a600fb72ddf723db WHIRLPOOL b7472f61c678caf9849974891b419b819e11b33d8b17389ce9e5ae0213dd8025014c23a570417169795daaded30d079fa416ac4ff8b110bb237367f9bff24f0c
+MISC metadata.xml 441 SHA256 e5879149980210e8f2d49197b3a141a69fff5f9a053f4a3c1bff75e93f39c05f SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce WHIRLPOOL a9d10c7bb882c4d6d8b7bd32fa2dda3d77d90c746722916a95ac3c1528ea44476c284d8a3155fee9db63f346a3e4cb05ec691dd4ee03df21e768b1ae87304402
diff --git a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
new file mode 100644
index 000000000000..4691acdcd8ff
--- /dev/null
+++ b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
@@ -0,0 +1,219 @@
+From 00b816027e11f5fd890df07ae94d720cce106f34 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Apr 2012 14:57:59 -0400
+Subject: [PATCH] Drop pcre workaround for <glib-2.15.1
+
+For unknown reason, it sometimes gets enabled even on modern systems,
+causing problems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670316
+---
+ configure.in            |   24 +----------
+ goffice/utils/regutf8.c |  106 -----------------------------------------------
+ 2 files changed, 1 insertions(+), 129 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fd40d53..62e299d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -93,7 +93,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ dnl *****************************
+ goffice_reqs="
+-	glib-2.0		>= 2.8.0
++	glib-2.0		>= 2.16.0
+ 	gobject-2.0		>= 2.16.0
+ 	gmodule-2.0		>= 2.16.0
+ 	gio-2.0			>= 2.16.0
+@@ -492,13 +492,6 @@ SAVE_CFLAGS=$CFLAGS
+ SAVE_LIBS=$LIBS
+ CFLAGS="$CFLAGS $GOFFICE_CFLAGS"
+ LIBS="$GOFFICE_LIBS $LIBS"
+-AC_MSG_CHECKING([for G_REGEX_ERROR_STRAY_BACKSLASH])
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gregex.h>]], [[GRegexError error=G_REGEX_ERROR_STRAY_BACKSLASH;]])],
+-               [AC_DEFINE(HAVE_G_REGEX_ERROR_STRAY_BACKSLASH, 1, [Define if G_REGEX_ERROR_STRAY_BACKSLASH is defined])
+-	        glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=yes
+-                AC_MSG_RESULT(yes)],
+-               [AC_MSG_RESULT(no)
+-	        glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=no])
+ if test "x$goffice_with_gtk" = "xtrue" ; then
+   AC_CHECK_FUNCS(gtk_dialog_get_response_for_widget)
+   AC_CHECK_FUNCS(gtk_widget_set_tooltip_text gtk_tool_item_set_tooltip_text,
+@@ -511,21 +504,6 @@ if test $gtk_disable_deprecated = yes; then
+   CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
+ fi
+ 
+-if test "x$glib_has_G_REGEX_ERROR_STRAY_BACKSLASH" = "xno"; then
+-  dnl Check for working pcre
+-  AC_CHECK_HEADER(pcre.h,[], AC_MSG_ERROR([Header files for PCRE were not found]))
+-  AC_CHECK_LIB(pcre,pcre_compile2,[], AC_MSG_ERROR([The PCRE library is missing or too old]))
+-  AC_MSG_CHECKING([for UTF-8 support in pcre])
+-  if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then
+-      AC_MSG_RESULT(yes)
+-      LIBS="$LIBS -lpcre"
+-      EXTRA_LIBS="$EXTRA_LIBS -lpcre"
+-  else
+-      AC_MSG_ERROR([The installed PCRE library is not configured for UTF-8 support.])
+-  fi
+-fi
+-
+-
+ AC_DEFUN([GOFFICE_CHECK_FUNC],
+ [AC_CHECK_FUNC([$1],
+ 	[],
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3f32dd6 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -7,9 +7,6 @@
+ 
+ #include <goffice/goffice-config.h>
+ #include "regutf8.h"
+-#ifndef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+-#include <pcre.h>
+-#endif
+ #include "go-glib-extras.h"
+ #include <gsf/gsf-impl-utils.h>
+ #include <glib/gi18n-lib.h>
+@@ -21,11 +18,7 @@ void
+ go_regfree (GORegexp *gor)
+ {
+ 	if (gor->ppcre) {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ 		g_regex_unref (gor->ppcre);
+-#else
+-		pcre_free (gor->ppcre);
+-#endif
+ 		gor->ppcre = NULL;
+ 	}
+ }
+@@ -70,7 +63,6 @@ go_regerror (int errcode, const GORegexp *gor, char *dst, size_t dstsize)
+ int
+ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ 	GError *error = NULL;
+ 	GRegex *r;
+ 	int coptions =
+@@ -119,47 +111,6 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
+-#else
+-	const char *errorptr;
+-	int errorofs, errorcode;
+-	pcre *r;
+-	int coptions =
+-		PCRE_UTF8 |
+-		PCRE_NO_UTF8_CHECK |
+-		((cflags & GO_REG_ICASE) ? PCRE_CASELESS : 0) |
+-		((cflags & GO_REG_NEWLINE) ? PCRE_MULTILINE : 0);
+-
+-	if (&pcre_compile2 == NULL) {
+-		g_error ("libgoffice has been dynamically linked against a libpcre\n"
+-				"that lacks the pcre_compile2 function.  This indicates a\n"
+-				"distribution dependency problem.  Please report this at\n"
+-				"bugzilla.gnome.org and for you distribution.");
+-	}
+-
+-	gor->ppcre = r = pcre_compile2 (pat, coptions,
+-			&errorcode, &errorptr, &errorofs,
+-			NULL);
+-
+-	if (r == NULL) {
+-		switch (errorcode) {
+-		case 1: case 2: case 3: case 37: return GO_REG_EESCAPE;
+-		case 4: case 5: return GO_REG_EBRACE;
+-		case 6: return GO_REG_EBRACK;
+-		case 7: case 30: return GO_REG_ECTYPE;
+-		case 8: return GO_REG_ERANGE;
+-		case 9: case 10: return GO_REG_BADRPT;
+-		case 14: case 18: case 22: return GO_REG_EPAREN;
+-		case 15: return GO_REG_ESUBREG;
+-		case 19: case 20: return GO_REG_ESIZE;
+-		case 21: return GO_REG_ESPACE;
+-		default: return GO_REG_BADPAT;
+-		}
+-	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
+-		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+-		return 0;
+-	}
+-#endif
+ 	return 0;
+ }
+ 
+@@ -167,7 +118,6 @@ int
+ go_regexec (const GORegexp *gor, const char *txt,
+ 	    size_t nmatch, GORegmatch *pmatch, int eflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ 	int eoptions =
+ 		((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) |
+ 		((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0);
+@@ -196,62 +146,6 @@ go_regexec (const GORegexp *gor, const char *txt,
+ 		g_match_info_free (match_info);
+ 
+ 	return matched ? GO_REG_NOERROR : GO_REG_NOMATCH;
+-#else
+-	size_t txtlen = strlen (txt);
+-	int eoptions =
+-		((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) |
+-		((eflags & GO_REG_NOTEOL) ? PCRE_NOTEOL : 0);
+-	int res;
+-	int *offsets, *allocated;
+-	int offsetcount;
+-	if (gor->nosub)
+-		nmatch = 0;
+-
+-	if (nmatch > 0) {
+-		/* Paranoia.  */
+-		if (nmatch >= G_MAXINT / sizeof (int) / 3)
+-			return GO_REG_ESPACE;
+-
+-		offsetcount = nmatch * 3;
+-		offsets = allocated = g_try_new (int, offsetcount);
+-		if (!offsets)
+-			return GO_REG_ESPACE;
+-	} else {
+-		offsets = allocated = NULL;
+-		offsetcount = 0;
+-	}
+-
+-	res = pcre_exec (gor->ppcre, NULL, txt, txtlen, 0, eoptions,
+-			offsets, offsetcount);
+-	if (res >= 0) {
+-		int i;
+-
+-		if (res == 0) res = nmatch;
+-
+-		for (i = 0; i < res; i++) {
+-			pmatch[i].rm_so = offsets[i * 2];
+-			pmatch[i].rm_eo = offsets[i * 2 + 1];
+-		}
+-		for (; i < (int)nmatch; i++) {
+-			pmatch[i].rm_so = -1;
+-			pmatch[i].rm_eo = -1;
+-		}
+-		g_free (allocated);
+-		return GO_REG_NOERROR;
+-	}
+-
+-	g_free (allocated);
+-	switch (res) {
+-	case PCRE_ERROR_NOMATCH:
+-		return GO_REG_NOMATCH;
+-	case PCRE_ERROR_BADUTF8:
+-	case PCRE_ERROR_BADUTF8_OFFSET:
+-		/* POSIX doesn't seem to foresee this kind of error.  */
+-		return GO_REG_BADPAT;
+-	default:
+-		return GO_REG_ESPACE;
+-	}
+-#endif
+ }
+ 
+ /* ------------------------------------------------------------------------- */
+-- 
+1.7.8.5
+
diff --git a/x11-libs/goffice/goffice-0.10.32.ebuild b/x11-libs/goffice/goffice-0.10.32.ebuild
new file mode 100644
index 000000000000..6feb53890851
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.32.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.38.0:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24:=
+	>=x11-libs/cairo-1.10:=[svg]
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.8.7:3
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
diff --git a/x11-libs/goffice/goffice-0.10.35.ebuild b/x11-libs/goffice/goffice-0.10.35.ebuild
new file mode 100644
index 000000000000..7ffe9e16c764
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.35.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.38.0:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24:=
+	>=x11-libs/cairo-1.10:=[svg]
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.8.7:3
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
diff --git a/x11-libs/goffice/goffice-0.8.17-r2.ebuild b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
new file mode 100644
index 000000000000..a1b5eb192dbd
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.8"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="gnome"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=gnome-extra/libgsf-1.14.9
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.8.1
+	>=x11-libs/cairo-1.2[svg]
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.16:2
+	gnome? ( >=gnome-base/gconf-2:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
+
+	gnome-base/gnome-common
+"
+# eautoreconf requires: gnome-common
+
+src_prepare() {
+	# bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
+	epatch "${FILESDIR}/${P}-no-pcre.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+	# Gsettings is still experimental
+	if use gnome; then
+		myconf="${myconf} --with-config-backend=gconf"
+	else
+		myconf="${myconf} --with-config-backend=keyfile"
+	fi
+
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		${myconf}
+}
diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
new file mode 100644
index 000000000000..2bc9db5d368f
--- /dev/null
+++ b/x11-libs/goffice/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		GOffice is a library of document-centric objects and utilities building
+		on top of GLib and Gtk+ and used by software such as Gnumeric.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
new file mode 100644
index 000000000000..7b31b6ee3ad7
--- /dev/null
+++ b/x11-libs/goocanvas/Manifest
@@ -0,0 +1,10 @@
+AUX goocanvas-1.0.0-gold.patch 848 SHA256 d4bcfc3f6b8c83fb4f1e1f1d858342382306d6f9664b5473170acbafe06ed0f0 SHA512 8e61ca8a0e9d673bc77a90e9c8f8a5107717df32d094b34aed04ea2bb56383fd2a018e3fd3a4ece5b18a754adc83d29095a80fb0a34e24db0cd900a6fa8cefea WHIRLPOOL a18e56aee8b16e50ec4bac963f74d2a728ff23254c19203a7fa4469dc3ca671f0cbbaca8b125e023d28a85b33fc45a00f9b1a12da8529ba834153e257a09daa7
+DIST goocanvas-1.0.0.tar.bz2 570552 SHA256 1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644 WHIRLPOOL fb8592136bacf10d73e3aeeac9366c0614f8cd60e74a30d31e475b1ae9a1ac76c97b64837490f916733d31191a90c121ac0d60e077acef7cc61a861f5b57fde7
+DIST goocanvas-2.0.2.tar.xz 502732 SHA256 f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0 SHA512 2b3014b832a5426884aa472fbfabcca171ef90305afccd312583d259517725a1839509e39b13b30c5097bf54ed9b3dfd2bf9eeca4e813a82d14cf1d5a54578ac WHIRLPOOL 714682b70d747e5db94140e5067e4df3c396332cab9f8b112141f39135758cea0a7e07405d796a70d81b95b76ce68ec17c58b317d0508dc413f2e6139dc39c87
+DIST goocanvas-2.0.3.tar.xz 584532 SHA256 6b5b9c25d32c05b9bafc42f5fcc28d55f1426e733e78e9fe4d191cfcd666c800 SHA512 e7db229d029906febc5cc8154cecfe9a7c81497abfb1cdf8e41b8135ef87ef7478dac60bd160adb0d6efbe69680be488c67e78497cb89b1ba295a407af04b786 WHIRLPOOL 8f94970f348d4abdfcc5411a9f5cac6a729db837c6b31693ebcc3af4aee15be898f1f973e58e20f2b6668dc6cc02db26cb9cbbd7f042e79bf25958d6e1a9ffa2
+EBUILD goocanvas-1.0.0.ebuild 1256 SHA256 16dd68c341f10b953a0fec7acbec199577dc3d65fb847ace340e13b392e2b88e SHA512 83729254a1f425bd1e953b4a69dec8fee7f8f28357c1e71e635c46b7b7615da090883c5ff914bea81825cb923b43dcbedbf793d842dc9fcd0df9ce577b08fea8 WHIRLPOOL 0f5c339ae64de706f1ace29e855073336aca0fdde8a84147a25b9375a60fcd4e85c896100e48849bae6ad0651eab9ddd49bd6749a83c58ed818142221b960158
+EBUILD goocanvas-2.0.2.ebuild 1598 SHA256 d4d539f0b8b6756994676a057ed9901446b64bc804e70cb08cadd8275c25e97a SHA512 3c3bfcba036750a75c294d1ba430a3e966e76874c4e678dfa5a8d2d3446ce66df259f653fb997a69dc7d397ff1d2b2fa0d0356a28ae8b284d50037db88f13e89 WHIRLPOOL c5bcc14d16989ef5c98231923481a64123acefef76f84ce74b215ae3e06356955d78eaeeb4723d3a11514e598b86af73839da5b65ae3655a08e7db58bfddd7b4
+EBUILD goocanvas-2.0.3.ebuild 1617 SHA256 b87f076361db05f6acc967a538eb881106d1e4ad2ab08ad593000789982d4f3b SHA512 d98cbc2076ad9113e93ced77f2288a6ceda157e3e6fa4552e471667a190755ca4947aa7e699605ff09c1c3f49fc55c7049dd5ebb1c9295f3d20ec5ff06659e52 WHIRLPOOL 438eb898adbc3d6cf1601523c6f6b08aaa5c9a5f5b83e3c59ea5c1ede68a8887e34d70f12d273c17933a94b240eadff035d8cbf2beaab389836421ce95be6187
+MISC ChangeLog 2561 SHA256 d5697909195da2188cba57880dd76d71f889e2b3a3a559c97d7ca2a9356e0666 SHA512 df4dd1d72d07ca211160a96c4540645a7c48b9df00852c14a97a23ecb43d87aa1e800dc36c5e431eaf549be1f00123f90681b9fafac3771aa5c1874a0d3e2f06 WHIRLPOOL 00c3618620b1a633bb5ce78b09f18d577010b575f62daf5ff84181a2a030e1daa729231193010285781b397040546700def6115dc858800e386e88523f801747
+MISC ChangeLog-2015 7154 SHA256 73fd77644f9629c2a2034b94c6101be79573b76639c2d7ecd0f87c79901f1aa9 SHA512 d4ef4f158d2fef0984e0744b8dda39b23894a4848ed2e46d8cd7a81046efbab2fa24ba3628c76e5fbaffc3348ddc1095aacc04ffe63689f7a6afbaf6186132e9 WHIRLPOOL ef5bf60a0d33d52dd7971840c13942962b83af498376581b7c49cdbb879e3f227bc32617adf2e416a3f9da6a804b2df16352eb1448a26399660309cfb45ac07b
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
new file mode 100644
index 000000000000..c395c6ffd797
--- /dev/null
+++ b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b49c009..9c3316b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ INCLUDES = \
+ 
+ lib_LTLIBRARIES = libgoocanvas.la
+ 
+-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+ 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c4d43b2..8d555fe 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -254,7 +254,7 @@ INCLUDES = \
+ #	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ #	-DGTK_DISABLE_DEPRECATED
+ lib_LTLIBRARIES = libgoocanvas.la
+-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
+ libtool_opts = \
+   -version-info $(LT_VERSION_INFO)	\
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
new file mode 100644
index 000000000000..5b8652989b62
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 libtool
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=671766
+	epatch "${FILESDIR}"/${P}-gold.patch
+
+	# Fails to build with recent GTK+
+	sed -e "s/-D.*_DISABLE_DEPRECATED//g" \
+		-i src/Makefile.am src/Makefile.in demo/Makefile.am demo/Makefile.in \
+		|| die "sed 1 failed"
+
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${P}/examples/
+		doins demo/*.c demo/flower.png demo/toroid.png
+	fi
+}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
new file mode 100644
index 000000000000..de7678e1ec1f
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="examples +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# python only enables python specific binding override
+RDEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/cairo-1.10.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed failed"
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-python
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		sub_install() {
+			python_moduleinto $(python -c "import gi;print gi._overridesdir")
+			python_domodule bindings/python/GooCanvas.py
+		}
+		python_foreach_impl sub_install
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.3.ebuild b/x11-libs/goocanvas/goocanvas-2.0.3.ebuild
new file mode 100644
index 000000000000..41235bfdd14c
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# python only enables python specific binding override
+RDEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/cairo-1.10.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed failed"
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-python
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		sub_install() {
+			python_moduleinto $(python -c "import gi;print gi._overridesdir")
+			python_domodule bindings/python/GooCanvas.py
+		}
+		python_foreach_impl sub_install
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/goocanvas/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/gtef/Manifest b/x11-libs/gtef/Manifest
new file mode 100644
index 000000000000..21c3dac72c8d
--- /dev/null
+++ b/x11-libs/gtef/Manifest
@@ -0,0 +1,3 @@
+DIST gtef-2.0.1.tar.xz 429800 SHA256 8432f0f404b93e5a2702978b5f121b8f9ae2167c906e9f2ed7b5165142e27a4f SHA512 51cec42405f41c8d3d311811f3a9f6c67ca2a6a87cb305f9becc14694683ed427bf14797d8c997f17d4a05b3048d91cb5ebde81d0db4d11048e8978ecb7e64e1 WHIRLPOOL 285fb42b8b74849e212b022f81d734f1c8c2675bd6a55ec5b9258693b7b329e6fed372dd7604925fdfed268344424d83293a2b80ee6b9b996ff711a9866d259f
+EBUILD gtef-2.0.1.ebuild 1309 SHA256 9365444647614302dfa242c58fd9ef5e6735364ef8b1a3754d385ac25a0b8742 SHA512 4af4a9a852d3f5de81d2c821d47552007f7b5d32497f9b2401c38af5fdb17d28258707bba52794431de2b55e9421b2dfb6875e0c9a2fddcb6d34919c73e422ce WHIRLPOOL 048ee202f4bd0d122d26fa8f54ada3041c2b9e7397df62e1c2c26b8ba4156e46efab5af1871ff9982aa09473626dfacf4c007cf787a6ad70a90d2ef8e80f8798
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/x11-libs/gtef/gtef-2.0.1.ebuild b/x11-libs/gtef/gtef-2.0.1.ebuild
new file mode 100644
index 000000000000..8be374567d7e
--- /dev/null
+++ b/x11-libs/gtef/gtef-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.20
+	>=x11-libs/gtksourceview-3.22
+	>=dev-libs/libxml2-2.5
+	app-i18n/uchardet
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${DEPEND}
+	test? ( dev-util/valgrind )
+	vala? ( $(vala_depend) )
+	>=sys-devel/gettext-0.19.4
+	>=dev-util/gtk-doc-am-1.25
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# requires running gvfs-metadata
+	sed -e 's:\(g_test_add_func.*/file/load_save_metadata_sync.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/load_save_metadata_async.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/set_without_load.*\):/*\1*/:' \
+		-i testsuite/test-file-metadata.c || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable test valgrind)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/x11-libs/gtef/metadata.xml b/x11-libs/gtef/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/x11-libs/gtef/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
new file mode 100644
index 000000000000..3334c59f1e82
--- /dev/null
+++ b/x11-libs/gtk+/Manifest
@@ -0,0 +1,21 @@
+AUX gtk+-2.24.24-out-of-source.patch 1487 SHA256 3492f3c22df40f7e0696098eb689b949ce0b6152293aba0a54adb8a859ec5250 SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 WHIRLPOOL abc0a7572bd27afc3d4b0d0dbae78e93ebfec8c8bbc6787c632de80401d4f0b9f6621ccb0fbae867a70cea8767f97542b7c42c9f532598676d89563677cd79d3
+AUX gtk+-2.24.27-update-icon-cache.patch 1929 SHA256 7a14a547d56dc063238e55dc85c6fc64857423c52cd65bde5d7308cd14aac359 SHA512 cc1ed6a5f24b18c7caf3152885cd56dd06464f69cf4d7432025dbed7ca0395685f11b51ff2f14717ac428359c625c93c13a8f0648424cf500617c5c32ab08726 WHIRLPOOL b14419031ce7d0cfe1c5fff796d932b26155ba78a34c142c373a614a655438697c42a7a0bce87d89620898ca335db78afb082cbf997b1022f9ae565616183d90
+AUX gtk+-2.24.31-fix-gtkentry-beep.patch 1331 SHA256 d12ab8774f248cdec0eee97763735365c9804fce2bdcc022611f93f32e776afa SHA512 a5fe1474a044299dd2a6e3d238cb1afedc363db095c752cbc9d0435794a6a8f9f6260b7eb96eb3a64ae7fe46b9ca275168c6c39358dca28f7f42203f929c935c WHIRLPOOL 9f7300bcfcfb6855b43f53b6d84cb90247b1bb84c41dbcd50d31c8f43c687ac40824c010cd5d83f08cb2cec3ba22353aa148c2abbb721fa72da996ddd75a46c9
+AUX gtk+-2.24.31-update-icon-cache.patch 2504 SHA256 aff2bc60ebed09103d3f5d69a095986afeb5fd2c311f82df6c8fd18478258d4f SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48 WHIRLPOOL a77b23f47308e06524418eff422545062f67ba9a1cfe5038c1e4bb67c08b2eeabbf22049301c6beef909542a5adb4c3c6fd312402ae25c41eaadbeb25d755a24
+AUX gtk+-3.22.2-update-icon-cache.patch 5474 SHA256 afc558b4763a68c5a3b0aa26da36e37abac66335b8256aa25b51576453dba172 SHA512 46ac52f18c0e74f5e35101ef978d7708c42abb05985894b65e8a7f7a76f1934015ff35a912628a5ae2c6333916ffd00570aa19230108aabe3a20adc5e31d958e WHIRLPOOL 8e9cf76e9236bc7e6282feb24e412d288d659c26731eb8fd8cc566ffaceb31c24cbb5cfe0ba22520e59ef88253abde4bff4ebcd7e3edf3cf458c4bc95ec6471d
+AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
+AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
+DIST gtk+-2.24.31.tar.xz 12805344 SHA256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 WHIRLPOOL 6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e
+DIST gtk+-3.22.15.tar.xz 18662944 SHA256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758 WHIRLPOOL f0eae97db9ef7e1a3ecedc0d98fb35c4a671774f473c1b6f5a17424e2f6ca3d25e98efd74312bb481addfacbc44b6d2d6a549658d202ed6a7215743678de1d00
+DIST gtk+-3.22.16.tar.xz 18655144 SHA256 3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612 WHIRLPOOL 364cec780093ba60832a85769b4b6994adce43efbb408bc291fc059a6c804c50da169af4f0bbe152ed3072d02b02417bf0d700f52b50d9e41bea9bdf67784f71
+DIST gtk+-3.22.17.tar.xz 18702864 SHA256 a6c1fb8f229c626a3d9c0e1ce6ea138de7f64a5a6bc799d45fa286fe461c3437 SHA512 9503baa73f6e199a1fe807bec739df2bb8bc2e586e9c316184d37e874191eb5938c962d1eb83e58841579b16cde8b85d80e058a3577c0033de12fc3fce066dfa WHIRLPOOL 5e444e705d8888ede2ae8e9fcfd5ee6e7f205cd127285816a612217c5446ce27d52fa6733248d9119a66c54849aace81f620d98a593ce683771f0017ce42be56
+DIST gtk+-3.22.19.tar.xz 18841024 SHA256 9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 WHIRLPOOL 27b7921512951cdc3735e7c96fee5b7f930542c46d61a389bea2a3484ff4d9fbc8fc6a91b0ce4fb3fcf58f432b8939a77f829db2e27a9e7a690fb1ae6d600b4a
+EBUILD gtk+-2.24.31-r1.ebuild 10104 SHA256 c427479ed10949ebff00287f58bd281976bffe84d80f8f57f23ee0bc8db85d47 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e WHIRLPOOL 098fc2e32dcb2d46df799de14871d38c0a60453a1f1ad8d8d3afb4eb258122055a673fa689290d140004c994fb10924ad38ff376fa5395e61ab1bca83900f72b
+EBUILD gtk+-3.22.15.ebuild 6930 SHA256 45c4c967067b2f52054f6809ef2589e9079ad3483bbacf64739ea1ffc92dcb2d SHA512 3103bbf23ab5dc56738513599c48f6f090a0aacaa33424f498e7ad5bb0b3841537a4b6a6cadd8a9d86c8fd9a88f99623cc85d8565338229ff6419f267b93b7ac WHIRLPOOL 70703f3cfbe54875a3d1de99dbb68aa0ab978bb8075ab6d7fd10e2c153f54319fa76f6735fb2700753067b29dd4c4f5223bd2b7f95258ff2a106251638773dc9
+EBUILD gtk+-3.22.16.ebuild 6783 SHA256 30655946c7dc0b50feeea9e71f34b55e2d62657b2b55185e7943ed8bd19b004c SHA512 739f3120d98ef5802022d46bbc73afce41e55f75c6c5d6d68e058556f4aaf5f99268b8cb5717a9c5a4a6820b742d215f62abcc38e7c99e1367c0c1e2efbff32a WHIRLPOOL 3b192af3a38717b67f2f78b2a9bc401b64a0d10d8576c4d9a3f89464f2271454c2fe825286272de5c62287cb82e06b58e2453bafcce96b01ee5e41f58bc5a821
+EBUILD gtk+-3.22.17.ebuild 6788 SHA256 d772512b2fe2f78b3409dc3977b32bfa5501389ead22ad306a9e41f6cecca6fe SHA512 237f05cc646d2167ce857a85306468ee3f68c1670e048c91a6b13c5291f0291cd2fb0f00961440e4d69072519027626e3081e4954fe77fe830fadede7d3a185d WHIRLPOOL 7d3061314da8e6cd7bd9fdef03fb4772f33bd7cf61dfb0562ba7d8d1f0adf8e13ae17614e769c107f0907d9e53b3f83c7dc5c803c6776055aa60e647f9d17dbe
+EBUILD gtk+-3.22.19.ebuild 6788 SHA256 d3a6961e786ed41ace568550f0005fcae1f14dd7b6b0bc0a94b2bcbde342063d SHA512 15b42d8c22a16dcf0d3c0c3c9844ba8733330809083e02b892aba17d87f1a775462913fa951365c490d1af9a10180be0f8cf5ded257d29f684bd5569f10f2d65 WHIRLPOOL 82f3a09d4fa0957d54905507194eaebc8b0184d2a3047e60e3ac611db6e430c50553d3bc3ad5a002ad3dab304089b41b56a4cfd9b057eb0302b0722ba1b89d99
+MISC ChangeLog 18888 SHA256 bb9123ceec13c8279e45e94d0dbaea83c8c4c5aa9eb769121f3d5b8c568bc6ed SHA512 45e34684e22f47e5416d5641b935396327c58c7ca68eb01c61f3177b8354f9b38421ec35db410a98a9eb9a621225d87ba9474b8a1de59ecff6486ef037d18e37 WHIRLPOOL c4956dea2b9bdcf261e52255c29060d0801be82089100271b2579b6c1f74569e74b766522141046e2d647bea19a2ed46b7bc2dbd6cd41bbae3679babc6f5ae0d
+MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
+MISC ChangeLog-2015 25781 SHA256 53d3cf5f33e4c1f2e66d60db9a56ac485f3ba8ebd260c9066356d2e1e78d80b0 SHA512 6e5ce53fce815641a694778f5c5b070699ac2f6aeb19c1ed99b782489085b7fa53126a193fc15647f24bde7fd3b8c63b29182da3c768b36edc1e76becc71cec9 WHIRLPOOL ae27948fffac9e09dd80c158be0e14473f8d80ca5776dd6747d29a5288fb5c464d2c9f5f0b4d1a8814b17bd80b5bc74fcd84eef9a8ce2c6c0893ddc6f2bc2c8a
+MISC metadata.xml 834 SHA256 75a6d7ecf4310e93b751cca313bc8775adb334f2cb9f43a324827c5d3138ca91 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561 WHIRLPOOL c8a6c88cc770afce3839f8bf0b8c41a508d2a2aeaa7b49bcda6873ddd728a2a977a215402cfa8cf1daf9cf1d37ba1a7e334f61cf73eb9a024b8cd00bc25c4cef
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
new file mode 100644
index 000000000000..451233ca812f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
@@ -0,0 +1,33 @@
+From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 18 May 2014 10:50:05 +0200
+Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
+
+The $gtk_all_c_sources variable contains both supplied and generated
+sources. The former reside in $srcdir, the latter in the build directory
+(cwd).
+
+In order to handle both kinds properly, first try to find each source
+file in cwd, and then fallback to $srcdir. This makes it possible to use
+out-of-source builds, and guarantees that fresh-built source files will
+be used rather than pre-generated copies included in the distribution
+tarball.
+---
+ gtk/aliasfilescheck.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
+index 31b49d4..3636a82 100755
+--- a/gtk/aliasfilescheck.sh
++++ b/gtk/aliasfilescheck.sh
+@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
+ fi
+ 
+ grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
++{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
+ 
+ diff expected-files actual-files && rm -f expected-files actual-files
+-- 
+1.9.3
+
diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
new file mode 100644
index 000000000000..f88e02e53500
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
@@ -0,0 +1,64 @@
+From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 9 May 2015 23:30:58 +0200
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+---
+ configure.ac    |  8 +++-----
+ gtk/Makefile.am | 13 ++-----------
+ 2 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2671a3d..fa46004 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-if test $cross_compiling = yes; then
+-  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+-  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+-    REBUILD_PNGS=#
+-  fi
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
++if test x$GTK_UPDATE_ICON_CACHE = xno; then
++  REBUILD_PNGS=#
+ fi
+ 
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 248220d..42e4c23 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1039,8 +1039,7 @@ endif
+ # Installed tools
+ #
+ bin_PROGRAMS = \
+-	gtk-query-immodules-2.0 \
+-	gtk-update-icon-cache
++	gtk-query-immodules-2.0
+ 
+ bin_SCRIPTS = gtk-builder-convert
+ 
+@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS)
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
+-if CROSS_COMPILING
+-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+-else
+-gtk_update_icon_cache_program =							\
+-	   ./gtk-update-icon-cache
+-endif
+-
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
++	$(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index		\
+ 	   --include-image-data							\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+-- 
+2.3.6
+
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
new file mode 100644
index 000000000000..1d09721b6711
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
@@ -0,0 +1,42 @@
+From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 5 Oct 2016 12:20:14 -0400
+Subject: [PATCH] entry: Fix a corner case of overwrite mode
+
+We currently beep when a character is appended at the end in
+overwrite mode. That is obviously not right. Patch based on
+a patch by Ian MacDonald.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=772389
+---
+ gtk/gtkentry.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
+index b522039..bc33754 100644
+--- a/gtk/gtkentry.c
++++ b/gtk/gtkentry.c
+@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry       *entry,
+   GtkEditable *editable = GTK_EDITABLE (entry);
+   gint tmp_pos;
+   gboolean old_need_im_reset;
++  guint text_length;
+ 
+   old_need_im_reset = entry->need_im_reset;
+   entry->need_im_reset = FALSE;
+@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry       *entry,
+   else
+     {
+       if (entry->overwrite_mode)
+-        gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
++        {
++          text_length = gtk_entry_buffer_get_length (get_buffer (entry));
++          if (entry->current_pos < text_length)
++            gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
++        }
+     }
+ 
+   tmp_pos = entry->current_pos;
+-- 
+2.10.0
+
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
new file mode 100644
index 000000000000..11dbb5e4a705
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
@@ -0,0 +1,78 @@
+From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 9 May 2015 23:30:58 +0200
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+---
+ configure.ac                   |  8 +++-----
+ docs/reference/gtk/Makefile.am |  2 +-
+ gtk/Makefile.am                | 13 ++-----------
+ 3 files changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e11b40..7ef8cb6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-if test $cross_compiling = yes; then
+-  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+-  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+-    REBUILD_PNGS=#
+-  fi
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
++if test x$GTK_UPDATE_ICON_CACHE = xno; then
++  REBUILD_PNGS=#
+ fi
+ 
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index c239445..60b5265 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in
+ 
+ if ENABLE_MAN
+ 
+-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
++man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
+ 
+ %.1 : %.xml 
+ 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 8cc4536..a7afbf3 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1087,8 +1087,7 @@ endif
+ # Installed tools
+ #
+ bin_PROGRAMS = \
+-	gtk-query-immodules-2.0 \
+-	gtk-update-icon-cache
++	gtk-query-immodules-2.0
+ 
+ bin_SCRIPTS = gtk-builder-convert
+ 
+@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS)
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
+-if CROSS_COMPILING
+-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+-else
+-gtk_update_icon_cache_program =							\
+-	   ./gtk-update-icon-cache
+-endif
+-
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
++	$(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index		\
+ 	   --include-image-data							\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+-- 
+2.10.0
+
diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
new file mode 100644
index 000000000000..fc1e86e997d0
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
@@ -0,0 +1,138 @@
+From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 1 Nov 2016 15:24:22 +0100
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+Check for gtk-update-icon-cache to install demos, otherwise it is not
+used when building.
+---
+ configure.ac                     |  2 ++
+ demos/gtk-demo/Makefile.am       |  2 +-
+ demos/widget-factory/Makefile.am |  2 +-
+ docs/reference/gtk/Makefile.am   |  1 -
+ gtk/Makefile.am                  | 44 ----------------------------------------
+ 5 files changed, 4 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f9f183..ecf99dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
++
+ ########################################
+ # Windowing system checks
+ ########################################
+diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
+index 8c15e16..5d774d2 100644
+--- a/demos/gtk-demo/Makefile.am
++++ b/demos/gtk-demo/Makefile.am
+@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
+ dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
+index a6bfbdc..28a3be2 100644
+--- a/demos/widget-factory/Makefile.am
++++ b/demos/widget-factory/Makefile.am
+@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
+ dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index 5a88a12..b51f3ac 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
+ 
+ man_MANS = 				\
+ 	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+ 	gtk-encode-symbolic-svg.1	\
+ 	gtk-launch.1			\
+ 	gtk3-demo.1			\
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 3b76b82..d4c5681 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1581,7 +1581,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ 	gtk-query-immodules-3.0	\
+-	gtk-update-icon-cache \
+ 	gtk-encode-symbolic-svg \
+ 	gtk-builder-tool \
+ 	gtk-query-settings \
+@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+ 	$(GMODULE_LIBS)				\
+ 	$(GTK_DEP_LIBS)
+ 
+-gtk_update_icon_cache_SOURCES = updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+-
+ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
+ gtk_encode_symbolic_svg_LDADD =			\
+ 	$(GDK_PIXBUF_LIBS)			\
+@@ -1621,46 +1617,6 @@ gtk_launch_LDADD =				\
+ 	$(top_builddir)/gdk/libgdk-3.la		\
+ 	$(GTK_DEP_LIBS)
+ 
+-if OS_WIN32
+-
+-# Workaround for UAC silliness: programs with "update" in their name
+-# are believed to be installers and require elevated privileges to be
+-# used... Embed a manifest file into executable to tell Windows that
+-# gtk-update-icon-cache.exe doesn't require any special privileges.
+-
+-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
+-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST):
+-	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
+-	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
+-	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
+-	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
+-	 echo '     name="gtk-update-icon-cache.exe"' ; \
+-	 echo '     type="win32"/>' ; \
+-	 echo '  <!-- Identify the application security requirements. -->' ; \
+-	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
+-	 echo '    <security>' ; \
+-	 echo '      <requestedPrivileges>' ; \
+-	 echo '        <requestedExecutionLevel' ; \
+-	 echo '          level="asInvoker"' ; \
+-	 echo '          uiAccess="false"/>' ; \
+-	 echo '        </requestedPrivileges>' ; \
+-	 echo '       </security>' ; \
+-	 echo '  </trustInfo>' ; \
+-	 echo '</assembly>' ) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_RC):
+-	(echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+-	$(WINDRES) --input $< --output $@ --output-format=coff
+-
+-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
+-
+-endif
+-
+ .PHONY: files
+ 
+ files:
+-- 
+2.10.1
+
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
new file mode 100644
index 000000000000..8d1783431d9c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtkrc
@@ -0,0 +1,39 @@
+style "default"
+
+{
+ font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
+}
+
+style "button" = "default"
+
+{ 
+ bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
+}
+
+style "treeitem"
+{
+bg[ACTIVE] = { 0.7, 0.7, 0.9 }
+}
+
+style "scrollbar" = "button" 
+{
+ bg[ACTIVE] = {0.6, 0.6, 0.6 }
+}
+
+style "status" {
+ bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
+}
+
+style "gtk-tooltips" {
+ bg[NORMAL] = "#ffff60"
+}
+
+class "GtkWidget" style "default" 
+class "GtkButton" style "button"
+class "GtkItem" style "button"
+class "GtkProgressBar" style "status"
+class "GtkScrollbar" style "scrollbar"
+class "GtkTreeItem" style "treeitem"
+widget "gtk-tooltips" style "gtk-tooltips"
+
+
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 000000000000..a65c0a818dbc
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
new file mode 100644
index 000000000000..bb7b00678e4a
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	!aqua? (
+		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+	)
+"
+# docbook-4.1.2 and xsl required for man pages
+# docbook-4.3 required for gtk-doc
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	!aqua? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		x11-themes/hicolor-icon-theme
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-2
+	!<gnome-base/gail-1000
+	!<dev-util/gtk-builder-convert-${PV}
+	!<x11-libs/vte-0.28.2-r201:0
+	>=x11-themes/adwaita-icon-theme-3.14
+	x11-themes/gnome-themes-standard
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	x11-themes/gtk-engines-adwaita
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+	# marshalers code was pre-generated with glib-2.31, upstream bug #662109
+	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+		perf/marshalers.c || die
+
+	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+	# -O3 and company cause random crashes in applications, bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+	else
+		# Non-working test in gentoo's env
+		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+			-i gtk/tests/testing.c || die "sed 1 failed"
+
+		# Cannot work because glib is too clever to find real user's home
+		# gentoo bug #285687, upstream bug #639832
+		# XXX: /!\ Pay extra attention to second sed when bumping /!\
+		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+			|| die "failed to disable recentmanager test (1)"
+		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+			|| die "failed to disable recentmanager test (2)"
+		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+			|| die "failed to disable recentmanager test (3)"
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+
+		# UI tests require immodules already installed; bug #413185
+		if ! has_version 'x11-libs/gtk+:2'; then
+			ewarn "Disabling UI tests because this is the first install of"
+			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+			ewarn "has been installed."
+			sed '/g_test_add_func.*ui-tests/ d' \
+				-i gtk/tests/testing.c || die "sed 2 failed"
+		fi
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+	fi
+
+	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
+	eapply "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+	# Rely on split gtk-update-icon-cache package, bug #528810
+	eapply "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch
+
+	# Fix beep when overwriting at the end of a gtkentry, from gtk-2-24 branch
+	eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtkentry-beep.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	# see bug #133241
+	# Also set more default variables in sync with gtk3 and other distributions
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
+	echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
+	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
+
+	insinto /usr/share/gtk-2.0
+	doins "${T}"/gtkrc
+
+	einstalldocs
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"usr/bin/gtk-builder-convert || die
+	rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk2 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	set_gtk2_confdir
+
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+		elog "aware location. Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+	fi
+
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+	fi
+
+	# pixbufs are now handled by x11-libs/gdk-pixbuf
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	fi
+
+	# two checks needed since we dropped multilib conditional
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+	fi
+
+	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your gtkrc."
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.22.15.ebuild b/x11-libs/gtk+/gtk+-3.22.15.ebuild
new file mode 100644
index 000000000000..a26e067b2e13
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.15.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.7
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	>=x11-themes/adwaita-icon-theme-3.14
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild
new file mode 100644
index 000000000000..7d0a6347c290
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.16.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.7
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.22.17.ebuild b/x11-libs/gtk+/gtk+-3.22.17.ebuild
new file mode 100644
index 000000000000..2034f00888c9
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.17.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.7
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	>=x11-themes/adwaita-icon-theme-3.14
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
new file mode 100644
index 000000000000..8ea8f71c60eb
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.19.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.9
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
new file mode 100644
index 000000000000..7fe0a6b99d41
--- /dev/null
+++ b/x11-libs/gtk+/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>
+		GTK+ is a multi-platform toolkit for creating graphical user
+		interfaces. Offering a complete set of widgets, GTK+ is suitable
+		for projects ranging from small one-off projects to complete
+		application suites.
+	</longdescription>
+	<use>
+		<flag name="broadway">Enable the GDK Broadway backend.</flag>
+		<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
+		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+			in printing</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
new file mode 100644
index 000000000000..b2d061e895ac
--- /dev/null
+++ b/x11-libs/gtk+extra/Manifest
@@ -0,0 +1,5 @@
+DIST gtkextra-3.3.3.tar.gz 1503817 SHA256 7889f958ee9fb6bd564aa941891909c3af7a03b92e232c5a90bab0289407d884 SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9 WHIRLPOOL eb93af92deaed2c4b3b0b4ca9c4a58eef33be675bc3f5415b3979992be282dedf9406451e516ac6ed9faca816a529dddd3f1e0e1922dd0413de967e33d981a5e
+EBUILD gtk+extra-3.3.3.ebuild 834 SHA256 641fdbc8a7c3a1014e65d7eb54d42b6cce943ac155418550d61bd22ebc04a4fd SHA512 759b55a2acfd89c5bf799e0760029b0f3d1fa10238e95b6685dd3242bc8041c89a3c4a7dfa419b5e83b2cf0063908966c5449e3ad630f9f82bedfed7d22fe037 WHIRLPOOL 11c6adde08883042524707a1b77a12f91042f6d4c27407106955fa5217585995206c9b7d0f2ab3a13ebe488aee715530f71a49a7c3315f2363259d6275302103
+MISC ChangeLog 4037 SHA256 0e6a8b3c6d0c64c8a2476c10f33bcbd216b2bbd6b4383643d04673a832552814 SHA512 50f882756c97ae23b3f66f049c1ad0c67c7c142c895586260ce64d3e7213a463d939e20f59c8fed227f82b8349492057a97f4c00b77f0a63619aae3d485b1ae7 WHIRLPOOL 1f617da014c460d878cf21da11c3eeeadb58d293570d162471fa19ce5fb659e2a8a279a903e1454043f5c193d7f74246fb00b475a611f342c6f323372597d01a
+MISC ChangeLog-2015 7411 SHA256 da1081064942422db4ac78136007008a74490be748c65095a4f5a65bf0e63293 SHA512 9a95502c04db8449653fabcf1aaf02d5b35086a9777b34d3abba00a7a49d87b1dc13bd90cc3f35e0260ab0c065674c5f2b10fb245804aeaa7d1b7c7925a0086b WHIRLPOOL c1426cd95ef38c0c1d52f56faa1efe129cc79c4e0086f04e52fd2d639e1e4ddabb80be15cf7c713e42c620f311e3301c1e0af4ad9d4b46615d6ab8aac35f793b
+MISC metadata.xml 331 SHA256 691d982c435460be0fb3a2022269c8523abd448b097d91fc0332fcba127e920d SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c WHIRLPOOL 251b2d9a145231139e7aa3f37724504c9f10dfb1e22990c03ff37951451f1b79ccd03d297d02b7a19926dd1bd237afd9b54119c6b14ff207d24b891cff50bf26
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
new file mode 100644
index 000000000000..a072f27eba04
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Useful Additional GTK+ widgets"
+HOMEPAGE="http://gtkextra.sourceforge.net"
+SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
+
+LICENSE="FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection static-libs test"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12.0:2
+	dev-libs/glib:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+# dev-libs/gobject-introspection-common needed for eautoreconf
+
+S="${WORKDIR}/gtkextra-${PV}"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-glade=no \
+		--disable-man \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
new file mode 100644
index 000000000000..cbb03314ae25
--- /dev/null
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gtkextra</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtk-mac-integration/Manifest b/x11-libs/gtk-mac-integration/Manifest
new file mode 100644
index 000000000000..1d6e2b59fabb
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/Manifest
@@ -0,0 +1,5 @@
+DIST gtk-mac-integration-2.0.5.tar.xz 305656 SHA256 6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f SHA512 c26c9ceadb4b8c4410636e38fcd57f76a5b04b6dd14be44e62217973fe9ad1b1107a9771ddcc66e8e8fa078fa3b521df834b9928ba9371ef08cc5a55953426cd WHIRLPOOL ea369122dc30dab1327946e9fb52b6b48612f097ae29119cc5e1fce11f71d89cf2a9734162b0efe4ffdc0dba0b0318fd3c30a9a81b9cd0098867bc4ed5d6564b
+EBUILD gtk-mac-integration-2.0.5.ebuild 509 SHA256 1de77cbfd02d75c9a4928d34509b624fa482954ec46bd8dd430257c876061c10 SHA512 2e03fc94b032f472368f0c5645affad1c56155016d2bcade66ae37ff4739ecbed2caefa4d5147b7bfc5687e4b9576160738325fdc42055c56bf0f9acc19e3607 WHIRLPOOL f2ff5f186907c3a2f026a63de351883c37085f567efbc6b99a554687eb89911c4cb753b13f23af051c9b84298ba001fb587fc9f4e79f5efffa3e9ea81c0fc9c4
+MISC ChangeLog 2463 SHA256 efe8ef7d81d1c548ac2d637a3a22542110acd7b228fa9650102423ca3189e69e SHA512 b1a8818b24c629d4eea4bffddfc39a03f990680f7b5e42deacac75b3c77666f13425d2fc77f8c74fdc9259d496618f2ccdd60dfd149ee9236678ac30ad30da97 WHIRLPOOL 7b2ac9a43c7bda41043543bbd99535c3033ba48ef81219a8bb8e8c313f54dec1fd992e752d1ec7a4c8999244f86740d19fa2dc5a8aa1f5adcee53dd11e2dd21b
+MISC ChangeLog-2015 604 SHA256 23c9ee962fae5ba2ad7a1b878b549c45037e0d9e967f0ff3a9d515df6844fded SHA512 a28ea911a1887211aa82713246f23a0571b26ef301803d78212d3b1042d6424033877e03a169e9a151d511c78c5abfe163524556a9e5e70d8fc6f3ba9001d20a WHIRLPOOL 76f566d2293d85f271d90e6cfe3f2837dbec25bd5fe4a2fb79aa3a89f302daf087dcc1f5eb8b2e2afb21299ff45c9fd6a24b3315fc63e47822475deaad123a8d
+MISC metadata.xml 247 SHA256 beb9a5395fe6fcde3c82e31b0cde4a75ea911efb59294b0419f76b71e4518366 SHA512 ae91bc559b2380b04af0bacbaf419deb042e9a9235c596c1afdbbb3933e59ba4f895c6e7ebf8fa4884702d5b39febedfdcce109ab912d6ef4f51b3696bc82c18 WHIRLPOOL b82c282b0539e6427a6d6dc1d6742794f922e0b6276dbc7acb805735d6654c79600eb6f650a9c1e36cd727a63d1f1655d728535082154a218c6fb40c01eb8fe0
diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
new file mode 100644
index 000000000000..2cf046c6889f
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Menubar, doc and app bundle integration for GTK+"
+HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration"
+SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x64-macos"
+IUSE=""
+
+DEPEND="virtual/pkgconfig
+	>=dev-libs/glib-2.14.0
+	x11-libs/gtk+[aqua]"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --enable-python=no
+}
diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml
new file mode 100644
index 000000000000..0c982d881307
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
new file mode 100644
index 000000000000..c6dc7d4b993e
--- /dev/null
+++ b/x11-libs/gtkdatabox/Manifest
@@ -0,0 +1,7 @@
+DIST gtkdatabox-0.9.2.0.tar.gz 2836730 SHA256 745a6843e8f790504a86ad1b8642e1a9e595d75586215e0d2cb2f0bf0a324040 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91 WHIRLPOOL 4c03b14ab984b375b9d7543e9e50f1e1cf8cc750bc76e164b5675840143451b6450593912121786379f540f54185a3392dcbfdb15b29cd132a06a39dbf4793b3
+DIST gtkdatabox-0.9.3.0.tar.gz 2883977 SHA256 1f426b525c31a9ba8bf2b61084b7aef89eaed11f8d0b2a54bde467da16692ff2 SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a WHIRLPOOL ccd9b2b10c698868a1f6b2520a4ee90450450acc44ed7b38161baa5313378a406193e6cdabf5d7845b8727ca59f9ce142f3ee05bdcb6433f01835a079eecf8f4
+EBUILD gtkdatabox-0.9.2.0.ebuild 1361 SHA256 acfeb2e89a845b08710ee3827193bc75298040282d378c924bfbe2beba00ca1e SHA512 fd6e782fe5b326fe61a4be6155cb2a8f70792e7a793ec09e4f0b00692fbd614e61be5606fd7cf99385e7e7fd0074af2fa0ecdfdd8c3cdf9f7ce99d840660891c WHIRLPOOL 0c0389cb44e615137bca16cc0106b3157b3ca7ec44e03230cf4280de6a49ce1f06e05828dbddade3d39707a852dac2af6f09c94814be135dd48f6f4f9eee4634
+EBUILD gtkdatabox-0.9.3.0.ebuild 1298 SHA256 8111efc4ef9e26197f6cc9223ef77f29d3cd0ec3ffc8fe07299b231b356af08a SHA512 cc43c4eadfb0a1a5edee1dc7e379329ffdfdda6c34081ca8a7676b1f8a3cfa62ae17f58853f852b0fca3cc82b2c86c1cee454df1830c2066a4f86895d952150d WHIRLPOOL 0991fb0a3e16601927fc1b22133f8b1ad9498a0daf300f7a8adefdf4da21ddd7b5ad1064869dcf280413798cda071fafd95284429883f5236dfee7c6be9752a0
+MISC ChangeLog 2557 SHA256 aa05405169fe656b2400ddbf93cff56349f032ce7694d134bb4138c277aee179 SHA512 02ad76ecddc9abf6e8c8171a12b3e5e4181424a0d6229612fcee20252cfb93e7722a949bf5c5b938a14d9a86c3210f2395bd06757ff7c2e95896a50594483c5b WHIRLPOOL 51ea007f17bf66af19aa196f754db9447c75c0bcd5a964a6291b0c3550c93a3a30b1378acc4f605059951354427236934272fd0778f8ab2069068e0419217a1d
+MISC ChangeLog-2015 1868 SHA256 b467cda5250a968768fbc64e66355715c6fd278173689e21127d7d97b3f62589 SHA512 4a79ab7c0418483c9dd7301237e570b9c367913b02466374be5743098953bea068e63d96d641f1bb09a7c2cc535909c43b3383a6ea195ffb35b72e641fb9a1c3 WHIRLPOOL b4d006d96feb487d5b232c5777eddff5a785facf55d143f6d1eb4f150b9ad46ff78973e831085773c9568a193d411033381446f46944a867a2bf727e91c0d20f
+MISC metadata.xml 685 SHA256 f9de9351b0d3f908cf72064a2b9b8bef9c0bf0674bf24288cc4987e458667826 SHA512 c74bdb14d98365cc3941704371125c9f482cbc21d34c0d09b3f13560cbc362d489f9eda8e4ce2446c26c2d8aba98e7be6e5a014598eb331a312d89f4466c2911 WHIRLPOOL 7cb9e1ccf8ca648ff8d3b825a4d6e93a918acc35c4ed85c91e794961de233a0b56252e57743f88609764cab5381c3f4be1fa36166bc1fd835a6c836378d3b5e4
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
new file mode 100644
index 000000000000..432198462bb0
--- /dev/null
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
+HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples +glade static-libs test"
+
+RDEPEND="
+	glade? (
+		gnome-base/libglade
+	)
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	# Remove -D.*DISABLE_DEPRECATED cflags
+	find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
+	sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable glade libglade) \
+		$(use_enable glade) \
+		$(use_enable static-libs static) \
+		$(use_enable test gtktest) \
+		--disable-dependency-tracking \
+		--enable-libtool-lock
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	dodoc AUTHORS ChangeLog README TODO
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+}
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
new file mode 100644
index 000000000000..fdea59496fad
--- /dev/null
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
+HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +glade static-libs test"
+
+RDEPEND="x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	glade? ( gnome-base/libglade )"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	default
+
+	# Remove -D.*DISABLE_DEPRECATED cflags
+	find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+	sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable glade libglade) \
+		--disable-glade \
+		$(use_enable static-libs static) \
+		$(use_enable test gtktest) \
+		--disable-dependency-tracking \
+		--enable-libtool-lock
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	dodoc AUTHORS ChangeLog README TODO
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+}
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
new file mode 100644
index 000000000000..54b59b40ec8d
--- /dev/null
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
+	<longdescription>Gtk+ Widgets for live display fluctuating numerical data</longdescription>
+	<use>
+		<flag name="glade">Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gtkdatabox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
new file mode 100644
index 000000000000..f100ee0f363c
--- /dev/null
+++ b/x11-libs/gtkglarea/Manifest
@@ -0,0 +1,7 @@
+DIST gtkglarea-2.0.1.tar.bz2 298744 SHA256 2318a18806bc2ebac56d18701965bb1f93783293a1795e285b990fc579076d95 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e WHIRLPOOL a5c78bfb86291a282f54276acccda38598d3af22065a82bc8b31683de9e804955075b7ad1e87d6a6369580b73582ba5ab61bcd2fe59970d2cd107aeb5fa0e624
+DIST gtkglarea-2.1.0.tar.xz 264100 SHA256 8e1e545877d2f5139300b54c2e3bcd70acf7d80a78421a894192186a64db82de SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b WHIRLPOOL deb909ad7b295f9712723b83be896b3c7ccba1d4e932de8ac4db9355fe568bc0228d7d87bec365ae64bf244f0ee8dec90061e934d9ec952d873cf803f2d8d331
+EBUILD gtkglarea-2.0.1-r1.ebuild 1128 SHA256 4d1cd88861a372c1d0947b1078214f8e00b1c9f64c41cc0d5d0a5a8d36095f92 SHA512 f2a18d475018a441805f4bbae400efac27e1fb37724975c29455c006a61ae6f14340be00fa35fecceac41384375b5a8778c8c3a13b03bca1340d08c0b094e715 WHIRLPOOL 4aec7cb800c8874e61bf34c5b0fc3ed7574454f1062c4d87a7cb0a71fe421f2ab9ab059d91ddaae0a0c43c68d33a12234d53cf904c1580e36abf66c774a7c139
+EBUILD gtkglarea-2.1.0.ebuild 997 SHA256 29b0b4895987610997aced4b641e311f5b7eb960164afd4e5302a8dd47622f76 SHA512 3fd960298430c2572f7890831e600e5cf03bd2afe9a45ac73745ecadf6266508702928f6d40270c627d79d854f8a134b8b4a290005b0e9f8545657ec71fe60d7 WHIRLPOOL 8beb56d4978f449a86ef7c09375905b6f43cd2906bb156a5b123c103c2d67635d13a6dee9aa50021afc2eb1d118f3bd5a95e0e0caddd132eec0cb3860d649502
+MISC ChangeLog 2758 SHA256 3e4b4e5202f42e2b2c6a5aa485b99c8b5765773e7ffc851c1a09f270a2e1e7e2 SHA512 8628433cc7a64107d8d4f16aaa0af1ad8f1b2f33cee0317cbe12c76f38a0782174bbe6c1e96b1cf3aea27de25fb7332764758b7dc35234ed773e74c59c47e05d WHIRLPOOL 4891092361e349d8661cfdaf583975b1e633e7d48055476a87b173013355c2d5902f8b902278a2947cee41f93cbaf76974c9eea0187d2091baadb0855059b6a0
+MISC ChangeLog-2015 8288 SHA256 9afccf4e997c469829ff419bd071aa37b1d20d10c667f921ba5596035085b244 SHA512 8f8c04854ee5f368f78e7e475e8b1174717ed48c8072990e0d14d60e9b3107fc71453fdbef32832c30add79c2d809dee63b9554cb3091f60f3773ba39a42838a WHIRLPOOL 4a01970b6a8cba4147bb8e13d46e04374d6c665f8be096dd8cc4b666a1f64d4177c6c0f193fbdc2f82ea6be6acfd0aea349dfbc8ac361102575e902a04fd3abe
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..4189a9ddb6af
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND=">=x11-libs/gtk+-2.0.3:2
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Do not build examples
+	sed "s:\(SUBDIRS.*\)examples:\1:" -i Makefile.am Makefile.in || die "sed 1 failed"
+	# -lGLU is only needed for building examples. Avoid autoreconf.
+	sed -e 's: -lGLU::' -i configure || die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+	gnome2_src_install
+
+	if use examples; then
+		cd "${S}"/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.c *.h *.lwo README || die "doins failed"
+	fi
+}
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
new file mode 100644
index 000000000000..b27202dcb50b
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.22:2
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s:\(SUBDIRS.*\)examples:\1:" \
+		-i Makefile.am Makefile.in || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+	gnome2_src_install
+
+	if use examples; then
+		cd "${S}"/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.c *.h *.lwo README || die "doins failed"
+	fi
+}
diff --git a/x11-libs/gtkglarea/metadata.xml b/x11-libs/gtkglarea/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/gtkglarea/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
new file mode 100644
index 000000000000..087db8addf55
--- /dev/null
+++ b/x11-libs/gtkglext/Manifest
@@ -0,0 +1,7 @@
+AUX gtkglext-1.2.0-gl-configure.patch 11350 SHA256 43b248ae9d5897610c5988832ae8cedde5f0aa614881e64b9ac0f62d699100e0 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb WHIRLPOOL 0c3c0f8b6d9e3abb1454fb701870b365ca8c2e613fce0bc4e550640b11623df2a476e2a02c4fc429426427f54314ffaa79f481f683549aedaea00a95609a62aa
+DIST gtkglext-1.2.0.tar.bz2 703821 SHA256 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d WHIRLPOOL 2be1308abd4a73a838942ab9fac4d733239b4fe5ba0b50f542510be24088d6697868d2d900b77f8c8e973efd46a5fbb4d2ffd53c7aea8a07d9326bf276908c4f
+EBUILD gtkglext-1.2.0-r3.ebuild 1845 SHA256 ba32a5fb5b3c1a1ed3a15c99be06eb496e1b4223b11ce09e4714a60a56dcb36a SHA512 36671527538a273c8b9fe479d9549ac60f9fb4326977990fe15cdb4d26e3c4828c5b7dffa4b59f89618e6c3107aac8ec86de3ac8db997e42d2956c1868eaf42d WHIRLPOOL 0a24a225cad38a76ade53296a64cf9e10dcbdbf8a7cb3e2007dd9324496e108c709fb834fa17d275a966ddded98f21d520c08f6a2b72fe88e11ae5eb95b4a8a3
+EBUILD gtkglext-1.2.0-r4.ebuild 1795 SHA256 db6c8be4bf9fc141a353a592c9e2ba61cc40ed0cabafdc8f4fe37b001835cb2a SHA512 0b584c4b4a2971dbf511d174555cfaf2ee2d4df7b706bf3a20bd3983a0d7e39028ed24c0a21cd48a77d4d8813e519942d0f1e864358dc89045c4118fd072a667 WHIRLPOOL 1d73fb96b9936161e948d3022da0ab2f774f22a7135dea428a975b72cf0affce3626a5845e100ead9b193fdd62716fdefcf85eb5281bf89a30f4fc0625170025
+MISC ChangeLog 2771 SHA256 dd4f9cdbf4b5c8864150c5da0ff399f0660e1e703ad6f3354e1db13f2dc25621 SHA512 e5c835843e8d8ea46d0c124bd8788fd7a44913cb6054c94de2aa1bc5f8e3e4f5831e93f2e5a886b5e6dc1e53acd0d6fefa8e0b1f9df32783d07d8b58f16f4e3e WHIRLPOOL e701cfebc94eb51c05572a5831f6d4a1885a15db6594c13b9ca199b2dde2a61ea17d89eb6af0066527bfd0194b1ec1c88939d6e9bf9126b2520a6cc2684e01ed
+MISC ChangeLog-2015 13089 SHA256 d3fa4d2f26a55800a58428792ae8556b42a44eb669bcfbb695bc66610f87dda1 SHA512 1c75b79f64c20472fbc9c002c5a0a02e0c111eda5dbd4f60a48cb4e9bc8e2cd74a760c9d78c8f67853dc6048b0c7bbfd0cae4d95905e6b6aaa02d4b18cd795e4 WHIRLPOOL 513867b5fd31cadbde026b7447f2263844a404b74bce9d110375760721a67a1ab09d89ba152fefe04c33c61e5686d59c9bb03c9ad5668451171b0c2e5d4aa26f
+MISC metadata.xml 331 SHA256 e7d420cf2af732fb11712544de9bd35ff3f181c0173c4fd2449ded482d33b292 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9 WHIRLPOOL d0888c427175b9df243390bb3f74314847eca49a2bc3f4406f5d00b4fa3d7cc4823c706446ee3107648e634de2f452e4d2eb45ce07dcdc9cc03e2824a85d9fac
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
new file mode 100644
index 000000000000..b408dba94156
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
@@ -0,0 +1,362 @@
+Fix broken multilib gl and glu detection
+https://bugs.gentoo.org/543050
+https://bugs.gentoo.org/578482
+
+--- gtkglext-1.2.0/configure.in
++++ gtkglext-1.2.0/configure.in
+@@ -139,6 +139,7 @@
+ AC_ISC_POSIX
+ #AM_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
++AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ 
+ platform_win32=no
+@@ -502,275 +503,59 @@
+ # Checks for OpenGL
+ ##################################################
+ 
+-GL_CFLAGS=""
+-GL_LDFLAGS=""
+-GL_LIBS=""
+-
+-AC_ARG_WITH([gl-prefix],
+-            [AC_HELP_STRING([--with-gl-prefix=DIR],
+-                            [OpenGL (Mesa) is installed in DIR [default=auto]])], ,
+-            [with_gl_prefix=auto])
+-
+-AC_ARG_WITH([gl-includedir],
+-            [AC_HELP_STRING([--with-gl-includedir=DIR],
+-                            [OpenGL (Mesa) headers are in DIR [default=auto]])], ,
+-            [with_gl_includedir=auto])
+-
+-AC_ARG_WITH([gl-libdir],
+-            [AC_HELP_STRING([--with-gl-libdir=DIR],
+-                            [OpenGL (Mesa) libraries are in DIR [default=auto]])], ,
+-            [with_gl_libdir=auto])
+-
+-if test "x$with_gl_includedir" != "xauto"; then
+-  GL_CFLAGS="-I$with_gl_includedir"
+-elif test "x$with_gl_prefix" != "xauto"; then
+-  GL_CFLAGS="-I$with_gl_prefix/include"
+-fi
+-
+-if test "x$with_gl_libdir" != "xauto"; then
+-  GL_LDFLAGS="-L$with_gl_libdir"
+-elif test "x$with_gl_prefix" != "xauto"; then
+-  GL_LDFLAGS="-L$with_gl_prefix/lib"
+-fi
+-
+-save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
+-save_LIBS="$LIBS"
+-LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
+-
+ if test "x$gdktarget" = "xx11"; then
+-  AC_CHECK_HEADERS([GL/glx.h], ,
+-                   [AC_MSG_ERROR([Cannot find GLX header])])
++  with_gl=x
+ fi
+ 
+-AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
+-                 [AC_MSG_ERROR([Cannot find OpenGL headers])])
+-
+-if test "x$gdktarget" = "xx11"; then
+-
+-  # for X11
+-
+-  THREAD_LIB="-lpthread"
+-  STDCXX_LIB="-lstdc++"
+-
+-  have_GL=no
+-  GL_LIB_NAME=GL
+-
+-  # GLcore and GL (SGI)
+-  AC_CHECK_LIB([GLcore], [glVertex3d],
+-               [GL_LIBS="-lGLcore"])
+-  if test "x$ac_cv_lib_GLcore_glVertex3d" = "xyes" ; then
+-    # if GLcore found, then also check for GL
+-    AC_CHECK_LIB([GL], [glXCreateContext],
+-                 [GL_LIBS="-lGL $GL_LIBS"
+-                  have_GL=yes])
+-  fi
+-
+-  # GL
+-  if test "x$have_GL" = "xno" ; then
+-    # if no GLcore and GL, check for GL
+-    AC_CHECK_LIB([GL], [glVertex3d],
+-                 [GL_LIBS="-lGL"
+-                  have_GL=yes])
+-    if test "x$ac_cv_lib_GL_glVertex3d" = "xno" ; then
+-      # GL may need to be linked with the thread library explicitly
+-      AC_CHECK_LIB([GL], [glVertex3f],
+-                   [GL_LIBS="-lGL $THREAD_LIB"
+-                    have_GL=yes], ,
+-                   [$THREAD_LIB])
+-      if test "x$ac_cv_lib_GL_glVertex3f" = "xno" ; then
+-        # GL may need to be linked with std C++ library explicitly
+-        AC_CHECK_LIB([GL], [glVertex3i],
+-                     [GL_LIBS="-lGL $STDCXX_LIB"
+-                      have_GL=yes], ,
+-                     [$STDCXX_LIB])
+-        if test "x$ac_cv_lib_GL_glVertex3i" = "xno" ; then
+-          # GL may need to be linked with std C++ and thread libraries explicitly
+-          AC_CHECK_LIB([GL], [glVertex3s],
+-                       [GL_LIBS="-lGL $STDCXX_LIB $THREAD_LIB"
+-                        have_GL=yes], ,
+-                       [$STDCXX_LIB $THREAD_LIB])
+-        fi
+-      fi
+-    fi
+-  fi
+-
+-  # MesaGL
+-  if test "x$have_GL" = "xno" ; then
+-    # if no GL, check for MesaGL
+-    AC_CHECK_LIB([MesaGL], [glVertex3d],
+-                 [GL_LIBS="-lMesaGL"
+-                  have_GL=yes
+-                  GL_LIB_NAME=MesaGL])
+-  fi
+-
+-  if test "x$have_GL" = "xno" ; then
+-    # no GL found
+-    AC_MSG_ERROR([Cannot find GL library])
+-  fi
+-
+-  # GLU
+-
+-  have_GLU=no
+-  have_SGI_GLU=no
+-
+-  AC_CHECK_LIB([GLU], [gluSphere],
+-               [GL_LIBS="-lGLU $GL_LIBS"
+-                have_GLU=yes], ,
+-               [$GL_LIBS])
+-  if test "x$ac_cv_lib_GLU_gluSphere" = "xno" ; then
+-    # GLU may need to be linked with the thread library explicitly
+-    AC_CHECK_LIB([GLU], [gluCylinder],
+-                 [GL_LIBS="-lGLU $GL_LIBS $THREAD_LIB"
+-                  have_GLU=yes], ,
+-                 [$GL_LIBS $THREAD_LIB])
+-    if test "x$ac_cv_lib_GLU_gluCylinder" = "xno" ; then
+-      # GLU may need to be linked with std C++ library explicitly
+-      AC_CHECK_LIB([GLU], [gluDisk],
+-                   [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB"
+-                    have_GLU=yes
+-                    have_SGI_GLU=yes], ,
+-                   [$GL_LIBS $STDCXX_LIB])
+-      if test "x$ac_cv_lib_GLU_gluDisk" = "xno" ; then
+-        # GLU may need to be linked with std C++ and thread libraries explicitly
+-        AC_CHECK_LIB([GLU], [gluPartialDisk],
+-                     [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB $THREAD_LIB"
+-                      have_GLU=yes
+-                      have_SGI_GLU=yes], ,
+-                     [$GL_LIBS $STDCXX_LIB $THREAD_LIB])
+-      fi
+-    fi
+-  fi
+-
+-  if test "x$have_GLU" = "xno" ; then
+-    # if no GLU, check for MesaGLU
+-    AC_CHECK_LIB([MesaGLU], [gluSphere],
+-                 [GL_LIBS="-lMesaGLU $GL_LIBS"
+-                  have_GLU=yes], ,
+-                 [$GL_LIBS])
+-  fi
+-
+-  if test "x$have_GLU" = "xno" ; then
+-    # no GLU found
+-    AC_MSG_ERROR([Cannot find GLU library])
+-  fi
+-
+-  # Checks for SGI's GLU library
+-  if test "x$have_SGI_GLU" = "xno" ; then
+-    # Try static linking
+-    save_LDFLAGS="$LDFLAGS"
+-    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-
+-    AC_CHECK_LIB([GLU], [gluBeginCurve],
+-                 [have_SGI_GLU=no], ,
+-                 [$GL_LIBS])
+-    if test "x$ac_cv_lib_GLU_gluBeginCurve" = "xno" ; then
+-      AC_CHECK_LIB([GLU], [gluBeginPolygon],
+-                   [GL_LIBS="$GL_LIBS $STDCXX_LIB"
+-                    have_SGI_GLU=yes], ,
+-                   [$GL_LIBS $STDCXX_LIB])
+-    fi
+-
+-    LDFLAGS="$save_LDFLAGS"
+-  fi
+-
+-  AC_MSG_CHECKING([whether libGLU needs to be linked with the std C++ library])
+-  AC_MSG_RESULT([$have_SGI_GLU])
+-
+-  # Checks for some types in gdk/GL/glxext.h
+-
+-  # GLXFBConfigSGIX
+-  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
+-  AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
+-                 [#include <GL/glx.h>])
+-  if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
+-    GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
+-  fi
+-
+-  # GLXFBConfigIDSGIX
+-  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
+-  AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
+-                 [#include <GL/glx.h>])
+-  if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
+-    GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
+-  fi
+-
+-  # GLXPbufferSGIX
+-  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
+-  AC_CHECK_TYPES([GLXPbufferSGIX], , ,
+-                 [#include <GL/glx.h>])
+-  if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
+-    GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
+-  fi
+-
+-  # GLXVideoSourceSGIX
+-  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
+-  AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
+-                 [#include <GL/glx.h>])
+-  if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
+-    GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
+-  fi
+-
+-  # __GLXextFuncPtr
+-  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
+-  AC_CHECK_TYPES([__GLXextFuncPtr], , ,
+-                 [#include <GL/glx.h>])
+-  if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
+-    GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
+-  fi
+-
+-else
+-
+-  # for Win32
+-
+-  AC_MSG_CHECKING([for glNewList in -lopengl32])
+-  have_opengl32=no
+-  LIBS="-lopengl32 $LIBS"
+-  AC_TRY_LINK([#include <windows.h>
+-               #include <GL/gl.h>], 
+-              [glVertex3d(0.0, 0.0, 0.0);], 
+-              [GL_LIBS="-lopengl32"
+-               have_opengl32=yes])
+-  AC_MSG_RESULT([$have_opengl32])
+-  if test "x$have_opengl32" = "xno" ; then
+-    AC_MSG_ERROR([Cannot find GL library])
+-  fi
+-
+-  AC_MSG_CHECKING([for gluNewQuadric in -lglu32])
+-  have_glu32=no
+-  LIBS="-lglu32 $LIBS"
+-  AC_TRY_LINK([#include <windows.h>
+-               #include <GL/gl.h>
+-               #include <GL/glu.h>], 
+-              [gluNewQuadric();], 
+-              [GL_LIBS="-lglu32 $GL_LIBS"
+-               have_glu32=yes])
+-  AC_MSG_RESULT([$have_glu32])
+-  if test "x$have_glu32" = "xno" ; then
+-    AC_MSG_ERROR([Cannot find GLU library])
+-  fi
+-
+-dnl   AC_CHECK_LIB(opengl32, glNewList,
+-dnl                GL_LIBS="-lopengl32",
+-dnl                AC_MSG_ERROR(Cannot find GL library))
+-
+-dnl   AC_CHECK_LIB(glu32, gluNewQuadric,
+-dnl                GL_LIBS="-lglu32 $GL_LIBS",
+-dnl                AC_MSG_ERROR(Cannot find GLU library),
+-dnl                $GL_LIBS)
+-
++AX_CHECK_GL
++AS_IF([test X$no_gl = Xyes],
++      [AC_MSG_FAILURE([OpenGL is required.])])
++AX_CHECK_GLU
++# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
++AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
++
++# Checks for some types in gdk/GL/glxext.h
++
++# GLXFBConfigSGIX
++GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
++fi
++
++# GLXFBConfigIDSGIX
++GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
++fi
++
++# GLXPbufferSGIX
++GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXPbufferSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
++fi
++
++# GLXVideoSourceSGIX
++GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
++fi
++
++# __GLXextFuncPtr
++GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
++AC_CHECK_TYPES([__GLXextFuncPtr], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
++  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
+ fi
+ 
+-dnl # if using mesa, check for xmesa.h
+-dnl if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
+-dnl   AC_CHECK_HEADERS([GL/xmesa.h])
+-dnl   AM_CONDITIONAL(ENABLE_XMESA_FX, \
+-dnl                  test "x$ac_cv_header_GL_xmesa_h" = "xyes")
+-dnl else
+-dnl   # force a failed check
+-dnl   AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
+-dnl fi
+-
+ # Checks for typedefs in gdk/GL/glext.h
+ 
+ # GLhalfNV
+@@ -781,22 +566,13 @@
+   GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes
+ fi
+ 
+-GL_LIBS="$GL_LDFLAGS $GL_LIBS"
+-
+-AC_SUBST([GL_CFLAGS])
+-AC_SUBST([GL_LIBS])
+-
+-CPPFLAGS="$save_CPPFLAGS"
+-LIBS="$save_LIBS"
+-
+-
+ ##################################################
+ # CFLAGS and LIBS
+ ##################################################
+ 
+ GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+-GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
++GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+ GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB"
+ AC_SUBST([GDKGLEXT_PACKAGES])
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..3ecf3a25d4d5
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}]
+	|| (
+		>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
+		<x11-libs/pango-1.31[X,${MULTILIB_USEDEP}]
+	)
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2014.02.28
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	# Ancient configure.in with broken multilib gl detection (bug #543050)
+	# Backport some configure updates from upstream git master to fix
+	epatch "${FILESDIR}/${P}-gl-configure.patch"
+	mv configure.{in,ac} || die "mv failed"
+	eautoreconf
+
+	gnome2_src_prepare
+
+	# Remove development knobs, bug #308973
+	sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+		examples/Makefile.am examples/Makefile.in \
+		gdk/Makefile.am gdk/Makefile.in \
+		gdk/win32/Makefile.am gdk/win32/Makefile.in \
+		gdk/x11/Makefile.am gdk/x11/Makefile.in \
+		gtk/Makefile.am gtk/Makefile.in \
+		|| die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+	einstalldocs
+}
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
new file mode 100644
index 000000000000..518b12f06ebe
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2014.02.28
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	# Ancient configure.in with broken multilib gl detection (bug #543050)
+	# Backport some configure updates from upstream git master to fix
+	epatch "${FILESDIR}/${P}-gl-configure.patch"
+	mv configure.{in,ac} || die "mv failed"
+	eautoreconf
+
+	gnome2_src_prepare
+
+	# Remove development knobs, bug #308973
+	sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+		examples/Makefile.am examples/Makefile.in \
+		gdk/Makefile.am gdk/Makefile.in \
+		gdk/win32/Makefile.am gdk/win32/Makefile.in \
+		gdk/x11/Makefile.am gdk/x11/Makefile.in \
+		gtk/Makefile.am gtk/Makefile.in \
+		|| die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+	einstalldocs
+}
diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
new file mode 100644
index 000000000000..aa10f62c61db
--- /dev/null
+++ b/x11-libs/gtkglext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gtkglext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
new file mode 100644
index 000000000000..8fe1c262bc23
--- /dev/null
+++ b/x11-libs/gtkhotkey/Manifest
@@ -0,0 +1,6 @@
+AUX gtkhotkey-0.2.1-glibheaders.patch 726 SHA256 7be97ac1c768278facab2b316ecf92cde8e1e3d9a81187dc64c9270a24ebb8ef SHA512 32ed2b19a0f61edb877c70353abfd3817c3ca59010efbce6ea7d4332455e0468d527fdb5c8e749d8e6240723063dcff27b5c2589290e40fa08b0f00e0db189d5 WHIRLPOOL 2b34dd0a9541ae5675dde92956ed538c33a30eb7cc33c3a4ef1560a79307994b77e3198345ad7fa6a41469ac8b103ef5d0e6332ab21cd7f47c9e339860722bbe
+DIST gtkhotkey-0.2.1.tar.gz 382043 SHA256 fe1cf0d93026d791e856170356f56fbdff9095fe637c4a74104144c1e5111d67 SHA512 7f7e1b9bd94ff806d98277f2dafbf5b6569efdc6f0367a83e885d38584a8f6e098f31d0f03b080f2ca76394eb73e43f9da07e0d944a2e6443a55d9f2e8fee324 WHIRLPOOL 4fb7e1a131ae64c4fa0901c6444fdeb9af97cd0b85f48e282e5cc08877222f32eca9b1f279b072c2d49a8414839384560abed1d8bbc5cad94e64c09d875cb8bc
+EBUILD gtkhotkey-0.2.1-r1.ebuild 991 SHA256 f93dd4248d86414de8d7b1980c72ea45e780ef197f2919024aee928c3f1fdbc2 SHA512 ebd0360dc36b47b9079fffb9404dc0114c0e1eb0521aebddb049eea1a573f84b0be843eb63d39208674e0fd6cc985314ffe25f22fde1136c3dc11262abff96fc WHIRLPOOL 3bf28b9bfe3a9cd00d68e4d0fd81dbcc8de43d5cb4ccdc3cf739b77fcbbe2a924dbced4f54fbae88318bac6d672ea69aa3f9674931850bd9a9434dcf94b12286
+MISC ChangeLog 2979 SHA256 353dbeb6eb1e1a7024115b32016fe1364b118e9cb31572aa5d7ebde4ecf845be SHA512 b76e9b2326f625aeb8e498dfd39b49dfe3e770db66cfee2b23ef3b5b31921da175c949fd60b0e48951faa1837a1653980ef3413fa024a381681167b33a234263 WHIRLPOOL c16ea57d61f72cefe4e022e77b039efe03803a2cbc8b480647658aff0f53e8c495fd012d8896cce12dfe1dfbef7f16b87a9340d2750e02b48b3c5db04eec9832
+MISC ChangeLog-2015 2798 SHA256 6b55114a9e310cf30a44d672d719394be5670749e0d7a79e686c27211ecadbec SHA512 2208e2ad179ef2372e60deaee13f716a7cd91d697c51a8e666e0812cf720bfcdc4911e84318eaa0153cc53b94ba6aa2f093b7bb5f080a07c70f6c33c1cafe947 WHIRLPOOL cd807270da092ec41c2c4013b8e27182537c3fbaa8ceb39c7e7caf305c29f2c8ca00a9a93d2ff1ea9a8745d2365d2d5d2e0cbe0e4b10c4674c1aab598c081ac4
+MISC metadata.xml 244 SHA256 27d3cf765275db4362085480caa8b7e197e9a26194ed1d966b970c25456c1299 SHA512 6fe538123e95fd8536bc8965f2f8316828a399536618130db5b27f08add330a0bdef412e1f5ac8360df5c7bd8df56789e716d6d1d8cfd7b31f8c5e126f64f391 WHIRLPOOL c323167249a8d0d4029abe684a1fe1789590c35547e65a0c9d05bde956b70dcca104b19789e6b2a7991e969bc4f8f83b1075128c0a523b90095ac2cb68cc0915
diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
new file mode 100644
index 000000000000..389db601c43f
--- /dev/null
+++ b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
@@ -0,0 +1,22 @@
+diff -Nurp gtkhotkey-0.2.1/src/gtk-hotkey-error.h gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h
+--- gtkhotkey-0.2.1/src/gtk-hotkey-error.h	2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h	2012-02-19 12:04:19.483701649 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+ 
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- gtkhotkey-0.2.1/src/x11/tomboykeybinder.h	2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1-r1/src/x11/tomboykeybinder.h	2012-02-19 21:40:09.004325272 +0100
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..c4e3b9053cff
--- /dev/null
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_CRV=$(get_version_component_range 1-2)
+
+RESTRICT="test"
+# Tests try to access live filesystem
+# See https://bugs.gentoo.org/show_bug.cgi?id=259052#c3
+
+DESCRIPTION="Cross platform library for using desktop wide hotkeys"
+HOMEPAGE="https://launchpad.net/gtkhotkey"
+SRC_URI="https://launchpad.net/${PN}/${MY_CRV}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12:2"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-glibheaders.patch" )
+
+src_prepare() {
+	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/gtkhotkey/metadata.xml b/x11-libs/gtkhotkey/metadata.xml
new file mode 100644
index 000000000000..67a70ede9b49
--- /dev/null
+++ b/x11-libs/gtkhotkey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="launchpad">gtkhotkey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
new file mode 100644
index 000000000000..754b94905c62
--- /dev/null
+++ b/x11-libs/gtkmathview/Manifest
@@ -0,0 +1,14 @@
+AUX binreloc.m4 2563 SHA256 cc9c0d1dd10f7664aaa37c7d77e426fa976eb8cd96a739760545c75db7c1096b SHA512 f19802e6c97001cc90b74700bf9be4aabf9d127cc28f05a5d3807fa952d31ec53526b07ec95a7c3d1c28e48e2cc5624ce38502cfe90c805b90ec5091b82febab WHIRLPOOL 17d1ec7552dbdf5a67bfcfcfc526f343ef17aa85354639b38cc1bf52bc6009262f140e8b19de82c5c1d27ebd89c6e7a7e86ce5c60e2a8b921fd4771abeaffb4e
+AUX gtkmathview-0.8.0-cond-t1.patch 1270 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709 SHA512 bd5aa2385d9452d05293ec59670f1640c35875c1fcba5197b793093f3322900d7ca6fd005d2cc6622215d83746d738722a59f2ee656312284eaf6c2ca0498d13 WHIRLPOOL 79f36abafbe08ca9ab8cbf377f127d3151c84aea4dd5ae00566e2a02b0ca9b4b05c9ed3e11ad63f6dfc2553f78440a195cd2d9f6df964c73182c189adb184632
+AUX gtkmathview-0.8.0-fix-template.patch 2209 SHA256 b5c43c185ec0920882eb8f27e46082baf32c0e9583c62bfc28d1c6a2ca4e0a7b SHA512 d65275e14542e5cf45b19731c2ecac9cfa88454abb5f0a35c6ed94e2ae75d082c826eabc530e4d4430af87f86573f7fa1271930713fe22c8cbdb0fe45e4c80d3 WHIRLPOOL 2d1f28b248ace3a407213f711e9c224a36d6f7fb7c77116d1e8b02c9993231a25b716adc0e480df7570bcc9b17aa000aa061f232b22f8fb382847e8bcdc30460
+AUX gtkmathview-0.8.0-gcc43.patch 1437 SHA256 49bac4edcbad1b06614e889f28fc89f4b6d4a013e0e14f0a6bffc9e92a68e047 SHA512 3d1e57a17bdf539e10a72463b293e4a7870df63b47da6d69bb2519277d815582df652db29e3e22d8d4e50f489e9f7a485d04b90118e00be47c1699e46492d67d WHIRLPOOL 203f49e5953cd466ed1f798598d370738445d9078bb2e7a0ae7e8c40eb93795d1c2217534f2efcefb7dbc257559e2954d54bb8d9fa2d4fec1f81915386e434bb
+AUX gtkmathview-0.8.0-gcc44.patch 263 SHA256 0b1b5fdd85b019ca6db975c786c42902939e2e945130f230441cf34208ef947e SHA512 fed98000cd4ac710f8b683fbf2c5a0ecfa4064d56af314e0367e6ae84a7c6fdcc56cefb2a2998854f765783b5c3ce6d930e6969087dd88acef47d4cfb26ef3b6 WHIRLPOOL 243900486b005e357735faac2adfbfe61e856e10b6025881ef8b08aca46d76823630da4654efff234b4d65e14d15b742e9305f7295793bc58b4de01f5815d3be
+AUX gtkmathview-0.8.0-gcc47.patch 3123 SHA256 520ca656ce5ebd32efe7183cbb09b270c2cb80099632628afc397070089d5d92 SHA512 e5c7a1d32bd578ad56d5008bd46f99f49a1d292f46b1f525da8f6c4d20b3fde796d93c7520f5161f43dabba7e7275aa1daf990b08d1aad0ac3445af6b9989f5a WHIRLPOOL 3c1e89b29de2cecee1e151f0df7f14e7988a123cb58372ab0c0653a04bf0b305330c434e726964d0574062e28d7f7f3bf1da34d65dbec966eeb5233ddbc662a2
+AUX gtkmathview-0.8.0-gcc6.patch 2043 SHA256 74d32fe6a816e78c2e53920342ef51379bedb79515f44b39f54eb59a1702605b SHA512 c2a9d5b1bf14130ddea729a7cbe158f2029ba18ff5c3fd89882e1948e5eb1b903f4f4a7d3c02fb33f9fa9e3dff9db80516a6c3c895daa5f4b5612dfa2e5f4629 WHIRLPOOL 2a9429fa6f472f601c2cbbeb627ca9016ba4a68bfd409d32b92169652b642d78fa017f9a53d4b4aa6f3bb2ef61f3513510649b631711b61ed49c2090d7aae5d8
+AUX gtkmathview-0.8.0-underlinking.patch 1926 SHA256 d0a466e074f0344529410f988a2097b0103cf86eca760c8f1a6da6a0a2cbd682 SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d WHIRLPOOL 10543128125189822f9b066c555d8126071332d464161210c0f94593307913d896a32cf6f75abac510edaf0409a73ff67ee5d843581fdc07dc8a5e40c79fc402
+DIST gtkmathview-0.8.0.tar.gz 987328 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb WHIRLPOOL ade6b30a20e8f0e38b2a9935733425759eb69db3d28ad9ebc28f5441fc82571a52787381d4d3f48852f9bcf1550318048a316bd92c9151fdf3074bf3f4edd591
+EBUILD gtkmathview-0.8.0-r2.ebuild 1986 SHA256 3c2a12775484d4bfe7e1b43cd079528ce9a628a5e3af76571fa5e54fc9ba5501 SHA512 e4115e71579be885119f9e9ce20e5748d5dbdcd105b64c8a8a03d09f964a673b74e220de80f966a7437f79497537789bf9c9147bcd7b16a0b15a7fbf99857293 WHIRLPOOL 3d52aa436938cd030d0cb11244bdfc143cd44ecd1dfe330914dcd1a3924f24cb4bd97579c42024510df16dc45e0c906743ef7c4175a0c378ef2a18c3274a8738
+EBUILD gtkmathview-0.8.0-r3.ebuild 1995 SHA256 4275e9eb7be4132be237ae0b3d72967487667acfb77b7c3cddcfd42c427d066d SHA512 17d8cfac37861a617436e22c250b6a14ea571a12fa05e5ab68c7f055cae36fd3a70941ff39330ff57fedfc5767b30304966fb7a560c6825409c70cc2da98d323 WHIRLPOOL f470c56346cfd8cc7916719a170ac833ffca21b81c25fd37064262dbfb35628efa80d24cff41211f30033d7e72113d964a41b91426cf94d65feb0371fc11c0f4
+MISC ChangeLog 3112 SHA256 cc24ebf9f7734f7c75a28e112d1ca81bb9de798e1bde2fdcfcf0e363443396f5 SHA512 01f670edf42c940441599280b655db961dfe54d3823bb916bcb48fe91e72c5c9a6dec18e419f8c4f52410cd3f6144abf899cb6dc4eb7f4974c0430f195d7c626 WHIRLPOOL be37c0e7bca0af9d8dab8045d14cbfab6abe21dc3c89347a7d7a3dbd49a11ee5e3232b95d7cb5b6383cfeebe91650d945552c8a5bc8eb61531b7ebbf9b8154da
+MISC ChangeLog-2015 8477 SHA256 af24b199e754b29bdf78cf6cd63dce6436430bc0da059a5332e9b282aa0ab114 SHA512 3afa717f85b6deefe57e129ffc5f422f4c503edbaf70a5b8effedede253952e82660b4cd4de77d347a2103e17100f3a96dc32028f905650373bdc149fc64b14c WHIRLPOOL 07360ec4ab95e9e31682b8b91bb39059e4b3c3a7484addcbd3664f5c703a25afc5d3b63c019d3f694560ae4f99a2fbf4f129611d4114529a50cbf3e3c22af844
+MISC metadata.xml 413 SHA256 cb1148098db7af900af1e2e78bc310f0e444263d9441bd7be4b860a461f41246 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352 WHIRLPOOL 3e082567600f946e6cd9311fbd618ff8315a02cf25c8dcce4c1458d194f527405e54cc08cf9b57c9a867ffe6d34e68f14211929cad697f9a06211200dd669d57
diff --git a/x11-libs/gtkmathview/files/binreloc.m4 b/x11-libs/gtkmathview/files/binreloc.m4
new file mode 100644
index 000000000000..46696bf64567
--- /dev/null
+++ b/x11-libs/gtkmathview/files/binreloc.m4
@@ -0,0 +1,77 @@
+# Check for binary relocation support
+# Hongli Lai
+# http://autopackage.org/
+
+AC_DEFUN([AM_BINRELOC],
+[
+	AC_ARG_ENABLE(binreloc,
+		[  --enable-binreloc       compile with binary relocation support
+                          (default=disable)],
+		enable_binreloc=$enableval,enable_binreloc=no)
+
+	AC_ARG_ENABLE(binreloc-threads,
+		[  --enable-binreloc-threads      compile binary relocation with threads support
+	                         (default=yes)],
+		enable_binreloc_threads=$enableval,enable_binreloc_threads=yes)
+
+	BINRELOC_CFLAGS=
+	BINRELOC_LIBS=
+	if test "x$enable_binreloc" = "xauto"; then
+		AC_CHECK_FILE([/proc/self/maps])
+		AC_CACHE_CHECK([whether everything is installed to the same prefix],
+			       [br_cv_valid_prefixes], [
+				if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
+					"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+					"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
+				then
+					br_cv_valid_prefixes=yes
+				else
+					br_cv_valid_prefixes=no
+				fi
+				])
+	fi
+	AC_CACHE_CHECK([whether binary relocation support should be enabled],
+		       [br_cv_binreloc],
+		       [if test "x$enable_binreloc" = "xyes"; then
+		       	       br_cv_binreloc=yes
+		       elif test "x$enable_binreloc" = "xauto"; then
+			       if test "x$br_cv_valid_prefixes" = "xyes" -a \
+			       	       "x$ac_cv_file__proc_self_maps" = "xyes"; then
+				       br_cv_binreloc=yes
+			       else
+				       br_cv_binreloc=no
+			       fi
+		       else
+			       br_cv_binreloc=no
+		       fi])
+
+	if test "x$br_cv_binreloc" = "xyes"; then
+		BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+		AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
+		if test "x$enable_binreloc_threads" = "xyes"; then
+			AC_CHECK_LIB([pthread], [pthread_getspecific])
+		fi
+
+		AC_CACHE_CHECK([whether binary relocation should use threads],
+			       [br_cv_binreloc_threads],
+			       [if test "x$enable_binreloc_threads" = "xyes"; then
+					if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
+						br_cv_binreloc_threads=yes
+					else
+						br_cv_binreloc_threads=no
+					fi
+			        else
+					br_cv_binreloc_threads=no
+				fi])
+
+		if test "x$br_cv_binreloc_threads" = "xyes"; then
+			BINRELOC_LIBS="-lpthread"
+			AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
+		else
+			BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0"
+			AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
+		fi
+	fi
+	AC_SUBST(BINRELOC_CFLAGS)
+	AC_SUBST(BINRELOC_LIBS)
+])
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch
new file mode 100644
index 000000000000..9f134745da72
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc	2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc	2008-06-26 14:46:31.000000000 -0400
+@@ -24,7 +24,6 @@
+ #include "PS_StreamRenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+ 
+ PS_StreamRenderingContext::PS_StreamRenderingContext(const SmartPtr<AbstractLogger>& logger,
+ 						     std::ostream& os,
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh	2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh	2008-06-26 14:46:31.000000000 -0400
+@@ -25,7 +25,6 @@
+ #include "PS_RenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+ 
+ class GMV_BackEnd_EXPORT PS_StreamRenderingContext : public PS_RenderingContext
+ {
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
new file mode 100644
index 000000000000..3f566f7bf5f7
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
@@ -0,0 +1,49 @@
+diff -urN gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h gtkmathview-0.8.0/src/widget/gtkmathview_common.h
+--- gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h	2011-03-01 12:17:35.000000000 +0300
++++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h	2011-03-01 12:25:00.000000000 +0300
+@@ -22,6 +22,20 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
++#if GTKMATHVIEW_USES_CUSTOM_READER
++#include "c_customXmlReader.h"
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
++#elif GTKMATHVIEW_USES_LIBXML2_READER
++#include <libxml/xmlreader.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
++#elif GTKMATHVIEW_USES_LIBXML2
++#include <libxml/tree.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
++#elif GTKMATHVIEW_USES_GMETADOM
++#include <gdome.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -45,24 +59,16 @@
+   typedef void*                     GtkMathViewReaderData;
+ 
+ #if GTKMATHVIEW_USES_CUSTOM_READER
+-#include "c_customXmlReader.h"
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
+   typedef void*                     GtkMathViewModelId;
+   typedef const char*               GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2_READER
+-#include <libxml/xmlreader.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
+   typedef void*                     GtkMathViewModelId;
+   typedef const xmlChar*            GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2
+-#include <libxml/tree.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
+   typedef xmlElement*               GtkMathViewModelId;
+   typedef xmlDoc*                   GtkMathViewModelDocument;
+   typedef const xmlChar*            GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_GMETADOM
+-#include <gdome.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
+   typedef GdomeElement*             GtkMathViewModelId;
+   typedef GdomeDocument*            GtkMathViewModelDocument;
+   typedef GdomeDOMString*           GtkMathViewModelString;
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
new file mode 100644
index 000000000000..63b49180e4ac
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
@@ -0,0 +1,61 @@
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index b1a10b7..6d1f58e 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
++#include <cstring>
+ #include <fstream>
+ 
+ #include <popt.h>
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index d513e43..1f1f9d1 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -22,6 +22,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index ee031a8..fcc9f5c 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
++#include <cstring>
+ #include <fstream>
+ 
+ #include <popt.h>
+diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc
+index c4299ba..538f18d 100644
+--- a/src/backend/ps/T1_FontDataBase.cc
++++ b/src/backend/ps/T1_FontDataBase.cc
+@@ -23,7 +23,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc
+index 7792ca5..92e4716 100644
+--- a/src/engine/mathml/mathVariantAux.cc
++++ b/src/engine/mathml/mathVariantAux.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #include "mathVariantAux.hh"
+ 
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch
new file mode 100644
index 000000000000..f15a6ff73fa8
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch
@@ -0,0 +1,10 @@
+--- a/src/common/AbstractLogger.cc.orig	2009-04-25 20:39:35.815053524 +0100
++++ b/src/common/AbstractLogger.cc	2009-04-25 20:40:01.240595176 +0100
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <stdarg.h>
++#include <stdio.h>
+ 
+ #include "AbstractLogger.hh"
+ 
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000000..48180ea12fe8
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,101 @@
+From bf7e95285e8df1bc3b86085791de7cf94c2f544f Mon Sep 17 00:00:00 2001
+From: Luca <luca@ant.local>
+Date: Tue, 10 Apr 2012 16:39:57 +0200
+Subject: [PATCH] + patches from Vincent Untz
+
+Conflicts:
+
+	CONTRIBUTORS
+---
+ mathmlps/main.cc                               |    7 +++++++
+ mathmlsvg/SMS.cc                               |    1 +
+ mathmlsvg/main.cc                              |    7 +++++++
+ src/frontend/common/TemplateBuilder.hh         |    7 ++++---
+ src/frontend/common/TemplateElementIterator.hh |    2 +-
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index 48339af..6de113c 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index be7add8..f4b0ddc 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -704,6 +704,7 @@ SMS::fun_depart(const HandlerArgs& args) const
+   if (asLocation(args[0], loc1) && asLocation(args[1], loc2))
+   // delete "return 0" and insert here the code
+     return 0;
++  return 0;
+ }
+ 
+ SmartPtr<Value>
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index c49e8ac..42e7895 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff --git a/src/frontend/common/TemplateBuilder.hh b/src/frontend/common/TemplateBuilder.hh
+index f5c8341..2b9a1ac 100644
+--- a/src/frontend/common/TemplateBuilder.hh
++++ b/src/frontend/common/TemplateBuilder.hh
+@@ -47,12 +47,13 @@ protected:
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    SmartPtr<typename ElementBuilder::type> elem;
++    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
+diff --git a/src/frontend/common/TemplateElementIterator.hh b/src/frontend/common/TemplateElementIterator.hh
+index 5366040..25b5fef 100644
+--- a/src/frontend/common/TemplateElementIterator.hh
++++ b/src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@ protected:
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
+-- 
+1.7.8.6
+
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch
new file mode 100644
index 000000000000..7361f8e90c7c
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch
@@ -0,0 +1,99 @@
+From: Gert Wollny <gw.fossdev@gmail.com>
+Date: Sun, 26 Jun 2016 13:25:00 +0200
+Description: gcc 6.0 build fixes
+Bug: https://bugs.debian.org/811682
+
+--- a/src/engine/common/View.cc
++++ b/src/engine/common/View.cc
+@@ -291,7 +291,7 @@
+ 	  }
+     }
+ 
+-  return false;
++  return SmartPtr<Element>();
+ }
+ 
+ bool
+--- a/src/backend/common/tfm/TFM.hh
++++ b/src/backend/common/tfm/TFM.hh
+@@ -37,7 +37,7 @@
+     unsigned char face;
+     const char* codingScheme;
+     int designSize;
+-    int checksum;
++    unsigned int checksum;
+     unsigned int nDimensions;
+     unsigned int nCharacters;
+   };
+@@ -52,7 +52,7 @@
+   struct Kerning
+   {
+     UChar8 index;
+-    int value;
++    unsigned int value;
+   };
+ 
+   struct Ligature
+@@ -67,7 +67,7 @@
+     UChar8 index;
+     int width;
+     int height;
+-    int depth;
++    unsigned int depth;
+     int italicCorrection;
+     unsigned char nKernings;
+     const Kerning* kerning;
+--- a/src/backend/common/ComputerModernShaper.cc
++++ b/src/backend/common/ComputerModernShaper.cc
+@@ -578,7 +578,7 @@
+   };
+ #endif
+ 
+-static ComputerModernShaper::PlainChar cmsMap[] =
++static ComputerModernShaper::PlainChar32 cmsMap[] =
+   {
+     { 0x007B, 0x66 },  // LEFT CURLY BRACKET
+     { 0x007D, 0x67 },  // RIGHT CURLY BRACKET
+--- a/src/backend/common/StandardSymbolsShaper.hh
++++ b/src/backend/common/StandardSymbolsShaper.hh
+@@ -32,20 +32,20 @@
+   struct HStretchyChar
+   {
+     Char16 ch;
+-    Char8 normal;
+-    Char8 left;
+-    Char8 glue;
+-    Char8 right;
++    UChar8 normal;
++    UChar8 left;
++    UChar8 glue;
++    UChar8 right;
+   };
+   
+   struct VStretchyChar
+   {
+     Char16 ch;
+-    Char8 normal;
+-    Char8 top;
+-    Char8 glue;
+-    Char8 middle;
+-    Char8 bottom;
++    UChar8 normal;
++    UChar8 top;
++    UChar8 glue;
++    UChar8 middle;
++    UChar8 bottom;
+   };
+ 
+ protected:
+--- a/src/backend/common/StandardSymbolsShaper.cc
++++ b/src/backend/common/StandardSymbolsShaper.cc
+@@ -29,7 +29,7 @@
+ #include "ShapingContext.hh"
+ 
+ struct GlyphMap {
+-  Char8 index;
++  UChar8 index;
+   Char16 ch;
+ };
+ 
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
new file mode 100644
index 000000000000..35cb9bec6a9d
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
@@ -0,0 +1,61 @@
+From 319c39458e72be82ed1ce60f0a386a146964f507 Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre@debian.org>
+Date: Sun, 13 Mar 2011 19:00:15 +0100
+Subject: [PATCH] Fix underlinking (required to build with gold link editor)
+
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554753
+---
+ mathmlps/Makefile.am  |    1 +
+ mathmlsvg/Makefile.am |    2 ++
+ viewer/Makefile.am    |    3 +++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/mathmlps/Makefile.am b/mathmlps/Makefile.am
+index 201f410..717cd20 100644
+--- a/mathmlps/Makefile.am
++++ b/mathmlps/Makefile.am
+@@ -17,6 +17,7 @@ mathmlps_LDADD = \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
+   $(NULL)
+ 
+ INCLUDES = \
+diff --git a/mathmlsvg/Makefile.am b/mathmlsvg/Makefile.am
+index 2290230..8007350 100644
+--- a/mathmlsvg/Makefile.am
++++ b/mathmlsvg/Makefile.am
+@@ -30,6 +30,8 @@ mathmlsvg_LDADD = \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
++  -lxml2 \
+   $(NULL)
+ 
+ INCLUDES = \
+diff --git a/viewer/Makefile.am b/viewer/Makefile.am
+index 7b950a0..67220b4 100644
+--- a/viewer/Makefile.am
++++ b/viewer/Makefile.am
+@@ -31,6 +31,7 @@ mathmlviewer_static_LDADD = \
+   $(DOM_LIBS) \
+   $(GTK_LIBS) \
+   $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(T1_LIBS) \
+   $(T1_LIBS_X) \
+   $(NULL)
+@@ -88,6 +89,8 @@ test_rendering_LDADD = \
+   $(T1_LIBS_X) \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++  $(top_builddir)/src/libmathview.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+   $(NULL)
+ 
+-- 
+1.7.8
+
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..4b57785e9a43
--- /dev/null
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Rendering engine for MathML documents"
+HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
+SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="gtk mathml svg t1lib"
+
+RDEPEND=">=dev-libs/glib-2.2.1:2
+	>=dev-libs/popt-1.7
+	>=dev-libs/libxml2-2.6.7:2
+	gtk? ( >=x11-libs/gtk+-2.2.1:2
+		>=media-libs/t1lib-5:5
+		x11-libs/pango
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) )
+	mathml? ( media-fonts/texcm-ttf )
+	t1lib?	( >=media-libs/t1lib-5:5 )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+DOCS="ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-cond-t1.patch
+
+	# Fix building against libxml2[icu], bug #356095
+	epatch "${FILESDIR}"/${P}-fix-template.patch
+
+	# Fix building with gold, bug #369117; requires eautoreconf
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
+	epatch "${FILESDIR}/${P}-gcc47.patch"
+
+	# m4 macros from upstream git, required for eautoreconf
+	if [[ ! -d ac-helpers ]]; then
+		mkdir ac-helpers || die "mkdir failed"
+		cp "${FILESDIR}/binreloc.m4" ac-helpers || die "cp failed"
+	fi
+
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	AT_M4DIR=ac-helpers eautoreconf
+}
+
+src_configure() {
+	# --disable-popt will build only the library and not the frontend
+	# TFM is needed for SVG, default value is 2
+	econf $(use_enable gtk) \
+		$(use_enable svg) \
+		$(use_with t1lib) \
+		--with-popt \
+		--enable-libxml2 \
+		--enable-libxml2-reader \
+		--enable-ps \
+		--enable-tfm=2 \
+		--enable-builder-cache \
+		--enable-breaks \
+		--enable-boxml \
+		--disable-gmetadom \
+		--disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..13d87d522276
--- /dev/null
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Rendering engine for MathML documents"
+HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
+SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="gtk mathml svg t1lib"
+
+RDEPEND="
+	>=dev-libs/glib-2.2.1:2
+	>=dev-libs/popt-1.7
+	>=dev-libs/libxml2-2.6.7:2
+	gtk? (
+		>=media-libs/t1lib-5:5
+		>=x11-libs/gtk+-2.2.1:2
+		x11-libs/pango
+		x11-libs/pangox-compat
+	)
+	mathml? ( media-fonts/texcm-ttf )
+	t1lib?	( >=media-libs/t1lib-5:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+DOCS=( ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-cond-t1.patch
+	# Fix building against libxml2[icu], bug #356095
+	"${FILESDIR}"/${P}-fix-template.patch
+	# Fix building with gold, bug #369117; requires eautoreconf
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+
+	# m4 macros from upstream git, required for eautoreconf
+	if [[ ! -d ac-helpers ]]; then
+		mkdir ac-helpers || die "mkdir failed"
+		cp "${FILESDIR}"/binreloc.m4 ac-helpers || die "cp failed"
+	fi
+
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	AT_M4DIR=ac-helpers eautoreconf
+}
+
+src_configure() {
+	# --disable-popt will build only the library and not the frontend
+	# TFM is needed for SVG, default value is 2
+	econf $(use_enable gtk) \
+		$(use_enable svg) \
+		$(use_with t1lib) \
+		--with-popt \
+		--enable-libxml2 \
+		--enable-libxml2-reader \
+		--enable-ps \
+		--enable-tfm=2 \
+		--enable-builder-cache \
+		--enable-breaks \
+		--enable-boxml \
+		--disable-gmetadom \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
new file mode 100644
index 000000000000..ff2703fcd58b
--- /dev/null
+++ b/x11-libs/gtkmathview/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="mathml">Install additional fonts for proper mathml
+	support.</flag>
+	<flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
new file mode 100644
index 000000000000..49112dc1174c
--- /dev/null
+++ b/x11-libs/gtksourceview/Manifest
@@ -0,0 +1,13 @@
+AUX 2.0/gentoo.lang 3910 SHA256 fcb5133892038174826d9ee1a720ec7204f3842c7bd3e9aabf0532b408e663d1 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2 WHIRLPOOL 01b2482cde3f45bd61db77b9e2d546b01deee5d318b26032722ca4765bbdbb30f5871d7b6a609791912b9bbce80a902187d3d5846f58f41c450ac5925fb87d1c
+AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 SHA256 3462673c6856a8435dbe970d4fef3716f8743ad56ad0150ee08fa694c0380040 SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 WHIRLPOOL 96c692461f379ca938c72ac5854ea0dffa14882b532702504b0970dbdd3dda18c794f2ba170bdd1601b8036a2f7e88e261b239933a90e3bb8f5a7169d26109dc
+DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
+DIST gtksourceview-3.22.2.tar.xz 1596384 SHA256 6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e SHA512 1d51a975471172835cd9af64828ba93eb1b45e26fae91b1778c5963a8578404bbbdf1fe7f2c92953dff436bf2dac2d9e01a5188216d2a60a705e4635f0c91b81 WHIRLPOOL 76f333a55d868f6e56bdf8ead44b541c78083a5a64d5b19ae2423a9b22cb8cf17e2fe063dd1a569baab192597c34dde42c6f104c27c13d40b364a81f71e8a183
+DIST gtksourceview-3.24.3.tar.xz 1625584 SHA256 3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd SHA512 354a06502d55d7b237d5cbec5a35102225ae3d7e80e53d1ba42e506fc9c75470c4548b4ab8e9e6b2813d732617a2f13b978194240556b8d810066c94ec13de44 WHIRLPOOL 100e811aa7cc3194f4c63c84af2d4a45e413320c1b5fe3e09a5b506fd3cc910dcb9e1a71f8f4c647918d6c95c10d27b2bfe633b9dfac35d791caf55c50182858
+DIST gtksourceview-3.24.4.tar.xz 1619860 SHA256 207fb1958087d89393521eafac05f6dd67448ef6edb43ec2c708a79f3b1aa793 SHA512 fef2008dccae6bca859f99b7171851b84f30e7b4cdb00500972039bf111ab5901498820c91926374a7b446491330c55f7179e8522b90279d0169371981bc90fd WHIRLPOOL a0d1d6e9bf0e73545b489010abd823c236a24416c5374ff2ee1344536b2cc2a655b0a544cde96fe21f4734e9e398b9d806aac233d7e7f3f1696f2b317d8cd9ca
+EBUILD gtksourceview-2.10.5-r3.ebuild 1353 SHA256 0063ba94c10a7d8cf696604acb2393090005915f97b72e3469c27a08b5c1abe4 SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6 WHIRLPOOL 7aa72562001e0381830b7b7cbce960c99d2006f7ebc587f776a6e0acfff95e8e5e5ebb02daacc391dce82d23a045a887b31009bbd77918b8e6b57e02958b393e
+EBUILD gtksourceview-3.22.2.ebuild 1323 SHA256 242eee0dee11bf0b9b1e87381bd69bd2a30457c43237f18f6e94a7dbd8c4131b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45 WHIRLPOOL 77ae8c3d4ada10d9b83f36cff60a9e772af1c2f6322c33adf702c5b66c9dbd2aa0e75cb9aa5a3b97cf40eddf0cd0c3c879c22c687fec721145ec4ba8bc32a47a
+EBUILD gtksourceview-3.24.3.ebuild 1331 SHA256 d0a04c73f8bb74235740273bac70ac8319feddf9adc9a891ea8b6cb3db3a99cb SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26 WHIRLPOOL d0073f8460242f7ed2010481d38d371778f92059960706124fa7218127943da2a1a61bc68710129a0bf14df7107105bac79b90a8d7224af277177cf193491ed0
+EBUILD gtksourceview-3.24.4.ebuild 1331 SHA256 d0a04c73f8bb74235740273bac70ac8319feddf9adc9a891ea8b6cb3db3a99cb SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26 WHIRLPOOL d0073f8460242f7ed2010481d38d371778f92059960706124fa7218127943da2a1a61bc68710129a0bf14df7107105bac79b90a8d7224af277177cf193491ed0
+MISC ChangeLog 8731 SHA256 47d267466ebb455102fc48abb4a337a9f5fcceb1f674336ae7fb5c216e131e71 SHA512 cae5f73ff322786025cfc634874278c79be1aaa340f7df6cb882a068470a1a1c6b94f8bee9d0a943bd872ffa80e42432eed166e4ebabba17384dc6b1559df1b4 WHIRLPOOL 87728981353e79bca0bd80fc8416e8f6b6f5526e5297740e4412be662c1ade9dafc3ebff423b1654589f000b8cd26d479532e6d830332cbba46b14e16abf3a1e
+MISC ChangeLog-2015 40584 SHA256 6f34b75c3165f108831e228013dd2670825eebae8c92babd15bb93356537d3f6 SHA512 31fb5e2d28e92c92952aab95182efb0421cfc3c559d0cd07e1fa8e7569b10eb231efeab21ed7ff2110ee1c25c91380eae7ccfc5685aadab5cb90974b62d9b9f1 WHIRLPOOL 83f65d28baa75b3e33b38841a4b213389744e734127bfba4724065187996d7f855ca72862d73e77839656c462212483e200f644a0a0e7e3beea469f801833c50
+MISC metadata.xml 318 SHA256 e497ade2cab3c21d2ad658db031dc00055affdb90046406694bbac4fd3b445e0 SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5 WHIRLPOOL be9e4fd24b0c1c6ec197e4214f9930cda4da1d1c7551437aabe711ea3b89a0b888859c7f7fe74fa6b5b73716e790e5a3f772f61a719a278c468fedfaf9e03001
diff --git a/x11-libs/gtksourceview/files/2.0/gentoo.lang b/x11-libs/gtksourceview/files/2.0/gentoo.lang
new file mode 100644
index 000000000000..f1e0660c74fc
--- /dev/null
+++ b/x11-libs/gtksourceview/files/2.0/gentoo.lang
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	GtkSourceView syntax highlight for Gentoo-specific files
+
+	Originally written for gtksourceview-1.x by:
+		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+	Rewritten for gtksourceview-2 by:
+		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+	
+	Distributed under the same license(s) as gtksourceview.
+
+	TODO:
+	- do not highlight "enable" in the configure options
+	- perhaps highlight portage variables and portage functions different
+
+-->
+
+<language name="gentoo" id="gentoo" version="2.0" _section="Scripts">
+	<metadata>
+		<property name="globs">*.ebuild;*.eclass</property>
+		<property name="line-comment-start">#</property>
+	</metadata>
+
+	<styles>
+		<style id="variable" _name="Portage variables" map-to="def:builtin" />
+		<style id="command" _name="Portage command" map-to="def:type" />
+		<style id="function" _name="Portage function" map-to="def:function" />
+		<style id="string" _name="String" map-to="def:string" />
+	</styles>
+
+	<definitions>
+
+		<!-- rewrite shell string to show highlighted variables -->
+		<context id="string" style-ref="def:string">
+			<start>"</start>
+			<end>"</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<context id="string-2" style-ref="def:string">
+			<start>'</start>
+			<end>'</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<!-- subprograms:
+			- $(..) is not supported currently in the normal sh.lang
+			- `...` is interpreted as string - I think the subshell behavior is more acurate -->
+		<context id="subprogram">
+      		<start>\$\(</start>
+      		<end>\)</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<context id="subprogram-2">
+			<start>`</start>
+      		<end>`</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<!-- portage variables - currently unused -->
+		<context id="portvars" style-ref="variable">
+			<match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
+		</context>
+
+		<!-- portage functions - currently unused -->
+		<context id="portfuncs" style-ref="function">
+			<match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match>
+		</context>
+
+		<!-- extra portage commands -->
+		<context id="portcmds" style-ref="command">
+			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+		</context>
+		
+		<context id="built-in-command">
+			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
+				<context ref="sh:built-in-command-1" />
+				<context ref="sh:built-in-command-2" />
+				<context ref="portcmds" />
+			</include>
+		</context>
+
+		<!-- gentoo is just a shell with the replacements -->
+		<replace id="sh:built-in-command" ref="built-in-command" />
+		<replace id="sh:backtick-subshell" ref="subprogram-2" />
+		<context id="gentoo">
+			<include>
+				<context ref="subprogram"/>
+				<context ref="sh:sh"/>
+			</include>
+		</context>
+	</definitions>
+</language>
diff --git a/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch b/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch
new file mode 100644
index 000000000000..d42feacd3e3f
--- /dev/null
+++ b/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch
@@ -0,0 +1,139 @@
+From d27fec22c3f50bcd3c384256b8ad75d662033c7f Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Sun, 13 Mar 2011 11:01:37 +0100
+Subject: [PATCH] Do not use G_CONST_RETURN anymore. This macro is going to be
+ deprecated.
+
+---
+ gtksourceview/gtksourcelanguagemanager.c    |    4 ++--
+ gtksourceview/gtksourcelanguagemanager.h    |    6 ++----
+ gtksourceview/gtksourcestylescheme.c        |    4 ++--
+ gtksourceview/gtksourcestylescheme.h        |    3 +--
+ gtksourceview/gtksourcestyleschememanager.c |    4 ++--
+ gtksourceview/gtksourcestyleschememanager.h |    6 ++----
+ 6 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c
+index b431e1f..31deba7 100644
+--- a/gtksourceview/gtksourcelanguagemanager.c
++++ b/gtksourceview/gtksourcelanguagemanager.c
+@@ -275,7 +275,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
+  * containg a list of language files directories.
+  * The array is owned by @lm and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+@@ -394,7 +394,7 @@ ensure_languages (GtkSourceLanguageManager *lm)
+  * no language is available.
+  * The array is owned by @lm and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
+index ce234f5..de7a3aa 100644
+--- a/gtksourceview/gtksourcelanguagemanager.h
++++ b/gtksourceview/gtksourcelanguagemanager.h
+@@ -63,14 +63,12 @@ GtkSourceLanguageManager *gtk_source_language_manager_new			(void);
+ 
+ GtkSourceLanguageManager *gtk_source_language_manager_get_default		(void);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
++const gchar * const *	  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
+ 
+ void			  gtk_source_language_manager_set_search_path		(GtkSourceLanguageManager *lm,
+ 										 gchar                   **dirs);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
++const gchar * const *	  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
+ 
+ GtkSourceLanguage	 *gtk_source_language_manager_get_language		(GtkSourceLanguageManager *lm,
+ 										 const gchar              *id);
+diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
+index 6b470e8..d9d41a3 100644
+--- a/gtksourceview/gtksourcestylescheme.c
++++ b/gtksourceview/gtksourcestylescheme.c
+@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme)
+  *
+  * Since: 2.0
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+@@ -326,7 +326,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ 	if (scheme->priv->authors == NULL)
+ 		return NULL;
+ 
+-	return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
++	return (const gchar * const *)scheme->priv->authors->pdata;
+ }
+ 
+ /**
+diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
+index 501163c..fe74bd2 100644
+--- a/gtksourceview/gtksourcestylescheme.h
++++ b/gtksourceview/gtksourcestylescheme.h
+@@ -62,8 +62,7 @@ const gchar             *gtk_source_style_scheme_get_id         (GtkSourceStyleS
+ const gchar             *gtk_source_style_scheme_get_name       (GtkSourceStyleScheme *scheme);
+ const gchar             *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
++const gchar * const *	 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
+ 
+ const gchar             *gtk_source_style_scheme_get_filename	(GtkSourceStyleScheme *scheme);
+ 
+diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
+index cba042f..eec5d45 100644
+--- a/gtksourceview/gtksourcestyleschememanager.c
++++ b/gtksourceview/gtksourcestyleschememanager.c
+@@ -516,7 +516,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager
+  * of string containing the search path.
+  * The array is owned by the @manager and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+@@ -555,7 +555,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag
+  * of string containing the ids of the available style schemes or %NULL if no
+  * style scheme is available. The array is owned by the @manager and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
+index 6effc1c..456e8bf 100644
+--- a/gtksourceview/gtksourcestyleschememanager.h
++++ b/gtksourceview/gtksourcestyleschememanager.h
+@@ -74,13 +74,11 @@ void 			 gtk_source_style_scheme_manager_append_search_path    (GtkSourceStyleSc
+ void 			 gtk_source_style_scheme_manager_prepend_search_path   (GtkSourceStyleSchemeManager	*manager,
+ 						    				 const gchar			*path);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
++const gchar * const *	 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
+ 
+ void			 gtk_source_style_scheme_manager_force_rescan		(GtkSourceStyleSchemeManager	*manager);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
++const gchar * const *	 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
+ 
+ GtkSourceStyleScheme	*gtk_source_style_scheme_manager_get_scheme		(GtkSourceStyleSchemeManager	*manager,
+ 										 const gchar			*scheme_id);
+-- 
+1.7.8
+
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
new file mode 100644
index 000000000000..9954aad33b57
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/libxml2-2.5:2
+	>=dev-libs/glib-2.14:2
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+
+	# Skip broken test until upstream bug #621383 is solved
+	sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
+
+	# The same for another broken test, upstream bug #631214
+	sed -i -e "/get-language/d" tests/test-languagemanager.c || die
+
+	# Patch from 3.x for bug #394925
+	epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-glade-catalog
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-2.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.22.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.22.2.ebuild
new file mode 100644
index 000000000000..2bb8038d61b2
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.22.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.3.ebuild
new file mode 100644
index 000000000000..1e25a7583c48
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.4.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.4.ebuild
new file mode 100644
index 000000000000..1e25a7583c48
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
new file mode 100644
index 000000000000..7bcd75b4aa2d
--- /dev/null
+++ b/x11-libs/gtksourceview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="glade">Install a glade catalog file</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
new file mode 100644
index 000000000000..1b8f2fb938cb
--- /dev/null
+++ b/x11-libs/guile-gtk/Manifest
@@ -0,0 +1,10 @@
+AUX 2.1-brokentest.patch 1029 SHA256 6aa51463c7f0f966c8a7668877fc1199b6ed85187be21811ca3c84ca42c029c1 SHA512 e398ba38b19a2076a0974da3b8c2a038fe7b49e59cf187e20eb33df1bc74f6d34afcec5ffac5b288ed59b0f131a2a30254e248b6c63ff10cbf9107005ca56625 WHIRLPOOL 8cc58c4482cd44cbcaa83c4003f6eab286d6fb8a48e96510fba60cbbdf16afc4b52aca0ba330b73c10fd1be703b448f17457e2b6574ff80a4e4c83e070b0dd31
+AUX 2.1-prll-install.patch 421 SHA256 9f2aa837ee4cae17e703e4367179e64e69c0759f601ad3acd74431222e420b0d SHA512 ff30ed5edb3a9a2bfde6b480b2bbf2d8487cfe6583f73bbefb35e434b37e727037005e6e11e91aa115fcc75ed558883e36aa64d46f34d9ab40a94792eb201e10 WHIRLPOOL bb12b45f907f87c6d030a5562053d116191c9f8a50b37b85fb8b83d85a84a27891b9fc2db28de27c4ac296639051e8ea9b8cb5dd9f235d3c998cd1b983fd546b
+AUX 2.1_migrate_gh_functions.patch 1872 SHA256 185c7e62e9082dcb130bb78d5d7e0b1e72836b93d5bda42559121dfa095045e6 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8 WHIRLPOOL 04953cdb2487216affabfec307b97ac281c192f0bef5d1f45ba245b6152dde96aecc5452bbb88816a124d7d1c1a3e4ab39d48f12e43450b99d55c98691c3a71c
+AUX guile-gtk-2.0-g-object-ref.diff 1239 SHA256 fb68d90e21c8d7fb2b73c55a068b5528ae56c82336b200012f97b8abe56242fc SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513 WHIRLPOOL c44bca7a1f82d0c0331611f8aa6711d1e12efa84279e36ae4512e9829b7ce09f8efce9b49e8411fda148969ab0de3e622cfdcd107b21f39e3c6eb60700dc168c
+DIST guile-gtk-2.1.tar.gz 781985 SHA256 9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7 WHIRLPOOL 6e14158951fa307fedc20f8956ecb1eefc7e1b2c3f5d0b3505060ceb709efd51a40e5931c4e05877b7ce35498ebe1fa06526859efc00b09e9c46bb7b8661a4c5
+EBUILD guile-gtk-2.1-r2.ebuild 941 SHA256 6165ce921c66e74fbe21363678077bcecc332b580a3a97e40132582a99581137 SHA512 2b5d98ae19552633d99090448fce793cabe09f7303c09f28b953dc21f8bd23ed369c1ce75acdb08263f2799adf9eb7265b241946faa0a5d5e4b6edd055f81014 WHIRLPOOL f0448ced4d2e8f282b3a26ef1286f55b82524978338287e6913702739e3c2a7b9a95ff12cf29d47b5bed9e063d4e50798cb1107c5425ed7e5b135cf030a7a37b
+EBUILD guile-gtk-2.1-r3.ebuild 1008 SHA256 316349b43a40ff14e9aee8c6bbd965aed6d18fc8eb18916774c10a687e8e0d2d SHA512 8a697172fa7b3bbc321ce0b3dc541edbeef06d7d3e08b555c2feca9beef6997b072a2481885f0ea2c16e8cedd357f336042302e4870edee2fc00316459091dc5 WHIRLPOOL 63346ec91211b23d35460e8f4ed64d57e53ddbbaf71c9fdfee3131e603e83e2111bf2aff7de133310a8bf2db5aae1806a3d2c1fc54c84b5f860918c2d98a8f8c
+MISC ChangeLog 3869 SHA256 2b3147bd1d0ae65dc3e0b5b8266276bce14773f0f1b148e0e171d276f001553c SHA512 54a204ed9953ea997c8fdea7f236f5fc169b856115a9babb6d5082ed4dbe133bf06276bb34c1f07466fbb55a8526f358e167339c40c44233289d960ed7eac15b WHIRLPOOL c1b766d2bc862d1bf15770de4fe23243fe7281e5c1df801c135837d699022574162f97aa2dc45735f50d02829e063441a522c9764a8a2f9c43fdf64be2b06617
+MISC ChangeLog-2015 6194 SHA256 bf4d111ba6115fed024af1c89e44ae70604dc8668b3b760a0080169e3a84be68 SHA512 72e70e221342910ac3c857e7c8c3235d9ef9a7dd0247aa20d5e255769e9466f3438911988bd0e109aed6553c38404973ca1f0c70dbff649c427b24fc1e323a7d WHIRLPOOL 06df81750001ed0aa414bea92ff009e95bf1335a23e03b8edf68ff45076a689ddd27923f7fb4b317ef44513d04aa32b30bc00c3a7901ce56c35d6a5386b66283
+MISC metadata.xml 384 SHA256 89b17a71f881aa6940f56ffa6541025aa8927ab2998a3d48ce734171ed1361e4 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77 WHIRLPOOL f7803ed8a217e73be0279d742c1598e95fef40cdca9af5d929abff517f9a8352b25470409bca57f1985ba282657ce46270c1b185ecad6b233b7b14fc2961210d
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
new file mode 100644
index 000000000000..ecba95174e0c
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/gdk.scm b/tests/gdk.scm
+index 6e08f9f..6b01e83 100644
+--- a/tests/gdk.scm
++++ b/tests/gdk.scm
+@@ -1102,28 +1102,6 @@
+ 	  (got  (exact-positive-integer? (gdk-screen-height-mm))))
+      (test "gdk-screen-height-mm" #f want got))))
+ 
+-;;
+-;; gdk-selection-property-get
+-;;
+-
+-(malloced-steady  ;; with nothing ever requested
+- (lambda ()
+-   (let* ((win    sample-win)
+-	  (want   '(#f NONE 0))
+-	  (got    (gdk-selection-property-get win)))
+-     (test "gdk-selection-property-get" sample-win want got))))
+-
+-(malloced-steady  ;; on a destroyed window
+- (lambda ()
+-   (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
+-	  (want   '(#f NONE 0))
+-	  (got    (begin
+-		    (gdk-window-destroy win)
+-		    (gdk-selection-property-get win))))
+-     ;; final free()s only take place under the main loop, so need this to
+-     ;; satisfy `malloced-steady
+-     (gtk-main-iteration-do #f)
+-     (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
+ 
+ ;;
+ ;; gdk-text-extents
diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch
new file mode 100644
index 000000000000..b00fc29ca34a
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-prll-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 822a170..37f43b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
+ defsdir = $(datadir)/guile-gtk/
+ defs_DATA = $(gtkdefs) $(gdkdefs) 
+ 
+-install-exec-local:
++install-exec-hook:
+ 	rm -f $(DESTDIR)$(bindir)/build-guile-gtk
+ 	rm -f $(DESTDIR)$(bindir)/guile-gtk
+ 	ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
diff --git a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
new file mode 100644
index 000000000000..5a194874f155
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
@@ -0,0 +1,60 @@
+diff -ur guile-gtk-2.1.orig/glade/glade-support.c guile-gtk-2.1/glade/glade-support.c
+--- guile-gtk-2.1.orig/glade/glade-support.c	2016-08-12 12:00:45.894290499 -0600
++++ guile-gtk-2.1/glade/glade-support.c	2016-08-12 12:02:33.186666585 -0600
+@@ -17,7 +17,6 @@
+ 
+ #include <glade/glade-xml.h>
+ #include <libguile.h>
+-#include <guile/gh.h>
+ 
+ #include "config.h"
+ #include "guile-gtk.h"
+@@ -83,7 +82,7 @@
+       sgtk_protshell *protshell;
+       GClosure *closure;
+ 
+-      cb = scm_internal_cwdr ((scm_t_catch_body) gh_eval_str, (char*) handler_name,
++      cb = scm_internal_cwdr ((scm_t_catch_body) scm_c_eval_string, (char*) handler_name,
+ 			      scm_handle_by_message_noexit, "glade",
+ 			      &stack_item);
+ 
+diff -ur guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c guile-gtk-2.1/gtk-gl/gdk-gl-support.c
+--- guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c	2016-08-12 12:00:45.894290499 -0600
++++ guile-gtk-2.1/gtk-gl/gdk-gl-support.c	2016-08-12 12:02:19.530121760 -0600
+@@ -19,7 +19,6 @@
+ #include <gtkgl/gdkgl.h>
+ 
+ #include <libguile.h>
+-#include <guile/gh.h>
+ 
+ typedef struct {
+   char*		name;
+@@ -100,7 +99,7 @@
+ 	    if (! SCM_INUMP (s_value))
+ 	      goto error;
+ 	    
+-	    *aptr++ = gh_scm2int (s_value);
++	    *aptr++ = scm_to_int (s_value);
+ 	  }
+       }
+     }
+diff -ur guile-gtk-2.1.orig/guile-gtk.c guile-gtk-2.1/guile-gtk.c
+--- guile-gtk-2.1.orig/guile-gtk.c	2016-08-12 12:00:45.890957197 -0600
++++ guile-gtk-2.1/guile-gtk.c	2016-08-12 12:01:59.346968496 -0600
+@@ -28,7 +28,6 @@
+ #include <gdk/gdkx.h>
+ 
+ #include <libguile.h>
+-#include <guile/gh.h>
+ #include <libguile/dynl.h>
+ #include <libguile/tags.h>
+ 
+@@ -2196,7 +2195,7 @@
+ #if 0
+       /* Gone in Gtk 2 */
+     case GTK_TYPE_CALLBACK:
+-      return gh_procedure_p (obj);
++      return scm_is_true (scm_procedure_p (obj));
+ #endif
+     case G_TYPE_OBJECT:
+       return sgtk_is_a_gtkobj (type, obj);
diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
new file mode 100644
index 000000000000..bd582117f621
--- /dev/null
+++ b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
@@ -0,0 +1,45 @@
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
+@@ -22,14 +22,14 @@
+ ;--- Types ... --------------------------------------------------------
+ 
+ (define-struct GdkGLContext
+-  (copy gdk_gl_context_ref)
+-  (free gdk_gl_context_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Context"))
+ 
+ (define-struct GdkGLPixmap
+-  (copy gdk_gl_pixmap_ref)
+-  (free gdk_gl_pixmap_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Pixmap"))
+ 
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
+@@ -83,8 +83,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_context_info = {
+   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_context_ref,
+-  (void (*)(void*))gdk_gl_context_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
+@@ -100,8 +100,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
+   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_pixmap_ref,
+-  (void (*)(void*))gdk_gl_pixmap_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
new file mode 100644
index 000000000000..d22ebfa6bb27
--- /dev/null
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils virtualx
+
+DESCRIPTION="GTK+ bindings for guile"
+HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
+SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-scheme/guile:12[deprecated(+)]
+	x11-libs/gtk+:2
+	gnome-base/libglade:2.0
+	>=x11-libs/gtkglarea-1.90:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
+	"${FILESDIR}"/${PV}-prll-install.patch
+	"${FILESDIR}"/${PV}-brokentest.patch
+)
+
+src_prepare() {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	Xemake check
+}
+
+src_install() {
+	autotools-utils_src_install
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
new file mode 100644
index 000000000000..8e7ec2669b51
--- /dev/null
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+WANT_AUTOMAKE=1.9
+
+inherit autotools-utils virtualx
+
+DESCRIPTION="GTK+ bindings for guile"
+HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
+SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-scheme/guile-2[deprecated(+)]
+	x11-libs/gtk+:2
+	gnome-base/libglade:2.0
+	>=x11-libs/gtkglarea-1.90:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
+	"${FILESDIR}"/${PV}-prll-install.patch
+	"${FILESDIR}"/${PV}-brokentest.patch
+	"${FILESDIR}"/${PV}_migrate_gh_functions.patch
+)
+
+src_prepare() {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	Xemake check
+}
+
+src_install() {
+	autotools-utils_src_install
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
new file mode 100644
index 000000000000..fe1bacfb1309
--- /dev/null
+++ b/x11-libs/guile-gtk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+The guile-gtk project brings the power of Scheme to your graphical application.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
new file mode 100644
index 000000000000..26a72b7fa3a9
--- /dev/null
+++ b/x11-libs/hippo-canvas/Manifest
@@ -0,0 +1,6 @@
+AUX hippo-canvas-python-override.patch 349 SHA256 6c251e142c0cb591e27c0637f3a521f62b5664c1d709021c74683fd3f4af241e SHA512 58bb19ed76a4ef07cbebb7b7fad46b931ba7e81ea2e38a6596ea0247ea38bca96c392b13db9673a43f973b67b3297ae7d6a4656772105db688a34ef3be7847f4 WHIRLPOOL 8da045a4f8f842d0e0dc9cc63db25c40016b3eed0d9e3dc4b8b93ebecb98dc2a475e2552a9ab7fe249154ba2542de2d0174f30d7293de2422b32d63e37fad884
+DIST hippo-canvas-0.3.0.tar.bz2 376859 SHA256 21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514 SHA512 8290f6ab1875eed606ea152f12741ec4ebd8839091a9c258b8c4fa39f395adf94217576c6c689c5ab22b62c65e37d82991c7b8942815cb2030bd45616528f4f3 WHIRLPOOL 2b78ce076c1e6f8bfa40fad38e036cc583739b99801c5a550ad835484da255a8ee7c21d086f748c81707a5b262d65b7c95bbfe1a5fd01812d93409f42e7ba76b
+EBUILD hippo-canvas-0.3.0-r2.ebuild 1021 SHA256 81de42abddaa633fec803ad7f51ece170f22c6f9fec490214e56194586f98f29 SHA512 f4050adb70e78a271baeb9a41d23783d8bc32e6a780cffed8bd2acbff6a743cabeeb010d56b656dd52aebd6978331d54300e1eacff61cd5b41ed2a6d7d76f099 WHIRLPOOL f96972cbe70d762f989aaa9b857bc56f9b153301d70d18afe40b58c62f69cec0707eb9e6b1d9cb696ab567dcccd03a52286ff325ac3101626ababa370fff5972
+MISC ChangeLog 2588 SHA256 e07270e9cdb50217cb43092a70e07aa2bf4e884e4a8954280e6a0625bd14f986 SHA512 23b3747c45b2fc68a54983809c52fc4ce2b416de27c63db20e791d6a848ad032c7c76a54c8ea3790c76cb7e49e8be6a6b25e8be9c9065f00ed3c3c09d29706cf WHIRLPOOL 69a4500def8550f2e9e9ad629dcedfe0e0259921115e49ac7f28d367e7f1a47bcae95d7be5c8d20ea2918b072d5cac0c1314673adfbea41acc99a31480cfeb21
+MISC ChangeLog-2015 3338 SHA256 258278d287a24918bf3614f0454a5cbdd593b3da46bb2e7780496c1b2650c5bb SHA512 f809f78d3ec90feda0829fa1ea58e708b27737a1043439cc5a2097273af665a3f1ecc76b79b848ae89b79bf12ede94f866e909986f6cfd606e50864c2ea565a6 WHIRLPOOL fb17320fdaba6870184d23ac0bb7723f0db4ce8a612424e39f27e9a14de38912998a17ce159a71a43ee6c59f4dcee9f5cccbb5e573daddf046b41c90e99d9f2d
+MISC metadata.xml 487 SHA256 56d125dc6bfa29918492151aed9ff949447a7f582aefcabc7420bcb61662d4e1 SHA512 4fcbed02fb004fdde36668aa8c089a0180f38355103720d55f94687868189f1583f09d29c8c071f5151fa24695491044445f6444c5af4776b8e8517307388e8e WHIRLPOOL 824554a4effc49397310993a6160f6f8ddfd84a709e8602a819defa669e9248dd1870467d06cd19753576403f6d0732ce10afa3de9863377270a9dce743a8697
diff --git a/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
new file mode 100644
index 000000000000..bcbae474160b
--- /dev/null
+++ b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
@@ -0,0 +1,10 @@
+--- hippo.override	2008-05-21 16:22:02.000000000 -0700
++++ hippo.override-new	2010-04-13 13:11:20.826177339 -0700
+@@ -19,6 +19,7 @@
+ #include "hippo/hippo-canvas-widget.h"
+ #include "hippo/hippo-canvas-window.h"
+ #include "hippo/hippo-canvas-widgets.h"
++#include "common/hippo/hippo-canvas-test.h"
+ 
+ #include "hippo/hippo-canvas-type-builtins.h"
+ 
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..36b88c85f039
--- /dev/null
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="A canvas library based on GTK+ 2, Cairo, and Pango"
+HOMEPAGE="https://wiki.gnome.org/Projects/HippoCanvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	dev-libs/libcroco
+	>=x11-libs/gtk+-2.6:2
+	x11-libs/pango
+	gnome-base/librsvg:2
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cd "${S}/python"
+	epatch "${FILESDIR}/${PN}-python-override.patch"
+	cd "${S}"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python)
+}
diff --git a/x11-libs/hippo-canvas/metadata.xml b/x11-libs/hippo-canvas/metadata.xml
new file mode 100644
index 000000000000..65b0f97626e6
--- /dev/null
+++ b/x11-libs/hippo-canvas/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	HippoCanvas is a generic user interface element that can draw Cairo graphics, respond to key and mouse events,
+	and lay out other widgets. It is currently used to implement a number of Sugar's custom widgets (toolbars,
+	rounded buttons, etc.) and to lay out the screen.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
new file mode 100644
index 000000000000..0d59ef7fccbb
--- /dev/null
+++ b/x11-libs/libFS/Manifest
@@ -0,0 +1,7 @@
+DIST libFS-1.0.6.tar.bz2 323246 SHA256 9007fcfbd37bfa6ede4000ec4b5c2dc6dc0f52789358361b43f68e9ae4d6aed7 SHA512 6eb20abb963e4f1c897dcc69321351c7672f2d15463d5d1e3391ff534848eb1a95a80833f698c98d9d5b6c8d7462eb3207eb5c0f74d86ef84a461ae6b11c8447 WHIRLPOOL 700b6c0489f8b3d81791dbb441deb2b90bc2d36748a81bf65f6cae2ea825805345e142292634d1f04800a07e3c4441e77f8fd99b00d3bfdfe15c99e1b0122c13
+DIST libFS-1.0.7.tar.bz2 315569 SHA256 2e9d4c07026a7401d4fa4ffae86e6ac7fec83f50f3268fa85f52718e479dc4f3 SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f WHIRLPOOL 093e93bc5a8d6f68c9f236b266bb220e888718d211ff9fad91b0762561917b61bc169858d315cc357fcb2632d385d418cdc809d92e471451f7bd44455748e490
+EBUILD libFS-1.0.6.ebuild 438 SHA256 69b77294cb2d0ae4d170409c6f6bad74fcf2006ecf0d1a306f7b7f5a6bfdeea5 SHA512 dd621d2dbc9b85e050916625248d907a414f46f1201f59d61bfb44d51c419d516c50e68914ba327cc2429f3fd6e94073682b22a67094d9440e87dc0c940dc1cd WHIRLPOOL 483b95e4d779629cc49b844754e6af7397ea667929e06d6c9352996e2728cbd262564129f9e6cac87a225d22946df5c23a38890936fc50428a56d33a53cebbaf
+EBUILD libFS-1.0.7.ebuild 438 SHA256 ed229dbf9365ec81017cf09bd20ee41be454eaba50b896416ad9785798dd2538 SHA512 43f1c60c813ce2b2d5a7646506016238bbdb3eede6740517b5bb151a48949c5e9f3d07cfb28b3761eaae65d6a7bc974e5db1d17bc625aa03342b7da71157d4df WHIRLPOOL 3dacbc64471f14cf82a2ca1dc462a5ba2533871a0c15b5c7f9394406a2cb336af104c521578f73db055e4a492747f07be18d0f7717d505ebb67afff23d6a4b10
+MISC ChangeLog 3979 SHA256 1214062d50c121bc988912017ea10d665696d033f53f71133508eaae89da8c04 SHA512 78471359fe387eda6a9c34c2c2e01c5fa158bb16fb9b1817ee83750f8fe2ef5a22b16cd0144364e55628233591a78c2ca6756886a251888ef8e0ab5824e284a1 WHIRLPOOL 042112f8f8d83d8d0b0935838ba72f2a42dc5735dfa4ddd3c9f8dd0ec9d05633aa21c0286823675df9aa089f5015fee521c57ad638221cd89e58f11917cf2377
+MISC ChangeLog-2015 9110 SHA256 cdff8dd4783f21f508f8e9581e39818f93d273c8b82c5f0139fa96b302227b84 SHA512 341fdb449b14280b911893f0a15e49e4738f4e12bdb9546668c38eaae420adb3a6795003dcfe5ed2706e75f0448a482c605a9b0ed402c6adf93eb548152f1f37 WHIRLPOOL 2dd0a0a110e5d3d26721b4c4c2fc6cbff49c3f7445812e5a362fc712166d52fb50b8859886cc59094776fdb57da9fae90c47deb22d1890ed8ab39548c5b8988f
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libFS/libFS-1.0.6.ebuild b/x11-libs/libFS/libFS-1.0.6.ebuild
new file mode 100644
index 000000000000..93b0cd3502bc
--- /dev/null
+++ b/x11-libs/libFS/libFS-1.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org FS library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+	x11-proto/xproto
+	x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libFS/libFS-1.0.7.ebuild b/x11-libs/libFS/libFS-1.0.7.ebuild
new file mode 100644
index 000000000000..b66b91ff3d11
--- /dev/null
+++ b/x11-libs/libFS/libFS-1.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org FS library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+	x11-proto/xproto
+	x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libFS/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
new file mode 100644
index 000000000000..57c25bb4772f
--- /dev/null
+++ b/x11-libs/libGLw/Manifest
@@ -0,0 +1,5 @@
+DIST glw-8.0.0.tar.bz2 221136 SHA256 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587 WHIRLPOOL 53c783e10c6db8f1dd5682ad4a0898fa0c4a1889ea8bc3eb89dd48c082d28644fb821c9ee5b11ffd8818f98cc3bcc8f280ce1e90bf90fb02bc0facc922df1b22
+EBUILD libGLw-8.0.0.ebuild 664 SHA256 79c70ee6e1fabb4ffc231f136597083b55f294df6db10990b5fe5f7f9dcc9a4a SHA512 3aa270d027a55105a5827b8df1eab0bc70cc1a058e5b36a7fb803ffff5f55b3ee194ff3b9d665667b8e6b81159f789b79b4f3aa2b6b75af19fc9766f5c27203f WHIRLPOOL 75c981a273597c656d8a4f6b077e74b36a523a9cff319a6bf603a7f81857619872225cd585e5b15b395580a3bb09c5555c8dce5c1a18e83c75b803e7d6a01040
+MISC ChangeLog 3335 SHA256 bcdcfbe304b14fe2e52851e31e9b9d198331c5a6241491e47341bb6a6abb281e SHA512 2ec9bd5a74a5e0a97ffbef13cacb38000123ac8a97618947af9b65652bef77e84d9b5210e3c3b6972a6cb671b878747c4834decd42fa5497db41f303dec69f34 WHIRLPOOL b9f33631f34144fb25f301806208fd02fd6dc63bcd2eaf593252411a4d9fb4bd2e296ccc0be7539839ca4bb3e4008432cc5fd34d4bc3116623ac2ac34bc50a45
+MISC ChangeLog-2015 1625 SHA256 77632fe00af358b82ae56a7a77c0cb931f835e9a9734f855efbc319798f58ceb SHA512 b052433aaf6bff67aad3461634f04551566d48b7bee376822d1245eaa1c18fd5435700ad5bf95f7705e71b030c610820c1942f51350cdb544180d1934694a6f9 WHIRLPOOL e12a1c80f5e9518319c481cfce243d87be029c7f064b042b3cb6f2ee9165c4232d501613852db82940d4102fc6efc1543d4c39b4e067f865343b2abd2b5b01ac
+MISC metadata.xml 310 SHA256 fa348dcede878810a441f5bfeac1ad24b706191f74be25542c611309b4c1e83b SHA512 797bbd05193951c317b30062db58f04f950889b9c5b31d1e3338142c9ea826d10e2f4c6d55fd076bb9c409239667bf3bf9f7ccec3c7c5d4aedf9187619ee1196 WHIRLPOOL 042d7ecbc3c78dbfc1bfff050017a22991b7d5ca573594c09a4bf113a0bb379854b1ec494512e545f6e7793bcc4fb3067589692c484187885f2dacb099289706
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
new file mode 100644
index 000000000000..f0bdadb77125
--- /dev/null
+++ b/x11-libs/libGLw/libGLw-8.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_P=glw-"${PV}"
+
+inherit autotools-utils
+
+DESCRIPTION="Mesa GLw library"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+motif static-libs"
+
+RDEPEND="
+	!media-libs/mesa[motif]
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/motif:0
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-motif
+		)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
new file mode 100644
index 000000000000..0b5ff5f5177a
--- /dev/null
+++ b/x11-libs/libGLw/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mesa3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
new file mode 100644
index 000000000000..0d5869a228e4
--- /dev/null
+++ b/x11-libs/libICE/Manifest
@@ -0,0 +1,5 @@
+DIST libICE-1.0.9.tar.bz2 384921 SHA256 8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 WHIRLPOOL efdd7bc60416d883b15af7cfd0c152a2b7f7ee539d0717704b89c0621f9cefa718b14af63fb1d10709e7b0cc84d660f30d069ff0b273d304be8f0c5a74fe1090
+EBUILD libICE-1.0.9-r1.ebuild 778 SHA256 ba9691b805ee9217b4b7989ec2a3e965df980b28c34964498784adcd026911db SHA512 ec9da132d29b3524cc735ce216c70928978210bde761cf2ec83ac38d0883573996439215a9653da03286f72d2feeb124fb504d7cfe4e527d9edad7a85731cd72 WHIRLPOOL ef399561f948e65d19b81029f2f8ac64678fd5aa25687d32f0d6edb8447954092b750106bb7056507834ca5f0ed725174d80345393b24f8c2ccb4b38b272cd35
+MISC ChangeLog 2480 SHA256 4bc1effee22961104e987463327bb9e5849ebe78d3bac9eff0c37e2aa34022e9 SHA512 7169544b92c347e2373ba36f1f359ad3078e61a67865bfdd5098e056d9826ccc8eb4614f7f309c7a58125384e5d7f71c7e89f0053a7e4ed0e3594028bd72db96 WHIRLPOOL f1d51dd057562bd2fe9ff5d4c7b50556d59e6a87ec8f65468f601efa680f9dcf6a21602b2b5e1909028c91609b37817d78e4166d026f0d7fa2b75b2715c4b9f3
+MISC ChangeLog-2015 12637 SHA256 4dd56b956108e79b595929937ce4ed0d168fff0cdf4caf1a3c237ba7261d51be SHA512 84f2d396061657c7d7d448c522c99682f0ac6914414cde89b20f1281950c288cd191b83443509fbcca5a0894dc8d866b89830fc777fb0608a28317ec3b915b8c WHIRLPOOL efe8daf798756f5fe66a998c05f9355f88b03ed56b534ff641e121f9a418859eb197ae5353fd14d91d1fe79a5d9c864fd34cbe19c908be323f8fc6e24ca59026
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libICE/libICE-1.0.9-r1.ebuild b/x11-libs/libICE/libICE-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..0478d6c0f7cb
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="ipv6"
+
+RDEPEND="elibc_glibc? ( dev-libs/libbsd )
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libICE/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
new file mode 100644
index 000000000000..87ebe1c47cc0
--- /dev/null
+++ b/x11-libs/libQGLViewer/Manifest
@@ -0,0 +1,5 @@
+DIST libQGLViewer-2.6.4.tar.gz 2996712 SHA256 d25cb6800649f26c7f61ae510af5d4abd88f9fb63b7264390e214e9facb1f17b SHA512 fae9caa7fe049b13ba970c971a9454700631cac18d46b6154ae4e155fabe64dc3b8eacf968dce69292743ade6c8c2772e236505ee8099bbf9ed291382dbd65f0 WHIRLPOOL e3beecca95576bc501645c1cc7784b2248f6cf7ebd11fbbda35a721996f5d16a12cd76f8daf5dad60876683acf3ead489e570e53ab71fdf37f855089ee6f455b
+EBUILD libQGLViewer-2.6.4.ebuild 1235 SHA256 d41995963a0f40bdae76a9e4950543f176b8b21342cc26ec3719862bd6d13d9d SHA512 96bb2854665c64eb9821ac27497810a28e29c3e3056e0d853eb91bd7677636b983518824fdeead5932eb4f19797516b2af304a645aef3152b218b55aa4bf49cc WHIRLPOOL 23bf094aded2475faaf1382d7d75595c910b82957f814bb594945c135c4af0c11d9409c67d8e1ef3eccf2ef3aaeb3185a7fd018c5b2e98abe5d0b6d4e92ff82a
+MISC ChangeLog 2498 SHA256 d323b4c663fff14d98663eab35e141f96201a466da994332592e645b87b5ffc4 SHA512 a2f7ece127b5cfe1fbce3fb4051c77f3cb4bd0fc283c21c3aec75e328ce510cf054de38ab351831c8029c0b4945633c664b20f6d4109656ec0b7042cfacfea49 WHIRLPOOL 54517af75bbfbde2a7dc24e7671c0da5311f5a14b32d01a8dd8cdc552d52bb703b3bcafa81e9db3be0ba5ec96e72b5787f4100617783478c7f5f1cd741137b04
+MISC ChangeLog-2015 1620 SHA256 97f18e3f7c02dfda8acc9daa5ec9bb2d2e4eeb59505a478eb7f98199a316b063 SHA512 3148d90b588b0352926bdd2b1f66bcf8ca5f998ec1d0682c2595698194401d0bdd20963f8f43e9d51cceea3ceed4b1f6be4d8e14517493854e9d53a849ba27eb WHIRLPOOL 79c8dabd501a0fc30f1955c9b0c00871899418a6ad24bf1629b9ddb80ba84819a5ae439d4bee65ccbb43d6afaa2f60640566054115e974fa5e1a59392e4b8847
+MISC metadata.xml 337 SHA256 2abcfcdc44b97721d4f888ca260ced8cdd83d9bc4c85a747b61c1db3603da5e9 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e WHIRLPOOL fbd11e2ab5c3a71046eadea94af5bf488878c34f99ce3550b175bee072a3a02a1ff80fafdadc02381a3f0fde428fd5a3a734afbbdebf1f648ed177471864b325
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild
new file mode 100644
index 000000000000..ad58bdbd9023
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit qt4-r2 multilib flag-o-matic
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/qt4-2"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="virtual/opengl
+	virtual/glu
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	designer? ( dev-qt/designer:4 )"
+
+src_configure() {
+	append-ldflags "-L${S}/QGLViewer"
+	sed -e 's#designerPlugin##' -i ${P}.pro || die
+	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+	eqmake4 ${P}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+	if use designer ; then
+		cd "${S}/designerPlugin"
+		eqmake4 designerPlugin.pro
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+
+	if use designer ; then
+		cd "${S}/designerPlugin"
+		emake INSTALL_ROOT="${D}" install
+	fi
+
+	if use examples ; then
+		exeinto /usr/bin/${PN}-examples
+		doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+	fi
+}
diff --git a/x11-libs/libQGLViewer/metadata.xml b/x11-libs/libQGLViewer/metadata.xml
new file mode 100644
index 000000000000..6f836ff48534
--- /dev/null
+++ b/x11-libs/libQGLViewer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>aballier@gentoo.org</email>
+<name>Alexis Ballier</name>
+</maintainer>
+  <use>
+    <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
new file mode 100644
index 000000000000..2863f852c773
--- /dev/null
+++ b/x11-libs/libSM/Manifest
@@ -0,0 +1,5 @@
+DIST libSM-1.2.2.tar.bz2 348908 SHA256 0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca WHIRLPOOL d9b45a64ccc85b6ed2eb181bc01e8b9c8b839dfb2b41067665688ee27c7d35cb6f3661f96966bb7c8256b1d9391f613cd11b1ccfc9d3a4c362167fa7b77b135b
+EBUILD libSM-1.2.2-r1.ebuild 1754 SHA256 bab083de33c83161d4fbf888226437bba50678f8d634cefc01a76d5423c9c21f SHA512 a12611c82b7724b7ebfedf74b595a4362b34d874af8a389750240edb87fbfdb2a75ff87d00ca6b7bb8c032fee8c8bf737529e2eff73a764057d5a75f7ec7b15b WHIRLPOOL 1ab97d3b1ad8f928b82b2282f7ff5192fccd1d229383e91cc48bb197e3cb6db3fe1ba89ba1e3a63b49cf59ff59e417ecd8d9987349593b12aba1a6f26ac4a0f2
+MISC ChangeLog 2427 SHA256 c51f2cc5545a72e13e0c288754c52f675cd0a1e4bf8e19c1b6f4cbfc215b3c5f SHA512 7745766567e91287e74559724f8022cf5867144ebe52f44354835007e091427efa44a29ea82bf889a2cfc395679e1f72e6fce8dc6cd8d1911e00c7fcd0b38436 WHIRLPOOL 1d6892db0e9966757b186e3a77c0332bb0e946b5b243df8b718f55d0332b000757f22b4fd31f496193df15eb8d46e25757fb3b805696e3b4361c89937046af6f
+MISC ChangeLog-2015 13909 SHA256 804c0355b77851785f8b7dc1d1cf5af3bbd3757744f9c3ff1efb01a15409f7a3 SHA512 131605a5bafc123b15bcf8573cd485a72d9f4a9becc39e9777454adcde87ae49faa56734f4b82ae26778974a9f161ae6c0ccb7c95db13753b7a79444f528dc3c WHIRLPOOL 775b778c3b67cc978d8cff74c9a7445b96d72e1207bea4cfa86e526bcbe4e5bb9e2765001d6d4c110cbbb5ea6eae14e4f62bf824d85ad98990dd0ccdebfa73f5
+MISC metadata.xml 348 SHA256 a3c7d4cb6ac9ca0a5a83a4c8053af751349139e5699169ee0167683cbed523db SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5 WHIRLPOOL a34b6880c07a229b6e4766038297e1bfcbbcbaa20f4cb7ca483118bddca6e1204213d805dc5ce6c3f0b67cbb7f9b1eee17d6bc1a48577067f75eb103da299abd
diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..303ae7650ca2
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Session Management library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc ipv6 +uuid"
+
+RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+	) ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+					[[ -d ${ROOT}usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
new file mode 100644
index 000000000000..73384252f25d
--- /dev/null
+++ b/x11-libs/libSM/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<use>
+	<flag name="uuid">Use UUID for session identification instead of IP address
+		and system time.
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
new file mode 100644
index 000000000000..c3dea2435dce
--- /dev/null
+++ b/x11-libs/libX11/Manifest
@@ -0,0 +1,8 @@
+AUX libX11-1.1.4-aix-pthread.patch 300 SHA256 4b7fcb715a3a7568b8febeac29cfb32674c56e884a8bd274ddc6a2d69ea1dfe3 SHA512 53680a5ffe7ec0892d3e39414ebdffe466c3a98494b164efa5b21939e9e981abea16929da249c6c3a72315ebc3ad297352cc74877d0610d2dd5537f324f0827b WHIRLPOOL 1b19c0bb94d9e33851b24dabd8297d1eeca449959555b0f1e76576732d568c9455b1f864dd400e365e0b8be9d168eacdea4e4295f0acf9decf296f9f5134f8a5
+AUX libX11-1.1.5-solaris.patch 246 SHA256 89210b0559e936cdb0a42b9bc5df9bf47704b88b53d93d329b372ca855cddd0c SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878 WHIRLPOOL d4ef7620161fe18063854e0fc122730871ec9025cf15bb44463b5e701c8e3ef513a6017b961f80b61cff74cb04aadc55edb432db654ab649721a0e542da005e8
+AUX libX11-1.1.5-winnt-private.patch 420 SHA256 d0349ef4d379ab3eefa33a28d20e0ec9c630ab0b5c64a52c3849cc8d1d4abba0 SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251 WHIRLPOOL d72c7b3cf0ea7202c0aa1aae3d30c5c453dbeafc8b6d8ccb8aa993da41ea1863edae8ed27a4bcdb8e02335c9083e5bce8842ae5018bbb9f23eb6fe8057e5e16f
+DIST libX11-1.6.5.tar.bz2 2361556 SHA256 4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0 WHIRLPOOL 0eb876343e64677098a3b40f371ab4af1863641970262c1f2727f2181f6c22937684e1da0896b5318a0ea4ad98f61e228a308c1ee041174d42fbf6a8fc2107b3
+EBUILD libX11-1.6.5.ebuild 1525 SHA256 28f00fe930739cd27a512120464dd8778f961477d804385ca8e88caf82270c6b SHA512 ed642f422e0ddb0e19bee3f57e627f11c6f14da706c849c016f510475da5413d9217fbe721d6f70de11a3888095146c933dd3cc488e24211fea7c6cda9762b2d WHIRLPOOL f61ea2d1fb23617a30100532e548723cdc083b528a7a44d6687304cc2398860eeeca73401efffeb8d08bcf3c952aa9442c92f0ca2f6b26df4b435480c377ceb7
+MISC ChangeLog 5564 SHA256 7f7ae71417a2e6bb3c7d0ed7010b32dc19d0689e9cde9f8db1b60c73438f9110 SHA512 95d2fdd5dfaacf45bdad829ee7e0c2c512bb69857a31b84f303cfdecfe46a7a7c642b3959e290bbe46d92608e951a3e32dc378f6fa95cd378290f28975439963 WHIRLPOOL 25faa72e464ddf824ec25d9236f8f5a971489a52c9712d909d31271bf2213e1fb0947d0021e81b69cea0e7e29e193ec548436ab6d752da2a3d6a7c9e963e81d0
+MISC ChangeLog-2015 29666 SHA256 978963feeac7f75ed2b8435ace0e1bbcdd2f8ed446b5e9ee1f1f33bf1eeea271 SHA512 3e06dc82662c53d9ed276e67994756d5c9f2021de48624feab3080fac484225fc2f9593586596389ce8350ae231cacefe17251dbd33efe23311457d03c24c263 WHIRLPOOL 32cd160fc9f486527260f5fd532167e5653cddd0ddc4c11ba4058cf04b3c36680eec02313ac093483b5d994c607516af033ec7d225891ab9c9106ba575d80387
+MISC metadata.xml 311 SHA256 cbe094e94f77d3401480a4dafa0e3a45ea7de4d09e8da11e86bc3d97efc90377 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2 WHIRLPOOL e37186a656b2b0c13a78e29aec34c3e23c024d97893e9aa45c3896dcdcdcd960744582c21eabdf892260551238c4fdecb2eb8707e008df462375da6735eb6599
diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
new file mode 100644
index 000000000000..c854e0b4080d
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2008-07-21 15:48:33 +0200
++++ configure.ac	2008-07-21 15:49:23 +0200
+@@ -198,6 +198,8 @@
+         XTHREADLIB="-pthread" ;;
+     solaris*)
+ 	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
++    aix*)
++	XTHREAD_CFLAGS="-pthread" ;;
+     esac
+ fi
+ AC_SUBST(XTHREADLIB)
diff --git a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
new file mode 100644
index 000000000000..a7926a53d78b
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
@@ -0,0 +1,13 @@
+wchar_t is defined in /usr/include/stddef.h on Solaris
+
+--- include/X11/Xlib.h
++++ include/X11/Xlib.h
+@@ -71,7 +71,7 @@
+ #endif
+ #endif
+ 
+-#ifndef X_WCHAR
++#if !defined(X_WCHAR) || defined(__sun__)
+ #include <stddef.h>
+ #else
+ #ifdef __UNIXOS2__
diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
new file mode 100644
index 000000000000..4539f111faf1
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h
+--- libX11-1.1.5/src/xlibi18n/Ximint.h	2009-01-16 10:14:37 +0100
++++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h	2009-01-16 09:39:48 +0100
+@@ -37,6 +37,9 @@
+ 
+ #include <stdio.h>
+ #include <X11/Xutil.h>
++#ifdef WIN32
++# include <X11/Xwindows.h>
++#endif
+ 
+ #define Public /**/
+ #define Private static
diff --git a/x11-libs/libX11/libX11-1.6.5.ebuild b/x11-libs/libX11/libX11-1.6.5.ebuild
new file mode 100644
index 000000000000..a3b6aea1896b
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="ipv6 test"
+
+RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
+	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
+	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+	xorg-2_src_configure
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		# Make sure the build-time tool "makekeys" uses build settings.
+		tc-export_build_env BUILD_CC
+		emake -C src/util \
+			CC="${BUILD_CC}" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			clean all
+	fi
+
+	default
+}
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
new file mode 100644
index 000000000000..e1e8e6f760c3
--- /dev/null
+++ b/x11-libs/libX11/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXCalibrate/Manifest b/x11-libs/libXCalibrate/Manifest
new file mode 100644
index 000000000000..71ad23b0238e
--- /dev/null
+++ b/x11-libs/libXCalibrate/Manifest
@@ -0,0 +1,5 @@
+DIST libXCalibrate-20081207.tar.bz2 16962 SHA256 dc77ff47b693165fef00f4b665b4d23989fad61aac7d25b35f2ef60eb9095dba SHA512 c41f484cbaccb8bffdbf9185d861495cb62b8e03f2b1fbd9f611394063bcfd3a8bd832cedc69861dac9a943e5dbc49d0f41423baa25a51516adbdae840eecaba WHIRLPOOL de1a41f47d9e87f568b2f9787c3d690309db54abec099f1bbe5d5b6022ae64007fd2db127f388defb7ec8c27f0edb53781b832f8dd8aec288de8a0351bda8d83
+EBUILD libXCalibrate-0.1_pre20081207-r1.ebuild 553 SHA256 04205846f5550ecd5b4dc56862538aed165238c1a31c88398fdb8216934b6543 SHA512 a27ee77f32ecab2ae7a738e8935a27ee94e1e92312d942aa9919ed68b15c58dba3b6ccaef6304af7e5c6f3c68c46714e8a49ee1b96816a080a94a291a973d93e WHIRLPOOL d173df4ae84f994861de451e4f61d397f9097d3b3a3f06c98368af2bc209486901331a3c3fdc37646fa69490ef6e0ba8024a298399abf707a260fca070030db0
+MISC ChangeLog 2471 SHA256 5a668f13417b517ee1b03258d849bdb2b49a40d122ec65f6ac2d3f035662cc6b SHA512 852c88b95a757af0387213b1e72a19efac4a28750f349b23f9ca8a97afcc01ef78bf92078526880767886ca3bb3d1e699adc507b6791e264156f3bc8007b6d1e WHIRLPOOL 179cbd5df3d2a761a927e9280ce071f7870a7cb5888d298f7abd3e29fe052505bae84f599591b5f5fd4da0de9d008f13ff44fcf061e56338002995b98dc101d5
+MISC ChangeLog-2015 3066 SHA256 67c55eb9560f90a17e24946d3b10545696fe10ef8213b8245a6ef92fe85f2057 SHA512 45a3e60b7ad4e8495f131d39c1b88aa61700a990bae6c8055584b3ec081a2d074b840c19443901d2f8968d31edadfee477798298a2041baac36796b28dc35344 WHIRLPOOL 459b86c4a4d4f717487730e47aeaabbd3ef590a7b23211f75581bfdaeb21d90103981389362517a627b03fe4683965ef073510b65beca19e89875a5da948e16c
+MISC metadata.xml 338 SHA256 28109dcaa4f770b124fd06e4e7f2b93f2ddc2fd038c9fc161316bf5f1d20ec5a SHA512 fbe9ddd4efac249b7382068964ac0d57020d2c1b834bb9aa1046460c3547fff964405de8e0be3cc0e19a46597006272325b8cddab744d031c95bc55157311455 WHIRLPOOL d5e3c189018fb94a5eb1dd05c600b9035991b6df434d69ca94a3c2b21d6ba445ca2414bf9ffd69854fd7d4225dbc1292b38a2c27898095e0e225204cbcd55c63
diff --git a/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild b/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild
new file mode 100644
index 000000000000..31be01dc1b17
--- /dev/null
+++ b/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+MY_PV=${PV#*_pre}
+
+DESCRIPTION="X.Org Calibrate client-side protocol library"
+SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xcalibrateproto
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${PN}
diff --git a/x11-libs/libXCalibrate/metadata.xml b/x11-libs/libXCalibrate/metadata.xml
new file mode 100644
index 000000000000..c7b47913b668
--- /dev/null
+++ b/x11-libs/libXCalibrate/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer type="project">
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
new file mode 100644
index 000000000000..0f964b9d1baa
--- /dev/null
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -0,0 +1,5 @@
+DIST libXScrnSaver-1.2.2.tar.bz2 290437 SHA256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f WHIRLPOOL 527e65bf555a0c1e87df07906cf2d0f737a46c6a181d42c7c6e3431e1a1f8b858312d2419486b99cfea92eb50cb17d3453289c0cc5303550fbdab24eb82ca338
+EBUILD libXScrnSaver-1.2.2-r1.ebuild 560 SHA256 d07057e6834dd7c605173b7386552c9196b33b56b1d31ef6ba2b20329ff5cec9 SHA512 511501966db866101927f08f0278b5bc332b0c6a3a620987b864a965eefef086309dc3eab9fbcd928134efffcc8839d99ef362b4dd0f6cd108b8f5cbf47eb0e7 WHIRLPOOL 08f8a7737984b1db113c992fb47a2de3d35091fc784e869c62c81c553671c1c69ee6910d10ef99567901d42078ae70ec44fe330a868ad723f895d16f7732d0ce
+MISC ChangeLog 2738 SHA256 437fc574becc6f9e2078d57d7250230dece5cb954d7745b37e2c6e828e5c855e SHA512 d6e218a3d44e8502c04d97562c99b48a08636d45b216cd29f5b28336f7fb5d02cb3602bfbbdb2f11fa79fbd8b3c09254bfbb1db176f97f51026e7d71c39374f6 WHIRLPOOL 5c7aba48e37e1df649cd9ae741dc15d4f6fefdf6a54a86d54b8279cc5e28026b13c2b5c0df9d8042c59eda0f11c74a2ec80fa34f9856736675b1014ef02c79b7
+MISC ChangeLog-2015 12559 SHA256 b11dc75478a1305583a31034cc9567d68ad43c2b85bec7047f832206cd8b26b0 SHA512 af30f571beabddb097a8117c2468daaf748eddee8dae1418ce8c0084e276dc7b4cf1f0813c053ef98b79bfba88ccae249b5f5269c252032faf19b2b334fbff93 WHIRLPOOL 8e6831414e496548161cc212597a0c57e4c2718b378ace3a03a5d145394a8ae788bcd4df400c54b264522294a7bc453be8fcc46264cb7576b90ec704c4a2d3cc
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..9130a449b440
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 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-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/scrnsaverproto-1.2.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXScrnSaver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
new file mode 100644
index 000000000000..c28da0f5e52d
--- /dev/null
+++ b/x11-libs/libXTrap/Manifest
@@ -0,0 +1,5 @@
+DIST libXTrap-1.0.1.tar.bz2 269484 SHA256 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e SHA512 638f79aeb7a68aaff51839266c74b5e4f875e5bb2b473f01a637ea0dd75e4fbc7350612ff27dc12716142397c824fe16b178003015878f34f439d90d748391f1 WHIRLPOOL f38821942fc75ab9b4dbc49da9dd9d685e8bbcff3d79151eb345281d135ef75cfcbc645780dcedb139e6fc769d5db0d57f6e5993992876ba79c1ccf1c5bf0d65
+EBUILD libXTrap-1.0.1.ebuild 392 SHA256 e8648efe35dfd14d68966f54db4b6f81938c23e9e9aa3e383fe445403afd2671 SHA512 e4511db1e511678046b5d95222c0d9611fde004833e4f20c11c5135accf9efee95ed322eb82a69e9041c3dfe8181feed7433d75735bc23a126471891e774ea06 WHIRLPOOL 4a9793254d976149ad5a5e85c08fd042b756cec90d352780ca50ade985517e8aca458f35a2ccf9aa4c5aab5cc141279a3fe8352cc33d5c37a341625517962a7b
+MISC ChangeLog 2694 SHA256 98433bdae629d2cac269af5c4d425f4ef647a4bfa5457e218a6b2d4c36a7ccad SHA512 6631ab285996820738ef72d509005adc43b6cfa833717985237f887f947cbc5a07c2d5864c45327bf215845b9831f92eb440cff39ecbe2e7828063583009ac82 WHIRLPOOL c07e08b20afca35b2e093a477e2b68b9ad6064dbfe95545a3569dbc1c84e1faf57cf2e33a9e97a595b06755a89436ccf23e1424c9dc15273e3e3bc0c8c27d3ff
+MISC ChangeLog-2015 5361 SHA256 235e13bc1fbfeb0e4924a51bfd6fe5f47a449de36c2e4e01ec35a11f501ff4a9 SHA512 94e47bbb32136c72c8d4e3d15c85d0d5fa5f869e32b4188b60cb5c7a9e8bf83c6d1e5aca8eeafa809ed520b61aa1062d456d119c0ff10e7edb4303a949eff4b6 WHIRLPOOL 9ccb373791a51be72218b1c3adcafaa5f71c430f6d8d086a6d34fb966929c916b280035b56a68288d905e9cf52bede08e9f206bfd6e505fab0a61ddff2470acd
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXTrap/libXTrap-1.0.1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.1.ebuild
new file mode 100644
index 000000000000..932a23d771a3
--- /dev/null
+++ b/x11-libs/libXTrap/libXTrap-1.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org XTrap library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-proto/trapproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/metadata.xml b/x11-libs/libXTrap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXTrap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
new file mode 100644
index 000000000000..2d379175c737
--- /dev/null
+++ b/x11-libs/libXau/Manifest
@@ -0,0 +1,5 @@
+DIST libXau-1.0.8.tar.bz2 295297 SHA256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5 WHIRLPOOL 2315bec66062227051833e6248582c77ecb776947f6dc52369e51ef1fc810a2c5480d0f56e9457d02a54d1fc403871ee80a209fedc92040bfe2c72ca4880bb80
+EBUILD libXau-1.0.8.ebuild 527 SHA256 b1ce8da086e9a2ecedfb79ba676ab864c5dcfaafba6d64f87c9c1e4b311fdbe8 SHA512 0b4fca5acec193a850dec2716d8e88b89cd315aa0b4b737d52ee98a005779703a034b479c417d7e168d2cee2898d22f73a469d8f62145b789b057f331a32dec9 WHIRLPOOL d196a9de7c091e1aa4a11c59bf51695597be38a91a078eb4fa25726f5d011ab571e6fff3e969718d79a1971fb18762f4905cfa61c2e740f7f92a8281d13fa87d
+MISC ChangeLog 2424 SHA256 cb6ec3a54d973a2a06cbbb952f2ecd626b24c7a07f1751080c691d843879baa0 SHA512 aafd39b001f8cb34d2b9ee011b9b0dc9ae3d4cde19e1bdabd962d0f04179aefbaa12e8b88bfb68d9aedabeba25bf58c957f702fc8f5597dbb33951dd9d36880e WHIRLPOOL 186809f7cefed514b4f734fffd1ef2157d199a22dec4bf908dfa845f5f33f483ac9263685cc9d15fe406874ed5c10fe444df2927be1a3c32f424fe48714d26cf
+MISC ChangeLog-2015 12023 SHA256 a966b27b2aeaa95596b9ee406d0ae3185ba5d82c6c55fc5e6446069d16331bc2 SHA512 e554b69fbdcf572cb4532c927f2a983fbcbb465f73b42d51b0ac5dbd8cb62afad38876bf3a1bd49d1195196084b296e76389a8137cbfa27214c9c06c6eadcfdf WHIRLPOOL 0ef2f7d90d5ecd01a827bf89763edf8431fd09f0db54804cf504d4546c75e70ea6f7a4a1bd5e8f3df149f07c21fc49dd833af162521ec5c20afedbc285141210
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXau/libXau-1.0.8.ebuild b/x11-libs/libXau/libXau-1.0.8.ebuild
new file mode 100644
index 000000000000..f81794783006
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.8.ebuild
@@ -0,0 +1,15 @@
+# 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 X authorization library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXau/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
new file mode 100644
index 000000000000..154d1b9fa800
--- /dev/null
+++ b/x11-libs/libXaw/Manifest
@@ -0,0 +1,8 @@
+AUX libXaw-1.0.12-format-security.patch 818 SHA256 bde20c0fe5ee51debd2de15bcc4368b19104a18d79c76bc3d120a7c7401a7f51 SHA512 d08763618a02eeb2ec2abe339566d7a2d2465615306831e4ee02ee2b1699446e598d5aa8dd36356936a87c643900b36845e8419bfa1a1570431c4b5a608f955a WHIRLPOOL f10bfde72933bf0d7fc8c8f82dcccb966cfb5f9403792f0083b5ac90a5f14e8714e78feb10d3be75b7a0ba8b3355d13585d4c153d70c86dd450c66fa046c63c2
+DIST libXaw-1.0.12.tar.bz2 677147 SHA256 96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6 SHA512 baf11625a20b89f08747e25dff6755ab796c8a5a91341d3cb21f85780733c4a3c25bbf134ac6259982207067d0a617f83f516c48aef6f57cbab14c8a9862944d WHIRLPOOL f23798a3c221d6f23de9b8d708f5c054d39d6681df23a53ab7a3c221215dfafc23463475e2d8290d609fd591443e35c1d0e9bc939a528eca3c6e757d7dd2d6e0
+DIST libXaw-1.0.13.tar.bz2 674140 SHA256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f WHIRLPOOL c2af8386b8803b0429bc27875761214a5dbabf4b3feda69af18ddcd00ae6809a3de6fa0912ac1299cbb381d4d8180d1a57f2330639bfede79ef9bcbdd6e6fd34
+EBUILD libXaw-1.0.12.ebuild 1099 SHA256 192b1067d704ae8223248c81147c959ef6fd1352b9dcfca0713bd525fc21d78c SHA512 1b7ea909325c6cebf3c70e22ffe13f3806c8db62a62d111677ad98ec1df166be40e4bd360f865d5c838dc9e356ce1a5f9bc3d8f8f61c75becb1033c7bfcbaf22 WHIRLPOOL d0402e8c4f1d413986f64f8c13bad5affb22f6b43dbb060eca416f8306b4a22ec0305c13898c552683f09759a4da7e24364beaf6055cf648f077a3db30597bec
+EBUILD libXaw-1.0.13.ebuild 981 SHA256 f8935b0d2eb0d0943c368dcaf52068b2ba03101e49070963289d902768ad7116 SHA512 8bcb3fd9eb65d62bd851952c32422c2250c0bda73005977a85e5bed5222202a9c0a390bd98f0c8c0fab8e6bc0a62061dac013cf0278bf5c444fa015c4cebd670 WHIRLPOOL 7c5f187d7c0d75a2c2128f1f41d700ca0aabd97a9419163acd0712098f5bffeca4917c20158e9c31c91973fd5af240117e79de794a53ab9e55cc26b7fcbb4493
+MISC ChangeLog 4051 SHA256 f2f93748cb2549411f7d16c7955c1a352b8d39473f12b8863bad22de375f4559 SHA512 e70721007723a02cf6a268a9fcb8d39465ed4287494e76cd6fc4f79524681260fb682d722a595f11da3470f13c8c30c360e9a05b5b5bc3e3ffbc75556c18d050 WHIRLPOOL 42ae700bb844ef9942317dd09ef852fa28dcf4ab413d785d09c2e53ebb448c8a6f6b018c70203b9e38091a611f87c2811e363d9173f6f24db05ed8e7f578eff8
+MISC ChangeLog-2015 15489 SHA256 ba4deed7f81b17a848d766b535aa53aa3378f36f9dde67e70c348801c8e6cfa4 SHA512 6bc161e68191be653a01ec4ab5728780d310defa2b1d3c50785149d9d94489e6546af472e5acc44e8569c2e593121f089c83eaa4b2cce8598873d5902372ee24 WHIRLPOOL bb78175238d2d18aea6fcd2e1239825ed93a9c5340e9ac00385779b1e5fd0960c5802255a6947c5202e89a47df659b5f902ab5fd910ed1c83d61d21ee4cbc000
+MISC metadata.xml 308 SHA256 86718af383b6c9ac2967adb409aa65e86fa690af1ba54f356bb271363fe0e229 SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364 WHIRLPOOL 898faac1cc1bfd45c2407d1afb3dc860c7b261a262f58ed2ed124e24d98bf0173a86847f508ea821c9d086bf4101a6e760e362425bbbb894d15d2f703baac1b8
diff --git a/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
new file mode 100644
index 000000000000..dfc2e23672f9
--- /dev/null
+++ b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
@@ -0,0 +1,26 @@
+From ec7d7c303385a6bdb0833a5aaae96be697cca7ab Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 21 Nov 2013 11:43:55 -0500
+Subject: Fix build with gcc -Werror=format-security
+
+DisplayList.c:290:4: error: format not a string literal and no format
+arguments [-Werror=format-security]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/DisplayList.c b/src/DisplayList.c
+index 3e99df4..0581bf7 100644
+--- a/src/DisplayList.c
++++ b/src/DisplayList.c
+@@ -287,7 +287,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
+ 	}
+       if (fp)
+ 	{
+-	  snprintf(cname, fp - fname + 1, fname);
++	  snprintf(cname, fp - fname + 1, "%s", fname);
+ 	  memmove(fname, fp + 1, strlen(fp));
+ 	  lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
+ 	  if (!lc)
+-- 
+cgit v0.10.2
+
diff --git a/x11-libs/libXaw/libXaw-1.0.12.ebuild b/x11-libs/libXaw/libXaw-1.0.12.ebuild
new file mode 100644
index 000000000000..93554d3c6304
--- /dev/null
+++ b/x11-libs/libXaw/libXaw-1.0.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="deprecated"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Fix build with gcc -Werror=format-security (from 'master')
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable deprecated xaw6)
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXaw/libXaw-1.0.13.ebuild b/x11-libs/libXaw/libXaw-1.0.13.ebuild
new file mode 100644
index 000000000000..e6e751e4bb70
--- /dev/null
+++ b/x11-libs/libXaw/libXaw-1.0.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="deprecated"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable deprecated xaw6)
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
new file mode 100644
index 000000000000..570177e533dc
--- /dev/null
+++ b/x11-libs/libXaw/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<use>
+	<flag name="deprecated">Install deprecated Xaw6 library.</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
new file mode 100644
index 000000000000..f70cd9add713
--- /dev/null
+++ b/x11-libs/libXaw3d/Manifest
@@ -0,0 +1,5 @@
+DIST libXaw3d-1.6.2.tar.bz2 551851 SHA256 b74f11681061c1492c03cbbe6e318f9635b3877af0761fc0e67e1467c3a6972b SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea WHIRLPOOL 6d56384ed8a4f25d789521203186b6b40330569bb9d3376486b84927906eff0f487139b7cdf664372061a8b0da54db5aa0a7ccbaf7e7b6c51fb4c4166cc48f14
+EBUILD libXaw3d-1.6.2.ebuild 689 SHA256 23e12d9bc2fb0ea837e0ac0b84cf3705003c06b2771f2af739254f141ba1a10f SHA512 eb7a17ba7d411284a8018236f8de7245d9874f22bcee93bdc096e27c8b0d04c5e5e6632a58d492218678842bab1668da4200d6b74947acb9b31a839d910f2eea WHIRLPOOL 25d35a6ad7d9a1debd72df0c69519f8b619b7ff1949921f2a70daca9137a2644b906892bc77730a179a69080ec69b8208ba23b00af6afc124df51e882cc4c372
+MISC ChangeLog 2430 SHA256 790172335441faab61ce5f0b38a022c0e45f46d6299635bc625db8185a3ed694 SHA512 3b23809c4598ebd7c5d87b85001e211111e45d2ec4559ec49e8ec08248b07e68b1af56e6bcb7ea401d20ccfbc9a17566af7d55cbc9801fa5a6cb936db0fe99bc WHIRLPOOL 2b60680876b8dca40749441f21238aeb65ea843f2d9da53a2fb26858232dc8c75e6e41aa035e1fa626ed6639aa43e0459265e1443337a72349908becefef5001
+MISC ChangeLog-2015 6510 SHA256 32b5c1fa9ed66b043fa0f7d765dedf4b6a197a80e1eb06f1d5644c4c2e675e40 SHA512 2f3491e77b3efab6ac8fd5439bf3a15e8475c7629a2b6695a98048e2d3d230a49b7ff722d2ba33633e257473c1f156a46b0acf1e2ecdd780beb2a330798beb8b WHIRLPOOL cb64e64278875dd10d5eb7e5f91d8eb144afe8c43d3e84d889f8b264ab59c82f524b62dc7efbd0099bce2a38b718fda55ecedfbda7879941c98cfe7543824811
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
new file mode 100644
index 000000000000..05b2473ab0c7
--- /dev/null
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw3d library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXaw3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
new file mode 100644
index 000000000000..1a9d4c6e5bfa
--- /dev/null
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -0,0 +1,7 @@
+DIST libXaw3dXft-1.6.2c.tar.bz2 574326 SHA256 12fed1c4f71b12a7fe51ff2859ecf0c9dfb4c828f8bedfbde186fa6498285a9d SHA512 4bc2b8257cc44cbdf1640c9946acd5958694beef4af9f5910cf07b1d32133708561e59532a3ae8f1540b930f97649978910b2eed349e81486ab86f340363faad WHIRLPOOL 9a9df5a5ae37c22a1507d6dfbe062e8b135a9380773c07d337520f00c5423473e856e80113138d182ccc918c5faf21abc1a3555ffdbed9979169f85327fedba6
+DIST libXaw3dXft-1.6.2d.tar.bz2 584670 SHA256 c0ef54c2f40484507c3b7b4df3102b5284d258fde9557de0c417e89ba7f176fe SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740 WHIRLPOOL bfeb4c0a169ce0ddbf9aeaec55b3dec964e5a273128a7831e9afee7b2763ca44f18d31432a61a57053abae63c87537f0f7ba530bc51fa2b8a40ef1a1df597b55
+EBUILD libXaw3dXft-1.6.2c.ebuild 732 SHA256 b96c58b08bfbf496cd1b1e5374da5acab2a8c5082a0495ce079c58ab0f868176 SHA512 5df11ad419e817dd868b989cf75bb4a907499dfbe88e2fc2564b85f5329d35f58d02e45daf8586431abac5229e053203ff405608ae20737eb98cb8eb24c59532 WHIRLPOOL 8094671772dd5201996de20b60e1af337eb8d11ba934332528dd82c6a60451908db62cfc3003109c6d2f5002b0308b6850be8be3f132cc29aff3981065b3ec4c
+EBUILD libXaw3dXft-1.6.2d.ebuild 734 SHA256 dcea337fbfaeb024b771d4113c9045e74507826769b6e1d9cc66f70a54608f38 SHA512 0832a9f7c6de188a906159c7d7acfe60c39e04e3cfc9cce648b40525c44c199018fa4b40b401a5a772b8a2bfa1c3cd217bd9e051098996f9e1128b12c321469a WHIRLPOOL d623a88980832df2c9abb3e42902eca0eae12f095f5f686d372441c3ff4551daa3bc2e824a5340167355645dbbad9ea009cfd3e2c7266274ba361a8013a41477
+MISC ChangeLog 2744 SHA256 809aaad22e7a5b1bf25c92416c9316fc054f6bcc5f4101ad7099f55f5afb468a SHA512 b413b647380d2b7b36f13da522b8e2b2760f21f3840b6835bc9ee342c24115058a34077febce724f596bd44d9bcbc1e88e2b14f1743f438310875e192683b6f7 WHIRLPOOL 1f3ed9f8b6261326282442d3b212cf051e3bd33798d4fe382da0183f6c2a506470224110ce9a9aead5a42871aa2d370b0317b804b179669c2f6e9d256450d735
+MISC ChangeLog-2015 1323 SHA256 b319b29ff1e43baf2ac136a305c0295b305b63afbb475de8a3631ed8e44eca48 SHA512 f36d34cf0ad83eb6a46b30fa6143ea598e1956f89cb098b09dc22ae625c0090c01bee92a8633822365837910cad61df0416d5c822e561b2eb0446e93511aa227 WHIRLPOOL c27cc20b004b1847fed5cb76496706a3abc9d6052667fcc3f4c7473e795eb1e53f5ada391334db8562b5533c8795907c6dd8dbcfdeba3ec9d65003d6acf7106e
+MISC metadata.xml 246 SHA256 219ef412fa62806533f692d030afd62c57b695b49df2803786c93d16b1482848 SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c WHIRLPOOL 024bc46595ac62a9e4c20e9863ce26d464ffe717af35e2aa03264b56ce11b71b964a7fc270104115b8bb2686aeccb6eb4ca4abac65113e30b8d62aed3ed52051
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
new file mode 100644
index 000000000000..40603156daf9
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+IUSE="unicode xpm"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		$(usex xpm "--enable-multiplane-bitmaps" "")
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
new file mode 100644
index 000000000000..14241ad4622c
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode xpm"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		$(usex xpm "--enable-multiplane-bitmaps" "")
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
new file mode 100644
index 000000000000..9809f23e9c1a
--- /dev/null
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">sf-xpaint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
new file mode 100644
index 000000000000..f4792f5cd77e
--- /dev/null
+++ b/x11-libs/libXcomposite/Manifest
@@ -0,0 +1,5 @@
+DIST libXcomposite-0.4.4.tar.bz2 283746 SHA256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b WHIRLPOOL 5b7c5886920bf49f539f0d2460055aa8c226e26387cd21c7d551057f7b0ed51b1e545dacfcb5ffc08817d9bec1d64697ed81d10852c679a0efe2c4af60dd08ea
+EBUILD libXcomposite-0.4.4-r1.ebuild 751 SHA256 248a417000ac9aded8c82327399ba5e5935c1b3008d20b723658369e36e720a5 SHA512 fcbb8b30f0689f59e432389a5a0d4d508b1fae230260bfb0d567a8ba3a5737c7df9481622a76bbc4978c85bb9e72274b2c09782c6e92387b267b988343b0bbd3 WHIRLPOOL 0031b1f3e87c72f84e331a6a06503b57b3960bb8e943817a7cb56b16baee16585f759c5aa72c91125a3bcac4a0e4f9f698f185d2cc2b3087db4bfae7a5a88d70
+MISC ChangeLog 2840 SHA256 75782aeed3274fab1e9e4221ee5a61f4c89ba7f14123925a2876bb3c8162fe8c SHA512 1987ca0647a8b60b9e7fe08c3d790fe096ee93d3a41b94c273b18f6368298fdceb8ce4e0a5c8d55a0c208e1ad693f71d8df003d01709566d718dca7fca08f658 WHIRLPOOL 40b16781ecda466f80f087a3b425db34ff494ed87854ac561f98644970d7c24f8353affd439e8f46c5e835f8ea2b4ea9fb171eae3f943a7d356363cb2086698a
+MISC ChangeLog-2015 12871 SHA256 08fe8a79591566c3123990e9ccecfc2b44a612c80d26628f4c164cc7dfdc72a4 SHA512 eac49a8c9fd1d5fec814211ef9d4bfe7ebbe119fec4f3fb10685dc438539f3a7aa7e96a8ca97196b9ce869a6bfd8a17f58b886206ab0204970c0262ec42cdbf2 WHIRLPOOL 5f2e8f1c73ac7425b9cfbaf8e34e84ecc72854a9be942b073f3469798059ac619203e97953a121910f695b44e577923a7f1b7416c1d1792d0e8a9a9faa085efe
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..6a861dcc776a
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-proto/compositeproto-0.4.2-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXcomposite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
new file mode 100644
index 000000000000..09c0630f9f3d
--- /dev/null
+++ b/x11-libs/libXcursor/Manifest
@@ -0,0 +1,5 @@
+DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec
+EBUILD libXcursor-1.1.14.ebuild 909 SHA256 5fafe5b0c4a76aee95e57d991f8b89af73e5c50cc1e27a76b04b45f11184843e SHA512 eb5fad96a13c3791257ca3a28708a81bc28ea43b33fefc9446b91b313aac2901090cb549a087f882da71b29da0f0cdfb1cd84371a6e0408066d6639d45018908 WHIRLPOOL 82bde37c16f8b191553c562cd579109bdf310f0385ca059e6b4f3a267752bef01f3482de30b120ef96a4e307c6a15f48c1485ae172217df688776a9db1afe134
+MISC ChangeLog 2438 SHA256 f6099c4fcef9ecbd2695825e30b1bd4f1c44d07db59001b6507c9937eaa3ddb7 SHA512 e709ea3c85bc8103fbf62e26580e1640e784bb5f166b80a683822720c7371b30a01ec15ed94bf7c7d526e3fe98300d3529d6132e2931bb3ddf92f55914db715f WHIRLPOOL b4e61272a05fb54391034b26ebfd05c8a0d03883b6f22fa713c3b9840b848d63944893312ae84f78e874cdba7faad1ed48fd18ba348af137eaae33a3a2888403
+MISC ChangeLog-2015 13572 SHA256 b8f308ae3aa77470abedda3bb37b89c85a5a3938ec16cf7b0b4ca33229057df5 SHA512 ca3fbe0a717fa1ccbf09e0fc8620c6d26c919eb24620398e3d8fdb5649add97262710b1f67db6e1d5338eb5469a8567934eba0bdd96791ae7237ee586812d68f WHIRLPOOL f287080ef5f9b20a977de3c0bcc49380e5e5d5addf612d6dda81dce78cb5308723c23871e645376abc81fe7e1436848aac8c09c3e53e35b822377bcf43e82865
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
new file mode 100644
index 000000000000..d929b596bba2
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.1.14.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/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXcursor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
new file mode 100644
index 000000000000..38a80f1a07fc
--- /dev/null
+++ b/x11-libs/libXdamage/Manifest
@@ -0,0 +1,5 @@
+DIST libXdamage-1.1.4.tar.bz2 278937 SHA256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904 WHIRLPOOL b375cecaf924396e186e2836ce6bdb8f78a29260898a0d8cf4dd537dd1240d5b0a0a425792727ecc42a95b4d93dd050e265c661f32bea992377c6e5533c8ab39
+EBUILD libXdamage-1.1.4-r1.ebuild 630 SHA256 65776a292e08a86e2dc0bd616ccdb13abe1add9f48d272981b400020bbfbaea4 SHA512 e5cc6f7c58f06501d548474b5e7deca1012e8b40cd2b48b5cea1ff46976a220416897ccf6bf60a5c84d815cc1a5e07c1b9abc6478468844c7dbb3309ed0e357f WHIRLPOOL 91bf3913cc307e8a7399efd7e0ea0111117cb41f28914904f6873a261b2877f8fe14ee1c67e5d7887843f819d2f203872c7caf35c88e3478b0b9403d485c0db3
+MISC ChangeLog 2442 SHA256 56b78d175e743ba24979908743b17da08c025ff7098cec6e7aeac2c009db83a9 SHA512 c9c06f064d1c4a7afafde767b8fa9011cc00ceca8240179f88c7027717100285f77a4a126c792106e55967db553e1a4183dc9937b651765a92b9838a1420cff4 WHIRLPOOL 820a79a67f35802eb17597719e55fa1d189d48f87ea505566e851abeaffdb20e27e338e1ebc59980bcbf8359f5c5e5d49cd649ea8dab52278ca29bf584091d36
+MISC ChangeLog-2015 9620 SHA256 d29d46c8d52b3009782d0c9c1e6e82fa231282b5899f154b12f7140a94de3c88 SHA512 2d25e0eb57b5ede475392da729ae7b4843f1604bbefd00d54912d441eeaa9b3390ef982b08b862f0f7ae2270bc4b5445d56a0390faa59bfbd33a801a28039041 WHIRLPOOL c5b87737f2a0453e9315f80386251478dd8041fb99a762aeee5d17a7cb0bc5e95e6e5c8060cd261a9a2559260c088a24f229eae77c201b2f631ee341e1b50068
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..b952f9b7bbcd
--- /dev/null
+++ b/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
@@ -0,0 +1,18 @@
+# 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 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"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXdamage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
new file mode 100644
index 000000000000..d50b9f2fd272
--- /dev/null
+++ b/x11-libs/libXdmcp/Manifest
@@ -0,0 +1,5 @@
+DIST libXdmcp-1.1.2.tar.bz2 331518 SHA256 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb WHIRLPOOL ad5a3c86463d4ae582f1ffaf2ae85f5d118f7789b18f9cafd08dcc43b6fe03d9797430e0a686a7d422e09342f4a2c01f0e83a9eb9563dd6a66bf94722b81f2e0
+EBUILD libXdmcp-1.1.2-r1.ebuild 694 SHA256 7b1ef5229ed6d551d32fe883c7906544dc9938ef479523998be280bad4fcba4f SHA512 a99c5ca3cec917663a561950a0b9e727a85cabfaaa14f79ea86935f273689cd31c2d560d7f5ea4c23a00952a4af3754026d69ff4a75955cbc7b6d2618dd89478 WHIRLPOOL ee93dbd24daf366ed11a3805a515398a35b1847014d43dcc9c245455381b218880da5ee88a53ed7f0972ee1bbd9fdf06d612a103329f8983bf65ce46f7146ea4
+MISC ChangeLog 5975 SHA256 fd9407a339a31c819337107bfa6919abfddc9d53a121e14f3045afc0bfeaf8e7 SHA512 68efa00ae3a3c1303fc3820968dd6c616212c7d7b5f9127d77a25011c93daf810930b5bb80b96f2ea86e7b9cabd22004ccdc7e54b11102e0ae7cd6dee86f35d6 WHIRLPOOL d388ae273a7ca42e514cb1a44353ea31d84e103fca267f187926482985e504fbc5d622ca0677c006b2978785ce06b1d2a1e9e8103ff4c8d2126aac478170f91b
+MISC ChangeLog-2015 9662 SHA256 718b1afee2a7cefa43d29710424c071bf353f329afa9a262f10fe6c0f854eece SHA512 c29c3586cb2dbf88fb761e104e947cd548a4084188c7a97fecdd72a0cfc00bfeedd345652fdad3f9562bc3a8b2a62646017de4022b1408c1211ecb380b3adf8f WHIRLPOOL e62dd6a5fc073cf15ade43755bc45bc552851970b66f11f525cfb81b35da4f7cadf7a53b5944a3c71188ad516cd8d9247a717eec49823c0123947017dba0ab43
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..eaa04f9d4aed
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X Display Manager Control Protocol library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="elibc_glibc? ( dev-libs/libbsd )
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
new file mode 100644
index 000000000000..d00a3fa86f0b
--- /dev/null
+++ b/x11-libs/libXext/Manifest
@@ -0,0 +1,7 @@
+DIST libXext-1.3.2.tar.bz2 378901 SHA256 f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0 SHA512 5ed612f2c5e902648eb0438bfb8d9d6440a5baa19d95eb1253b51fe9ad8dcf903a7ee68a9455044d17ce0d486e421df0f98a069ab5ad1a49364f157bdf64efe7 WHIRLPOOL dff91d80c9bcddebd0b1eb0356395749bec3511d40bb69ea681ba55c5353827242bf60dae550081fd482678f6ab551c053ece7728a9dded62aab97a2bdf2137c
+DIST libXext-1.3.3.tar.bz2 389523 SHA256 b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a WHIRLPOOL 4f70b913c6cdcdb6f2e050931ac00c92e5bd4b07254a3864cbc54451adc1c240b52f0a4ae5502ceef1ecde02fbe270c6b59d291f397c8734a3b65ff82c674cca
+EBUILD libXext-1.3.2.ebuild 717 SHA256 ca28b3114d602fcd55b81c771f93eafde44df409eeabe96cb3a1f24cd94bb7da SHA512 20277830306c87a0f0b11b515be9ed78ab8c71bb7dc49433b6e192fcbe07e4e84bc2cef7b436ac9af8b9bfd5992756032c7dfab5a83d612ccfbc9be1a4356b1f WHIRLPOOL 5a7a0966bf17703ff7211fdc95f3cb0c7ae62a2174482406de863afcc8928d8c7882e3b5d31845d6bdf6666384969d4135f53cad4cb4147c8795ad6ffbb43bdd
+EBUILD libXext-1.3.3.ebuild 722 SHA256 7055386a96350c3480c1f0c0520cd69a7b5e59f3e60fd0e5d3973379a5472f7a SHA512 1f3d8ef18d242707429cdd0c356f0d31f1d619af6228492b07c9d26f760dc62c936a0db1f2110c473dd74a4e791db68c1ce1d6a826dd88a37e810b6358716235 WHIRLPOOL bafaa3c9edde6f262a417292fc694d8b7591f6342986016a7d636ac930a1821a29cc03b6e15d85f694be8740fd56a30fb4b0d6556fa794b3801e49b1c341e3c6
+MISC ChangeLog 2479 SHA256 dbbc2f174596be0131397e3e3a8ff46a3be4a2609878f9dbc2f8239245a8ef13 SHA512 0f44d751f58a1935b789ef3f4cbb7b37341f039b26c5770a15fd49f5ecc738b0ea216677919a0e955ea0805a29a1bc61f23a2df0bd04f5f07108bede1c558f44 WHIRLPOOL 25572101bee05f156c1282b016e4c79b120d30f776e4222f0ffee411dd6f6ea85bf496f7e59bbf4b7e572041138ed5a20da6a862a5066b9755a103ef20bef659
+MISC ChangeLog-2015 16797 SHA256 05f50ba1d9b387529b2fa36b638ad836df5979478ab49178a5d59715c998bda7 SHA512 79e9eb7f3f98cb18eab94e69879bf7a782a578a97c1a512ba5438a00303e299d63db617b6e25c95b5d9e334d0371c58dad59f1d68d09d7e093d3589bfd6d5bb9 WHIRLPOOL 7e4e4b20cc3272a292197ee7358bc7689c2f913eb32f1613b605df7f7fcbaf011aa24c20028107135fa35b63564c27766223c15d33901c5e296f29539ed2e128
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXext/libXext-1.3.2.ebuild b/x11-libs/libXext/libXext-1.3.2.ebuild
new file mode 100644
index 000000000000..36036be1a331
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXext/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3.ebuild
new file mode 100644
index 000000000000..0f7f775f9662
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
new file mode 100644
index 000000000000..adc2d5759dab
--- /dev/null
+++ b/x11-libs/libXfixes/Manifest
@@ -0,0 +1,5 @@
+DIST libXfixes-5.0.3.tar.bz2 294400 SHA256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10 WHIRLPOOL 2763a03c25f237afdf9a91e8d5be9bbe322af2413042ab20eaf78e152f3390e7e05bba1a04eb7f3e0bbaf147c1feeeb4590da3526027648843d8e679c8158a80
+EBUILD libXfixes-5.0.3.ebuild 657 SHA256 aad36d8f3e28c9fefe75d9744618518eb4a0e9c10669df58572fe7b839337659 SHA512 a70129a5fc92e982050fd00e8bbb9226fd0fb38a3867cf454b1807375572dc2856a4ad50abba298d427b611d388f837283791ce0790d6211c126baab654836fc WHIRLPOOL d3309252471f3981f284e702394546ad46634a9e9f2b9f60b95dcac5751af4d80c941f49b0e8c0f79af10cbb054ab432cf802e91417c25745c9244d8d0a58fc0
+MISC ChangeLog 5196 SHA256 b77537c573c3dce14d7955ac607edfe17c5f85d82754a150eeb1c8572b0ea545 SHA512 1299cfb5079982bf0553372e76a887b5220cbd076a1fddac9e87245868ceaae038cb07b0dc5f7c19c79a3da24454cb8340c65fe260293fabac3ce7788b4c5a59 WHIRLPOOL d9b53b60d6c0262bdb79655ebb3b1ac52374f1196f95482ba99f900627a46c3c09fc0a1e353434b0686de367be7a14f98824a580bb59736b53bd1a00dbedbf97
+MISC ChangeLog-2015 10930 SHA256 e5fc74f204193e01b329f21bb5be4af5efad848d4142dd5e5337a4e904027c21 SHA512 2ca4c09710b86dfffffd31421a1876adb48eb150177ef0dc2ebda040caeeb12a5c9936ab574ea2fb075bf6eb423b2ebdddae4f886b22fc23090b1be0a4d29ba9 WHIRLPOOL 75b7c210f151b3bef467e1deb19116a34b31ef20681466a4de07abc495197a3ea25aa40db27567591d826e75a53199e97b22877e0b67ccfe8454c2a53c71eb98
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3.ebuild
new file mode 100644
index 000000000000..68267a496244
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-5.0.3.ebuild
@@ -0,0 +1,18 @@
+# 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 Xfixes 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXfixes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
new file mode 100644
index 000000000000..dd83d74deb90
--- /dev/null
+++ b/x11-libs/libXfont/Manifest
@@ -0,0 +1,7 @@
+DIST libXfont-1.4.9.tar.bz2 495464 SHA256 6c6b061a3aa44f0ac95785f9579f6427080c60ae6948b49bcc8d44f63942ad89 SHA512 d541dac1c8639578a122eaa61c3df1cd180f820609a02897baf1f1e45f49109b3a755a7f3b5f284716f5e6f494a829aa86be1c730156eb82db11b1551a320654 WHIRLPOOL 4c3e71025da5688ab594569557abcff714f423406409800e419a3d1b7898135ce36f6f9aa31f17613f82fe5cee9fe8e36da5b5a46529ff7203eeb5dfc07a25df
+DIST libXfont-1.5.2.tar.bz2 530367 SHA256 02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71 SHA512 6f2005eb07afe6ea39b0be035cebdf3492b60758b7b9bed9e226280e370c15883ce6e2f72d1faa006968a0d9b3b649d3b80fcdaa3f7e01a71abcae88d99c7a41 WHIRLPOOL 5175dae63b4bde3959cecc018daca94d42ff023d439d43a8470a5a8ade9eff60dd753fc18a0b6525fb6feb16d03f023abd0353ac12d6907d2c6672adc346b5a3
+EBUILD libXfont-1.4.9.ebuild 825 SHA256 5b3dc24e49b3449c7619a7863ad375e71e3dd121deeb244a0a3d2435d066c37c SHA512 a55701a7daa83a3c66d0f81101e3ef0e2f90c13d9f21fd280ad8c202326b47e2837cba8eb3bb196b4d7f23d3b8df63be5629b64078cf46a1518a31a962abbff9 WHIRLPOOL ed29dae1a46755f17f1ef7456dbfb130427a608a468b1e29780905ea6151dcc1cc16b5ffaa2e100b647bf8fac5d82fc86380719e8691c01fd52fbeb9fa8ed549
+EBUILD libXfont-1.5.2.ebuild 868 SHA256 f3e12148c4cdcfe8ac3b01be33afe898f5f7bebc870fdf6378f6c92cd43265ad SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f WHIRLPOOL 7c85e7287508e208f32023d4fbf28eefc4751fc12d8af80926c9bcf05a125194c60e1bc5774f137fc6ada619a83e868caf2dd016613591cb50e35395dc2bf594
+MISC ChangeLog 2614 SHA256 e7d8991fdf45b22339592f5121acbf852bf6a2eb31d4e443daaf6530a37921db SHA512 e8c7e7b5a5401692b5d198a6780a0495af69a5bd491137230b22578055e5fcca53f0c92af6e69ced3b47df1278fcce61d45fef083b9baaed81d8cf027acaf3b8 WHIRLPOOL ddb4dcb927c51fbb194e603594f9c0743392a856b5e49f737a14101e2d56759860ce856ae92ce4ae6449994d14f4751e78f231fd13d44b6c6c4964ccee1ee8d5
+MISC ChangeLog-2015 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606
+MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont/libXfont-1.4.9.ebuild b/x11-libs/libXfont/libXfont-1.4.9.ebuild
new file mode 100644
index 000000000000..7423b0831d72
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.4.9.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 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/libXfont/libXfont-1.5.2.ebuild b/x11-libs/libXfont/libXfont-1.5.2.ebuild
new file mode 100644
index 000000000000..f54a49c17cf5
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.5.2.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/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
new file mode 100644
index 000000000000..cb2e6a7213ce
--- /dev/null
+++ b/x11-libs/libXfont/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
+		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
new file mode 100644
index 000000000000..d080e87c0b0f
--- /dev/null
+++ b/x11-libs/libXfont2/Manifest
@@ -0,0 +1,5 @@
+DIST libXfont2-2.0.1.tar.bz2 472822 SHA256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e SHA512 5e4dcb587b4d25dd41124bb50d71c30b5e29663ce675b0830def82fb6e00b64ba34e1b1ed7fad947fd0da95007aa55d14f587383e4cff08c3e0a0241c8879d16 WHIRLPOOL 305b33b83f6bb3c5e73e39f8be597e0d0934d5ed190691b141bf792987cef6b50ee1c31310b955eafea0e16869d52378e453805cddf4e06c8d172385ccc81228
+EBUILD libXfont2-2.0.1.ebuild 833 SHA256 5cc05dc427e71cf247870d357e79806abaa75b195fd791264dbca830f9bc0f07 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd WHIRLPOOL 9cf4fa661a4567b451f03795e7f9c8b041805a37b98c3444b14ae7dd7a83d6f853fe90dcf0558d377675a5885f3a071ac5a2887a2fedff9463440b82c56877e7
+EBUILD libXfont2-9999.ebuild 708 SHA256 12d8b9d6f84e979df9fcb44881ae063cafe60db98766f9851e5cb5bc59234e7a SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1 WHIRLPOOL 48dd14d2760caa6ed2acc8996401e87c97ea80941e4089248b82b9c28d4ec5b9f6b50e3c9270b56934005d5f4c5d379194863559238a558c10b901de697cef99
+MISC ChangeLog 821 SHA256 2321434d8c275290513cdec74f8bf70440ec93da094bf4b77759f11ed6d03018 SHA512 1bba91fe37673341c61ab6916530753c69dbcea29ea5e47a35fe0fa51cb7e7b23146928c61a9f78ffe66a9253583c5be720d831d7750b01b91b7e9833c835b3f WHIRLPOOL 42fbefe010b45dd74ff4270f75be044e44f8ccd18af786964f18b84d382411ee4de7398465ed795337489f283878296ca9a0f78629f96cb9ddf70e821abecf48
+MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont2/libXfont2-2.0.1.ebuild b/x11-libs/libXfont2/libXfont2-2.0.1.ebuild
new file mode 100644
index 000000000000..333ec175f52e
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-2.0.1.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/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
new file mode 100644
index 000000000000..cb4dfd2d7d3f
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-9999.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
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXfont.git"
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS=""
+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/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
new file mode 100644
index 000000000000..cb2e6a7213ce
--- /dev/null
+++ b/x11-libs/libXfont2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
+		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest
new file mode 100644
index 000000000000..31b45926a783
--- /dev/null
+++ b/x11-libs/libXfontcache/Manifest
@@ -0,0 +1,5 @@
+DIST libXfontcache-1.0.5.tar.bz2 240293 SHA256 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce SHA512 cd11231b95d3d3be9deb82e61506e58281150d743b07d05716aa627ab31005cf0f963ef2b96eafc65c4a0438f7ff93cdfab25022a05961ea1ff184d47c131310 WHIRLPOOL 81e0622146d1d8c4f7e6e318be1974d7d45f8021195e57ab849df00904b2b2a54c28c68c6c49ae0c3a65253effc27a0b8027bb805384d07825d46a0d661417a5
+EBUILD libXfontcache-1.0.5-r1.ebuild 412 SHA256 3a0140fe9067f57f56f91d2653aa60f8eb95762f612290ff6aea4738b4057f41 SHA512 249231b7338fb2eb3e23f8ab5c4ac128a6e9631d2540a676809427256262dfb3d44f4663e3cdbed5f386509bffa28252ce5d29abbdc159768ffb2b3f805de6fe WHIRLPOOL 93bcbcb25be6027781a6fe0c794c896181b6ff1d531f8168ae407de070c07c9bc5f00f7c75c1ce56d5517dc256e2a0d70681ff9578e358c65c2acfcdc70d134b
+MISC ChangeLog 2451 SHA256 07098197e484c21a01592c4443f546b600cbd05818a239b83e09a7af5f91f3d7 SHA512 03214d83d1aea58846c3857c974b1b48e5e6e0ab86b4ce8c5f126d3dc89d5f3ad60e93184b358d3a2369975f14f64c42d77b9c6a69a12b6926140f3345f12e8a WHIRLPOOL b02134a6bb91225ba954885399afcc54454ae8deff9b725ce55ec86b781a935dccb44606038f7f55c098192c28f978e218322a20d8a69677f150564683fa05e9
+MISC ChangeLog-2015 7240 SHA256 3c2f44cbfc12ebe68d1136a6f622f9ea497759244001686af3dbe899df88b667 SHA512 da9ca777b0b6456171e05b08510a04d8d5562a3ba86556ae67f4148e1b7c0dc876c4cd61737a025a291d0e6408b59561e6df8bcffea70fad78aa528a4abba789 WHIRLPOOL 0415d1d907f98aabae035201b9d9f6911552c82ae06a00702036bc642419f12ab34e01b5f1b8056f1b860945cfbfcc177e9a6c759bb70cc5dbd203d722a546b8
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..146320862e85
--- /dev/null
+++ b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfontcache library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-proto/fontcacheproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfontcache/metadata.xml b/x11-libs/libXfontcache/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXfontcache/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
new file mode 100644
index 000000000000..942233d4e099
--- /dev/null
+++ b/x11-libs/libXft/Manifest
@@ -0,0 +1,8 @@
+AUX libXft-2.3.1-compile_fix.patch 404 SHA256 c567d6781034d83df173f903e3dc536854933d599a93bca85327fcb65c65cacd SHA512 b8bf5c564741c805ebb7b07c9a605de07fe5e66330743e92d47f6f0d8ba9e58d78d038aabcd08514a4d14d365d1f08faab87d9ef5788762eb0ab53ea80cc2dcc WHIRLPOOL 7c0be45084aa5c5147aec83b8c4be2d96bc9c880c65fc3986d75e83de7127385bbaa3c5ede3eb9b32acdf2b776928c916b42f69951cfb22b09747fb20fb32cc3
+DIST libXft-2.3.1.tar.bz2 311556 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f WHIRLPOOL ecd372614afc4fba05598e51c051f0a011c5ccaabc41e9e585b67180099cd9f7c6d68904adbe5ccf44f79133e21495daa6cd46675ca7556e7d7ab0dac1ee432a
+DIST libXft-2.3.2.tar.bz2 335495 SHA256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 WHIRLPOOL d6d5e5741f223824ffaffc11f0bd51b992516f87a688a9f4f7d344caeef52d60094aee0d5e1f6313b714f68865828f3ddbb5531e073c04e4f6a9311c652218dc
+EBUILD libXft-2.3.1-r1.ebuild 833 SHA256 e9625d1d39e83daacf133de774e9619b516f2da5de1933ea236023fec4aa8c39 SHA512 8710b4c400f3cc8c11d26315426f5d28281347e0f3c92d82cb062684bcb39a01d260a24f4c96f56add3483102de4b5ca5565f3eb2512da02b1574492bfb004ca WHIRLPOOL 2af1553e68df48cfc274cebd66815d85f3206113dfb33994ba6f7337bc354f96487289cd5a4ecab429deeece6b12029f79f10c3ba9fa49014f5173250cf2fed5
+EBUILD libXft-2.3.2.ebuild 782 SHA256 dc03d52b74ea10ed3d1127060bf4d14856b5ec0da3d742814558c42e1be90222 SHA512 626b5ee582cb0836464a18b677ad828a9bb76627f6fb30286fe3c42d3239d36f1b3fb0de9b9f68fdff435cf7172d5ddd9a4ede07589084508be1e1ef3f7773b4 WHIRLPOOL 0fd30fa07a582e17b92f4e0e7cfb1d920e2afb8a1da59b99e22aa1910126d9da2a80b0caa180bc52bd2babeeb670c4737bb054d8554095020680ce86e4838c81
+MISC ChangeLog 2521 SHA256 e75d2c5cf1b07be204d32eeec4a034823d57138a6f79e9e64436814eb96d80ff SHA512 13126ceb66022c0f4a8e2635e67cf24399f0bbbe1cc3c741c5b42b94527ce42360209e0e1f0759861008b05e8648ee3ea840a57d1f401f0f9e88a96d2cde3392 WHIRLPOOL 4263c906c62af0b40724d20265c0a7cd4781859caa98899bf4de5a6d323aa1e81587b8d29c2f6edfb249a53b71f9ba135b8731fb72eff6481e5094dbafff846e
+MISC ChangeLog-2015 12794 SHA256 4eaf82dad45b960b8e11bcf6a4e2e646b73f23de4711a880afefda616f4b7510 SHA512 8d970bffe347d04d86e008f66197fdcec28481053e26b3b5fca05490e316bfd19a8c1a949ac8fa90e94905384e762e8824bae96e26c3134bc39f2a3831dffa63 WHIRLPOOL 47416d7a4d45df439dc6b74bdeee6df62aefc23e7bb56ecfb2b9f6fd2f7e949b4b99fad833432ddf828a59cc9fa7110b70ae542eefabd7c413cad81078fc3fdb
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
new file mode 100644
index 000000000000..4fc944aa2195
--- /dev/null
+++ b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
@@ -0,0 +1,17 @@
+--- src/xftglyphs.c.orig	2012-06-02 11:36:35.000000000 -0500
++++ src/xftglyphs.c	2013-11-28 01:39:49.000000000 -0600
+@@ -21,10 +21,10 @@
+  */
+ 
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
+-
+-#include <freetype/ftsynth.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
+ 
+ /*
+  * Validate the memory info for a font
diff --git a/x11-libs/libXft/libXft-2.3.1-r1.ebuild b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..eccb6f06fadc
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )
diff --git a/x11-libs/libXft/libXft-2.3.2.ebuild b/x11-libs/libXft/libXft-2.3.2.ebuild
new file mode 100644
index 000000000000..2db1b632983a
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXft/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
new file mode 100644
index 000000000000..dbdfcfe4b5ad
--- /dev/null
+++ b/x11-libs/libXi/Manifest
@@ -0,0 +1,5 @@
+DIST libXi-1.7.9.tar.bz2 486312 SHA256 c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45 SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5 WHIRLPOOL c09207a5b8ac0f8e4770734a3bc0722189811ce8bbadc729969de87a5a0ea195467f648a3ac75f422d9ed8d281dd92345658785517a75b4f8514fd8e26f8a08d
+EBUILD libXi-1.7.9.ebuild 921 SHA256 8c127377d8303e24c77d389ccd6fc68b9e3bf301500154a6c2ff9e82301770bc SHA512 85a99607a29c1a0981ee98cde141570f5ef96ac74835c1c2575c122aa068c44d214c26017acfdc85dd1cf5df667d57c77880cfc347c9aeffd0d6085b02ca7749 WHIRLPOOL 19b5c4c7b4866efd68221c9f868485829afc2e20d1f8845bdb435a35682d05f321d623fa2fa4890a37c49523adf44edadf5b8ca39b05beedb3a5ea1f8312f0f3
+MISC ChangeLog 7405 SHA256 29452e3e3a686ece1ea2c75e354ec137435cd4a0f9aa16ccfff3289476b944d0 SHA512 360cdfafac4ff95c6b2620cdc66942ccc4ab33cf802336f4d90b30ab7e4dccacd71701c9f3a5e5b978297e77b94cb8ac94c469e0b6ddd99fcb6aa8ce9cf3bb7f WHIRLPOOL 748c8497a9f6b53371056fda4c7f56276f572c49307e8a19114489ce60acfc3f94c37d05d5e375f8144fcdaef5822bb2aa90be5566d54666fd103f991f1435f0
+MISC ChangeLog-2015 21546 SHA256 056be8736dcb4379c4ba8ab9f6ea5b2f5f8c736574a84a90d37af1c74fddabd2 SHA512 2756ac55ded09a6ce05f7e6c8cf0ccc59b177337c33c3b96f7c8e0683a5e8ba07f688987f590ebe1f04d5e6a5e2a7492850b232a7f9b3fb621c99c7fe2dcd986 WHIRLPOOL dd6c78cc0e7c8f51f4c86f1d303b32d10bb5c2ce518e008cdc5942421423deea7e4ecdd094c9a6d93264bdbcce63b4546e5545d2250a3a8d46130319d7947426
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXi/libXi-1.7.9.ebuild b/x11-libs/libXi/libXi-1.7.9.ebuild
new file mode 100644
index 000000000000..f0da0f489080
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xi 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		$(use_with doc asciidoc)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
new file mode 100644
index 000000000000..a46e67775906
--- /dev/null
+++ b/x11-libs/libXinerama/Manifest
@@ -0,0 +1,5 @@
+DIST libXinerama-1.1.3.tar.bz2 278026 SHA256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c WHIRLPOOL a97c76b2ad26b5f322cb5990c5b7643f9d283783cbe7e22b9735473f226fa92ddd78085f70f17a6231da087410bf351d533ec53cdfe1663aeacf97421f4dbc7d
+EBUILD libXinerama-1.1.3.ebuild 625 SHA256 a9806dd009683075002d203a49e5f72c17f76d5bd4f12370dd3d3b63dd6f15e4 SHA512 97e4e750a0ff2d98b82c1af39e58ef3b9cb4054c5bafa4ec2e16deb6e9d3e443e47c71419bf8ac9cb362ed93976af51fca6a74d27207365275c3d3ddb4ac6c56 WHIRLPOOL ab7b547b307145da79467c3a76fe779aa79956edea2e4523a43f014fe809975e9e6d7b8fd075603c33d79dd8abeae94de6206bbc631988f7535957fd0e14c4c4
+MISC ChangeLog 2439 SHA256 acad5ee21aa7a6122bf31260c220accf410ee47cbd402020184f7215197c5004 SHA512 52d18be71fa361809eceaeb2a6186793146222a82746aa98ec127d2629dea9c1eb586e39b7a61c2ccda8cb03a88139a9c0ca4068f8ae6e7421331928231574a6 WHIRLPOOL 78884eb5a0de812721a4ad1e0429707cb5e146dedb64c729789d229104ac1982ce5f656083d07ec28e0f8b966df7a0e5916393f3e6d54bf2889679ae8170cea2
+MISC ChangeLog-2015 11046 SHA256 443a98dd485f03199cd27ed54cb0d7a06ccbebf1b6c79ed6ee7d733c9f5db68d SHA512 2ae5baa331ced81abe9e6e54015c7c9753a821c5ede18ea127a466e33b25c5a752dca326680d7db7d98b5d072715fea6a5a94d9dbd4596bea7c722e7778269f1 WHIRLPOOL 1db458114e4fcaa3ab3b0029edfafd1945e4600f070372332df4ba334d8b67710592ec4f90b222fc8aa7b7151285ac8db15b1b38e302976a8592dba523cc79d2
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
new file mode 100644
index 000000000000..2e877b48e9ff
--- /dev/null
+++ b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
@@ -0,0 +1,18 @@
+# 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 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-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXinerama/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
new file mode 100644
index 000000000000..5a7df863dd61
--- /dev/null
+++ b/x11-libs/libXmu/Manifest
@@ -0,0 +1,8 @@
+DIST libXmu-1.1.1.tar.bz2 383473 SHA256 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd SHA512 fb3baf697bb93fd5c2a26af318b9f7632b83bb2efe9cb4570b799ecca54e7de93248930fb8fd14d973c67612ad31502733417b1a6eb6d0c91ebafa204371c953 WHIRLPOOL f5c897ed6ebbb57e0367be8f7b790f7ce557930deabf66243c71802125072887fcf73fcd7ffa29323e4030f70fad402d754248bd15e8e87ab535b77e6d5c2002
+DIST libXmu-1.1.2.tar.bz2 396230 SHA256 756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc WHIRLPOOL 5b6326b127e14e13542dc81f891c584063abc2f3e22e60c7df0a1cac69da7bcad088e75aa9120f47244e11502acc60b2f5559ffa2e269e5e02f9cf879d91ff96
+EBUILD libXmu-1.1.1-r1.ebuild 815 SHA256 eec9a3ba5af13eccf2f6325e67ccd4c3db3ba1ae161e3513fa2a839234b2e608 SHA512 29b1c888a8606eaca48ec3169344777bd39f61c6095326c1f6c458d599f8c24ef0c37b047ec82e0485fb55f1959f477f78980dbf0253684ddf07e41fcbbd0500 WHIRLPOOL f8992a652551fb42d378e851a7cd9ccd470f51229eeecea7c9d535409deb67958a829daa247d93e8bf40912d832e4c1175517d43f64689597b9fa7b2892daf64
+EBUILD libXmu-1.1.1.ebuild 671 SHA256 3f4dd8b1e4e609f454773ed7ae823ed108619beb21305c86cbb4a2ebea4759e1 SHA512 96c726dd77fe930ac355d30ffba9328532342eee5bcbf2afbce193a0359df09b26bffd6937e7bb3e7148c4b843bbb8ced5f95d23cb1af92e3f1849ef1f39ec33 WHIRLPOOL f47bc5631e11b6569d6f5942b6ff2e243be18ffda31244e032a69e6af0e632ac8b852c9b8d521beaccdb8b53148c69b3e816939891474a8e27ad71185e763d58
+EBUILD libXmu-1.1.2.ebuild 819 SHA256 820c7f14c12d082c9fe5539b35da974bcc4a085f33b315f5fea0cff4c4e798db SHA512 50c78e134179aba4b2f7bf6d92c8151d59eff1ede1b07f6f6277df1b3d972f5c1d1c19cb2245474c8f13250601f3c625195b4ff4eb569f019195287f30aabe3a WHIRLPOOL c44f28f55ca1945d24abc21dcca810879c11a6ad5aa332c8fde3d5ea8e16caa26aa7b207df3e3442ebbacdf8bb2dfd0106bc5a89ae54675634a047b3edacf773
+MISC ChangeLog 2530 SHA256 be565cfe2925d567bc5a1eb94b4a80d0cc6d25b1e76c4ffc2112de809efe038b SHA512 d7a1c671bfe3347d96356b23b7f58d228bb2ab98f9cd97dfd024124eb19c572fe20808cc3415d2e6a64dfa7f8397855787d87ec894759abffbd5a8c24d0eaca4 WHIRLPOOL 7fd58a78b03be384171281c61372fdf8d531157465f04b5305bbae73ac38f04c9260462cd5b1541b4b5b523a466695097a814353bcef3b3c55c26170a073be38
+MISC ChangeLog-2015 10417 SHA256 a3ab15152eb54811df3ebc32420cf9b7594a8068213601b7af69a942636c600f SHA512 c1a004692c024361391ffd6e80503f031914f1d801928821a6c0d698a7be852d430dc2890e7d234cf836879ac9e5fd2c5dc3b589f28847d87f99b7d78c17de70 WHIRLPOOL c045d1c8fa2ad6fce875facfa053702740c574aed7ac794602eb61c26ad4e12c7eda453314a1e1703a738c988a47ccce273f653cbba00602547e3b63b9755637
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild b/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..3720b13e4b3d
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
new file mode 100644
index 000000000000..559805399594
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXmu/libXmu-1.1.2.ebuild b/x11-libs/libXmu/libXmu-1.1.2.ebuild
new file mode 100644
index 000000000000..59793d754e0c
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXmu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXp/Manifest b/x11-libs/libXp/Manifest
new file mode 100644
index 000000000000..8d4cf238f0c1
--- /dev/null
+++ b/x11-libs/libXp/Manifest
@@ -0,0 +1,7 @@
+DIST libXp-1.0.2.tar.bz2 298632 SHA256 952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5 SHA512 39670864e29db469060bdd66c7f4a64aadfd07506367617b8c2c91b91553b4e632ff70ebe59fc0198cdb7f12874e380a8bffcae7c192b0028bc5c52faf2bdc52 WHIRLPOOL e0945b866502595b11a2b95036521dcf028fd57f22ef4c95c91bc7f07a10f1a7e7c14d9cca683e71e6a3bf810d53550341bd8af54d6c3bdfea2ba84b133601b0
+DIST libXp-1.0.3.tar.bz2 316717 SHA256 7f360c9905849c3587d48efc0f0ecbc852c19f61a52b18530d6b005cb9148c57 SHA512 502a2500ec0f519dae69ac035bf93c65c47e3bc301604aacb350e90043455f3485626194db45208e5521300b282843825e08b7f7c412a7497ffa02f5f1560c8d WHIRLPOOL 07fea09cff082c5cbcf9d6faa1633a788eee0be16ce725e984202636b8f9634545da48607dc7f6bef2348f782043eabaf1eb931b9f9e0e04cf0d6a601686faf4
+EBUILD libXp-1.0.2.ebuild 660 SHA256 6e4491998724b08b6f44f178031ca6520675f492e6f2d3188c540430038b9a4b SHA512 b7b64b16da8c34eb07dc24124572d989b9366454b957a2a3797f2febd7a017479affaf2910d7fb31b341d70936cdc7150a4fcab3e7f592e96f258f1243dfbff2 WHIRLPOOL 811927c520fa51377c0f05fa673d0ddfef30bc6998143bc1f8725f08bd1a43e7ead39deea78ca2237f1c4499d0f08036cdbae6a4774101e2eabb4ed60066147f
+EBUILD libXp-1.0.3.ebuild 659 SHA256 0d7349cb188f45c65afdb92a76b62cb97514d837c70edf7ab7550a5b9e9e8be0 SHA512 2097953736f428d7bdec9f016072bd5b678ef100568052bd34f65b70d056acf7e06e237960fde06c05ef7cff57deba0fb4d42f9025e0a3c769fd424ac73f8757 WHIRLPOOL f91532b7d731a804b73e4129785afa3f5cb2910d73ea066db42fb976faaf0f9122b5c9357d1338924f947a38714b9252ea124fba013b5046a15347127e7c59e7
+MISC ChangeLog 2469 SHA256 3035ab0131a9d98ea95bced51d1a5dcac5e53c7906c617e05c14cf0af33a4fa7 SHA512 77091af8577678dc60a0d998075054386ccf879a895ac2cbe44aff4c33f303fb1acbfcc8cfac6226848c76666ecb935ec7f7fa2536bf46c3bad7b9b4a4da4036 WHIRLPOOL 14aa0f9f982c43ced99e0eb9231f846422ac1fad14ff95d911777af53a8742339250736e4e722d83d32ec91f36c0c7d0e89d99b671a5d3880ae67da968471c10
+MISC ChangeLog-2015 6455 SHA256 e4c4af30c1d307faf682ae79e5c70a450dab2b25614d0b9041d48248a42c05ff SHA512 6a08c73c35142fdf0cf91108dd5dab30fec6ae6597c07b8650880cdaf38f046e0b336d171635067911012236acea36c63b9390d66a96b6faf97a6d675bc870a8 WHIRLPOOL de003acb7b34eb786ff96f3233090aa3f394a5d4317351677e29f323811598072acd4722201b1ed81e96b72485a2c6bffd0910fa22e954975eec1581ffa2bcec
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXp/libXp-1.0.2.ebuild b/x11-libs/libXp/libXp-1.0.2.ebuild
new file mode 100644
index 000000000000..954b3430a867
--- /dev/null
+++ b/x11-libs/libXp/libXp-1.0.2.ebuild
@@ -0,0 +1,18 @@
+# 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 Xp library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/printproto-1.0.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXp/libXp-1.0.3.ebuild b/x11-libs/libXp/libXp-1.0.3.ebuild
new file mode 100644
index 000000000000..6f429734db41
--- /dev/null
+++ b/x11-libs/libXp/libXp-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# 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 Xp library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/printproto-1.0.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXp/metadata.xml b/x11-libs/libXp/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
new file mode 100644
index 000000000000..1e287c7cdc2e
--- /dev/null
+++ b/x11-libs/libXpm/Manifest
@@ -0,0 +1,5 @@
+DIST libXpm-3.5.12.tar.bz2 430736 SHA256 fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e WHIRLPOOL 4e44eb629b7c862528b8a07b6ce752570951fc6dac93fb093b2b08c5313646699373e125df174c88524ddc6726e3b0af02230b4bbecb269ff08a600f59286705
+EBUILD libXpm-3.5.12.ebuild 1012 SHA256 a4499026da43d98f3b3109918ee2787fffc2e3450060ff04bc5ea71bf24cedae SHA512 4462fffa6049025ee46d5ba01d0d06dc0d8e50b4f86c6a33fdfa89aef49b7d32b6509ea0de760222dbd153bca439a2ea11cc3fb39527d4eb6508b48aa4e0c663 WHIRLPOOL c8c749e5afaff04b29c304d915715d211dadc394c95465512a46993cfab8cd711e77e0cb2910eaf9f11a0ee30e3d06a2afaf4bd32e11c2664661d3f632c6b297
+MISC ChangeLog 3441 SHA256 2dfe4f707af4015ae3e52ab8a31d0da00c3362134913186e530a4eb70613318e SHA512 fc01a947d12794fdccccb70b0b5f0881e6c4a55030deaeb50d4d193785479744d1bec7cebcd888a8c69ed0852328e1767c5964baa278118f3317288cf46c4672 WHIRLPOOL d2ed20e4d6206ac986368a0ba4ce701a16ffb1d30bf6cf55aecf380a9587a41d64a6112443f7a836d1e520e0fef113f5936bd5b1611e9c61029d623fa0bdca89
+MISC ChangeLog-2015 10876 SHA256 065576fde4fb72be826e9191a7cc908698672d4ab9447c59e32bbe63488bbf8a SHA512 2717000d2fd03673b1d9489333034239416816dac6afbe3a991bbfb9740a6660732fc79ceec1b57e71296b0ce901497555ae3c25b15a66c13ccd35e9c81d2914 WHIRLPOOL 4275592e71422d9ea30c6f58b254832cfebd0761406ae8512418772e4db66b1cdd70e5eaa006ce6e4280c5ac30758ee732ee544b90408a65349f5ef0c6fe25e1
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXpm/libXpm-3.5.12.ebuild b/x11-libs/libXpm/libXpm-3.5.12.ebuild
new file mode 100644
index 000000000000..4a4990d55ec8
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.12.ebuild
@@ -0,0 +1,28 @@
+# 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 Xpm library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	# the gettext configure check and code in sxpm are incorrect; they assume
+	# gettext being in libintl, whereas Solaris has gettext by default
+	# resulting in libintl not being added to LIBS
+	[[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXpm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
new file mode 100644
index 000000000000..905688ac131e
--- /dev/null
+++ b/x11-libs/libXpresent/Manifest
@@ -0,0 +1,4 @@
+AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 SHA256 48577cae1c50df846d4d82a62f4eb0404c76b173a08ae60cb4d3fc72bfaa8a6b SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4 WHIRLPOOL ccf18b8c34a98b82bcdf5a10badec4a0aa2f15837eb49a6c8db7a54521ecc2fb2f2e17dde0ae917f3c5eeea027f394bac548ad3c8a5be43ef68212d20dc133cb
+DIST libXpresent-1.0.0.tar.bz2 263461 SHA256 c11ae015141a9afbe10f4f2b8ee00b11adca6373dc1b9808d7c6c138b2da7b8a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b WHIRLPOOL 375532a8a5bd81332d4cda21a34cea617e7b09c649371efc85d103e1c379b4791a7c24ae3d01efdf2e6527e56111561ca50a2831ec1ecc2daa30beb374362dfd
+EBUILD libXpresent-1.0.0.ebuild 689 SHA256 06f90a8a6dc1ed95082e056a233e515c76be4e7bc9bd48e8809baf09326ddfce SHA512 c332669695eec6fb5f6e8a5a6fdf37b8c5d1a82c5827c62818e1e8e780fabf8002295fdee7ee93640c8284c324b5900963a11fc0ecc2cff2cf2a5d042ef3572c WHIRLPOOL d0b4d5c1b20c2a5448aa8bcdb96d265681187c353b36c4a5fde21558b786db1ac4b81d28937239db39d3e2b51911298c1af63db3f95bd393b8e1d6d50c61e9cb
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch b/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch
new file mode 100644
index 000000000000..1b5be70a4f3c
--- /dev/null
+++ b/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch
@@ -0,0 +1,29 @@
+[mattst88] Dropped configure.ac changes. ebuild depends on these.
+
+From dd6771cdf6f04cde37eb14891573c0e55be83241 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 26 Apr 2015 17:53:15 +0200
+Subject: configure, xpresent.pc: require xext, xfixes and xrandr
+
+include/X11/extensions/Xpresent.h:#include <X11/extensions/Xfixes.h>
+include/X11/extensions/Xpresent.h:#include <X11/extensions/Xrandr.h>
+include/X11/extensions/Xpresent.h:#include <X11/extensions/sync.h>
+
+v2: also add requirement in xpresent.pc since we include those in our
+    public header
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+diff --git a/xpresent.pc.in b/xpresent.pc.in
+index d5d0d38..8f6047a 100644
+--- a/xpresent.pc.in
++++ b/xpresent.pc.in
+@@ -7,6 +7,6 @@ Name: Xpresent
+ Description: X Present  Library
+ Version: @PACKAGE_VERSION@
+ Requires: xproto presentproto >= @PRESENTEXT_VERSION@
+-Requires.private: x11
++Requires.private: x11 xext xfixes xrandr
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lXpresent
+-- 
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
new file mode 100644
index 000000000000..f78b12e347be
--- /dev/null
+++ b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# 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 Present Extension C Library"
+
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-proto/presentproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-add-depends-to-pkgconfig.patch )
diff --git a/x11-libs/libXpresent/metadata.xml b/x11-libs/libXpresent/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXpresent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
new file mode 100644
index 000000000000..5dd5d874b764
--- /dev/null
+++ b/x11-libs/libXrandr/Manifest
@@ -0,0 +1,5 @@
+DIST libXrandr-1.5.1.tar.bz2 315769 SHA256 1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a WHIRLPOOL f53be81bf09207e75aee5d89e9b4369316c74ddf7cd190ab89fd73a2e7b0c2c44d922ef987dbb37845b883b9d78272f3dcb4c1f9771454758ad162991e6648a2
+EBUILD libXrandr-1.5.1.ebuild 759 SHA256 9bec06a7f8733283b2e10f5d17c32b0a1fd2f4b29bc45dbc7b6ab2286a7fd78d SHA512 90d8f42b56310c500c1c19959494e8f99d8e8aea23577f04a6006ff82d5d8c77fe1dfa5d80e8dee6f9f2f1390b02b82361ba33fe81347e71c4aa98193e075ada WHIRLPOOL 7ac2d270ae4bd61beb1f02f401a892e27bf48af88baf193641cb990f4abc4baec72786ad4f022a887837ee9187b600c3fed4f54c7cc74f8db6f7a58e67b3ec10
+MISC ChangeLog 5360 SHA256 dcb011dd5f88274fdd7bc16cb9b3acc94cf06acfdef62881df0aae82863833e4 SHA512 ff42f198fa6ce4f89deed510054d8d595468c987187859d0f7d61679885e144805058c107aca5b26ac2b9101ad569eb9f8c5fefe86eaf9bf3392aa7d21553140 WHIRLPOOL b0f72b93ff89bc4c40ebfb2c0c7409e45618ba6f7e519b8d455bb2b07e272fa2520ff2bab2c6bd27fb675844905825bb66e1d7b777a0a80d4c45d38d7251b179
+MISC ChangeLog-2015 14708 SHA256 59b055a7db8deb1dc571192ce3c53abf7693fcd4083694b5d04382af4eeb70df SHA512 76524c783d19048c011927cd85b05c7d136fdf060900bb85b469b5e0663f527f671f4ffed34ea7f6dbc01cc5a61a4d60f289a9d796ea4b769acd4abccc72c337 WHIRLPOOL 1a1b0f6fb39bd036651892fd9fc2f5a93aad5cfd4162b8d39c264c959fa341bde33fb55dc4a452cf0b681bb802b5a321656a546cb9dd8c25613f4e600ea4f1b9
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1.ebuild
new file mode 100644
index 000000000000..5538b7e5cd01
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.5.1.ebuild
@@ -0,0 +1,20 @@
+# 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 Xrandr 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-proto/randrproto-1.5.0[${MULTILIB_USEDEP}]
+	>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXrandr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
new file mode 100644
index 000000000000..6bfa5c00f931
--- /dev/null
+++ b/x11-libs/libXrender/Manifest
@@ -0,0 +1,5 @@
+DIST libXrender-0.9.10.tar.bz2 308318 SHA256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe WHIRLPOOL 6948410d44c68ba2a926bcef8a8458bcb6ecae37c29561d93f8b330b3c98c109357e733046ac4bba56dd48e9608d0efb87f57ea680919b579600fc21ed284316
+EBUILD libXrender-0.9.10.ebuild 610 SHA256 a64b7b49f9a9b98543fd5bd6a7c7d8eec189bd0be6fe4f34d5bf4ce51447d224 SHA512 97adfeb5c5368e17328c8522ea1c1df5260a6505ad4d6f6eaa07fe5a8d9df45f5565191e915404c7bbc2d9905992368dc9fd9653631c676e781ecb284910e924 WHIRLPOOL 7142e8c250949997f4da60c66f620dbea6a55eb0de548f561726aa3f1ccb72317a77113a91dcafc5e525e0becdb2f4f879da372ebe4c1178ce9fc08e8bba72c2
+MISC ChangeLog 5393 SHA256 d662b93c5ca8703b97abb3b69d4f6c9bbdbb28c7d98db549315ad182ad5f2f1f SHA512 b0c0012f28e3c235e3e770b04919733b305e73272032a845a2238770951130fe5569681d169376fc6b370bc293633e5ede75b3a432c6f748825e9717da09e278 WHIRLPOOL 8b327eef5469932fdb8a1d35614e5b0aebf4bc12d010cf33b08befe7452889b0cece445862ad0d7930d6469c408497ceae554c3fde05be68b802be531b3af330
+MISC ChangeLog-2015 12855 SHA256 e69667cd83cd882264ea641581b01978b0ae53e530b38827e176f4c3eae13276 SHA512 740afc6748e5ebf4481577cae2871155bce8ee0eea157c5770c649af13a872f0fc84cc61c50372ee7a7ec55f6b0a2c08c617e3e7d15370bdb38142e66d02df19 WHIRLPOOL 87d6b6c138a7c05ab2dca1946df9e1199ddc801f53ca3f9d7ad7dbd184ce0b5daccb0a5b36dd8c8b880a95084e0c3e2c16cde5b3ccb07e50179f031d4ba7c42f
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXrender/libXrender-0.9.10.ebuild b/x11-libs/libXrender/libXrender-0.9.10.ebuild
new file mode 100644
index 000000000000..add3b3631dd1
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.10.ebuild
@@ -0,0 +1,17 @@
+# 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 Xrender 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXrender/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
new file mode 100644
index 000000000000..261a2c419970
--- /dev/null
+++ b/x11-libs/libXres/Manifest
@@ -0,0 +1,5 @@
+DIST libXres-1.0.7.tar.bz2 282925 SHA256 26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0 WHIRLPOOL af59fcabab4f593b54c6a1cc9b03b5a59580e678f721e86836150091e1a30c7a29eaa7f19458cf3ce387ece8519c953639fb3fa8f0a89b5e1c2c6df6fce56ff4
+EBUILD libXres-1.0.7.ebuild 546 SHA256 986a08d0ca7e28f93c474a27d80785f48390609f1c39b3ced42cf8dbcff0ea25 SHA512 5d2df1ef0e9dd10f057a4481c85edb007e940cbd3a63738ccbe2d9795a1fc3b1092767a814bccf25bfbdc6c08793c72a14ca78f226db5c0e31edc682111db489 WHIRLPOOL be7e8a69e8ebc1c7bd3ee8473e0efd380ae8578227fa713cb9f736319af9bfbafb5cbb0beb88e75d25ac2c145f5f75936c3579d6f83a93351672e30dc4364174
+MISC ChangeLog 2427 SHA256 c35f319fb64f32fb74ec5d6109dc29566353a1f3b5925b2eec5dba26bb915d5f SHA512 40e17727fa4414ac22f15659fc604fc55d90d56f84495c5cb443b669ad9844985189aa04240247b4bbea577131c0433a1b661b7e40634e6c2d48e0f14c9f7206 WHIRLPOOL e987919e2720f82f76f13d26e89a38322fd054b9dd4d8892f668fb41fb6312c6a960607f34b31cd4a0c7512ff7e6249634dd21a5dba056625a67a4535b16b47f
+MISC ChangeLog-2015 9773 SHA256 9169c80a0c7e04bca6010d0eb26f16def8b4f8642c2666312c0873a576f78c68 SHA512 f6affcf57336cc06b3ef9b679d0a37fc204f08ce71df31b90ce96844331a84a74b1fd444a0c45f3abfa36613f3ce5afd66b9008d2df9738fe8f87d532dd31218 WHIRLPOOL 3024d36045f349052731f0f72a79ac6d218162fc29035c0ce14f4caa522afdb82c0901073276b762aeaf41e12f747e51e82ee21ac382e62395004015291e40f7
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXres/libXres-1.0.7.ebuild b/x11-libs/libXres/libXres-1.0.7.ebuild
new file mode 100644
index 000000000000..0247056ddcb0
--- /dev/null
+++ b/x11-libs/libXres/libXres-1.0.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git"
+DESCRIPTION="X.Org XRes 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"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-proto/xextproto
+	x11-proto/resourceproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXres/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
new file mode 100644
index 000000000000..fcf150e7951c
--- /dev/null
+++ b/x11-libs/libXt/Manifest
@@ -0,0 +1,7 @@
+DIST libXt-1.1.4.tar.bz2 762331 SHA256 843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57 SHA512 57721def16bf29e05deb746566400d71cf0cd5bf9b8b7ebed19abb7c6804e14073060b6cf94409903aa464d27acca2e91f55654b2d4770677b2b4b4dc78fd423 WHIRLPOOL ff97431f0afce438acceb30186b5458e0990fe27194a9457b2fb8865202c45dcdb2e9e24a9c3f3a9427ec136e74389c3b64a69b20d66e9bf04c44f61ffd930eb
+DIST libXt-1.1.5.tar.bz2 771567 SHA256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b WHIRLPOOL ed0bc3d5e11580b5d38a30d60985d1f1976e464e0b6f544ec07eaf6a69290304d150981fdde1047b73161d38ce1505221b8e4906f13cc0a5feb962269029763f
+EBUILD libXt-1.1.4.ebuild 831 SHA256 7bcf306faf3e80b47bd3c11193ef6608aa5143c27602a205c4f17ee3e1463589 SHA512 6b2b3c9a9f65f73a31c2ed5bfaca205e0400bc862bbd4f59306f6be7878f1cbf762eb6b40e93c809e82ac558e2264053f83aa3e8b79656a22bf04f735f50b77c WHIRLPOOL 133bdad951bdafeaf8dfac9340228de900313e38596f400945d72ebeaae82e663cd352daaf89daba0b99ec6d7b6a18beab1e215fc1a8bc47bc84b534f564a844
+EBUILD libXt-1.1.5.ebuild 832 SHA256 a8b120033fc41d70e6c01110a39b34992290ec161fb6d50d06fbe6f7bfac5058 SHA512 870c773e76cb7d3a37501112ed6e6693d577a27d467a480f44305b58de42932736edc0edd5d44c3e4fb13ba7c78c328f244d32d88ffecfabbe0fcf5fe0a23058 WHIRLPOOL a6e319d638ef0086fc7bc27b9849f674ababf141b7c3ee9a5ab0cfe312635ddfd292db71422a4f0702537af26b3eed9be2a5f95423fe6a2db860b490059a81b4
+MISC ChangeLog 3979 SHA256 33c1a5d7d0b8941a8243f249790c03048bc0c84efe629284beb0854a08061eef SHA512 5134f504c36a39fbf3a15addf1dcec47f1ae182c24a8e6a758cf852877175ccf2223e0de8d8ab5f297bb602c82da3d67c240117a078e146e4086dbf9e7ff5010 WHIRLPOOL df9a4566dbd130351b96dc025ec2f526b3d96bc45f7cd08f040716d720f63d119bcd97b6d4ee95b6ac9e038568a8258c54a693282ad9efa44f6013677eea171c
+MISC ChangeLog-2015 15077 SHA256 4e7cd8f2964e1503bc0d010f5ab293c875d36c9d730798cdfc812fd25fdac727 SHA512 8d7c0b54732248f234e34ffd4b8c26b27feaf52dd3c279343a8e14e2ac42bec1eff1baf9d9cf7c4b66ebd2bbd0a45ce7a95f9e2626dadcc54fc1afadd60b3a73 WHIRLPOOL dab30046fb0cb40582025d3d508affb146560b783c58bca8e0dc255eb902bdf73b2527a0f475ca3ab2ee18264e918920aefb58641882e0b5a70e7cbcebcf8024
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXt/libXt-1.1.4.ebuild b/x11-libs/libXt/libXt-1.1.4.ebuild
new file mode 100644
index 000000000000..956395f82716
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X Toolkit Intrinsics library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib )"
+
+src_configure() {
+	tc-export_build_env
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXt/libXt-1.1.5.ebuild b/x11-libs/libXt/libXt-1.1.5.ebuild
new file mode 100644
index 000000000000..dc7cd931ba7d
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X Toolkit Intrinsics library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib )"
+
+src_configure() {
+	tc-export_build_env
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
new file mode 100644
index 000000000000..e7a268074aec
--- /dev/null
+++ b/x11-libs/libXtst/Manifest
@@ -0,0 +1,5 @@
+DIST libXtst-1.2.3.tar.bz2 321819 SHA256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765 WHIRLPOOL efca21c823c9dcc690a1175a0cf55f4160dfe3bff620527cc408022b52c5bfa6e87a0b365cc3d05bb16f5364508f0ac2237623e57638be94358b43aa2ac8f10b
+EBUILD libXtst-1.2.3.ebuild 805 SHA256 77a4759179e23462dd8663356fc484a83b99cb9331a0b95a7ef70bc32b0ce017 SHA512 85a559230579390c75c5e8d04dcae0e9fd5dbb8a9a58962de099c1f0a899b18a469e0a91db1aa5e3bfc2158babfb24a9f2bd22b086a8d8cc2c73ebb9265a6d8b WHIRLPOOL 89f55a8f5f6fe3f40785832ff5d5d115a4e307aded0dd48a8aa77b4da64100a7a4cea4322a4940cf18c6e33c26a943e9278cb618a6d59bd14bc2ca3c915a23ac
+MISC ChangeLog 3528 SHA256 b20bdcef323ac118c82c019a438a9e29d02891b63fa03bf26580ec4c62b7f11c SHA512 2d755953c4c52a03ba4c0cd77c5a4c0be10e0205c5accdad07bd625c7744d77ac0e01deaad43cfdd6e130b62f2fb29a3663d316d73b056198f9e7a298292e207 WHIRLPOOL 29bf6c8f6b9550c99955a03e7cb4f299ceba7302ac4cc1e79c8c4ad66d28f9b19cc5f6f3919e9f4e71d46cefe6f1b3e8b4fec07e9fe8c2f247510d0177041945
+MISC ChangeLog-2015 10626 SHA256 24f32f6e6dfa4e22f2dadcc5e6a33f30a41ccc8bf2f004189ee4d7c37c8afa51 SHA512 f35d4b5385c1237c539704d6e8329479fa6be3a6bdb50f4f2917e5715a41566092a8a247b1cb112ee1d07325aa39d65daf960d4d311babe2442af054bfdeb9aa WHIRLPOOL 2e6a3030e80c37c99f0f8a5bbbaed46ef1b3346c0dcac6529b925722701c53058cfe4efff31814a8c3e6ecfb0375da1a6355a63b52df8cdba3744cbdb60b9657
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXtst/libXtst-1.2.3.ebuild b/x11-libs/libXtst/libXtst-1.2.3.ebuild
new file mode 100644
index 000000000000..38413474ba30
--- /dev/null
+++ b/x11-libs/libXtst/libXtst-1.2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC="doc"
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+	>=x11-proto/recordproto-1.14.2-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXtst/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
new file mode 100644
index 000000000000..e6350911ecd5
--- /dev/null
+++ b/x11-libs/libXv/Manifest
@@ -0,0 +1,5 @@
+DIST libXv-1.0.11.tar.bz2 317921 SHA256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58 WHIRLPOOL adf230b0b5a216fbd15b00db4ecdb5f61ac54d1501920664b860a4cfc2ac38a0d4605551fe5b4c6d945de4dd33e633ca3d36c84d52d70205706b043c6a6eac25
+EBUILD libXv-1.0.11.ebuild 630 SHA256 b5f85ad6014431479cdc29c2537c195f4a2da7ea75a9ff71cde8eabb0978a38d SHA512 52fab2549ee5b1ecf7fbe8f0889766b690a76256b9cc9decc2ec45411df2a997ee0b9f34aa0be3b2a2580ba5975d6e715f681510f1dc6981ee928c2e2c3cb0a4 WHIRLPOOL 4fee8397a75c7b7969d39c30f7e7b4d179fd2ebe09365e271e44b84cd19426eda382bcc43506b9125a255956a12d93ea701253bf88da0cbfa3fdc00bc3df6734
+MISC ChangeLog 3728 SHA256 4785bd60616eb668b20219b38bba9862a370ab2071719b994110b1f21a57ea1e SHA512 4d87a3ac20ae59ad50b062eb40d2dcfcada8ff11f29342d1e5ef330a731cdc010505c54684d2e0b7491d5b430c775fb934f4bc591ea50f0bd0a61ab994674817 WHIRLPOOL 4f506974e8ec6b95b018535f69e2a88fd30d2bfe2fcfe65ca7ed598340c1e68088a4cd7d2e97f665b83933f7d56e42d455c7f12d70b7eef492f2a56c0a65cd00
+MISC ChangeLog-2015 10597 SHA256 06cc4ab897c2ebdb506323aa0dd810a5651c45855e96892eb82c74c6396bcef1 SHA512 a74b56f845338499ad5e315b5222873dd4e97cfee7c76c423bf0efc4f933c674cc6811e49c0ee255dc5f1247be811d0e4d0e29691b069330d0e92febba9c0476 WHIRLPOOL 3bfe3372a49e17e5e707d16950dea6ea50566655b1bc645041a94b1937d65881125643fb2cf3a5f73c63bc92fa26b366fe22d186e6dc2398d3b73f7f5f2a3a37
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXv/libXv-1.0.11.ebuild b/x11-libs/libXv/libXv-1.0.11.ebuild
new file mode 100644
index 000000000000..36d922b38445
--- /dev/null
+++ b/x11-libs/libXv/libXv-1.0.11.ebuild
@@ -0,0 +1,18 @@
+# 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 Xv library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
new file mode 100644
index 000000000000..1cc4ff9aedc5
--- /dev/null
+++ b/x11-libs/libXvMC/Manifest
@@ -0,0 +1,5 @@
+DIST libXvMC-1.0.10.tar.bz2 313887 SHA256 e501a079b5dfaef0897c56152770c77e05e362065cec58910289aa567277ee2e SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19 WHIRLPOOL 1d7f0373b85ddf0af00a185ab0960bf977c84f6e8f86da1df4b959ccf01363237ca77e2e4256cbfad1f7cbe791a03ee9583ace9ba88d8002e0c3b29bcb63080c
+EBUILD libXvMC-1.0.10.ebuild 642 SHA256 b312fc10163e2e06b1f49e926843a8e333252e744f2c2a1950a7f1598fd933a6 SHA512 b987d4f6503c6ef996cd8b79da5343c289401a3f35e5f6d77b99a3a7f30f3c5e5ab457166e9f3a5805195b34584e7cf9becbfd471b5599990bb4ee7bb5e7b829 WHIRLPOOL 3e15a5ab482812f75b11b1154b13b6c848f004169ec06ff6c87b43288a98d4da834e5ca27aba1ed440db51d86f3f9517caa897fee09dbccc86071a2ebdc7f561
+MISC ChangeLog 5464 SHA256 88d6ca5e70f5779e39c30bede04d0e0fb1fe93903f30a9aa4bafe7bcc197fc9e SHA512 ccb818ecce28603a9c674ef91568860b2933a6528653c47e9f7e9f4898e88e2583218aad04b3caf3a7196e4dc6217922bb2d53dbf158ac04f1286adc374489d0 WHIRLPOOL 346f3896458555f72ea6a89f6d758a5ddb4bc757aea30e57bf3d4896e5700b57d4d49dc0308ddfbd499c7f3ad6060ecb4d2f2059902a2462a45caf619a164d8d
+MISC ChangeLog-2015 9939 SHA256 6e16484580bac75dc3e66d2b54ec77c7355946be40a25e10012c90e74fbc2dd5 SHA512 e96fe391de0ff3ad7f915ed335dfcae727ee7310e76fc4fa67dd672a747fae8be4d236d8186d1941b9908e4120a46e84c95f5bd2f102d437855191718d966fc7 WHIRLPOOL dbf41d438d9c779d8985ece03c6e1815cff44d2d9da39235e31c9debce971f43e81f2810c0c6fe289ac6cb649165799df4a412227f11200e21783ae1d549b849
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXvMC/libXvMC-1.0.10.ebuild b/x11-libs/libXvMC/libXvMC-1.0.10.ebuild
new file mode 100644
index 000000000000..109bb8a5f28f
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.10.ebuild
@@ -0,0 +1,20 @@
+# 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 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"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXvMC/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
new file mode 100644
index 000000000000..4ddf2aba84e4
--- /dev/null
+++ b/x11-libs/libXxf86dga/Manifest
@@ -0,0 +1,5 @@
+DIST libXxf86dga-1.1.4.tar.bz2 280216 SHA256 8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2 WHIRLPOOL 9349e19c04b7e166547bddade74d9e7ccb86796e8cc8232f9619d1c1e9cd0779d063a3afab845997a23dfbc447a367d33326d66ff41464d1c26ac2efbbe2088b
+EBUILD libXxf86dga-1.1.4.ebuild 632 SHA256 41d10fb7da5a4b366868520b72fab228122166d2b49a46ea8e172e377af5db0d SHA512 63102495a0c089d9efdd9d0bd1d6a2a11af0395136351cbfd6f30d8269a5468455609b07becf1b8c2d6c40db7d2a42c6b8cd9bb40b90d7a04a9f3c1437f7844b WHIRLPOOL f40af2ef7564ea7816e25213e1c93e5a4580d0b205c13f290644f72acf6a090731b0c3f5d737d1c7043281501f962fce5fba87d8dfc91d1f7d5c20b498b0c700
+MISC ChangeLog 2601 SHA256 87027d1e7efffb1faa49fe0f5afa66e788dd1546879bc8c2073ee439e30201a7 SHA512 15d94daa3e8e1d95de9d4b89cf0b61fc7efce2f62f82b6fb8bc60ec20e37869e8eb8a2733b734e09ae08642188f8af94c9ec7edcf25ab8d5653ab8d72f85f95a WHIRLPOOL 0b2bf312f2478fff8f7cd14342a4a12a4f9efc55e6a9419d349301e3d8351a19d93257a5e9a138261cc6a148fa7975493a888f3a980ae866c4497b8e42f3e6b6
+MISC ChangeLog-2015 10303 SHA256 e3c7d88e27d1db52e3fdfab4816f97c5846260f02a4bf62679df5ac6d26abb25 SHA512 1f8c11a6caf2afeda69b701c81d6848958772309b8ebdedebf67bf352b0aac68aa29c1bb481dd502d112f8d945550b11b874f52b359503088894aa7ed2c52dcc WHIRLPOOL d9b634245bf8ea77c2779686e995f40460fb699f322270c7ec4e5652b3017999feb8c208e8b33e1b53b02073c6641b36a8cadec60dea6ab40845f507efdd423f
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
new file mode 100644
index 000000000000..f6e587cbbd9b
--- /dev/null
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86dga 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"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86dgaproto-2.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXxf86dga/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
new file mode 100644
index 000000000000..e322159c7b20
--- /dev/null
+++ b/x11-libs/libXxf86misc/Manifest
@@ -0,0 +1,5 @@
+DIST libXxf86misc-1.0.3.tar.bz2 255831 SHA256 563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f WHIRLPOOL 7402fbac6d49c1be571cc8baa0ca53c2185d669a9f7b94e906a13ddbb8895f8f10b1e4299a0041f1c266af094c02f45f131e9c7b7d77c428c1f9e1c2374ec5a2
+EBUILD libXxf86misc-1.0.3.ebuild 505 SHA256 c731b66d689486bf2cec52e2d024d8837b77d4f34f59a4e6187848ddc59d97f7 SHA512 08740c8f682002288f9a15783184f4baeb36fb5fdc97e4571e058cc1b466ecfa0831a67261de7a895ac389e39837f4f0f2e808f8829f11cc91469fbd7c5f4c19 WHIRLPOOL f1c23af7eff7e819165b7130cb76cc62e51b850cdd0eff11ed5eb53af8e150b7dd5d25b7855e68d87841087818a808f8bdf48f7a4193d4018beb91abd7ea1888
+MISC ChangeLog 2442 SHA256 192fe39e5824ec21947defd5744b4b9db04558bde8f0b728d0223daa83c4b136 SHA512 43f2a79b1c3d85195fd34a436b33387bf70f2b23ae316ec078147e5f304d457514f60882a4f50cc96d150cbb14508e741af96f2cc4e59712ca8d7ee4c9fd3b80 WHIRLPOOL 835796db170e0c03c3c158af4f086c311fc8cde65c1237c9f367856f263b5788e7e38af1e71cae015e596d793ec7fb6d61edf73f3e97fe8705dc4a9e0407124f
+MISC ChangeLog-2015 6341 SHA256 0787937171d5b0718584295a0b4db344bd2e0e9ebfaa46b2075881a8f99cbe2b SHA512 72949085d6e911b3d331c2217595721bc0d8cbb97327f36d76a57485f2ed4b5911fb03f24f4730e02bbe55334bc03d51ad7301ea37528aaf35f012c295da7b3f WHIRLPOOL 934445c9d3fbdce1555aa072c083d121967c91fcb036fdb3eb0b66aa5dd287e1270e27a69588afca8fba4ceab93e6a1f62eb23215d29c6531c96c18cf53b64e3
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild
new file mode 100644
index 000000000000..c3b3d192547f
--- /dev/null
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+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-libs/libX11
+	x11-libs/libXext
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/metadata.xml b/x11-libs/libXxf86misc/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXxf86misc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
new file mode 100644
index 000000000000..e7a623ff0822
--- /dev/null
+++ b/x11-libs/libXxf86vm/Manifest
@@ -0,0 +1,7 @@
+DIST libXxf86vm-1.1.3.tar.bz2 284279 SHA256 da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8 SHA512 7cd5491b79920f9c1d134f2815f14d45b0a29cf5f99d866c35418b6f84ce6b48e702db3472bd7c6158804e573f2384ad4ebee78e5ea8f07afec2e34489d99ed4 WHIRLPOOL 9dcec1f837d53f6541cb950cca7f47194e7a99dd7d1ea7187316472940ea04e1ff25a02f66a5c775063b639027684a227dd6a713f78b2f5170af28ee398b9dd6
+DIST libXxf86vm-1.1.4.tar.bz2 295346 SHA256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 WHIRLPOOL 98aae6ede09ef4e204b71d30963d37b81a9f39c25e61ad2f5834b5e370d4a884a901e3a4ba19d534ec32111f316d24ffab7cfe9450e7ee63a9e6b9a281852d61
+EBUILD libXxf86vm-1.1.3.ebuild 694 SHA256 feaafbebbbcdda098677048ec57c26f72a50eb14f8a353d47a4d00f00d520223 SHA512 cedf72c264774d5861a34c48dbb056e83aa80aaf9190f948cb3595a82cfaa2f05f25b66cf632b3a238e8df37bb0988e3dd313ae7bda51ef875a3a93c0c4b93a9 WHIRLPOOL 9ef6d40b4591e37e19e257b3bf1e5a4660243a961f4b7b765f60359ba52cbd090c1d58620ca191f318eaf781752940ae1da8ce697e77df60472acd0cd50eaf13
+EBUILD libXxf86vm-1.1.4.ebuild 694 SHA256 feaafbebbbcdda098677048ec57c26f72a50eb14f8a353d47a4d00f00d520223 SHA512 cedf72c264774d5861a34c48dbb056e83aa80aaf9190f948cb3595a82cfaa2f05f25b66cf632b3a238e8df37bb0988e3dd313ae7bda51ef875a3a93c0c4b93a9 WHIRLPOOL 9ef6d40b4591e37e19e257b3bf1e5a4660243a961f4b7b765f60359ba52cbd090c1d58620ca191f318eaf781752940ae1da8ce697e77df60472acd0cd50eaf13
+MISC ChangeLog 2494 SHA256 925439d45d3095dfc7464e4731e49166ad68563c947ec32bc4edd604a4ad8b28 SHA512 7bf6543067cb4e0ef6dce2b51066f7010574c69dcc683e12af5f985cef7726e8e4882a3332aa965b841c39a98c37f0f993e82a9d1eb235f5c6afcaee3c13814e WHIRLPOOL 9298c927e383887bc75c6e6ccbd8d649422bdc8e073dc58565735100d035cc0e44615a1f589d066229dad3c5e74406824a1c4dfa3cd7bcd74ae3130eeca86385
+MISC ChangeLog-2015 10381 SHA256 9a722ce5a5acc9061f28a3ef880debf2c03cd1b85cb8bdc108cc78282cb42ae8 SHA512 edde83915e4ebee5394bd95d72f1a36c969c5beecadf191a1ec88a0ac1356e529b365c2f8d089601292f566d31ae6892927b404dfdeef4eec9e5c6137fdd19b5 WHIRLPOOL 19a3dff28682d9a96a616c391bfc344c68305677e7a7cd2090e344e5a7e89bf8deef186a26a82e7961d50443568b13a81a9abb22c1e816554e2faf1b455d3620
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
new file mode 100644
index 000000000000..d6d8ab59fe08
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
@@ -0,0 +1,19 @@
+# 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 Xxf86vm library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
new file mode 100644
index 000000000000..d6d8ab59fe08
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# 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 Xxf86vm library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libaosd/Manifest b/x11-libs/libaosd/Manifest
new file mode 100644
index 000000000000..2c401e16c109
--- /dev/null
+++ b/x11-libs/libaosd/Manifest
@@ -0,0 +1,5 @@
+DIST libaosd-0.2.7.tar.gz 51560 SHA256 b1d02cc5f1761ab6b1c1f8994a92466f11d91d57af65dcb3204e8c54ea514059 SHA512 ebe60b992b0315026c024db83c788ed9c829f1400e0c6da51caeb17d58649825fafb14d7f73cc80a82866f53f108a1e18f921109f940cb59fce038a12f214329 WHIRLPOOL 6a38e0e11e65b74d0da4726d6c301007489765029b97f4189439d570334a480b68d59cd26028995d9194a6eb9a65e473f9e0eabee1cc78a7a9adbf4a3e7add38
+EBUILD libaosd-0.2.7.ebuild 859 SHA256 c4e23b9cae393706425bdaf5268fac58d24f5f79bf79d798b16b79616926b39c SHA512 37c12f4b7b25a5f27ac1d94c34f07e0cc0db8d206be6e62a668880a45073824e5e433e4dd49e5220af149231040d497bfa56f58748dc67e5625e4215583ef704 WHIRLPOOL 1e40ff81bf4dedb14e1ffcdd5350b274cc4d3272c56eea341b515132aa7abb876392b1b43d76adbb00790ae45036aafef65d29693052613e1f5977b2b1447082
+MISC ChangeLog 2522 SHA256 5eb81c1cff886953d9b19e12ee21875904cdc772a58dae714626189f69da036a SHA512 09ffe44919ee709b9666d4d14b557f9d86ae943fcc971ef032f5a6f4c6cbc356d45af8dafd000bb592da5691d80dce3e74b402dff17561cb3dd197d7af498633 WHIRLPOOL fcf7527b23b667080aa9c6b4761f14b3ae2093170f23270b8621fd45d180dc77bd2ea2f83f88a01ec56b5cb3c029e5c5ed207cd1ff1a2d8d01c4ef74c7f61111
+MISC ChangeLog-2015 1946 SHA256 4c9173345a4f846f6a4ab7e4d40a3c49c64356ec840900cc74547cb48ed1cc8c SHA512 ed2f6789aab315f0e098f8467cae83c277f4289ccd7f245b877427f011359e6514657b13278a25c2fcc44bc660d9744b76eb284ac0628c4ba83b22efaf09bd31 WHIRLPOOL d30c4e118218bcf2d007d711a84bb09b814852f5c4264e61824c0ee99021aca926a7bdbf38058663958e8ecab18fdc0393cab51c37c856c8abb840d7cd23c193
+MISC metadata.xml 414 SHA256 5a639985d7ccd4c213f79302538f2f96ff576b35a98f365247d3c57fcaa58516 SHA512 467aafb4c9def817ebf1a7e0f44bf4d241f1c511dc266d5207734c07efdb723836670085ba919a1446385338c4e3432e8f6c19bc4d7ba825d591bfc3f280dd4e WHIRLPOOL 11f0f1ff10b5c10960a06a56cf1c395a4228c9523e6fbd84a6f5da1c37bf1ce072f2191f0ba745e53e9eb0e9f662d189eb601cb8d8ac19d248313b602fd1ce0e
diff --git a/x11-libs/libaosd/libaosd-0.2.7.ebuild b/x11-libs/libaosd/libaosd-0.2.7.ebuild
new file mode 100644
index 000000000000..6c2522feccbd
--- /dev/null
+++ b/x11-libs/libaosd/libaosd-0.2.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="An advanced on screen display (OSD) library"
+HOMEPAGE="https://github.com/atheme/libaosd"
+SRC_URI="https://github.com/atheme/${PN}/archive/0.2.7.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="pango +tools xcomposite"
+
+RDEPEND="
+	x11-libs/cairo[X]
+	x11-libs/libX11
+	x11-libs/libXrender
+	pango? ( x11-libs/pango )
+	tools? ( dev-libs/glib:2 )
+	xcomposite? ( x11-libs/libXcomposite )
+"
+DEPEND="${RDEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( Changelog )
+
+src_prepare() {
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable tools glib)
+		$(use_enable pango pangocairo)
+		$(use_enable xcomposite)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libaosd/metadata.xml b/x11-libs/libaosd/metadata.xml
new file mode 100644
index 000000000000..e7487235d122
--- /dev/null
+++ b/x11-libs/libaosd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="pango">Enable the textual helpers (requires pangocairo).</flag>
+		<flag name="tools">Install the aosd_cat tool (requires glib-2.0).</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">atheme/libaosd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
new file mode 100644
index 000000000000..3fb42751343b
--- /dev/null
+++ b/x11-libs/libast/Manifest
@@ -0,0 +1,7 @@
+DIST libast-0.7.tar.gz 508654 SHA256 52055cc0df0af58adc8c43cce6c9a2fff71c627a6bb0395073d353920dd1ebf0 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d WHIRLPOOL ee8cb1836997d864db70f73cde5024c6390a4ab49a0100c3c48aa2e979eea6483cb7899c2f27d91590c560567df57388b1c680df373fc2661215c7448da4f3c4
+EBUILD libast-0.7-r1.ebuild 954 SHA256 3a210a0c0d41a49789ab6ad194a8cdb72ad6f42c0634fd0a99e9ad5d7dffa828 SHA512 24495307eed6e2fdf0d1411273ff22d089a4c29c1a771569554e14b970c313729776c4068eaba7d8389803df4fc7e3b4a38bdc5c53f40fb4991270487b2b613a WHIRLPOOL ceded4cb7e434e2a7c179d8dab2485422b9223b31135333c9fde9240387617f67527c105b130951a6fd175b2d3363015c3e3abf4a865c21df4136675e9e9f8af
+EBUILD libast-0.7.ebuild 945 SHA256 c8110c0ee40ab9c5a35f4c141ead9e4d74febb5abdc7b00311995a96d6c7ad36 SHA512 1632a77e1c5216337fb1f81c15555606f95138c88822feedcf913bc8f33ca16080e5851d8f30bd024e10bb5dd8165d149adca153e25ce1321b2480a8ad5207df WHIRLPOOL 97acad0c202cc8bddba685d23550f06cdd1c643db16041b32baa85ee229be0943e81121ad7d6c749163a27d3ca3e7ae6ccd416ab5ec5158d99dd00f4a5da285e
+EBUILD libast-9999.ebuild 1035 SHA256 160c18d53177ab25131c6681130c4a25fd461832ef0ec3b8b161ee03c90cd326 SHA512 9a08bda18d9d681948b58a9dd12e7b2b282cc6f6f780020936a7e77cbb6c4ee576c24648560c414d1ce256ae4b568bf00000fe12b8df6e6ca1331a053ba02a79 WHIRLPOOL 6abca7c58877cb10c14002dd4afcc022a68c501c3187ae99355bc6cd41ebe1a8920c1283b3630c1088aacc9251ee05ffd3c531352e930d2e808dd7b8ac7fa4c9
+MISC ChangeLog 2367 SHA256 654a5cd5c9ae743f68f0f359062f30e55a36b71aa627aa8c9323a45fab8115e3 SHA512 418ea9c90fdaf4c82f12a32d17acc1339939bce0ea431f5010d896d6448f25f2499bb0b6d7acb9bb79cbc57329ae01c5fb399482ee2c09c8d5ce68c770cb89eb WHIRLPOOL 43fd89dc0bf7b3ccc36b023caf42c58478a3fe5251761c13fce74667b84e6ded2764153b910dd2e2651f1616d3c9c98d583cf7d1a49fdb87385f8219b608f561
+MISC ChangeLog-2015 4365 SHA256 c4457e6aa608033b6b647c3d73fda09dee4743df700649c5159156493a1a8d33 SHA512 448e0c96788fc9ace342ec062e1c630d23ec1541f438b31cd6741685cddd2da00cb457525df00c0666890c53005dd9baa5f42f2c559469d8bd623a20f9869781 WHIRLPOOL f76e3357d14d1efc998dedd8c4f7449d34631ea4e21ad7e35c06a41d9c8d572ef89ab066225329148dd1940e8ebb379b52360f75cc85ba2a7698fa2fa6d3d542
+MISC metadata.xml 784 SHA256 184f618285f4504b7f6f7c62cc5929da7f3af032c2d731d265eb94309a7d92d7 SHA512 0a5fdc870435029efcdd2f7206f6b9337addf8ba3b4aabb27de9b3437288641998c4fd14e4d48f6599c2067b49f502c04e4a7c2ae6bff86685808bfdf5f68d43 WHIRLPOOL 468bb20be4fa3ac4232997ec473a18145c4fe8c9b55c3f20e25996c2c96e3ae6883462b1aff5081ab0209f66dd61a5c5a78cc7913fc50f18f6baac889375d73f
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild
new file mode 100644
index 000000000000..079c427988ad
--- /dev/null
+++ b/x11-libs/libast/libast-0.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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-libs/libXt
+	x11-proto/xproto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	media-libs/freetype
+	imlib? ( media-libs/imlib2 )
+	pcre? ( dev-libs/libpcre )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README DESIGN ChangeLog )
+
+src_prepare() {
+	default
+	local myregexp="posix"
+	use pcre && myregexp="pcre"
+	econf \
+		$(use_with imlib) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		--with-regexp="${myregexp}"
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install
+}
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
new file mode 100644
index 000000000000..9704b6719355
--- /dev/null
+++ b/x11-libs/libast/libast-0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-libs/libXt
+	x11-proto/xproto
+	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
new file mode 100644
index 000000000000..2543ca46686f
--- /dev/null
+++ b/x11-libs/libast/libast-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#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-libs/libXt
+	x11-proto/xproto
+	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/libast/metadata.xml b/x11-libs/libast/metadata.xml
new file mode 100644
index 000000000000..803f108ffe33
--- /dev/null
+++ b/x11-libs/libast/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<longdescription>
+LibAST is the Library of Assorted Spiffy Things.  It contains many
+spiffy things, and it is a library.  Thus, the ever-so-creative name.
+LibAST has been previously known as libmej, the Eterm helper library
+which nobody really understood and certainly never used.  My current
+plan is to gradually remove some of the neat stuff from Eterm that
+could be made generic (things like the theme parsing engine, the
+command-line options parser, perhaps the event engine, ...) and place
+it here in the hopes that others will find them useful.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
new file mode 100644
index 000000000000..c8daa96658bd
--- /dev/null
+++ b/x11-libs/libcompizconfig/Manifest
@@ -0,0 +1,6 @@
+AUX libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch 891 SHA256 823ee778678d998dd205b1038863d1e4aa894893ecccee4995caf63fe57d0e2e SHA512 db732c5560e52a71eacc7bd4268fd0ef443b74df498409861bdd98b4ccfee96e597c852017ee47ec9085c11e1c29f44687704287dce440ab9f3761be347ef142 WHIRLPOOL 64c35165c47411eab54132e65d38759b02e8c783737c63dce4063162c67b8bf435dde99a85f30a5efffd9a5c1eb8e22381be60c6a8fe298ff62239d820c723d3
+DIST libcompizconfig-0.8.8.tar.bz2 318176 SHA256 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490 SHA512 1ba2f6143870d981e174c47fddb9fdd072a1c64a5a5f07779bd6261767a2c1a7612bdcb3f62a76c203f4ab630542c8ae750fff3ec30a0305f8851584c6a5d6bb WHIRLPOOL 14139c93bb67235c5a9e4581e11a6474a1ff0108c8e84d3401006d26c160eaf50c0b3c9a9c69c12d00919850ee6d20a9c81660a6bec180c69d459c3d2a89775b
+EBUILD libcompizconfig-0.8.8-r1.ebuild 760 SHA256 8f6dcd23bf15c7cd53ca50fa6713fe3a555803a48cc9311139c68cce2e966124 SHA512 778482d7297a993b56badee8f6515f0350db60c239f2b3c3e034b1fca342877ba2a64c5e7029ac4a912cb48c9918c31644e8e83e2a86a22e298f381670d971d4 WHIRLPOOL 65d2b094b762b703cd57ef8628d21b79e844e820c97bba5e472279318fbf3937d9e938ebe0c80b693c502dbadd073594f86f337fafafa172cc1232c3446ae873
+MISC ChangeLog 2515 SHA256 9f0ff66264952124ede76a74f3fae7b35d811613ef6dd4349fbcdb7a34e4f750 SHA512 ca6843d2f4d357076bfea002bcf957078747707abab3fe6b00748924b83af70033425e876a08d44e27103d58327a009f6a4e16944bb02ee24340105d1b9143bd WHIRLPOOL bf3313acf54c635ca6e2cba8f6d3977fa7c4da6eda1d8cd36a5c37de25ebf7d2799b57967d771ad9053a58a0d323d51b5d770cb081b23267c3a1758b5300be7e
+MISC ChangeLog-2015 5771 SHA256 6bbcd3c38da62e412d9147db90fb47abc8bcd1dd3e4a229f2f040f98953b7ec8 SHA512 1db9dd901e599f85cf0877957ff707aecf983dd6160acec0e29100bf46aea070575e010bbdf0a4e1a094403bb2f5ddd1e0c4140bf67ed6e84f39e90a47859eef WHIRLPOOL 22a0569b75a8739433c4e815c14afb944f66c1d38aa894ca5a6293a16d0b155d4d1edea95f98f55e366aa7ce3ca6b6a5077136b99e2ced1fabef8e53f0e60d20
+MISC metadata.xml 280 SHA256 91fa7c20877df9d75a15b3568549031ffb15d6ac50828294c15bdb88382d6146 SHA512 ed98d8c9940bb34caffe9f419c28dc9934ff5c16e3d40186a3ce5900f67758da1883aa521e91ec81f3014b6d65000a4dd9898b69b2b9bad46b649b0182ba15f9 WHIRLPOOL 783ec867474f5ad490e306e772b35c72d5ce76c6bb94016273b07ca2e324afdb303c5ca9a6822e0eccae76564f63e9e1e4d5d229fb272e7c579b6162221a86f5
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
new file mode 100644
index 000000000000..498a4bfa4d12
--- /dev/null
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
@@ -0,0 +1,35 @@
+From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001
+From: Scott Moreau <oreaus@gmail.com>
+Date: Wed, 9 Dec 2015 12:51:12 -0700
+Subject: [PATCH] Avoid using templates in C code
+
+libxslt uses templates and we cannot use templates in C code. Move the headers
+using templates outside extern "C" clause.
+---
+ src/compiz.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/compiz.cpp b/src/compiz.cpp
+index 43da02f..e5aba0f 100644
+--- a/src/compiz.cpp
++++ b/src/compiz.cpp
+@@ -23,6 +23,9 @@
+ #include <google/protobuf/io/zero_copy_stream_impl.h>
+ #endif
+ 
++#include <libxslt/transform.h>
++#include <libxslt/xsltutils.h>
++
+ extern "C"
+ {
+ #ifdef HAVE_CONFIG_H
+@@ -36,9 +39,6 @@ extern "C"
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
+-#include <libxslt/transform.h>
+-#include <libxslt/xsltutils.h>
+-
+ #include <locale.h>
+ 
+ #include <compiz-core.h>
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..a7fc1f919967
--- /dev/null
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Compiz Configuration System"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/protobuf
+	>=x11-wm/compiz-${PV}
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.41
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+RESTRICT="test"
+
+#602286
+PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" )
+
+src_configure() {
+	econf \
+		--enable-fast-install \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc TODO
+	prune_libtool_files --all
+}
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
new file mode 100644
index 000000000000..30804a862776
--- /dev/null
+++ b/x11-libs/libcompizconfig/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
new file mode 100644
index 000000000000..ab0d5807e846
--- /dev/null
+++ b/x11-libs/libcryptui/Manifest
@@ -0,0 +1,11 @@
+AUX libcryptui-3.12.2-fix-return-types.patch 1049 SHA256 20d928c9d16045086187a79c1ae9f75b646348b80fca7605e805d5d9f726aab1 SHA512 2c29a7213d620be54f00f8b753b429c3f87f3986f8b024274b0c8758b7207e05591820abb7f896f441b3097d3cb24baabadc7542c536a6db2d1d1c71df28de5d WHIRLPOOL 032e866c72fb113203c1e500bc994ac8682d8bbead42300faa81378c48511e64bae2597c092ab3a3fa5d19463549aa7bee1c040d2009376336a46e4e51c1b102
+AUX libcryptui-3.12.2-gnupg-2.1.patch 702 SHA256 2c4a49d7d011159a0abe49e674eeb133e373a1b5ec7eee155edeb82464ddbd33 SHA512 9207081483604b115ec6ca5dd920b6396e2ad3c00ad41e1f354f10e43d144ce110431b34a895baa9ea22702aa22210eee3ba83e78083216d720d43ec0e4cdc7e WHIRLPOOL 7d3cdeb170bb8ae33dfbe20be778d127b576f5010a9f89f9bfad36eb399c6ac2043012d160792403da5f3736f657fb04995387a7626b3c43519a4507a9dd37e9
+AUX libcryptui-3.12.2-gnupg-2.2.patch 708 SHA256 df8b1df97b16247c8522412d486d72f3767c9a16aad7c5362d0eded6f4f77d16 SHA512 7acf4770f9382e574822bf54defa48e817f40459a50fd5fd2b6794d61ef82329bbe1bfe013fb3ce0880bfc3f97d556c103e3685ead86772fd04e0119f70bc103 WHIRLPOOL fb7fa73c465f612e0d93ab7b4d1ab7d4c69880ab50fa625fcdd0e3f9677a35c2f451ba5abb365012d85e3dd7ac0aa35e3ecf60ed14d1f3f9536560231fdbce89
+AUX libcryptui-3.12.2-port-gcr-3.patch 4932 SHA256 f87cb63070ad777a47662b464e27bbccd9774b9f240e2f1d70df1f75f9558fa7 SHA512 3ffa45e6a2636bb4e6933082c92b83a2eedee927ad6a7d214df1bdb1b4c5ca41ca22c0c06469f3a6fe1c81e94888a3a5adca56e6354a00bebdc68faaa009e4c6 WHIRLPOOL 8cce8ec62f13fca38991c602f0806e5000c85c7c22e6a92ccab620bdf7bf0cefbe4861ea2ef56d36d250083aad57b76dd1c981b28208b753372b8bb57d8bf718
+AUX libcryptui-3.12.2-prompt-recipient.patch 1447 SHA256 1bdaaacd289306f2b2e0a095fe76952ca347291c5f329a9fa3c768ae7cf7d558 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43 WHIRLPOOL 0995c4b6dacac598a472aee96b9d1eb3487324362c0b26b047dcbc74aa9ac6993a24f0455be07b755e05dd6dfd48962108d368a2526facce903ac4eb9526860c
+DIST libcryptui-3.12.2.tar.xz 1163784 SHA256 71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866 SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0 WHIRLPOOL 0e376834c74df1492a7ffea29646a4912124b46b972dc9bdc64dd40b19e3b9c43c85eec87416f8ea0995e7d164e763bf7b5da7f66c2103df3be44f6516b8e632
+EBUILD libcryptui-3.12.2-r1.ebuild 1849 SHA256 43a99fcd2a71f7c290f79b54608968a910f7893b6be84a60d698ee8c7918253c SHA512 62e835191d29289f900ef7a373e2d30b02c8914576152a3c5769a5c7fd8ba3790aa6a7c92e0db534a2d51b8c997581d0640ba93364ae9395146466b655fd7e28 WHIRLPOOL b40abf0dce0674a6e4c7d091d34cc6df2ce5b904eb0097be8636d8641f1c911965fc7c1dbe96e769bcab6e32443400b1e63fea956f2c5235fe0dc71a298abc04
+EBUILD libcryptui-3.12.2.ebuild 1535 SHA256 bd72b17dd5238dd77548533ac1b5f9a2f58d50e12fc5181aa2d38d131f1011fc SHA512 8abb95d5b65b5e7bd915d1f5048f3f07f77a793b6724bd0e94f4fdc0038491bdae224487d3453c7669cdf91239295864d28fcd516ccdc3b1400cac94c08b9656 WHIRLPOOL 1e01c8357f1dd77eb227f22d58c25e92f174b6666d7dc2185d14513648e7da564d6e3a33d006e169f4fbd039319a679674302611ed375cab80d89ea9792f854a
+MISC ChangeLog 3208 SHA256 c08730ddb48bca368eb86674fd903b68221f50916ec69b6c95969e55c3b12c12 SHA512 c429e1c4a37c02e733d42801824346f43d2c1e2dace257d89a5bbf205fe13219e4271bb1f8b552e0db7d6163af991f8bc6c99dcbe429fd13439494b214c1f813 WHIRLPOOL 7f70a28619cfbb02b2c36539fc40e021d321d6977a5a7ef9b42c321a1cb2689444bef08fa7c9136225bd1f09dbe8ff30199f40c8c53d416b4994af3532565ab3
+MISC ChangeLog-2015 3376 SHA256 b69d0e1c9b749a2ad642c079f0e734183ce91b7e5f955212593af0da34f2da22 SHA512 db49fda715b4841eae5bd33e7bb47d3a4c68e204b3c7f0688c946c888bc6b34eae55fcfe4e2364b6e17aff5e1c7ff6b94db56cdfb905af98ad0cd4922d6c9d98 WHIRLPOOL 18b27e77a50547a075d0fba23b8beee81db1967f265636ba2d732a000e60fb2021acac85b4ccbc08ad5147c6871b254a5ceb7be1c0c03dc11881fd9fc19cdef7
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
new file mode 100644
index 000000000000..d3fdf3c408d0
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
@@ -0,0 +1,34 @@
+From a576e407d913b35804f838d615da52899681d61d Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Mon, 15 Aug 2016 18:12:06 +0200
+Subject: [PATCH 2/3] daemon: fix conflicting return types
+
+... in functions seahorse_dbus_server_{init,cleanup}
+
+Reported-by: Michael Tautschnig <mt@debian.org>
+Bug-Debian: https://bugs.debian.org/749001
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769943
+---
+ daemon/seahorse-daemon.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h
+index 93c0c452..09716bb5 100644
+--- a/daemon/seahorse-daemon.h
++++ b/daemon/seahorse-daemon.h
+@@ -24,9 +24,9 @@
+ /* seahorse-dbus-server.c --------------------------------------------------- */
+ 
+ 
+-gboolean            seahorse_dbus_server_init ();
++void                seahorse_dbus_server_init ();
+ 
+-gboolean            seahorse_dbus_server_cleanup ();
++void                seahorse_dbus_server_cleanup ();
+ 
+ DBusGConnection*    seahorse_dbus_server_get_connection ();
+ 
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
new file mode 100644
index 000000000000..d968dd367a11
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
@@ -0,0 +1,25 @@
+From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sat, 17 Oct 2015 08:52:35 +0200
+Subject: [PATCH] Allow building with gnupg 2.1.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 406b9f3f..b621b236 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
new file mode 100644
index 000000000000..4feaf2b18265
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
@@ -0,0 +1,25 @@
+From 98afc46861678162aad8cae1c4c01dc4d6780bef Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 2 Sep 2017 17:48:44 +0200
+Subject: [PATCH] Allow building with gnupg 2.2
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4486e7b2..be5b28b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0 2.1"
++	accepted_versions="1.2 1.4 2.0 2.1 2.2"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
new file mode 100644
index 000000000000..5ca31f664136
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
@@ -0,0 +1,154 @@
+From 728aceb6defd4e6e4f07fa49ca76f5e745230fee Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 16 Sep 2016 11:46:55 +0200
+Subject: [PATCH 3/3] daemon: port to gcr-3
+
+This removes the dependency on libgnome-keyring and adds a dependency
+on libgcr instead.
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Signed-off-by: Stef Walter <stefw@redhat.com>
+ * Updated commit message
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771522
+---
+ configure.ac                    | 14 +++++++-------
+ daemon/seahorse-secure-buffer.c |  7 ++++---
+ daemon/seahorse-secure-memory.c | 21 +++++++++++----------
+ 3 files changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b621b236..4486e7b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,18 +252,18 @@ if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then
+ fi
+ 
+ dnl ****************************************************************************
+-dnl GNOME-KEYRING
++dnl GCR
+ dnl ****************************************************************************
+ 
+-PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5,
+-                  [enable_gnome_keyring=yes],[enable_gnome_keyring=no])
++PKG_CHECK_MODULES([GCR], gcr-3,
++                  [enable_gcr=yes],[enable_gcr=no])
+ 
+-if test "$enable_gnome_keyring" = "no"; then
+-	AC_MSG_ERROR([gnome-keyring library or headers not found.])
++if test "$enable_gcr" = "no"; then
++	AC_MSG_ERROR([gcr library or headers not found.])
+ fi
+ 
+-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
+-SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
++SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
++SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
+ 
+ dnl ****************************************************************************
+ dnl LIBCRYPTUI
+diff --git a/daemon/seahorse-secure-buffer.c b/daemon/seahorse-secure-buffer.c
+index 0db87961..63f87cd3 100644
+--- a/daemon/seahorse-secure-buffer.c
++++ b/daemon/seahorse-secure-buffer.c
+@@ -20,7 +20,8 @@
+ #include "config.h"
+ 
+ #include "seahorse-secure-buffer.h"
+-#include <gnome-keyring-memory.h>
++#define GCR_API_SUBJECT_TO_CHANGE 1
++#include <gcr/gcr.h>
+ 
+ #include <string.h>
+ 
+@@ -92,7 +93,7 @@ seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position,
+ 			}
+ 		}
+ 
+-		pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size);
++		pv->text = gcr_secure_memory_realloc (pv->text, pv->text_size);
+ 	}
+ 
+ 	/* Actual text insertion */
+@@ -158,7 +159,7 @@ seahorse_secure_buffer_finalize (GObject *obj)
+ 	SeahorseSecureBufferPrivate *pv = self->priv;
+ 
+ 	if (pv->text) {
+-		gnome_keyring_memory_free (pv->text);
++		gcr_secure_memory_free (pv->text);
+ 		pv->text = NULL;
+ 		pv->text_bytes = pv->text_size = 0;
+ 		pv->text_chars = 0;
+diff --git a/daemon/seahorse-secure-memory.c b/daemon/seahorse-secure-memory.c
+index 3d94a674..f201d1df 100644
+--- a/daemon/seahorse-secure-memory.c
++++ b/daemon/seahorse-secure-memory.c
+@@ -23,7 +23,8 @@
+   
+ #include <glib.h>
+   
+-#include <gnome-keyring-memory.h>
++#define GCR_API_SUBJECT_TO_CHANGE 1
++#include <gcr/gcr.h>
+   
+ #include "seahorse-secure-memory.h"
+   
+@@ -47,7 +48,7 @@ switch_malloc (gsize size)
+     if (size == 0)
+         return NULL;
+     if (seahorse_use_secure_mem)
+-        p = gnome_keyring_memory_try_alloc (size);
++        p = gcr_secure_memory_try_alloc (size);
+     else
+         p = malloc (size);
+     return p;
+@@ -71,7 +72,7 @@ switch_calloc (gsize num, gsize size)
+     if (size == 0 || num == 0)
+         return NULL;
+     if (seahorse_use_secure_mem)
+-        p = gnome_keyring_memory_try_alloc (size * num);
++        p = gcr_secure_memory_try_alloc (size * num);
+     else
+         p = calloc (num, size);
+     return p;
+@@ -99,11 +100,11 @@ switch_realloc (gpointer mem, gsize size)
+ 
+     if (!mem) {
+         if (seahorse_use_secure_mem)
+-            p = gnome_keyring_memory_alloc (size);
++            p = gcr_secure_memory_alloc (size);
+         else
+             p = malloc (size);
+-    } else if (gnome_keyring_memory_is_secure (mem))
+-        p = gnome_keyring_memory_try_realloc (mem, size);
++    } else if (gcr_secure_memory_is_secure (mem))
++        p = gcr_secure_memory_try_realloc (mem, size);
+     else
+         p = realloc (mem, size);
+     return p;
+@@ -120,8 +121,8 @@ static void
+ switch_free (gpointer mem)
+ {
+     if (mem) {
+-        if (gnome_keyring_memory_is_secure (mem))
+-            gnome_keyring_memory_free (mem);
++        if (gcr_secure_memory_is_secure (mem))
++            gcr_secure_memory_free (mem);
+         else
+             free (mem);
+     }
+@@ -138,9 +139,9 @@ seahorse_try_gk_secure_memory ()
+ {
+     gpointer p;
+ 
+-    p = gnome_keyring_memory_try_alloc (10);
++    p = gcr_secure_memory_try_alloc (10);
+     if (p != NULL) {
+-        gnome_keyring_memory_free (p);
++        gcr_secure_memory_free (p);
+         return TRUE;
+     }
+ 
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
new file mode 100644
index 000000000000..0a172a635107
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
@@ -0,0 +1,38 @@
+From 7c805b5d4eca798a03ac56b40e53cb335e30c187 Mon Sep 17 00:00:00 2001
+From: Vlad Orlov <monsta@inbox.ru>
+Date: Mon, 15 Aug 2016 18:23:31 +0200
+Subject: [PATCH 1/3] libcryptui: fix logic flaw in the prompt recipients
+ dialog
+
+The prompt recipients dialog has been broken in commit
+https://github.com/GNOME/libcryptui/commit/cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d#diff-f0ea8a1eef5386b0149314d2a1743e85L202
+
+The patch fixes the logic there and makes seahorse-tool's
+encrypt command work again. Therefore, seahorse plugins for both
+Nautilus and Nemo should start working as well.
+
+Bug-Debian: https://bugs.debian.org/770436
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769944
+
+Reviewed-by: Stef Walter <stefw@gnome.org>
+---
+ libcryptui/cryptui.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcryptui/cryptui.c b/libcryptui/cryptui.c
+index 92f0d5d4..2bbfa409 100644
+--- a/libcryptui/cryptui.c
++++ b/libcryptui/cryptui.c
+@@ -211,7 +211,7 @@ cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset,
+             *symmetric = cryptui_key_chooser_get_symmetric (chooser);
+         }
+         
+-        if (symmetric != NULL && !*symmetric) {
++        if (symmetric == NULL || *symmetric == FALSE) {
+             recipients = cryptui_key_chooser_get_recipients (chooser);
+             keys = g_new0(gchar*, g_list_length (recipients) + 1);
+             for (l = recipients, i = 0; l; l = g_list_next (l), i++)
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..6447ee44eca7
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+IUSE="debug +introspection libnotify"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	>=dev-libs/dbus-glib-0.72
+	>=app-crypt/gcr-3[gtk]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	>=app-crypt/gpgme-1:1=
+	>=app-crypt/gnupg-1.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.1.4
+"
+
+PATCHES=(
+	# Support GnuPG 2.1, in master
+	# https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+	# from master, in Debian as well
+	"${FILESDIR}"/${PN}-3.12.2-prompt-recipient.patch
+	"${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch
+	"${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch
+	# Support GnuPG 2.2
+	# https://bugs.gentoo.org/show_bug.cgi?id=629572
+	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch
+)
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
+		-e 's/-Werror//' \
+		-i configure.ac configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-update-mime-database \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable libnotify)
+}
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
new file mode 100644
index 000000000000..edaa2db9c183
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+IUSE="debug +introspection libnotify"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	>=dev-libs/dbus-glib-0.72
+	gnome-base/libgnome-keyring
+	x11-libs/libICE
+	x11-libs/libSM
+
+	>=app-crypt/gpgme-1:1=
+	>=app-crypt/gnupg-1.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.1.4
+"
+
+src_prepare() {
+	# Support GnuPG 2.1, https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	eapply "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
+		-e 's/-Werror//' \
+		-i configure.ac configure || die "sed failed"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-update-mime-database \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable libnotify)
+}
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/libcryptui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libdesktop-agnostic/Manifest b/x11-libs/libdesktop-agnostic/Manifest
new file mode 100644
index 000000000000..95d3b7d33657
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/Manifest
@@ -0,0 +1,5 @@
+DIST libdesktop-agnostic-0.3.92.tar.gz 442653 SHA256 8a77ec9f299acecdf38a0f106675667a392d314ac33f4e9be84fb696488dd354 SHA512 c383a45edb6a1fed1b1a13ed583627eceda444519276a5d62a8442bcdc1be5e7d37a0449b678e2ccfcf7441648ca6bff6c40e5930dbec9221182657201671e90 WHIRLPOOL e5c8abfe11cd602a0f0a3116acd464348b1975a370435ed3bb7527f1c33af5f0d66d0f9c3824354ff3e2a2608bc98dc4a6504ab49769b225d72dc1c1d168e367
+EBUILD libdesktop-agnostic-0.3.92-r1.ebuild 1375 SHA256 c069ff4d1afd646eabfc20ef9bc45cdb0d6db55a950890007f8c3975ad6d03cc SHA512 0350d6b739aae086845e24b46ac1860a9bb8481745f3982385c601243be21c5d7879a6472afcffaecf00498e18ddd6454b636d82450880a69a6fef283c4c9d51 WHIRLPOOL 34bd552eeaa8603cfc1dfcc8ee41602e357255c78c0504f379f415f0446135818833270080dd6ed325be6c01c054c68b09866a57d27fd646cf89d9425d5ab58a
+MISC ChangeLog 3262 SHA256 d4624f10a4537f681e7689b10d61c2bbc79749052d075f555b091a7ab1e3d9c9 SHA512 734df3aa51ebd6eb756cf07f4fbe5b7a0d57dcf45eb93d9296934f02b5d2c8080ef9499f39ab8822de7e22ae51b458d6a330f3bab19505c84e47cc67dad30106 WHIRLPOOL 362a803b19aa20fe59293be22233613ec945420a83921f2366acbb3d150cee72997269539ec6b894b31d5c22c77c91e488793ccdc7b4d94989208ee91b18686c
+MISC ChangeLog-2015 1813 SHA256 54006607c7fe9f4d5c8aa584a0df9bbdc94c56d067e7724b719acb809b3e8557 SHA512 8351ac41859ac90e1d10e23fb394d2999c304a632b4f2b6c37849283ea34eef699abe37e9ae3234b4d7aa9fce63eb99cea541247f6ecb790c80f7c72366f3595 WHIRLPOOL e25f815478182cef1e54b44b08f8d1dd8aceb466d016af65fab621e3e91562d3be59a60566bea37a3e07472720f511b16d5779bc7dd8f9f5d06aeb5497ddcfd1
+MISC metadata.xml 410 SHA256 aac8dfb7bb9d452a53e9dba49ba636403709c10adba4925a58e4d4b3e60050c0 SHA512 8957d3d8b720e4d51c28bad1637ab6de0d25feb656a0be4d5335c34ba9955e857e79945a5904650f26423a5e8b8e49563b9d46c52c70a0fb834a74b577169b0e WHIRLPOOL d3f0361c2e4032cb11ae36fd58c6e2f28c9c6d209b7a605441de1099ffa28860e2b0700fc809dbc92db798c8894bf4f995364a6c7110eb013dd5a29c6cf78158
diff --git a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
new file mode 100644
index 000000000000..c587c4404e12
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+VALA_USE_DEPEND="vapigen"
+
+inherit python-single-r1 waf-utils vala
+
+DESCRIPTION="A desktop-agnostic library for GLib-based projects"
+HOMEPAGE="https://launchpad.net/libdesktop-agnostic"
+SRC_URI="https://launchpad.net/${PN}/0.4/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +gconf glade gnome +introspection"
+
+RDEPEND=">=dev-libs/glib-2
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	gconf? ( gnome-base/gconf:2 )
+	glade? ( gnome-base/libglade:2.0 )
+	gnome? ( gnome-base/gnome-desktop:2 )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/gobject-introspection
+	introspection? ( x11-libs/gtk+:2[introspection] )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_configure() {
+	local cfg="keyfile" fdo="glib" myconf=""
+
+	use gconf && cfg="gconf,${cfg}"
+	use gnome && fdo="${fdo},gnome"
+	use debug && myconf="${myconf} --enable-debug"
+	use glade && myconf="${myconf} --with-glade"
+	use introspection || myconf="${myconf} --disable-gi"
+
+	waf-utils_src_configure \
+		--sysconfdir="${EPREFIX}"/etc \
+		--config-backends=${cfg} \
+		--desktop-entry-backends=${fdo} \
+		--vfs-backends=gio \
+		${myconf}
+}
diff --git a/x11-libs/libdesktop-agnostic/metadata.xml b/x11-libs/libdesktop-agnostic/metadata.xml
new file mode 100644
index 000000000000..0bc19fc83076
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="gconf">Enable GConf as configuration backend</flag>
+    <flag name="glade">Install the Glade catalog for the desktop-agnotstic GTK widgets.</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">libdesktop-agnostic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
new file mode 100644
index 000000000000..ad2f3d7e37ce
--- /dev/null
+++ b/x11-libs/libdmx/Manifest
@@ -0,0 +1,5 @@
+DIST libdmx-1.1.3.tar.bz2 290859 SHA256 c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 SHA512 551cbba06e87ddc6f9a1f4567de4b8c592a4b6f6b6c27970c67c644ffe5c7f396e3c64c6df564d83a73f1b3842ba0a29a2463580fc0a264c552d76fbcba5a021 WHIRLPOOL 0cd116b9a764f699d147958fa4673e6be513ce5832450e308d4686ad998a7edc6ff60a6d5165d72584f8601f2742092f82e2ce9f34a1ef16a1c94d9f66ee43cb
+EBUILD libdmx-1.1.3.ebuild 385 SHA256 5e75e92083a4b8799197fe7fe38dfe5427d4e0b08779c5dfa5ef5529aaf89c1b SHA512 0957479fa47d97fe8bb10af1d1a10f6a7abe08d51c2e3290c5618b0ef2cb140900464cf079eca9213697049291be144f8792cf3a4f7a5217ceaca341facb01e3 WHIRLPOOL 443c0b980c6f15481c28cb66d5802617b21d9a44a0c549ada3c92fd39100e0d7f1ea3822a7416c45c27b334caec8249f44beab2e5fc3de551b1ba989321d51ca
+MISC ChangeLog 2424 SHA256 3d5940c53c8a7c0dba446ae7292e97ea3b9813347912b339c18aabba1042ccbe SHA512 f0a79f9e1532f980c41c15ca3c70a51ecfee7a5625d786afcdd4f858846b1a02e662d9dab218715daf0beba6527a61a68f87258d86c9e25427feccb19c651830 WHIRLPOOL c9bd479075e84df39a412583117ebfbd220b4eb7d16335f7bdc10eb4b93ca5524521e0262848c2f3c222ad8c24acb303395dfe37edb3b3f039a594bcdc496b7e
+MISC ChangeLog-2015 7161 SHA256 8f4c17c4b2a2826e9d6c519dc42e82203b73f8c8f082870c27ef469e97470f68 SHA512 44b6f02736de140f8978dfdd6d390b79928bab3df3e2735863e9e5f0029a2f2af2d797ad4382338bac2f411560bba1e5001d693c73531dc84ddb36b86facdee5 WHIRLPOOL 697ffad700d2c56c5ef3fbf0968b5a8d890e14111aa2c95698f2f6e51ebc8d50bc5f3dd63ec3cf18c08a45473fc01f24c0ba6689006ba5c47468f53c6a2084c9
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libdmx/libdmx-1.1.3.ebuild b/x11-libs/libdmx/libdmx-1.1.3.ebuild
new file mode 100644
index 000000000000..c8d018aea3ce
--- /dev/null
+++ b/x11-libs/libdmx/libdmx-1.1.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org dmx library"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=x11-proto/dmxproto-2.3
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libdmx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
new file mode 100644
index 000000000000..e3e80253b1fe
--- /dev/null
+++ b/x11-libs/libdockapp/Manifest
@@ -0,0 +1,9 @@
+AUX install-paths.patch-0.6.1 514 SHA256 0bb72eaa344d5ceb27380852bc0e9dfdc93bbeac3f2a3ed1d2a308f38c28c009 SHA512 88a8b54a4ea87de11f7ac925318522b84036f2471b580d67ab07611cdd2ca0b2cf512208d97d38e8689f7edc3c37e543c9d717f16cd26c134bc9db6f4496e226 WHIRLPOOL 03da372ebad4e801c62c2f652ee30b5d93d01cd161074b8e5daec7c1a1b2dda71b3dc369c1e2764cd8cae793c75d9ae44f11050754e16415db7e100b6ed67142
+AUX legacy.patch-0.6.1 395 SHA256 eba56bf50491b9685245451d5afd0b47e2cf9ab0ca689decd6742ac8de98bd8c SHA512 ea56df9a1ca25d575084e63a16724659292f7fad6af8a72761a167830c4861b3ed72828a3e418754d1e63a9543bb285ae68ea124c70142efbea43957aecfc6b3 WHIRLPOOL e4a59f82e4aca3a4a0ec682d7f8cc049cb40526ee9c6c193fe0f47763a3b5d650853db8e71cf1d806d6dafdde4b991e563ea0d4c4ec2384f6dace5714aaace97
+DIST libdockapp-0.6.1.tar.bz2 155920 SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3e290300f92048fdb11ebd273bd9f SHA512 bb0282db7b02fa1acd4456636f9b20eae98e6f1f1aae552016a103a7d75a712a689d111abd5502302cbc0eacade8235a74c6fad9f1e6548c5411b1c4c18b09ce WHIRLPOOL f2b655882747c43f95beaf190d18039bbaaa507a86f6858843a0687fd1ff6e0c6b9a4c0770e730b162c6e6a8f5c03c4c209621af2c35f22d7048880672d44a33
+DIST libdockapp-0.7.2.tar.gz 40462 SHA256 82a4f9f9235f425322fea46a723f16efe255c84e1717191bcea14565dadc2ff9 SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79 WHIRLPOOL 4664ff5d7d8702a9cc51cdb6b55d397e685c53bc1529ebaafd2886a914b51fa55627dcee886fee991a29d177d9c9e8362c943d147c8e01955793b0d5c303789d
+EBUILD libdockapp-0.6.1.ebuild 1917 SHA256 37e8fcc8e71f525b330f649636feb9aee4bbeade747bc369de3bc301d2e78529 SHA512 04b99f96a89143500ebf443eeef5904fcbf761c1900a84aeff08d8ad4b7c1b145c82e055e9623d1b256ac67d961294a287a08315270ae03643ff6104a4ca7ea1 WHIRLPOOL 81d85a90285731c6be09f7420199d9f1611d508ad8a5002d87953c6b2c9182b0783187837ae2c4074b6a79444c3736782fe4946047e4011e92baffec1ec5e036
+EBUILD libdockapp-0.7.2.ebuild 828 SHA256 3eab6c5ee6db7b6c6a19a3d8eabeb5a1fe683415d7a365b46190891028543bd6 SHA512 323fc8333eee38ae2be9a569322230090b4c99665820a2200055692f0f1aee308f61fef6889f90aa982d5435dbbb5acef6875e2e97b5d689b24979c96e97233a WHIRLPOOL 6241b9a5630dc3074a86330cdb08fe00385405c1926f1fc20c5c2eeec8a392b3143cbee36276e8a94a24ae72d36345182469b7b9780a1aa5d6468379bb05551c
+MISC ChangeLog 4836 SHA256 940dc832418bfdceb210c2b7c133d447467d817c6003af86367f51e5eb6b7599 SHA512 9d05da10a97bd6b49701742eaa2a8e0537bd9e6e52686cf5e6360d65fc40a3ac94aa184f6e7f2516116507ea533f744fabbb7813a22f20f1c1c5c84d783989eb WHIRLPOOL 4f7ab9f8e55f598b35ace45008dad3d1e748f842938cd8a0373b977899193c3a04b36b7c01dbba43b314a94c1830f58fc7d0ea78a879117b79d23db765196375
+MISC ChangeLog-2015 5793 SHA256 05e670f8fb8e455cfe8f9e9f7317457581899bbaafb3e394c48e763bd1581e25 SHA512 8b7507eaec0d8fbf0f7806b338eb2989719164dff0826976e4e68592784575cf28782a6f10660ff69483f1de88a60554eddc7378c1e4699352ca1de79ec80981 WHIRLPOOL 48e46ef0b1574da38226994a9ffba68d270cca505a728fb446c5784f0027a41852db130cfc6cb64d921eedf47fca4425513111342232ea4aae6de00968cfc3aa
+MISC metadata.xml 249 SHA256 ab0de85cc2ebef9f9bca3773395bc5c909312efb834a8b3948806c1b00dee4e5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d WHIRLPOOL 3d7026fc5a045f5c90505dab413fe4534364d8c9a47c053ffbfaf3579478e55f77427eb00b05bd4c593a372c69eefae5ca93a2bab9398f52d20d374c2265fb2d
diff --git a/x11-libs/libdockapp/files/install-paths.patch-0.6.1 b/x11-libs/libdockapp/files/install-paths.patch-0.6.1
new file mode 100644
index 000000000000..7206655bb7a3
--- /dev/null
+++ b/x11-libs/libdockapp/files/install-paths.patch-0.6.1
@@ -0,0 +1,15 @@
+--- fonts/Makefile.am	2005-06-08 14:36:38.389096256 +0200
++++ fonts/Makefile.am	2005-06-08 14:37:18.276032520 +0200
+@@ -5,10 +5,10 @@
+ #	but I don't know how and they don't tell.
+ #
+ 
+-XFONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts
++XFONTDIR = $(DESTDIR)/usr/share/fonts/libdockapp-fonts
+ 
+ MYFONTDIR = /dockapp
+-MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz fonts.dir fonts.alias
++MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz
+ 
+ install-data-local:
+ 	$(INSTALL) -d $(XFONTDIR)$(MYFONTDIR)
diff --git a/x11-libs/libdockapp/files/legacy.patch-0.6.1 b/x11-libs/libdockapp/files/legacy.patch-0.6.1
new file mode 100644
index 000000000000..b608db02195e
--- /dev/null
+++ b/x11-libs/libdockapp/files/legacy.patch-0.6.1
@@ -0,0 +1,10 @@
+--- dockapp-0.6.0/src/damain-orig.c	2005-04-20 20:05:04.000000000 +0200
++++ dockapp-0.6.0/src/damain.c	2005-06-04 19:21:34.000000000 +0200
+@@ -237,6 +237,7 @@
+ DAInitialize(char *display, char *name, unsigned width, unsigned height,
+ 	int argc, char **argv)
+ {
++    _daContext= DAContextInit();    
+     DAOpenDisplay(display, argc, argv);
+     DACreateIcon(name, width, height, argc, argv);
+ }
diff --git a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
new file mode 100644
index 000000000000..7c74fbe5d9da
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+IUSE=""
+
+DESCRIPTION="Window Maker Dock Applet Library"
+SRC_URI="http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/${P}.tar.bz2"
+HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+S=${WORKDIR}/${P/lib/}
+FONTDIR="/usr/share/fonts/${PN}-fonts"
+
+src_unpack()
+{
+	unpack ${A}
+	cd "${S}"
+
+	# sanitize fonts installation path
+	epatch "${FILESDIR}/install-paths.patch-${PV}"
+
+	# add legacy support for older dockapps
+	epatch "${FILESDIR}/legacy.patch-${PV}"
+
+	eautoreconf
+}
+
+src_install()
+{
+	make                                                    \
+		DESTDIR="${D}"                                      \
+		SHAREDIR="${D}/usr/share/doc/${PF}/examples/"       \
+		install || die "make install failed"
+
+	dodoc README ChangeLog NEWS AUTHORS
+}
+
+pkg_postinst()
+{
+	einfo
+	einfo "You need to add following line into 'Section \"Files\"' in"
+	einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
+	einfo "and reboot X Window System, to use these fonts."
+	einfo
+	einfo "\t FontPath \"${FONTDIR}\""
+	einfo
+	einfo "You also need to add the following line to /etc/fonts/local.conf"
+	einfo
+	einfo "\t <dir>${FONTDIR}</dir>"
+	einfo
+}
+
+pkg_postrm()
+{
+	einfo
+	einfo "You need to remove following line from 'Section \"Files\"' in"
+	einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
+	einfo "to unmerge this package completely."
+	einfo
+	einfo "\t FontPath \"${FONTDIR}\""
+	einfo
+	einfo "You also need to remove the following line from /etc/fonts/local.conf"
+	einfo
+	einfo "\t <dir>${FONTDIR}</dir>"
+	einfo
+}
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
new file mode 100644
index 000000000000..ecf24fc38603
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="http://www.dockapps.net/libdockapp"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+
+src_prepare()
+{
+	eautoreconf
+}
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf --without-font --without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml
new file mode 100644
index 000000000000..1d5e6504004e
--- /dev/null
+++ b/x11-libs/libdockapp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+</pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
new file mode 100644
index 000000000000..b1df1f84f71d
--- /dev/null
+++ b/x11-libs/libdrm/Manifest
@@ -0,0 +1,16 @@
+DIST libdrm-2.4.75.tar.bz2 774589 SHA256 2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f SHA512 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292 WHIRLPOOL 24134409e59fe48bae02890b8153c063a49b114bcad9911487aa25ee594fe622ba04a3b2e486a2944ebe4177e205a8a970dd8d584550022780a70cb0447decf9
+DIST libdrm-2.4.79.tar.bz2 783711 SHA256 c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197 SHA512 62d6dbdf5e4e73e948fcb128a3ee76c88843d0aabf0af5751526829e9b95cff151a121af88ba9625acc7f5bc4ecfa71f9a3762005d5da76cff1d91dfc8ea8ea7 WHIRLPOOL 38e64cad8cd49a44931b598896d9ced625560a0d9da4f095d4d76eff3b64d8ab80285a6df2ff3c27ab41946fa0dcc718960cf01ac662be891c0f561997058208
+DIST libdrm-2.4.80.tar.bz2 771243 SHA256 a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b WHIRLPOOL 210f62c21aa27fb93eba3a8303daeab80b9da4b20ec6a70649fbad88f4277559a58018fbb12ff4b92bc6b8dc16b7ccbec1724bfcafe353382673352e9ac6d16d
+DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 WHIRLPOOL 2694fe988c7ebf34b30076a10dcb2d5ba8a24ddddb1ad348da69874814d64e78ad48f959275faa02fabd798ae214f386ef8437bdf48d485f77519b8759d695df
+DIST libdrm-2.4.82.tar.bz2 754053 SHA256 43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0 WHIRLPOOL bf600559faf5ffe45b6f0192a561875e5284ea76d7611724c2e7f21e6f8aaa6d2e368546102170cffb713bb37fc4c5f98a08b6828e4f6f48f774d7b9b9d96906
+DIST libdrm-2.4.83.tar.bz2 756342 SHA256 03a52669da60ead62548a35bc430aafb6c2d8dd21ec9dba3a90f96eff5fe36d6 SHA512 8f894ff61939bca03ac857506a84bbbcbe2367e60c91a0f2388bfce5ae81e12ba2f96fe1c962416cf9e2d25ef04b98b5437c7015497789561311a72607b3bfcb WHIRLPOOL 8e585516cc8ce88085489b46916f3108b3481bf71877238290a0c79315020c835fb1af90907c4357656e16fcf26ee48b0febce37a189a522978ed95a05525c5e
+EBUILD libdrm-2.4.75.ebuild 2025 SHA256 2855e3112ce8532496a8289124ccd79b33e829ff460f1b024287149d987feea9 SHA512 8d7a0b34900c817d14da26817ce0df5e3edd961c21b3d8935463bc55110ada6947db1db1205a99d511c3c6abeb3945a38cb40b30e00744aebee342f6b6e85fb8 WHIRLPOOL 20af1655a3d9997d5e82b00451cbdc9d6ef5cd4bd14f94545b9f9b55725f41c34240e593ff5206a3e0f2d53e9e6a685449f799cef2ea100bdf248517658ab35d
+EBUILD libdrm-2.4.79.ebuild 2034 SHA256 a876da26b0bffe7155ac14482a9242be011b1e71d3fea9daa39e2ecba9292a27 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c WHIRLPOOL d3448d0e87f099ec43c28efe56670954827b079c1380dd440cc7d2d0bdeba483d40599a41afe7eafd33cc98cfa63350fead9bb7d4aefdfa18592e898bbb6dec2
+EBUILD libdrm-2.4.80.ebuild 2039 SHA256 70b36a071847c0cb058f1f8e2ab8dfe456b5f0c55e86d7acbbb4c5b7da16ba2f SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb WHIRLPOOL 8372438e85786af109efb3a003d74dc9378fab2b560acde1cfa815ac40899e65c98760565d7413b54490edd68408fab61dca472e1d9f282ac68e8fdad07ff7d9
+EBUILD libdrm-2.4.81.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
+EBUILD libdrm-2.4.82.ebuild 2044 SHA256 2ced701893f3f70eb358ae4a710bbd6b6e5a5c2e367722be407c2b98dd7d1f41 SHA512 e886fa3500543eacefc525a62f420687bd90bdd56edf5370555c3b46b410c91d5174486ed7ab583c9a7736bd31a63550365111675d963a396ac4aaa422874896 WHIRLPOOL 13ef211af44b1b6950b7963fc22f157a982aa2320a12147d5c18b20bd1676fced1c960988b0da6aa78525ac540d25f11be8749b9304859ba6f27d3952bfc95bd
+EBUILD libdrm-2.4.83.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
+EBUILD libdrm-9999.ebuild 1913 SHA256 a1a99fe8335f4dd1da299d84b2b9a536c1696812acfa8c2297b55857fc1c9790 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531 WHIRLPOOL d19ff320a2d73409063add688ae4cd547ca34bf2735123ffb2f9b07b010af751b6d0fe02e23137224ed427c3652430a2d68d25c185f1f806b3e69bbc89b6f06f
+MISC ChangeLog 10565 SHA256 0b5bb6e232fdf4da3f832885a9cf2a5941688a40b79fa11d71304a2d60a428ff SHA512 8072f0c334cd09fcabaf4989fc78c3e1f3455e5dca52ec0d71d20c4e74af2dd0464ec8240a32c9f8ac0b16a302b375bb542decf48b84465c88a7dd5ede2c1f2e WHIRLPOOL 48e58d54d58d7c1eb0ce4037a1dd8f3a64242c29fb4bdf29981ce0de0c38691e1b3bca4ccc3523829cb93ffb996efae76e87b980148605de0a3c780dbbfa7f9b
+MISC ChangeLog-2015 38773 SHA256 cd87b1d64a1a2aada2ed0a242dbf4b62a3af4b0cc1a203b6b078dc118ba8d12b SHA512 63c8986631498686718705509b75f5af6e25604f0336b69688039266e3bd6cce959f7b386081e02004e81cd88f7a41821b277bde235c422b4e60d40ea5d91e6f WHIRLPOOL 23a859dc9ddf9920a90a2e5d700c2d003207e20d6be90cd7f82998f0254370c451827c446564699443e5917228b0d84cd6557e41f8a8613c815fdff331a7252f
+MISC metadata.xml 406 SHA256 4c8d75a84f37733d8e746655b9b809083158de1db8129c2b8e0d2dc4500dbf4c SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da WHIRLPOOL 6d09e0a07a60f4a47a7d4ad57c21298f4160baf57576e9eb58ad55e039843ef32fa1ac86ac99c450529bc81339ff369357b25c93e0c4a453d765584339fe62a9
diff --git a/x11-libs/libdrm/libdrm-2.4.75.ebuild b/x11-libs/libdrm/libdrm-2.4.75.ebuild
new file mode 100644
index 000000000000..ea93d9f498e9
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.75.ebuild
@@ -0,0 +1,62 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.79.ebuild b/x11-libs/libdrm/libdrm-2.4.79.ebuild
new file mode 100644
index 000000000000..4a663bdd0b10
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.79.ebuild
@@ -0,0 +1,62 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.80.ebuild b/x11-libs/libdrm/libdrm-2.4.80.ebuild
new file mode 100644
index 000000000000..14a8265d38fc
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.80.ebuild
@@ -0,0 +1,63 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.81.ebuild b/x11-libs/libdrm/libdrm-2.4.81.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.81.ebuild
@@ -0,0 +1,63 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
new file mode 100644
index 000000000000..615539acfda8
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -0,0 +1,63 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.83.ebuild b/x11-libs/libdrm/libdrm-2.4.83.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.83.ebuild
@@ -0,0 +1,63 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
new file mode 100644
index 000000000000..9a326c12fb8f
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -0,0 +1,63 @@
+# 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 libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS=""
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
new file mode 100644
index 000000000000..25fe9f86f2ee
--- /dev/null
+++ b/x11-libs/libdrm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
+<use>
+<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name="valgrind">Compile in valgrind memory hints</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
new file mode 100644
index 000000000000..49f7c315a2ba
--- /dev/null
+++ b/x11-libs/libfakekey/Manifest
@@ -0,0 +1,7 @@
+AUX libfakekey-0.1-ac.patch 746 SHA256 f5239c79ee334e1d6b671a719d00a2f776b9e0c7894292a3cd9b021b1fbc81a1 SHA512 383912a211882f03cbfa6223703531c8975821c7861e460466e25b451eda81ca2d8c7449c0d9e928061ce9bf82c476c064a6cee96f58ad93c00fab2cc4d2fa57 WHIRLPOOL 779de158c952a25051ac1eb54f735264e5e615ca6e271498d3a2006c31ad05fb9a2153520e090d0e676a224a9ee25de16466ec4f83e77c25df55f849c0d94ebe
+DIST libfakekey-0.1.tar.bz2 203504 SHA256 c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808 WHIRLPOOL c33c01b745a1f3fd81333847a09ec1f5d11552976f2034e22bb323ae8cbd6f3d4ef819969d40f063d727f11004c77713fe906361433a7e467c2083ef0f0f3702
+EBUILD libfakekey-0.1-r1.ebuild 1160 SHA256 a0f86f046eccc29f421e5016fe64470d963d4161394f50cba54a3880bf73a7a8 SHA512 fb1d4c1463ba21e5a3ec55b518c8d25ceef4359ec5dde616713500f3268ab45ee58bcf21293ccb7d1427b299030a2e7f9a065ee93c7671090b07a560d9afc1fb WHIRLPOOL e7883bf27a2b08b6e6debb3be7d445a007b875704da976893987cfc2d7b9f2131d29d6634415bab45186f04594badbbc8b8da82f9d7938865a9c46ea5633c1db
+EBUILD libfakekey-0.1-r2.ebuild 1101 SHA256 97e2fa6025e59fdb7c11cd7f53d0d826a51cd95bceb606e641c6aaf84979a470 SHA512 e7dfb286d5a7e1482057ae682b21869d463147d13f4e915b278c92bad5f5557bb025978038832e53e7e13e6f4b3764e66f77abaa4f756832babffa01665db132 WHIRLPOOL 0c565e1892203027cfcf7ddca3d15b79e822f79b3b67c7692e7f97516c2d4bafada8cdc675dd8505b76f7977c473b3753d6ea661236a3570c8a0a6669096f08b
+MISC ChangeLog 2835 SHA256 02406c1529f90202020235b4b781ee3eeb9613bae2c2bc392f91ccae865db823 SHA512 e4520ad6b9fdb9959d78288223964cc13e52afc36896268b4ae937cd603f62e3bed6d07ceecba2c65aa450fa45f763e539d2b95019db5f5521eb14dec635a226 WHIRLPOOL aba97a4987c5473862cbdbed234c664675af7feda729b30e1943119a750bacc7f266816ae2e53da2846c675946f34ed3ca2761636299549c921dd550e148ae03
+MISC ChangeLog-2015 2077 SHA256 050a7f4edf3cb8c97e87071db0dec7359f43a7525a450c1c4407cbb3b048507b SHA512 9d2287cb8d5c2a3414f12431f28cfab49436838fa3aeb8249fb44e599e1cdbd145da1542cfeb40441bd29583d5eb69177c0adfd734d22cd82ca4a961b38fed8b WHIRLPOOL f2c2d427954922d0f5f8a1d37c12e04850fc18b278860a37525903471e94d0e43560a0c49b389586978ddee040c906f50bb7bf0d50708e835e11fb302bf4024e
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
new file mode 100644
index 000000000000..65c0b083aa72
--- /dev/null
+++ b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
@@ -0,0 +1,24 @@
+--- configure.ac.old	2011-05-22 14:59:45.801746472 +0100
++++ configure.ac	2011-05-22 15:02:59.437159981 +0100
+@@ -14,16 +14,14 @@ AC_HEADER_STDC
+ 
+ dnl ------ libtool versioning -----------------------------------------------
+ 
+-LT_CURRENT=0
+-LT_REVISION=1
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-LT_AGE=0
++m4_define(LT_CURRENT, 0)
++m4_define(LT_REVISION, 1)
++m4_define(LT_AGE, 0)
+ 
+-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
+ AC_SUBST(LT_VERSION_INFO)
+ 
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
++LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())"
+ AC_SUBST(LT_CURRENT_MINUS_AGE)
+ 
+ dnl ------ Check for X Stuff ------------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
new file mode 100644
index 000000000000..eff9f11885f9
--- /dev/null
+++ b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# Allow configure to use libtool-2
+	epatch "${FILESDIR}/${P}-ac.patch"
+
+	# Fix underlinking bug #367595
+	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+		tests/Makefile.am || die 'Cannot sed Makefile.am'
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# --with/without-x is ignored by configure script and X is used.
+	econf	--with-x \
+		$(use_enable debug) \
+		$(use_enable doc doxygen-docs) \
+		|| die "Configuration failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	use doc && dohtml doc/html/*
+}
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild
new file mode 100644
index 000000000000..962212c640fe
--- /dev/null
+++ b/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# Allow configure to use libtool-2
+	epatch "${FILESDIR}/${P}-ac.patch"
+
+	# Fix underlinking bug #367595
+	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+		tests/Makefile.am || die 'Cannot sed Makefile.am'
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# --with/without-x is ignored by configure script and X is used.
+	econf	--with-x \
+		$(use_enable debug) \
+		$(use_enable doc doxygen-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	use doc && dohtml doc/html/*
+}
diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/x11-libs/libfakekey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
new file mode 100644
index 000000000000..60b657113267
--- /dev/null
+++ b/x11-libs/libfm-extra/Manifest
@@ -0,0 +1,9 @@
+DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
+DIST libfm-1.2.4.tar.gz 1259686 SHA256 30474f25e4fbf78f50c7e2493cc4eca5970243089393d25a80f3d79b478a2ce7 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c WHIRLPOOL d42d7ee5d7fefd1c100a0b7f741a20a2d98e84bbea57cfe3b3f197e7731538bda51c4c916a88e185ce937bab88fcda7b511d3da81660f6f36f32ef389f480f1b
+DIST libfm-1.2.5.tar.gz 1261152 SHA256 6b51b6ac65cc6da4d11febb29e497b97c3a5591941639ddc4757fcab451f64ba SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc WHIRLPOOL 3ec363725023cf7ab02a82d4242cc8e1ec5ff9658d89554afbe55ab3cc78df0858dfd400c85a284d069365de159a385552e55b4bf8397ed1767a2c0ba8c6d1e1
+EBUILD libfm-extra-1.2.3.ebuild 2555 SHA256 92cb2c442217718cd5800d324c42dae39a0feea926d2ba55516f61b193501c33 SHA512 0e995b9810ea99678f5844ca6dfbb046b7dc10928475f6457efb546809b521c48ecd433b561eac24c0bcedd3a13550277aead1aa19a9f867149e2db467160a86 WHIRLPOOL 8c6aa6f47a9e516ff6b0faf98fd464864ebc43d2bb8a4f54ea53e5f29b45e83cfeb382e0de0ecce73f1132520907f6306b74ea0a5d6136ee86afead0d9e2ee91
+EBUILD libfm-extra-1.2.4.ebuild 2566 SHA256 1132f68e3f1ea8519d089be49ac0d2c9740cfb802a73ac6d763de774b72f4b37 SHA512 2a15974f0bd4814c1800d880f5b0b79c11cab5f7d4f77a29a946fdfc65f7ff6807d7f26e1427399ae4877823d1b95cc51dca5a07e013bd3e7b43bd77726fac64 WHIRLPOOL 290220f783d3522b9eec02d0d267dd9bf5747cc4135678af5910f1d66a7a3552a4c0b88988faa0a5bebb24e30f2b9d66ae02f6cd0a04f4639d6d2f031d42cb33
+EBUILD libfm-extra-1.2.5.ebuild 2570 SHA256 dc08e315912db6bf35d8d346df8eb8bef468e96d1d13cf03d4b26e245e1faf8e SHA512 ebe24370ed51c94757f72df1431ad11f85770de77d0f0e2e92772ea2f1c2de12a2caf6a97175908ee0995c38224ddba89774ed31c62858609af1330fe8472c3f WHIRLPOOL eca8e3d74d55c02be7ee50d6b91dc151b603c3545370ae132cd84f48646aa572f9ef6330e269b61d98de5bdbdec9e853fbf64f519231ac31f5d89f060e55a136
+MISC ChangeLog 3708 SHA256 e628be19718540e6f31703c872d5ebddcb7ddf69524d3c9c8e4cb6b564ce7152 SHA512 8c7425bf4666a0541a79537609647402626d5e7ff7adb820af6bffe926f53151d692828c05ae8b1c3b797ac71dd6a7dd4b6b2f66cd7aa557c48e818f321b9400 WHIRLPOOL 9620e9871fdf48f05db60206f37ecc35efdfe2f59ba1152aba8834eaa64e54ae4ff6e32663fc683c07ed6c1d3968228eb8bc4e4c5e1d41bf33ccf69a795cfcbb
+MISC ChangeLog-2015 1029 SHA256 dc62e1d92879b161895a1228af766982700353be789a59f649c9a7a55181477c SHA512 4dc852f2aaa50095628578d29f4b2686a1e9a4bd27610f02bd4e558f22ff760494c5cb1e8bad3bb408f78ffa3c1e37978b393183510149d871d5e1d665e75c82 WHIRLPOOL 35e08c3fd500fa6b1cfe85aa983964b1940c617b6e51247a9442482ae7515f3aa162a8ba4b489fe96cc7307aff46f47c93b2c7d23cd42eed7982cbfebc94ed85
+MISC metadata.xml 493 SHA256 3a546b4deaa63ba87a7a260e4f016e16358f841ec28b440c9ddccf3a487e812a SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b WHIRLPOOL 968c337a9a517e883fdecbf7a4d5efdcd6d983cf57f07a7e648abb9505d7a152819328cf2df311b25bb49dee569c446926caa2caabb1e5063556d09478bb3b71
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
new file mode 100644
index 000000000000..9295381c165c
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools fdo-mime
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+	!!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+		--disable-static --with-extra-only
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+		rm -r "${D}"/usr/include/${MY_PN}
+	fi
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
new file mode 100644
index 000000000000..2f21bf8da9b9
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools fdo-mime
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+	!!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+		--disable-static --with-extra-only
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+		rm -r "${D}"/usr/include/${MY_PN}
+	fi
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
new file mode 100644
index 000000000000..3315ccf135d4
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools fdo-mime
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+	!!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+		--disable-static --with-extra-only
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+		rm -r "${D}"/usr/include/${MY_PN}
+	fi
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
new file mode 100644
index 000000000000..9a22bf219698
--- /dev/null
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">pcmanfm</remote-id>
+    <remote-id type="github">lxde/libfm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
new file mode 100644
index 000000000000..7cce0df6e387
--- /dev/null
+++ b/x11-libs/libfm-qt/Manifest
@@ -0,0 +1,4 @@
+DIST libfm-qt-0.11.1.tar.xz 127624 SHA256 69f3f2564471272a0ccc8f1958d8f4f520a5a9fad9a6b99bb29f17fab8480578 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079 WHIRLPOOL f55f2b0bc9f876917f07ec23bf7d73bf7978c1102c722ac366b18f56cd77568f2284cd7a66752f72eeb3b94e26a6b030e9a848c5c3fc5e374e5f4389a6bf6520
+EBUILD libfm-qt-0.11.1.ebuild 900 SHA256 8011ad2f6f2d5478f7314ee98bcb20a45216ae94cd1779b461c1d04cf717efd2 SHA512 53800ec5883d1ecb0213acac68ab20b61bc8965cef9a477fa7c48a62511efcbe792c32b6e3401a608bc69e506e4addb544b43f7b6e693bbdafd9a6ad8c4873e4 WHIRLPOOL a0a8b92d82cfd61efcf1ccc83ea258fe4756059be9be62890179f18778701dcb96e2815acddf9eb1e92debf61a8af1562dfb8ca812bbc0887a38041a1af518a6
+MISC ChangeLog 316 SHA256 d4dbd1d1bd002602134164da5c4857b81302ffb83ab91e730c2ed0fef1af40f6 SHA512 535a4476e2d63bffd8cfb08ef69e0d356a87592c252cc76269aff7711e3094423ac27075b843fdcc2017327038fcaa7f7873a7feb0b666b05fdf3ca43a81d929 WHIRLPOOL 1e540b66d78f9ad1d1b4ac0d8e7180201080bcd842464d99dcb65c8f36b5f6d1631bc09af7d698f348685d603763f1dee188d701067b03194607a7dae7a2a001
+MISC metadata.xml 314 SHA256 fb7ccda9777104288f02c02ffc7d64d222d1675741a13744aa0fa64f2913f64d SHA512 02353c6506b0fd39ae1fa1d848894e4b07543d77e90fbdd873ef1f480ca21c06d7bd856765b411c7326945bc22ccd72aa3256d7f0d1856aa27ee6396397475d6 WHIRLPOOL aca2c690aa33e4e0366472b22b0c3f8d6de3b93d44847763e888e1271431a72284684d068d076b7c9f0104aa77254d5a81533c8d7b8d51049eca6e21c0018f00
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
new file mode 100644
index 000000000000..91eb9ddd080d
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
+else
+	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
+HOMEPAGE="http://lxqt.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-0.4.1
+	>=x11-libs/libfm-1.2.0:=
+	x11-libs/libxcb:=
+	!<x11-misc/pcmanfm-qt-0.11.0
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	lxqt-base/liblxqt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPULL_TRANSLATIONS=NO
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml
new file mode 100644
index 000000000000..51d3a803b1ee
--- /dev/null
+++ b/x11-libs/libfm-qt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxde/libfm-qt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
new file mode 100644
index 000000000000..13709b90f415
--- /dev/null
+++ b/x11-libs/libfm/Manifest
@@ -0,0 +1,11 @@
+AUX libfm-fix-use-after-free.diff 863 SHA256 fe8578f2fa37c08f0dcd6b3b6a9c3c19c9b07ded807bc9c742137d827fd850e2 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e WHIRLPOOL b620443d0cacf52bc085de337ba991e86070b540d3834b31f71004856f9ad2c98a87319fb5bb55cb3c946f4be936dd63e710b2a633557e04263a34441412cff0
+DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
+DIST libfm-1.2.4.tar.gz 1259686 SHA256 30474f25e4fbf78f50c7e2493cc4eca5970243089393d25a80f3d79b478a2ce7 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c WHIRLPOOL d42d7ee5d7fefd1c100a0b7f741a20a2d98e84bbea57cfe3b3f197e7731538bda51c4c916a88e185ce937bab88fcda7b511d3da81660f6f36f32ef389f480f1b
+DIST libfm-1.2.5.tar.gz 1261152 SHA256 6b51b6ac65cc6da4d11febb29e497b97c3a5591941639ddc4757fcab451f64ba SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc WHIRLPOOL 3ec363725023cf7ab02a82d4242cc8e1ec5ff9658d89554afbe55ab3cc78df0858dfd400c85a284d069365de159a385552e55b4bf8397ed1767a2c0ba8c6d1e1
+EBUILD libfm-1.2.3-r1.ebuild 3505 SHA256 1e99af11e48131167a3d90233aaef385d61170e359d093871611a6a7ae7b184e SHA512 ba54347a14bc1c297561f10077ab02d67d9df2e5c18689e5d12a8dba3c5a5902d411b93b6f603d7b924ab8a7ae4804e8cfc79943a329204c96ed750fe268c0ef WHIRLPOOL 7d347ef5821e3262288dbe71cb9737c4eaf8461f4916e1155af5d5b7e06a796ef56be57b38f5db0df5fb7fbcc4569ca478a4daa696ad99fae6e77ca2cb3e3202
+EBUILD libfm-1.2.4.ebuild 3722 SHA256 5afc3d79a7d915bb6439ee2790b218078cec550a85ed76df3840a5246f9f55f3 SHA512 0fb24103c5ef222b11cc4bc555fce4de90e95c649798d69b394ed9ab7dd6c9dc822c2c95ceef56d82a3dc5fbe1630284dd2ffa6477d56d8f6df504934f7e8d3d WHIRLPOOL 4ed94fdc1c2a33ae6420e5dce03efca510d0e1ac4367feb5984c4ae3781e07be97b2b8bf2bd510dc5c22d7394a12caee0cba6743625cb50f2d3f404995c09f1f
+EBUILD libfm-1.2.5.ebuild 3726 SHA256 d4a3cbd6d6d0580385732b8f4d54ef7fb5a92e63eb1e997144f632459c77db19 SHA512 f65c0014a6a8253e12e5f3f36fae13ae9db24a58398cb6f3eea005d182fbc022d108aa67d0fcd529d76b68a1804d1db197b4bfa7413aedc6b04cfbb0880ed4b3 WHIRLPOOL c3a67ee9e96576cb50da3af11b8bee679443b0bfe4c88f59180f9d23c3a5ee9d25d79f51d369ecd1db6defe932495e26c9c5728a2f6e85bcfeec5d8b6ab0f7bf
+EBUILD libfm-9999.ebuild 3434 SHA256 a6b85cd910c0e101f22450f3b9037307bdd1366975f65cf58d8aeeaf45fdcc08 SHA512 c53f08c820bb24c4c53c2fcf66bccf15313cdeea793d8d0595ed2587a6bb34e529006e7f5c8543f3780ac5ff35ab588300aeb329ec34d60cb549170564df7d1d WHIRLPOOL b28ab025d7b880881b1e802260a2653af08d9f63367883ba539b62d0395d67ef8998d37ca497ec250e927824a1d1ccfbd727d6aec3a307c9374eb923f98f2031
+MISC ChangeLog 4489 SHA256 dc6a5b84921525dc92c863ab69e524240aaabb5f61f64b109b09658774408fb8 SHA512 0f5d78bc164cd504acfe22704295b853307d19fe8969769f99429ac980b65c4f8cf82000423a4244d6e8f573f6935f79df008208d66cdb25abf2164ca23f38e4 WHIRLPOOL 8f6eb6ebe79998204e156ac621d470c6af4c1e860386495c732c7a1f8d7d0e4c576d0345aedec00cc721567a46e18881367add1daba7f32336d07f4677f3e5a4
+MISC ChangeLog-2015 16180 SHA256 d25dc00079a73d70c7e02c8a34d574555100eb2e7fb443ba14a34ca676fd4d40 SHA512 eaf4fcb1f62667e0cf4ac458118da5286b67f4403eb7fb66131867aeadd72181f7daa31cc4a26f6e9865a08f851fde66211a745571bdcd7acaf6ae60e660b2fe WHIRLPOOL cbfe2af7d54290eeaa99eeefc9c9f44cf0c4727cc0551060f76e4756ef1b1e8b7ef63b981d91a1e59fd5c1429ad09880895c0dcb8685df40156453f26d644c22
+MISC metadata.xml 891 SHA256 dcfa279f1a89f44cd5ac7b3d482635431c933e1a2a1f4c5408bc5c63aeeef68b SHA512 de30c6bbfed377885da535958c50c726e8e9b69a10b322b5d228b0aa5031c7601e006d8721c2d12a820960e2208c860bb0d8d97af69f8c88f4e6e34591e643b5 WHIRLPOOL 69ff0f38745da0603d1aa09a8b7a4f676ad6e89e753992831af80a388d48f60b40d83bafec404d002d2810b578125f31032d8ea0322907de416bcf5d079d2e8c
diff --git a/x11-libs/libfm/files/libfm-fix-use-after-free.diff b/x11-libs/libfm/files/libfm-fix-use-after-free.diff
new file mode 100644
index 000000000000..4a0ae61c40b4
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-fix-use-after-free.diff
@@ -0,0 +1,23 @@
+diff -Naur libfm-1.2.3/src/base/fm-config.c libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c
+--- libfm-1.2.3/src/base/fm-config.c	2014-10-14 18:29:21.000000000 +0200
++++ libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c	2016-06-18 18:23:35.721837971 +0200
+@@ -346,7 +346,8 @@
+     cfg->modules_blacklist = NULL;
+     cfg->system_modules_blacklist = NULL;
+     _cfg_monitor_free(cfg);
+-    g_free(cfg->_cfg_name);
++    if(name != cfg->_cfg_name)
++        g_free(cfg->_cfg_name);
+     if(G_LIKELY(!name))
+         name = "libfm/libfm.conf";
+     else
+@@ -363,7 +364,8 @@
+         }
+     }
+ 
+-    cfg->_cfg_name = g_strdup(name);
++    if(name != cfg->_cfg_name)
++        cfg->_cfg_name = g_strdup(name);
+     dirs = g_get_system_config_dirs();
+     /* bug SF #887: first dir in XDG_CONFIG_DIRS is the most relevant
+        so we shoult process the list in reverse order */
diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..aa6f3273385c
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools fdo-mime multilib vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	~x11-libs/libfm-extra-${PV}"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.2.4.ebuild b/x11-libs/libfm/libfm-1.2.4.ebuild
new file mode 100644
index 000000000000..6b60fec10a32
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools fdo-mime multilib vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	~x11-libs/libfm-extra-${PV}
+	udisks? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	# Fix use after free bug, see
+	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
+	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
+
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
new file mode 100644
index 000000000000..29bc894e16d2
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools fdo-mime multilib vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	~x11-libs/libfm-extra-${PV}
+	udisks? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	# Fix use after free bug, see
+	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
+	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
+
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
new file mode 100644
index 000000000000..447a8fc27f50
--- /dev/null
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/lxde/${PN}"
+inherit autotools git-r3 fdo-mime vala
+
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+KEYWORDS=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	x11-libs/libfm-extra"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS TODO )
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	else
+		gtkdocize --copy || die
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	intltoolize --force --copy --automake || die
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
new file mode 100644
index 000000000000..0bf4befbb5cf
--- /dev/null
+++ b/x11-libs/libfm/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
+  <use>
+    <flag name="vala">Support custom actions in menus</flag>
+    <flag name="udisks">Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
+    <flag name="automount">Use <pkg>gnome-base/gvfs</pkg> for automounting</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">pcmanfm</remote-id>
+    <remote-id type="github">lxde/libfm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
new file mode 100644
index 000000000000..bfc931d95a1e
--- /dev/null
+++ b/x11-libs/libfontenc/Manifest
@@ -0,0 +1,7 @@
+DIST libfontenc-1.1.2.tar.bz2 294884 SHA256 a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62 SHA512 e0905592b7ef65acb8298b9807f90e68d18eddf3112c6232c1c774603c95ca7ec7f6db161e133dadc00d8791c5f76d4c3d65aa95544a1500c0767b88fdb52f45 WHIRLPOOL d32fff4607144ce67527244b3db4b69a303c5f6814f6dc98fd57d1aa36e35ae732af293bd78356762769ce3f55dd65d0082d2cd19d4492cae37212613f2edf49
+DIST libfontenc-1.1.3.tar.bz2 301494 SHA256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c WHIRLPOOL 7ed419bac70ad80f0e67dcd985994379ef7698ecd5dd0e932b9a1ba184aaca8e2a65ef7bb9982cfc15dbd53bcc10670849b8b9122d7a85389fd1a0e0041f8831
+EBUILD libfontenc-1.1.2.ebuild 546 SHA256 dce5d74b11b5735c313d60f7af31d739b5c614f04aaeaba280fa50f445bce371 SHA512 cfc31442eb9d8f0579ec3757f9adc5bf128724ef6108c7b7e3c70312d25fab4b5daad5aa29b506e35078e38d7d887ca136620afc4c71c3b19d1835b922f7407c WHIRLPOOL 5005b29dec9083ff0b3ee0bd261aca1784617409959131adc3351b5862f632198a0da187813daf237fc3a067534dbaee3efedd5bf5b34b2af91c921809c03a0c
+EBUILD libfontenc-1.1.3.ebuild 549 SHA256 89f8e0738dfd30650d8bd263c5c5f6188dd87dba6d4f82b6bbdc16d5af642c10 SHA512 f9d14311904f9d1f5965c27c7f5b2e0c9e20fcee4994884e5f98b3ce50e7cc3daeb8131ebbae8fd677cdcf8dabbbdb5522c9db768a78f8ecc5e63e4309b997bd WHIRLPOOL 99abdf117f967353904ddbfa67126b6e24da1a2f4f0e4f4d9c5c8c02299246b5903c0f7897b938e0ec92c6e04b18502edcff43ae9c556565db1f4c7d8f3a5723
+MISC ChangeLog 4044 SHA256 49b52b69dcf8b9803cf10c627a3eeed4775b9a548f934d02958d287c16cb15d0 SHA512 0e5e3aa9b05f90e5ec28fd49110623f7d754abec5542d1a9887ee85bcaa3dccdd1552aa094e6e3bc73f3b8b245909ebb537dce6794b203ae8cc8f506f210cb16 WHIRLPOOL cbcfccd5d8c02547c0df567ee5c6a54298525783d3c18e17e87d019b76837dbc2e27edededd6bb1715beb5d3893956e57fd93092950bef82e75b0db711cdf3ab
+MISC ChangeLog-2015 10269 SHA256 e38d091ffa935ccabe0872e4f5289e9fa4f688021b65a60ef78c754df0188dc3 SHA512 0d2edbd4179bdeeb7adc360aee60510a4a60798990253ef3507d87aedf21d826ccd7d90cf908143e5f6f4a113d928fae1ec9f1aeb5d6404aafb952bf62d978e5 WHIRLPOOL d819f48f8c06b01ec48c27baf8b2f4e9a468a55bdc72a5d8994398bcfb28196cf36ab3d484029bba72f7d7928427c127c34257a119265449f413be685f5410c5
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libfontenc/libfontenc-1.1.2.ebuild b/x11-libs/libfontenc/libfontenc-1.1.2.ebuild
new file mode 100644
index 000000000000..7a8e143c3581
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org fontenc 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 ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
new file mode 100644
index 000000000000..02a8aed24ea9
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org fontenc 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 ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libfontenc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
new file mode 100644
index 000000000000..4c3205637e87
--- /dev/null
+++ b/x11-libs/libgksu/Manifest
@@ -0,0 +1,19 @@
+AUX libgksu-2.0.0-fbsd.patch 2847 SHA256 bf0343df8e316ac227da7c40a889dd5128da081a640c187dfb743b4f213c3792 SHA512 8c99781e617b7fa96d9ff019a42b362c18f107bf335fbd591c23ac49d9f8ab4ee15a633968a60ba3ae92fe2004f4cdbd4d69b7f7c60c8d5abbd3db90c632c9be WHIRLPOOL af0fcaa2f4ddc58bd8d9483dc0f9b0e2b41e21f3e3ebe51515da763cc41de38d7211670df295a23c455050596c774cbbac050e6c364b5a8cd3dc3e4af56ff9e6
+AUX libgksu-2.0.12-automake-1.11.2.patch 836 SHA256 8d6573025758e5f5c569963fab2d99f406ea50fb055bf06693868ba976c5dd66 SHA512 f4509984cfcd2de42a786cd111c980a985fac21956042a4d68431503f5d2f7fb28850052d876545be538a8bdeaf7a0cd9f7df823ee3011149c6f819e612fec8e WHIRLPOOL 11b63176e89745af4425b081c3bc5c5cbd9f5337201e8519fe8f0b40c2689af5b1b47cdcd4fab4c5df9b26c9134cb5be94611bad515c161f5b90370e74319c4a
+AUX libgksu-2.0.12-correct_colormap_get.patch 507 SHA256 ff1d3802457b3dcdd20aa89b79c383c8aeb52e5aac040d13a607d46198fb6882 SHA512 14da334403bcd48bf0e697eba115e2533cb0dd188ea69535d24401a71e40004c474f0c889d3b1096e2d47880fab9b12bd6c814abbb0bfed80275825f05912bbf WHIRLPOOL 167fce8b7b34e70b8c64b6418317bd4c8603e4ca3071f1b1c6a6850eb22fed20f77a0be928412713df652ba0d0995c028beb19946411ca3acbb5831f7f85b990
+AUX libgksu-2.0.12-desktop-validation.patch 507 SHA256 a053cbde2cbd069e1f820963c97e7f4da821b4d307e8fcd9bcefbebcd0dfe854 SHA512 768a6ce966eec9f55f70e87122d557fe861545b120c990835386e17e24b2f3ebab744d5bb945fadb92513f70920cfbb4de6060f76f1a0cdf2e08fbe52cb327a7 WHIRLPOOL a611a75a8ce6569e1254344b846b95247e85427101529f35ac39fe0eea89debe9e2d7b30c71442f323dffdf009425ca1bae3023bd51e74a480abcf469616dd81
+AUX libgksu-2.0.12-fix-make-3.82.patch 670 SHA256 2090fa01935a64a8e9c39b99adea462db26a07d8b2a83a0ea13c8435bd199392 SHA512 2711ea9d67ba327c28049a0ec260d3b15a5f3fbc327f242943c3ce0519575d92db64bbf3f33271260d276092f7d717048aa82d9824d620d32b94370036b2548a WHIRLPOOL 82cc077c01cc9c041637f50dd3da86875048702511cdcc6635f6e26ddec22a8559c969769395fcfb7c1563c764ac7506754e06a45785dcc160726780ff7be1fe
+AUX libgksu-2.0.12-format_security.patch 1019 SHA256 5e892b5f3610bcf79655a5768bced19102b04b272570cd886092599b84e85c56 SHA512 3d6772a1fb2ea9f2efa90e229151236a192aabb43980532e8dfe16d811be40ce054ebd7ed3c0a8451a0ba93e21dadc09de8bbfecfb2d71e062d964693f4d8853 WHIRLPOOL 3c8ef644886ac2954534b41e1b4ee958df5155571374ba0aa89e4b0f3a692d2373b5b834bff5d8640d72658899d87f0b01a1e6c5d2295920f81a4bbc6cd704d3
+AUX libgksu-2.0.12-g_markup_escape_text_for_command.patch 575 SHA256 5c8392de9815365cd74c71bea589845e8fa6b05f1cbb0d924c220e9c5c4d0fc7 SHA512 e881a34642659874480eb91e1d5e48effa4affa36357b67b83c3dacaa7f05fc3c2e1cd4d9363530eecaf88f63a9677cc413679d4bc342d981f9bd955299c97a0 WHIRLPOOL 20e791e3624c2022cd05c72e0f4a1865647d7d367fb9ceac15c1bee8b44ccb47ec219c0208de3f0728d78519b80a0297a254457c0a234f72106feead8416d72f
+AUX libgksu-2.0.12-missing-libs.patch 728 SHA256 2368951c23451cd7dac9a6e679debfe7b1bb601ffbf04194c2e6092501793c32 SHA512 c1478771c77708d9828b0aeb26dfedafd5b5e20de4e2e778d60375dde1b343e707e50c704ec367ce00b01bcb295b8d253e52b615692a6b5a68c7cbeabfb1f3fb WHIRLPOOL 6c55a9849d090e9db4cd1051eda32d6373da8bb38e0a7431e10e28a7c1133a7e7a04ba6f8a9cef7c410560edb8d4f336d2d50695a66a5f107cbf9df62434d928
+AUX libgksu-2.0.12-notests.patch 1060 SHA256 6cac450d0e3d8950c25fec078cc41478138fd14afe3492e96f7b889178725707 SHA512 359f009101e7d12cf2c4be2d03eb7a65944231941ae49813be84ad1609db843c31f8e28f0efe739831b33a1f287c2800d651adf299f36a7bdf7498119eebb19e WHIRLPOOL 6214f3d9158ce66a7b6454aa8068723e2abaf6970803774081abd488b8f3f4eb2c11f5fa6ad04012fdedafda70e2428a524a916d1116e03bd5b8fa76a0a7a873
+AUX libgksu-2.0.12-revert-forkpty.patch 11018 SHA256 e75597115bdc7c30ee223d73f5c071d7cceffd04fbf2798d1aa17920fae865dd SHA512 1e4572774c28a8c9e48b790df80553b5222dfbe04dd52062d9e16687c826aeb59a67c813327fae1ed1daa3e820258b59ed0bcb54223eeb05552c8a753bc707e7 WHIRLPOOL 57e2ccadd3903b71b5e4541f88e2bf42f5d69532e02df686985e1ef0a5ea920353e778c54fb89b035a20c132aac87a101d0c0e4fc7493be65b8ff88c1516979f
+AUX libgksu-2.0.12-sudo_keep_env.patch 347 SHA256 8f8288b50dbd01f36b22576cc34477e6545d92841f0cb15fff89ef6b82500d13 SHA512 ed4d4a2458b5a9afc11c6e3ecb02df43df97bd2fcb920ab79cbacccf5acccbd07fbe8a34212386b1a8331d9b788bb5ef0425da98c85a384f488ee9c128dbca67 WHIRLPOOL 48bd3b5c73ecc99a22febad374ccbc014c8099371969c37e8a264ecb18e60364f3c7c310a57168d365371f2c9de0775ec83f4e1a2e45c2e62af50f32b36d605f
+AUX libgksu-2.0.7-libs.patch 3129 SHA256 62d1d576bd8e4b07494a788d6760463ee2090e341dae5113d5f763a3549f6b6a SHA512 9c68a54d2f7cb3eb30d070a6946f9416fdf2e2690705f42289608d926aab3cd0742dd3510c262dcbe1b5d81d579f671770107f24366126adace085df2ba54b48 WHIRLPOOL 817d91559d1aaee88e2d4000420c7d2af7933fc7ae91d477eaadf0c8bdb3a0f793f11420fbfb9745891b0ccd6acbb4b4ae0bbb83017e311d7ead01fc0c7cba51
+AUX libgksu-2.0.7-polinguas.patch 749 SHA256 40ce03bebca2f06d09bda31418c331ed19c4f438bb30fe8c7afdafbbc6e38243 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103 WHIRLPOOL ae30db223c67d24b71c6e832a9039d9e5af7b67ebbb329d68339fc9525058323706e4a7da690d7ddfa6e60837e1ace262507c2f3b87d861450198b5574876149
+DIST libgksu-2.0.12.tar.gz 477903 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 WHIRLPOOL 429808802e740880c786c00f2abfaab564178c1da06be5023f1ee17aa766e10d61c3d3aad14affee834c928822a2b92cfac7e5fa2b326725497cdaa1334fb55d
+EBUILD libgksu-2.0.12-r2.ebuild 1669 SHA256 a39aded9f3ebe599c05ee9f836e44f2e3c8b40621996b89c957c115809d7785a SHA512 8832abf4ecc74673e01eb080bd5dfe4ba39d091964706a90de2de7a16ff7d979d152bd1839be034162cac7036cd2101c63ec233894ea49d0f43cd97262c80d17 WHIRLPOOL a07f4ec0cf52440c561bf85347fa09c69b66457b16de24b42b51ccae362f70ae2678e40f2a7c6634c9a22e7a1586bfa171caee9b954a3c23b07e7ab381567f78
+EBUILD libgksu-2.0.12-r3.ebuild 2037 SHA256 94d7a4c8fbef9a26ec850975055e1b00de3a4b0fb276bfcf7a1f5ed2b23fc4ac SHA512 099ca10aeea726322646855dc239cec6d4e4d53eae29ee810295aad650acf7120273777f38a1fb070a5bf628c539e3ee116b1e603f1d42b7f4d7c49cbef86b00 WHIRLPOOL 1a45efdb7ad85826788b4538433fc3cbf347576dbf593f45decd74ca643e8c4846438245732d1876d9dd552bdbd2ec6cb7fcc9c42b390580fad83c10441989d1
+MISC ChangeLog 2720 SHA256 08143a4e10dc026289dbb9855b2a0b812c4994faad896b2bd4f78f2177688629 SHA512 94e45024ff626a09d9331889c0018e0d4947a1c303c1eb3561fcc1869d1330f426d0055c6ddc9d76efc30b2f1196a127ac3f50ed8927155a6de8e53e3d72ed13 WHIRLPOOL 81c43a054698fc449ff65ab3f2c6234e07ec4d22a7ee4cabfb5d78a5d25deaa4fcb64294ebd99c31269db07c4e8dcd6d1261a2b6065efaf94cb6b98c4c3fea6c
+MISC ChangeLog-2015 13147 SHA256 806fe0e7443b32a466471d917c8b17adbd9b060450acde2faa0960b029982592 SHA512 d1959050a7bb41352e0e71efe9c60cc6cadc3dd662a412e5edb3e6667df0b5ca631b868fc960a82ddc40b9e0dcaafe065abd6e50ecded96daeac6b5ef23b6ab4 WHIRLPOOL 6b750cd3c7622ef8c3f30af6d5685f2b4061240e439f0bd4c47a15764e734d28c7a114f8cebd96b3855bb40ce4bc43e728910e60769b7ca5037a3bf6490062f6
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
new file mode 100644
index 000000000000..5c007be5b4b4
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
@@ -0,0 +1,60 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
+--- libgksu-2.0.0.orig/libgksu/libgksu.c	2006-09-14 22:35:51.000000000 -0400
++++ libgksu-2.0.0/libgksu/libgksu.c	2006-12-12 11:28:01.000000000 -0500
+@@ -23,7 +23,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
++#ifdef __FreeBSD__
++#include <libutil.h>
++#include <termios.h>
++#else
+ #include <pty.h>
++#endif
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
+--- libgksu-2.0.0.orig/libgksu/Makefile.am	2006-09-14 22:35:52.000000000 -0400
++++ libgksu-2.0.0/libgksu/Makefile.am	2006-12-12 11:28:01.000000000 -0500
+@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+ 
+ EXTRA_DIST = libgksu.ver
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
+--- libgksu-2.0.0.orig/libgksu/Makefile.in	2006-09-23 15:37:44.000000000 -0400
++++ libgksu-2.0.0/libgksu/Makefile.in	2006-12-12 11:30:09.000000000 -0500
+@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+ EXTRA_DIST = libgksu.ver
+ all: all-am
+ 
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
+--- libgksu-2.0.0.orig/libgksuui/Makefile.am	2006-09-14 22:35:31.000000000 -0400
++++ libgksu-2.0.0/libgksuui/Makefile.am	2006-12-12 11:28:01.000000000 -0500
+@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
+--- libgksu-2.0.0.orig/libgksuui/Makefile.in	2006-09-23 15:37:44.000000000 -0400
++++ libgksu-2.0.0/libgksuui/Makefile.in	2006-12-12 11:30:22.000000000 -0500
+@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
new file mode 100644
index 000000000000..0f22166fb8b7
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
@@ -0,0 +1,25 @@
+Due to the following change, pkglib_PROGRAMS is invalid:
+    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+https://savannah.nongnu.org/bugs/index.php?35241
+https://bugs.gentoo.org/show_bug.cgi?id=397411
+
+---
+ libgksu/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
+index 49362f9..3cb1090 100644
+--- a/libgksu/Makefile.am
++++ b/libgksu/Makefile.am
+@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = libgksu2.pc
+ 
+-pkglibdir = ${libdir}/${PACKAGE}
+-pkglib_PROGRAMS = gksu-run-helper
++gksulibdir = ${libdir}/${PACKAGE}
++gksulib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDADD = ${GLIB_LIBS} 
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
new file mode 100644
index 000000000000..5c34cae56136
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
@@ -0,0 +1,12 @@
+=== modified file 'libgksu/libgksu.c'
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -426,7 +426,7 @@
+   attr.height = fadeout->area.height;
+   attr.wclass = GDK_INPUT_OUTPUT;
+   attr.visual = gdk_screen_get_system_visual (fadeout->screen);
+-  attr.colormap = gdk_screen_get_default_colormap (fadeout->screen);
++  attr.colormap = gdk_screen_get_system_colormap (fadeout->screen);
+   attr.override_redirect = TRUE;
+   attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
+ 
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
new file mode 100644
index 000000000000..15de910474b6
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
@@ -0,0 +1,16 @@
+Fix validation
+
+--- a/gksu-properties/gksu-properties.desktop.in	2017-09-03 16:41:57.872594752 +0200
++++ b/gksu-properties/gksu-properties.desktop.in	2017-09-03 16:44:40.835919489 +0200
+@@ -3,9 +3,9 @@
+ _Name=Privilege granting
+ _Comment=Configure behavior of the privilege-granting tool
+ Exec=gksu-properties
+-Icon=gksu.png
++Icon=gksu
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
++Categories=GNOME;GTK;Settings;
+ OnlyShowIn=GNOME;XFCE;
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
new file mode 100644
index 000000000000..05ff3e0b0ad0
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
@@ -0,0 +1,21 @@
+Fix indentation of Makefile.am
+
+--- a/Makefile.am	2010-08-22 16:11:19.872577459 -0500
++++ b/Makefile.am	2010-08-22 16:11:55.289599110 -0500
+@@ -17,11 +17,11 @@
+ 
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+-        if test -z "$(DESTDIR)" ; then \
+-          for p in $(schemas_DATA) ; do \
+-            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+-          done \
+-        fi
++	if test -z "$(DESTDIR)" ; then \
++		for p in $(schemas_DATA) ; do \
++			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
++		done \
++	fi
+ else
+ install-data-local:
+ endif
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
new file mode 100644
index 000000000000..d39bbafd67a3
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
@@ -0,0 +1,28 @@
+Description: Fix build failure with [-Werror=format-security]
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643423
+
+Let chunk stripped due to Gentoo revert-forkpty patch.
+
+Index: libgksu-2.0.13~pre1/libgksu/libgksu.c
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c	2011-12-07 11:01:18.351654566 +0100
++++ libgksu-2.0.13~pre1/libgksu/libgksu.c	2011-12-07 11:01:41.231654725 +0100
+@@ -1276,7 +1276,7 @@
+   context->dir = g_strdup (mkdtemp(template));
+   if (!context->dir)
+     {
+-      fprintf (stderr, strerror(errno));
++      fprintf (stderr, "%s", strerror(errno));
+       return FALSE;
+     }
+ 
+@@ -2247,7 +2247,7 @@
+ 					  " %s"), converted_str, "gksu: waiting");
+ 	      g_free (converted_str);
+ 
+-	      g_set_error (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
++	      g_set_error_literal (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
+ 	      g_free (emsg);
+ 
+ 	      if (context->debug)
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
new file mode 100644
index 000000000000..de3ab6806eee
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
@@ -0,0 +1,21 @@
+Escape text for display in password prompt.
+
+From the Debian patch stack.
+
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -994,12 +994,12 @@
+ 				     "The application '%s' lets you "
+ 				     "modify essential parts of your "
+ 				     "system."),
+-				   command);
++				   g_markup_escape_text(command, -1));
+ 	  else
+ 	    msg = g_strdup_printf (_("<b><big>Enter your password to run "
+ 				     "the application '%s' as user %s"
+ 				     "</big></b>"),
+-				   command, context->user);
++				   g_markup_escape_text(command, -1), context->user);
+ 	}
+       else
+ 	{
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
new file mode 100644
index 000000000000..955f455b9f8a
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
@@ -0,0 +1,22 @@
+Add missing libs to relevant targets
+
+--- a/configure.ac	2017-09-03 17:10:57.552216900 +0200
++++ b/configure.ac	2017-09-03 17:16:39.674036975 +0200
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.57)
+ 
+ AC_INIT(libgksu, 2.0.12, kov@debian.org)
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_SRCDIR(libgksu/libgksu.c)
+ AC_CONFIG_HEADERS(config.h)
+ 
+@@ -44,7 +44,7 @@
+ PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0])
+ 
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0 x11])
+ 
+ # Checks for library functions.
+ ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl th zh_CN"
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
new file mode 100644
index 000000000000..3787ef6bfc13
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
@@ -0,0 +1,26 @@
+Index: libgksu-2.0.12/libgksu/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksu/Makefile.am
++++ libgksu-2.0.12/libgksu/Makefile.am
+@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+-noinst_PROGRAMS = test-gksu
++EXTRA_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+ test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
+Index: libgksu-2.0.12/libgksuui/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksuui/Makefile.am
++++ libgksu-2.0.12/libgksuui/Makefile.am
+@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+ 
+-noinst_PROGRAMS = test-gksuui
++EXTRA_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+ test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
new file mode 100644
index 000000000000..2c3a8cc786bb
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
@@ -0,0 +1,359 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
+--- libgksu-2.0.12.orig/libgksu/libgksu.c	2009-06-29 13:48:24.000000000 -0400
++++ libgksu-2.0.12/libgksu/libgksu.c	2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+  * Gksu -- a library providing access to su functionality
+  * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+ 
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+       for (i = 0 ; cmd[i] != NULL ; i++)
+ 	g_free (cmd[i]);
+       g_free(cmd);
+-
+-      _exit(1);
+     }
+   else if (pid == -1)
+     {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+ 	  /* drop the \n echoed on password entry if su did request
+ 	     a password */
+ 	  if (password_needed)
+-	    read_line (fdpty, buf, 255);
++	    read (fdpty, buf, 255);
+ 	  if (context->debug)
+ 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+-	  read_line (fdpty, buf, 255);
++	  read (fdpty, buf, 255);
+ 	  if (context->debug)
+ 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+ 	}
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+ 	{
+ 	  int retval = 0;
+ 
+-	  /* Red Hat's su shows the full path to su in its error messages. */
+-	  if (!strncmp (buf, "su:", 3) ||
+-	      !strncmp (buf, "/bin/su:", 7))
++	  if (!strncmp (buf, "su", 2))
+ 	    {
+ 	      gchar **strings;
+ 
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+ 		}
+ 
+ 	      strings = g_strsplit (buf, ":", 2);
+-
+-	      /* Red Hat and Fedora use 'incorrect password'. */
+-	      if (strings[1] &&
+-	          (g_str_has_prefix(strings[1], " Authentication failure") ||
+-	           g_str_has_prefix(strings[1], " incorrect password")))
++	      if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
+ 		{
+ 		  if (used_gnome_keyring)
+ 		    g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+   char **cmd;
+   char buffer[256] = {0};
+-  char *child_stderr = NULL;
+-  /* This command is used to gain a token */
+-  char *const verifycmd[] =
+-    {
+-      "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+-    };
+   int argcount = 8;
+   int i, j;
+ 
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+   pid_t pid;
+   int status;
+-  FILE *fdfile = NULL;
+-  int fdpty = -1;
++  FILE *infile, *outfile;
++  int parent_pipe[2];	/* For talking to the parent */
++  int child_pipe[2];	/* For talking to the child */
+ 
+   context->sudo_mode = TRUE;
+ 
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+   cmd[argcount] = g_strdup("-S");
+   argcount++;
+ 
+-  /* Make sudo noninteractive (we should already have a token) */
+-  cmd[argcount] = g_strdup("-n");
+-  argcount++;
+-
+   /* Make sudo use next arg as prompt */
+   cmd[argcount] = g_strdup("-p");
+   argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+ 	fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+     }
+ 
+-  pid = forkpty(&fdpty, NULL, NULL, NULL);
+-  if (pid == 0)
++  if ((pipe(parent_pipe)) == -1)
+     {
+-      // Child
+-      setsid();   // make us session leader
+-
+-      execv(verifycmd[0], verifycmd);
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		   _("Error creating pipe: %s"),
++		   strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+ 
+-      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+-		   _("Failed to exec new process: %s"),
++  if ((pipe(child_pipe)) == -1)
++    {
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		   _("Error creating pipe: %s"),
+ 		   strerror(errno));
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
+-  else if (pid == -1)
++
++  pid = fork();
++  if (pid == -1)
+     {
+       g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+ 		   _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
++  else if (pid == 0)
++    {
++      // Child
++      setsid();   // make us session leader
++      close(child_pipe[1]);
++      dup2(child_pipe[0], STDIN_FILENO);
++      dup2(parent_pipe[1], STDERR_FILENO);
+ 
++      execv(cmd[0], cmd);
++
++      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++		   _("Failed to exec new process: %s"),
++		   strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+   else
+     {
+       gint counter = 0;
+       gchar *cmdline = NULL;
+-      struct termios tio;
+ 
+       // Parent
+-      fdfile = fdopen(fdpty, "w+");
++      close(parent_pipe[1]);
+ 
+-      /* make sure we notice that ECHO is turned off, if it gets
+-         turned off */
+-      tcgetattr (fdpty, &tio);
+-      for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+-      {
+-        usleep (1000);
+-        tcgetattr (fdpty, &tio);
+-      }
++      infile = fdopen(parent_pipe[0], "r");
++      if (!infile)
++	{
++	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		       _("Error opening pipe: %s"),
++		       strerror(errno));
++	  sudo_reset_xauth (context, xauth, xauth_env);
++	  return FALSE;
++	}
+ 
+-      fcntl (fdpty, F_SETFL, O_NONBLOCK);
++      outfile = fdopen(child_pipe[1], "w");
++      if (!outfile)
++	{
++	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		       _("Error opening pipe: %s"),
++		       strerror(errno));
++	  sudo_reset_xauth (context, xauth, xauth_env);
++	  return FALSE;
++	}
++
++      /*
++	we are expecting to receive a GNOME_SUDO_PASS
++	if we don't there are two possibilities: an error
++	or a password is not needed
++      */
++      fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+ 
+       { /* no matter if we can read, since we're using
+ 	   O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+ 	struct timeval tv;
+ 
+ 	FD_ZERO(&rfds);
+-	FD_SET(fdpty, &rfds);
++	FD_SET(parent_pipe[0], &rfds);
+ 	tv.tv_sec = 1;
+ 	tv.tv_usec = 0;
+ 
+-	select (fdpty + 1, &rfds, NULL, NULL, &tv);
++	select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+       }
+ 
+       /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+ 	  if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+ 	    break;
+ 
+-	  read_line (fdpty, buffer, 256);
++	  read_line (parent_pipe[0], buffer, 256);
+ 
+ 	  if (context->debug)
+ 	    fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+ 	  usleep (1000);
+ 
+-	  write (fdpty, password, strlen(password) + 1);
+-	  write (fdpty, "\n", 1);
++	  fprintf (outfile, "%s\n", password);
++	  fclose (outfile);
+ 
+ 	  nullify_password (password);
+ 
+-	  fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++	  /* turn NONBLOCK off */
++	  fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ 	  /* ignore the first newline that comes right after sudo receives
+ 	     the password */
+-	  fgets (buffer, 255, fdfile);
+-	  /* this is the status we are interested in */
+-	  fgets (buffer, 255, fdfile);
++	  fgets (buffer, 255, infile);
++	  /* this is the status we are interessted in */
++	  fgets (buffer, 255, infile);
+ 	}
+       else
+ 	{
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+ 	    fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
+ 
+           /* turn NONBLOCK off, also if have no prompt */
+-          fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++          fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ 
+ 	  should_display = gconf_client_get_bool (context->gconf_client,
+ 						  BASE_PATH "display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+ 	  fprintf (stderr, "%s", buffer);
+ 	}
+ 
+-      if (g_str_has_prefix (buffer, "Sorry, try again."))
++      if (!strcmp (buffer, "Sorry, try again.\n"))
+ 	g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+ 		     _("Wrong password."));
++      else if (!strncmp (buffer, "Sorry, user ", 12))
++	g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++		     _("The underlying authorization mechanism (sudo) "
++		       "does not allow you to run this program. Contact "
++		       "the system administrator."));
+       else
+ 	{
+ 	  gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 	    }
+ 	}
+ 
+-      /* If we have an error, let's just stop sudo right there. */
+-      if (error)
+-        close(fdpty);
+-
+       cmdline = g_strdup("sudo");
+       /* wait for the child process to end or become something other
+ 	 than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+       if (context->sn_context)
+ 	gksu_context_launch_complete (context);
+ 
++      while (read (parent_pipe[0], buffer, 255) > 0)
++	{
++	  fprintf (stderr, "%s", buffer);
++	  bzero(buffer, 256);
++	}
++
+       /* if the process is still active waitpid() on it */
+       if (pid_exited != pid)
+ 	waitpid(pid, &status, 0);
+       sudo_reset_xauth (context, xauth, xauth_env);
+ 
+-      /*
+-       * Did token acquisition succeed? If so, spawn sudo in
+-       * non-interactive mode. It should either succeed or die
+-       * immediately if you're not allowed to run the command.
+-       */
+-      if (WEXITSTATUS(status) == 0)
+-        {
+-          g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+-                       NULL, &child_stderr, &status,
+-                       error);
+-        }
+-
+       if (exit_status)
+       {
+       	if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+       if (WEXITSTATUS(status))
+ 	{
+-          if (g_str_has_prefix(child_stderr, "Sorry, user "))
+-            {
+-              g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+-                           _("The underlying authorization mechanism (sudo) "
+-                             "does not allow you to run this program. Contact "
+-                             "the system administrator."));
+-            }
+ 	  if(cmdline)
+ 	    {
+ 	      /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 	      if (!g_str_has_suffix (cmdline, "sudo"))
+ 		{
+ 		  g_free (cmdline);
+-		  g_free (child_stderr);
+ 		  return FALSE;
+ 		}
+ 	      g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+ 	}
+     }
+ 
+-  fprintf(stderr, child_stderr);
+-  g_free(child_stderr);
+-
+   /* if error is set we have found an error condition */
+-  return (error == NULL);
++  if (error)
++    return FALSE;
++
++  return TRUE;
+ }
+ 
+ /**
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
new file mode 100644
index 000000000000..a51a1623debb
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
@@ -0,0 +1,15 @@
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -2704,6 +2704,12 @@
+       cmd[argcount] = g_strdup("-H");
+       argcount++;
+     }
++  else
++    {
++      /* Preserve the environment, if sudo will let us */
++      cmd[argcount] = g_strdup("-E");
++      argcount++;
++    }
+ 
+   /* Make sudo read from stdin */
+   cmd[argcount] = g_strdup("-S");
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
new file mode 100644
index 000000000000..b9fb77f27147
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
@@ -0,0 +1,76 @@
+# https://savannah.nongnu.org/bugs/?25362
+# https://bugs.gentoo.org/show_bug.cgi?id=226837
+diff -Nura a/configure.ac b/configure.ac
+--- a/configure.ac	2009-01-19 22:15:30.000000000 +0100
++++ b/configure.ac	2009-01-19 22:18:10.000000000 +0100
+@@ -43,6 +43,9 @@
+ PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
+ PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
+ 
++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
++
+ # Checks for library functions.
+ ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
+ 
+diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
+--- a/gksu-properties/Makefile.am	2009-01-19 22:15:59.000000000 +0100
++++ b/gksu-properties/Makefile.am	2009-01-19 22:19:13.000000000 +0100
+@@ -3,7 +3,7 @@
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+ bin_PROGRAMS = gksu-properties
+-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
+ gksu_properties_SOURCES = gksu-properties.c
+ 
+ gladedir = ${prefix}/share/${PACKAGE}
+diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
+--- a/libgksu/Makefile.am	2009-01-19 22:15:59.000000000 +0100
++++ b/libgksu/Makefile.am	2009-01-19 22:18:25.000000000 +0100
+@@ -8,8 +8,8 @@
+ # major -> breaks backward compatibility (changes to existing ABI)
+ # minor -> keeps compatibility (additions to the API)
+ # micro -> no change to the API/ABI
+-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
+-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
+ if USE_VERSION_SCRIPT
+ libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
+ endif
+@@ -24,12 +24,11 @@
+ 
+ pkglibdir = ${libdir}/${PACKAGE}
+ pkglib_PROGRAMS = gksu-run-helper
+-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
++gksu_run_helper_LDADD = ${GLIB_LIBS} 
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+-test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
+ 
+ EXTRA_DIST = libgksu.ver
+diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
+--- a/libgksuui/Makefile.am	2009-01-19 22:15:59.000000000 +0100
++++ b/libgksuui/Makefile.am	2009-01-19 22:18:54.000000000 +0100
+@@ -4,12 +4,13 @@
+ 
+ noinst_LTLIBRARIES = libgksuui1.0.la
+ libgksuui1_0_la_SOURCES = gksuui-dialog.c
+-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
++libgksuui1_0_la_LDFLAGS = -Wl,-O1
++libgksuui1_0_la_LIBADD = ${GTK_LIBS}
+ 
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+ 
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+-test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
++
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
new file mode 100644
index 000000000000..753862955716
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
@@ -0,0 +1,40 @@
+# https://savannah.nongnu.org/bugs/?25360
+diff -Nura a/configure.ac b/configure.ac
+--- a/configure.ac	2009-01-19 21:50:57.000000000 +0100
++++ b/configure.ac	2009-01-19 21:53:21.000000000 +0100
+@@ -50,7 +50,7 @@
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)
+ 
+-IT_PROG_INTLTOOL
++IT_PROG_INTLTOOL([0.35.5])
+ AM_GLIB_GNU_GETTEXT
+ 
+ ##################################################
+diff -Nura a/po/LINGUAS b/po/LINGUAS
+--- a/po/LINGUAS	1970-01-01 01:00:00.000000000 +0100
++++ b/po/LINGUAS	2009-01-19 21:54:24.000000000 +0100
+@@ -0,0 +1,23 @@
++# please keep this list sorted alphabetically
++# https://wiki.gnome.org/Initiatives/GnomeGoals/PoLinguas
++#
++ca
++cs
++da
++de
++es
++eu
++fr
++hu
++it
++ko
++lt
++pl
++pt_BR
++ro
++ru
++sk
++sv
++nb
++nl
++zh_CN
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
new file mode 100644
index 000000000000..6b6d834d95c2
--- /dev/null
+++ b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A library for integration of su into applications"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="nls static-libs"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-2.12:2
+	>=gnome-base/gconf-2
+	gnome-base/libgnome-keyring
+	x11-libs/startup-notification
+	>=gnome-base/libgtop-2:2=
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+"
+
+src_prepare() {
+	# Fix compilation on bsd
+	epatch "${FILESDIR}"/${PN}-2.0.0-fbsd.patch
+
+	# Fix wrong usage of LDFLAGS, bug #226837
+	epatch "${FILESDIR}/${PN}-2.0.7-libs.patch"
+
+	# Use po/LINGUAS
+	epatch "${FILESDIR}/${PN}-2.0.7-polinguas.patch"
+
+	# Don't forkpty; bug #298289
+	epatch "${FILESDIR}/${P}-revert-forkpty.patch"
+
+	# Make this gmake-3.82 compliant, bug #333961
+	epatch "${FILESDIR}/${P}-fix-make-3.82.patch"
+
+	# Do not build test programs that are never executed; also fixes bug
+	# #367397 (underlinking issues).
+	epatch "${FILESDIR}/${P}-notests.patch"
+
+	# Fix automake-1.11.2 compatibility, bug #397411
+	epatch "${FILESDIR}/${P}-automake-1.11.2.patch"
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
new file mode 100644
index 000000000000..0568909e0b6d
--- /dev/null
+++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library for integration of su into applications"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static-libs"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/libX11
+	>=gnome-base/gconf-2
+	gnome-base/libgnome-keyring
+	x11-libs/startup-notification
+	>=gnome-base/libgtop-2:2=
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+"
+
+PATCHES=(
+	# Fix compilation on bsd
+	"${FILESDIR}"/${PN}-2.0.0-fbsd.patch
+
+	# Fix wrong usage of LDFLAGS, bug #226837
+	"${FILESDIR}"/${PN}-2.0.7-libs.patch
+
+	# Use po/LINGUAS
+	"${FILESDIR}"/${PN}-2.0.7-polinguas.patch
+
+	# Don't forkpty; bug #298289
+	"${FILESDIR}"/${P}-revert-forkpty.patch
+
+	# Make this gmake-3.82 compliant, bug #333961
+	"${FILESDIR}"/${P}-fix-make-3.82.patch
+
+	# Do not build test programs that are never executed; also fixes bug
+	# #367397 (underlinking issues).
+	"${FILESDIR}"/${P}-notests.patch
+
+	# Fix automake-1.11.2 compatibility, bug #397411
+	"${FILESDIR}"/${P}-automake-1.11.2.patch
+	"${FILESDIR}"/${P}-missing-libs.patch
+
+	# Fix build with format-security, bug #517614
+	"${FILESDIR}"/${P}-format_security.patch
+
+	# Fix .desktop file validation, bug #512364
+	"${FILESDIR}"/${P}-desktop-validation.patch
+
+	# Collection of patches from Debian
+	"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
+	"${FILESDIR}"/${P}-sudo_keep_env.patch
+	"${FILESDIR}"/${P}-correct_colormap_get.patch
+)
+
+src_prepare() {
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/libgksu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
new file mode 100644
index 000000000000..dcf87a1a1929
--- /dev/null
+++ b/x11-libs/libgxim/Manifest
@@ -0,0 +1,5 @@
+DIST libgxim-0.5.0.tar.bz2 469547 SHA256 75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7 WHIRLPOOL 28ff037a1a671bc275ac3a81357dae6b8eba666831a05534b23d6f42678ba938166c336c0d0c0b58dbacb1d246c18ff62c617b9eb043a554ceece956b035c5a7
+EBUILD libgxim-0.5.0.ebuild 1257 SHA256 3ad7e376b59c836fa0c7f67525ead9ae8c7253ea7050052d706a9aa4b9e90f7f SHA512 853cc83ea8654685cdd41467c26ff3b821260a6a150f64757696c05c0781df757a57751237786fc1ebb86566dfaabfc17d5df50dcc9963abf8616de7128b8efe WHIRLPOOL 9cad1935490814fe04886a20a60e1e702bec0a79343fa5707cdbe49ce563a1f1de7f21bfcc4bb48e170c37d2497bef9c56d3728678475bcb31aaa470b42d07cf
+MISC ChangeLog 3179 SHA256 e50266c4d33ec5931951ddb8e7c20fa73f3658d4e9ee7c7342f71bbf990d60d0 SHA512 b11466c8d5bf8db0aad1fa7e816ea8da17f0a6684e37ff6370aa45bdab2e275c1753df4076a3ebe6fb088b0c66eb23b24846c05c9ec0fada82ebc0932e258c96 WHIRLPOOL 14062f358288caed390ab7fbda27efa0a4a2ae5f68c0f830b1653789b8588903996cab2c7dd0a5d0c6badccf4e141e448b7f74ce9533dde9be55c391d73480ec
+MISC ChangeLog-2015 869 SHA256 0cacbd241b45fb0c1990cf722307e0b02135734db2d7cc7fdf147daa6d310cea SHA512 23297e08979451a409737b96609b38186283f175e9b8f94b5e367b89855d65ec5deb6b6cc2a7c2386a41d67fea53407d4a68fe1cd5974d033087a196c303d24e WHIRLPOOL f7c4375864aeed17050ecf3db1b4f53321e008cd51a90591a585f70569a4b74176e902256e19873030c0d5be2a097882eda9f4ef51edbf77fb44f2eb3c56f289
+MISC metadata.xml 325 SHA256 a5bab79e8f37f1873fe186076bcb8f956cf28056444e6ed6e3326e7b55d30c17 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0 WHIRLPOOL 7c6edef34e0dde678644f02ca1b1b3e4d43f992bcd45265245eb33b4a56f52704d0bdf44a4e05a3bd5d7935950098cd7d90a137a5bf74a84f022907edf26be78
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
new file mode 100644
index 000000000000..8d4bb4e5405b
--- /dev/null
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit autotools ltprune ruby-single
+
+DESCRIPTION="GObject-based XIM protocol library"
+HOMEPAGE="https://tagoh.bitbucket.io/libgxim"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${USE_RUBY//ruby/ruby_targets_ruby} static-libs test"
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	${RUBY_DEPS}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+AT_M4DIR="m4macros"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(check\)/$(usex test '\1' _)/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	sed -i "/^ACLOCAL_AMFLAGS/,/^$/d" Makefile.am
+
+	local ruby
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if use ruby_targets_${ruby}; then
+			sed -i "1s/ruby/${ruby}/" ${PN}/mkacc.rb
+			break
+		fi
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
new file mode 100644
index 000000000000..412816b73f03
--- /dev/null
+++ b/x11-libs/libgxim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/libgxim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libiterm-mbt/Manifest b/x11-libs/libiterm-mbt/Manifest
new file mode 100644
index 000000000000..9ad68107c7da
--- /dev/null
+++ b/x11-libs/libiterm-mbt/Manifest
@@ -0,0 +1,5 @@
+DIST iterm-0.5-mbt.tar.gz 624262 SHA256 5dd6ba029814d98fef9e6bfc74ce0f2b1224176c6b84576a193f4eb57294c36b SHA512 7209e851bbde1bdf80004a70b47c62b2bc6c078b650713677972d2109e56bb73e79dd612ee90dc09efc6380244d8131a0b7b01d657466826d103ffd4f364e5ae WHIRLPOOL 6389e12f2b9451245de26eddda7df1e028be5bafff9844637332577a5104ef97c5221d3b98cdf378aff259bedbaafbc4d5f989ead247c1de04f11fae09f5d24b
+EBUILD libiterm-mbt-0.5.ebuild 581 SHA256 abaaceebe972f6f64235639d0438370f20462ab94dc91a457499a29203797316 SHA512 83dc07504e3f3ecf11d52d7d14efd2240b458a8b67be53030b9703a7091dfaa15024810e1d4276f4dce39b30f0eaa5b51b0ecda8a670480f66647520737dd400 WHIRLPOOL 8f6c11d1844039d52dbc15440e6a11f8f60f298ad72b8cca6613b5be7a6a68c6ca6d108154528c0616a7e26d4977f7803cb533074b08789a8e2754ef9f340ee0
+MISC ChangeLog 2438 SHA256 8d46755e4e62d395ee6ab13d6ae38acdb3052f2791d2369a1bcb3224ceb93b16 SHA512 15e6349e2f0b98b86942bf81fff5ead12416b21267bf9d758152e8116d1dfa2a90e8750f71909f266cef42d5d4dbfdf52f8962adce46d519fcf2d973899d2bb5 WHIRLPOOL 8af794b17958a27682b06b8cba998a8f0e42422bca2cb871e44e4fe142006c5213a80b849d62a8501dffcbb91ee023a0ebe32e106305330df815e60d2a4164e5
+MISC ChangeLog-2015 1001 SHA256 468168cd80b470b8e5b67fcbcb4b010c7c92857065e57520748ed05a233680ee SHA512 015fc4451f82238c82858f95311879aaa348ce3c224a5bf29c490bb6cbf4d5cca97af95a94d34a87a5ce9d1a0b349360e28b7e560a2ef0117bdc90312776b80f WHIRLPOOL 4a032ff10e6bcb4d4855cbbc0d94390275dd2bfabf36aca762abab290de57b066fca49d0e2c03a36b4e9f5fc0d5f58fee4f54b228adfe5e24a41dbd0ff24ae80
+MISC metadata.xml 308 SHA256 3aa9983d50b905c73c16847cf2ebecba37acf5e90f16d6113f8e0b0b960376cb SHA512 6a5c3ca4b6c7a991ace4ee3ec334a87c0d62a073e394d57bb069e3945cefd887753efa14acc733fb49787350dd6d8cd235dcac07feb4631cd248a835aa1ac2a0 WHIRLPOOL 9d2f857d1e05908f63059faabab433ce639e8f911edfa06ff19bf182ee6bce1d6256abc55d3cc52b8154cbc82af03fb823143384670393d099f30712732e5559
diff --git a/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild b/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild
new file mode 100644
index 000000000000..c2cefc5e5af9
--- /dev/null
+++ b/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Hacked version of libiterm -- Internationalized Terminal Emulator Library"
+HOMEPAGE="http://www.doc.ic.ac.uk/~mbt99/Y/
+	http://www-124.ibm.com/linux/projects/iterm/"
+SRC_URI="http://www.doc.ic.ac.uk/~mbt99/Y/src/iterm-${PV}-mbt.tar.gz"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE=""
+
+S=${WORKDIR}/iterm-${PV}-mbt/lib/
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README INSTALL
+}
diff --git a/x11-libs/libiterm-mbt/metadata.xml b/x11-libs/libiterm-mbt/metadata.xml
new file mode 100644
index 000000000000..47f6d2c06202
--- /dev/null
+++ b/x11-libs/libiterm-mbt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<longdescription>
+	Hacked version of the libiterm library.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
new file mode 100644
index 000000000000..f9ec58a67541
--- /dev/null
+++ b/x11-libs/libnotify/Manifest
@@ -0,0 +1,7 @@
+DIST libnotify-0.7.6.tar.xz 280388 SHA256 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df WHIRLPOOL e619c8d10790f5b78730a2599c407bc951de68b189f460c72999776eaf92014aded0953ca06398cce7ad09fd8c87e1c7727cea4f4c81eccee0a8b2f2bafd195b
+DIST libnotify-0.7.7.tar.xz 285356 SHA256 9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04 SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954 WHIRLPOOL 61281729f3369c817183e9503cecad4a4264834cf91548e0bd4ea0a827b97ae15be0e4a7ed0a4287f72e14661cc199f37c711ec2d36a613fc94a1d9dc294dce7
+EBUILD libnotify-0.7.6-r3.ebuild 1597 SHA256 2e803c18122224ea20c978cd5eb05fb6ceffb09220e20e169d77f4feb6ecdbd0 SHA512 2a2523fbc4c383a8a956c361c99edd9092c7b80ef2d0b17ccffcfe360e3769295893964bc31263ca3aa6dbc0ebf1a2de61f521fb478184a214b9464d05bfaec7 WHIRLPOOL d33135aeeaaf6e02b0b2ad59c7f4beb326a9e72bee5f60246db85c257fef1a9c01c73e81b1d65c7bdad96e90246e57a7f283ad6917d4ea936b30d6dee358d35e
+EBUILD libnotify-0.7.7.ebuild 1483 SHA256 94c2cc053e3904b08ab31f805bb9b72164b39b8265ea5bb3af2774ba348d78ef SHA512 c968363815ef0c615e83703859cdb81ed179f3e4ba045e059fb7c328aec6264a165f6e92d6ce2dfebf988cdcec74606fcb7d024e29db2ac2fe1f109c6c346d8e WHIRLPOOL 3206d721805754d96811e48023f9c563fd5d6a44814d541e07978b99db5693e10bc29966192b57614c5bb9c41a8b3b548f7366fad0f7ad7b2950ed6b85096274
+MISC ChangeLog 3873 SHA256 e54500990e998777af7bb5fb10d7558b96443733aa5ed1ac6240f2bf0853d923 SHA512 7379d921073010ae8d5ab618bc00503e34b2c566a8fb3f692a5c7e925ad1caea679a3ff11f92c9485f45aebc4917fe507286bf047d23d9482c30344329a4e3ac WHIRLPOOL 9520b33ebf08d67a055e7e02ab30fbd3ac648b7b5db0bfaf295fc12def6db25dae867c4138ea776c4dc36d28ef11ddf9905b2be940a402bb46fd85ec6dab9739
+MISC ChangeLog-2015 15129 SHA256 9fa69b47cffb9e085b66e572ba1fafcfc7faeeaebd45cd7997b18869e6939bcc SHA512 c1cc417c1062ef1284b77fefdee010b835c8eac5c3a0f03a33d3daec66a0bdd0dfa6ff1e4ecaa1199a631f2aa7539d706013a57ac99b93cf8509b3fa7b7b962b WHIRLPOOL 0a52ecdd056a3bde15d3a16ac0dce94a3630b8239dbb1e57ccd320d1387b615c0f3df07cdba0021072a6c159eed6cf363d23e7d1ddd3d10ae25d3e1890306002
+MISC metadata.xml 276 SHA256 6bb81cdb026b199d78fb2a2327320a915a3bd241a9300bb069bd9c998521f613 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59 WHIRLPOOL d494386e01171fe51879cf968a6cebca04c22477f3b8a52bfdd17b9ee06afd99c3979396f7abf40bee698d6fbb060e2f37e083cb3ed010c018d84211a2bc7cd0
diff --git a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
new file mode 100644
index 000000000000..bb919cb7bab0
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils gnome.org multilib-minimal xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://git.gnome.org/browse/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND="
+	app-eselect/eselect-notify-send
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+	xdg_environment_reset
+	sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+
+	if ! use test; then
+		sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--disable-static \
+		$(multilib_native_use_enable introspection)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	prune_libtool_files
+
+	mv "${ED}"/usr/bin/{,libnotify-}notify-send #379941
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7.ebuild
new file mode 100644
index 000000000000..d66913a9afaf
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org multilib-minimal xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://git.gnome.org/browse/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND="
+	app-eselect/eselect-notify-send
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--disable-gtk-doc \
+		--disable-static \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable test tests)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	prune_libtool_files
+
+	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
new file mode 100644
index 000000000000..0f6db5621bcb
--- /dev/null
+++ b/x11-libs/libnotify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/liboglappth/Manifest b/x11-libs/liboglappth/Manifest
new file mode 100644
index 000000000000..3e2b1584faaa
--- /dev/null
+++ b/x11-libs/liboglappth/Manifest
@@ -0,0 +1,6 @@
+AUX gcc-4.3.patch 258 SHA256 a3f2f1970569a12d7da90d55b043fcd88fe4c9936ffecaab737c33519e1ea8fd SHA512 906557a311f44892664f1b3c7e5f707271b4a6f10b13ea030226ada3de5f713efc83db72244af9b91e3fb905a5049d5d716760df02fecf3d4ea0456334d25598 WHIRLPOOL d0121f3ca8889a8598183c81cc2ea90fab77f5bf144c1f6df4add03fccd86384e483e953a183ed3fb9e33616b07b32e6a1b5ea16a9d7de77f767c36637b78880
+DIST liboglappth-1.0.0.tar.gz 325178 SHA256 b461a31065d6912d190f78ad0041218009f44a5acdb5757545bd4a8bd6b509aa SHA512 b0d883379650f1062d503d2adaab48202614b3ab68eba2e0ab01513b51cdd88f75fa02af5dcb00077fb057cdf09987dfe123ea9e0541e2e56893e11e53ac8ef1 WHIRLPOOL e01b177d75584cc6fda99396d0353fa5444f426e1616492defe19f32eb2d53b62b5353967f2c76024daca16e3f7c02bec5e70507cd04a1a3197dfee57ce5b2ac
+EBUILD liboglappth-1.0.0.ebuild 522 SHA256 2bccdf2a965eb4e736d0d4feb2f18e1545208acde0fc645eb8285d1a0380654b SHA512 1c920eac2ea5a2ac2d0c679cfce09a9fc51b310aebde97d1111ac564d844caabe64ee05b966c85b543085114f2039f9fd08e7b3a257227f68e68522476ca1b01 WHIRLPOOL 86962aa715f644f5ff3a1c09b8d68d620bbdb9e8da4a64312dc861e66136c3c1735d2baaf2ba4a8d37b61c80faa69849a2d677d2803db39d09fba4d308d5fc86
+MISC ChangeLog 2519 SHA256 c29e7493e45ad2c7a1a390aa7b4285b6e30ad40c697534db87b0ac065b16e6a2 SHA512 8b30732886271354cbd6981721431e2703e170eac181263f579afd93c6284f7ce9de3dbeeb8d036a610430917bc5d551cc17243363167636a3b7e224b2597fb6 WHIRLPOOL 1c244ed100be495d41a2d0ece4216d3b0a7f70aa97f81067f49651bd94803538577350d4c7f1f76156a24698cdafed4513ca8799f72825d111bf9a973c6a4a8e
+MISC ChangeLog-2015 1999 SHA256 944aad32dff350f5dda19babace689acd839a0521a1fcbcbd531f3ad8006244d SHA512 3a12aa1817678fce913894c465aab4c12a229e4718cc1c26713ac8c07e91791efee2d3ba63687204c50f2058f8eb18b35b6ffebe0685d668f1a2da7b2ef2a299 WHIRLPOOL f6630af6b62294eb2542c89d65200b69041c0422b49aaf39d06178033ca4211b02f8787851e6eefbb536a0e79ad602ec4cce8186422bbfc91388ac3403b5473b
+MISC metadata.xml 653 SHA256 edec490ae74a4b4c736d67f4250e91abf31556a1e4efbbc5f1abd9cf98ed6796 SHA512 c8354ad9612a5b03d7a0bdf21f30df433cb991064f6edd989fe68952a6858c6308814eabea2ce9cb6bd65fd56e40c5badd36b87a24acdac518155923fe01fb58 WHIRLPOOL b1c97540076c7e5e85c84f5122795be778b605bdb1ba3538bca862c0c201e69989956c5d4e0820c64bff934456feb211818268728871eb5f21d0e42b0a0c9740
diff --git a/x11-libs/liboglappth/files/gcc-4.3.patch b/x11-libs/liboglappth/files/gcc-4.3.patch
new file mode 100644
index 000000000000..bc04b9e97c7b
--- /dev/null
+++ b/x11-libs/liboglappth/files/gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- a/src/base_wcl.cpp	2008-07-07 23:49:10.000000000 -0700
++++ b/src/base_wcl.cpp	2008-07-07 23:49:26.000000000 -0700
+@@ -11,6 +11,7 @@
+ 
+ #include "base_app.h"
+ #include <stdlib.h>	// the definition for NULL...
++#include <cstring>
+ 
+ #include <GL/glut.h>
+ 
diff --git a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
new file mode 100644
index 000000000000..c0b2725651a1
--- /dev/null
+++ b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Libary for OpenGL applications with easy-to-code scene setup and selection"
+HOMEPAGE="http://www.bioinformatics.org/ghemical/"
+SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	virtual/opengl
+	media-libs/freeglut"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/gcc-4.3.patch )
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
new file mode 100644
index 000000000000..75150c966699
--- /dev/null
+++ b/x11-libs/liboglappth/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+	<longdescription>
+Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models 
+and molecular mechanics models (there is an experimental Tripos 5.2-like force 
+field for organic molecules). Also a tool for reduced protein models is 
+included. Geometry optimization, molecular dynamics and a large set of 
+visualization tools are currently available.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
new file mode 100644
index 000000000000..3d76f5d93c5f
--- /dev/null
+++ b/x11-libs/libpciaccess/Manifest
@@ -0,0 +1,9 @@
+DIST libpciaccess-0.13.3.tar.bz2 368755 SHA256 6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3 SHA512 11ad783c6278e340973a621339cece3776c098952d0eaf96bfe745d013347e928c0883ed8444c5ddea870f5e4b3c25da16a44facb9d7fc1c8fea1c7e77bd592b WHIRLPOOL 92ba320540535c2b2811c29272a2d94dd3c1f586a0e3073ed4678c03cb3e30656772ad6b0a3e9612a0972a28cfe0d9c4c93ea955610e609fb103a15bb8051e31
+DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92 WHIRLPOOL d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
+DIST libpciaccess-0.13.5.tar.bz2 381729 SHA256 752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999 SHA512 4b77aa66b3429fd5f9bff0408b0624305e766bf209f3fa2a0a9024df55bf87ca68f9a5aa34f97ffe131997e0669c65cf542210cf308c0de09842424968c5a159 WHIRLPOOL 1cf2b0b78d1c0ce25d0069dda9e9e5f9b3e1cf3423724cfa7a5028ce0cf8cc1c69ec28eb5766075435d6922a049192f76bfc65058709b24a4df6b1c59f8c5df0
+EBUILD libpciaccess-0.13.3.ebuild 861 SHA256 5ec1ba0081c7eb2ceaf95fece80a62d07ab0004a98c2b3f7e3a0aca9060e47b7 SHA512 2d9157939136a12bc9e0c9e307f1ea299d33d11aadfb77db5d070ae25d73742a5d843bc5f2d19610268b859ea8c5b585899b32868a6dc2bc4c1b7f882b4f00ed WHIRLPOOL d46e70bf5d3f24f6696af735b63d72a688a9d34ddfc37b896ed0296cb52a3e20fe037a4a8c3b64b88d1e9eea3e5122fcdb9aee95bf26e94eb3ad5fa89575c2d1
+EBUILD libpciaccess-0.13.4.ebuild 868 SHA256 41b0d0c093677d555fdc3525b9816b578d5eec297f2bdb8f43abb3687ff3ac98 SHA512 5fe17935dab18929a01fe41991496751f64a0a8ab87bd95b077cf794158b189272c6745c222be9f0c01e5c6dbbe5cc911d9bb7100e84f1608702dcaf27138d22 WHIRLPOOL bd508681325ee1170bc0f8fa2ec646b52033f16328579e9997951d6c58979ffc16a08dca95ccbe33dee9a98da80182e76c54e058dbec5d069bd687c8796b402e
+EBUILD libpciaccess-0.13.5.ebuild 877 SHA256 e5d21e811d9d4f322218201b3e6642a1ff5aa85e37ae4f7f4a88f03db64209bd SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009 WHIRLPOOL a8496ca1a468dbd38010e71b9d1343951be0f2e2804baa758a8d94022a9ccb2f2cbbec2ee6b0b9b4efc1e09f7fd665fa5047cc9d75fa04b7358cb7b8a834199b
+MISC ChangeLog 4425 SHA256 a8cf82f61b03f40ce07f87a08a2f7bf2b9b9e9a0e8ed00257fa27562edc2eb8b SHA512 5bdedfab507f2fae595db5fc66b5fdefefd79d7816000ce709f25328485de77ddfb301af45c78779c0b869921db669450a257dd92c35054e89d6410145ab311a WHIRLPOOL 128a6d27175db5e618d1578caf475302852187767368ad09d70d0ebc127fb7322f0bd1e096d8566b3de92f7f55877783d100ad013f3459cb115e4e015a3864a1
+MISC ChangeLog-2015 14232 SHA256 b87224c21643d85516e4f39b429eec0ff0453e61d1556d5b7370dff932ae1c13 SHA512 2fa3f526917a4f9674ad1604ea19505faa18fc67faf5bf2707092fe56a08f4fcfc848c3695162a768b47a9718b91e1c4127dc02423edf1a9d57faa6e73b2c0fc WHIRLPOOL 86d15121a6576ee6d9b1f2d3f2ced853249dbdce63ccbb415d2d0b04f3cf57609f1b5442bb087234cccf9b02c1e413969a685f68f21e6d17fc465320d6aad52e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
new file mode 100644
index 000000000000..b773942ddb59
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
@@ -0,0 +1,34 @@
+# 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="Library providing generic access to the PCI bus and devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		dodir /usr/bin
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+	fi
+}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
new file mode 100644
index 000000000000..3bf3b027aff7
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.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_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		dodir /usr/bin
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+	fi
+}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild
new file mode 100644
index 000000000000..40538ee468ce
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild
@@ -0,0 +1,34 @@
+# 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="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		dodir /usr/bin
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+	fi
+}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libproplist/Manifest b/x11-libs/libproplist/Manifest
new file mode 100644
index 000000000000..5cf0324b9f47
--- /dev/null
+++ b/x11-libs/libproplist/Manifest
@@ -0,0 +1,6 @@
+AUX libproplist-0.10.1-include.patch 156 SHA256 23191849fb931ef57da49d3294cb2ed4c511e4ebbc99b7e30025613f4b8b2595 SHA512 d7e97ce94508a9b75a0f578b9a2f33b4e9072bcd7274b57222bad0a88f57afb48f9b3943cf5dcebd8234da9b838662617ec99d2233ca9cbece5295fee565691e WHIRLPOOL 8ae113e77d77d55356d80cb63217ed4009bb60512b97dcd2b35f2aaf5f852a2d3d70142e1c052984add263591957c747ec7839e5961d90a0ec2e06c76056d442
+DIST libPropList-0.10.1.tar.gz 152625 SHA256 7181fa6f3450c0a619732c6ee60bab204eb7901d08182020e8340c648cd04e85 SHA512 8ebad2ffedda9cf0f0a01320340c1b6b9f7d9d9af06d886da9c82d626b5ad799692daeab4c7569e85f756ce8aef3fedf6f662ee38fd4e13e2ec52c7dbe843c39 WHIRLPOOL da4b2763cfe23838698ad7c0f5620cc06c8d3a13f138a3e5b4e88eb1eb10cc8a38941dbc392e82d5d09962282a26e3621031c2569aa933a124b46ca57e7a047f
+EBUILD libproplist-0.10.1-r4.ebuild 667 SHA256 82dac21cb64aa0bf498da6fde1685717a47f68cc14c44510b268346244a6e236 SHA512 460eb635691601ac1fd9d05248021264d366d64cfa63dc59dedac11970b8830d54a253f9a7263cdef0df1540e2bae5ba3680904e6865f860d7f65d4499c5b755 WHIRLPOOL 87bfd44f4a66cbeed345d6dbde3837f7fb544f1d234c45d5a7c4c05e3a27c1534c8ed054aead2246bc96650ac18f020a0ac567e63d30501d39ef2c6e5955ed35
+MISC ChangeLog 2585 SHA256 523beb45a57fad3a2b1ef57fc032e68ac64b7c69260267be9298551391cea31a SHA512 813a9df4de9c94b5f90a0a275e3c1eda05fdd46066f1a6f57dbb3a8023cc508ba1ea92d0f9799976113cbc7953094ec4bcc50d0c5c58273ad602a7c2ac02fc6e WHIRLPOOL 4b80c5a6dc28eb63650c29bd9709f3707b79f2ce3f4c9801e530b86f0349229d94685cb0195116ebcf783483c6fa0f6e7d90872589e89933f56441f4d601960d
+MISC ChangeLog-2015 2717 SHA256 3b1c540a26737163218687ab127510cc4e12162da556c90209b4fe8b8b237480 SHA512 5caa6e64093cc4fcfaad34f0d3b31161299b846f93be0f70aa2e15d1c5ebbe856ffa6b6c811aa4c2f3bf713f928d7eefe7eb637b4e62937fa13dd0271a477a73 WHIRLPOOL 575f2ea3f2769af929d2fbfed0be203ddad379f12460da673c5a137cd3f4f6810198cbe8e649af30650030aa6bab54c3a71f94405d196fb9f00859eee07ac8f4
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-libs/libproplist/files/libproplist-0.10.1-include.patch b/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
new file mode 100644
index 000000000000..3fd8fa696324
--- /dev/null
+++ b/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
@@ -0,0 +1,10 @@
+--- comparing.c
++++ comparing.c
+@@ -4,6 +4,7 @@
+ 
+    */
+ 
++#include <string.h> /* strcmp(), memcmp() */
+ #include "proplistP.h"
+ 
+ /* forward prototype */
diff --git a/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild b/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
new file mode 100644
index 000000000000..6f1c7afa1e3b
--- /dev/null
+++ b/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_P=libPropList-${PV}
+
+inherit autotools eutils
+
+DESCRIPTION="An library to mimic property list functionality from the GNUstep environment"
+HOMEPAGE="http://windowmaker.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/lib*/libPropList.la
+}
diff --git a/x11-libs/libproplist/metadata.xml b/x11-libs/libproplist/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-libs/libproplist/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-libs/libqxt/Manifest b/x11-libs/libqxt/Manifest
new file mode 100644
index 000000000000..836b23e247aa
--- /dev/null
+++ b/x11-libs/libqxt/Manifest
@@ -0,0 +1,10 @@
+AUX libqxt-gcc6-fix.patch 495 SHA256 95ba674f6679efea0d77ec24c58a355f7717b3f701b492dec5712c8baa49c7cb SHA512 53e325aa9f9e54ce1831900c0683eabd91d3848e7012e036710444efa0f3263458b220494bcb02c62da4bf3e6a8af8ee3773bd37682e738d940feb188dd49185 WHIRLPOOL 76660764b905c008be5430fa59c436b3dc2ccaca9367d765a34cd150fd3b0ba120f77220f7b65430d3463750894153f1d156ad116c3d6754da7b79ae0a4051ce
+AUX libqxt-invoke-prev-filter.patch 545 SHA256 17c08c8ffc14d6c2d0dc7cfd05c31859380e466f27035657f5457a898cee22aa SHA512 952645fca90eb5e45a2dc2b10a51600ea40800b2d43a2d25257bdf126cd2e36f58adb74ec5e94dff38f87b8a52f5426465c097b5943547ba46e8ad73d050032a WHIRLPOOL bc7b17abab2974381a267d206d09bba722071b96c706bb49fc5755ee034d2608cf5c6c5bfa48a3e78341839a426db8e6e00405ab37943522c5aff7a9b3bc43eb
+AUX libqxt-media-keys.patch 15834 SHA256 2696813b70ddaea284228901fd545213c0b8dacc8aa0cd0f2a7e10537ff1e3cc SHA512 35c5374d86f5a16a2e1bf002a4e02e2f33aa819db0ec568a73822daf5174a23b6496d96977ca319b0c3d2f312f2e31d75cd6b9983a87c8cd1b20520d20d504a3 WHIRLPOOL 536473280984ba1341895d303c14e7c92af8edbd34e6d6e0f0e5536b8f65f3e7f5bcf5a2252dfa721ce40afd8749b4d4d70a0665c978c3d386a0c600a303fbf7
+AUX libqxt-use-system-qdoc3.patch 944 SHA256 cbd383b3dc9c749eb51c8947c0ce58336a7fbc5183385d9e59412aa4238aa065 SHA512 7c768228ddec02d1d49dc80e729f2f041fadd3baed27263efa5ea8a351298cb023933c4b347685044fab36936cd797b5df72d83760a5a252bd2b2bd4f70c21a1 WHIRLPOOL 81027d4944109d17cedfe7cd0fe08fc0a2694210a2b855fe4c976b21839e7a3271a18b86219175a239911b78b78f69ac43f1c90a35271aaca999282479f21108
+AUX libqxt-xrandr-missing-lib.patch 433 SHA256 0cf394f6431593bac944662367ce0b4dd7060c94e98cdc21fd878610cef27e0d SHA512 38bc6bd912c349c7778f6c9f1919493f48a8b4e6c99ace1b26bbbe8e42dbe27469cf5298948c8293fec99f4bfc8763a7799c2839861acf7cde408566bdef8ead WHIRLPOOL 8317e5493adbe4c1b8fc04a9c0d623164ad4d336944364dcf40fddb4e4637a3fd38677dc726891f5e2e3c909f6d0dcb615f15457c62f916aa57ced4ce5926be6
+DIST libqxt-0.6.2.tar.bz2 2197939 SHA256 c59d01373e6bf1bf7072d5e80b95fb803a884ecd19997d3a25903f3fb7f0658a SHA512 45be88acaf7e77b8db2c60130fd6a7209a1d06140bf8aeb2cfa288652b36ecda0fb6917ad8060b03e7e8a0f6c4ca34f0c97bc2d73d9ec0d100beaa1a46df51ae WHIRLPOOL 6457b374dc8d85a4260296b3cdb3f3d12b59fa19475d17c020818fbb99a2380a9cd54eac71a7de58af0ec07d02b40fe224a2394a2e2c1d098ffdfd61d29223c4
+EBUILD libqxt-0.6.2-r2.ebuild 2281 SHA256 19555636046c86637e8a2c5e84718b0b133e8b97bfcf8821959baa9f8452b6a3 SHA512 8ed0f9a793cd1a77fdde205cb75685c7bd7fed67385ef3b7038653448f497d50a6b06609998b292a4294bdcaa6dd7beb82f480b288f8ffea0d48fdca7c44676f WHIRLPOOL 4aa35e75a2cc95e67777a5d99341065fd23c400679999f31172c00cf11f552c2b582a1f26594184d3e7efb6b64c355d36c2e723c3e618f3e9e90bfb569cfe278
+MISC ChangeLog 3031 SHA256 55066f83275e9b9be86425856eb326a330caeda888321dad383caa38119deb34 SHA512 467a5a74060a0d898a7425281cd57bbb2c00f67bffd4631269bb68cb2fc71f67f9c1acc5cf29df086e73b038eaad986c5e2693d2f90c18af57ab240a339e954c WHIRLPOOL 72df0adecc5556ac45eb6ab81c122a8898470c15c5c7bfd218fab2fa7c76707b445d3f2fbd2b4bf1269688b2a0ed32cf9244930c6ed1c1682229b83d5d34c54d
+MISC ChangeLog-2015 5682 SHA256 e154fb55245cb5fd6d6d7d187cc9c71e5ceb689cac44d19a08b381306a35d203 SHA512 4109f379525768b350184f81a42a100e99c3c220aa8f5e84a802c764765f06be3e2526b62496d5147c7a4200955d1a54569f9d8344cc9c616b1968a18da1d485 WHIRLPOOL ee5dfb7a8aa9dfbfefdbc8ca29b7adc91f67fd6cae04d4727b98f457181f03b792c970eaa105fb5ee0ccb95cd1f8f931679f97199546703baa4a58030bc06dac
+MISC metadata.xml 470 SHA256 8778d58a442f9c5c4afff65f2268ad6e85392a3436aeece05e2c9797a0afe3b1 SHA512 c69d6d2ad1f4e3635c0f28521087184862a9ef858e1a5d124fd647ba0f8b88cd22f7862793f000c7364a46a80afff32b43d5ce41d456a99c6bbe0291f2d849fc WHIRLPOOL e54e78e213cae268321da6d378e286cad30c689503e79a1c293d3482477274039c83c7434ad8c2fa5a55bc73487d9ae79d2bd5f27cbfcc6cf0a667d6d4562845
diff --git a/x11-libs/libqxt/files/libqxt-gcc6-fix.patch b/x11-libs/libqxt/files/libqxt-gcc6-fix.patch
new file mode 100644
index 000000000000..23adc1dca78f
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-gcc6-fix.patch
@@ -0,0 +1,12 @@
+diff -ru libqxt-libqxt-v0.6.2/src/core/qxtslotjob.cpp libqxt-libqxt-v0.6.2.new/src/core/qxtslotjob.cpp
+--- libqxt-libqxt-v0.6.2/src/core/qxtslotjob.cpp	2011-11-24 17:10:32.000000000 -0500
++++ libqxt-libqxt-v0.6.2.new/src/core/qxtslotjob.cpp	2016-12-08 18:07:07.460538282 -0500
+@@ -174,7 +174,7 @@
+ 
+ QVariant QxtFuture::delayedResult(int msec)
+ {
+-    if (!waiter->wait(msec, false))
++    if (!waiter->wait(msec, QEventLoop::AllEvents))
+         return QVariant();
+     return job->result();
+ }
diff --git a/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch b/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch
new file mode 100644
index 000000000000..4910fe403ae1
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch
@@ -0,0 +1,14 @@
+--- src/gui/qxtglobalshortcut_x11.cpp.orig	2013-12-17 15:03:25.388283632 +0400
++++ src/gui/qxtglobalshortcut_x11.cpp	2013-12-17 15:04:31.566286818 +0400
+@@ -59,7 +59,11 @@
+             // Mod1Mask == Alt, Mod4Mask == Meta
+             key->state & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
+     }
++#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
++    return prevEventFilter ? prevEventFilter(message) : false;
++#else
+     return false;
++#endif
+ }
+ 
+ quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
diff --git a/x11-libs/libqxt/files/libqxt-media-keys.patch b/x11-libs/libqxt/files/libqxt-media-keys.patch
new file mode 100644
index 000000000000..a2f39b173187
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-media-keys.patch
@@ -0,0 +1,407 @@
+diff -rupN libqxt.old/src/gui/keymapper_x11.h libqxt/src/gui/keymapper_x11.h
+--- libqxt.old/src/gui/keymapper_x11.h	1969-12-31 19:00:00.000000000 -0500
++++ libqxt/src/gui/keymapper_x11.h	2010-07-18 15:37:16.000000000 -0400
+@@ -0,0 +1,364 @@
++#ifndef KEYMAPPER_X11_H
++#define KEYMAPPER_X11_H
++
++// (davidsansome) Nicked from qkeymapper_x11.cpp
++
++#include <Qt>
++
++#define XK_MISCELLANY
++#define XK_LATIN1
++#define XK_KOREAN
++#define XK_XKB_KEYS
++#include <X11/keysymdef.h>
++
++//
++// Keyboard event translation
++//
++
++#ifndef XK_ISO_Left_Tab
++#define XK_ISO_Left_Tab         0xFE20
++#endif
++
++#ifndef XK_dead_hook
++#define XK_dead_hook            0xFE61
++#endif
++
++#ifndef XK_dead_horn
++#define XK_dead_horn            0xFE62
++#endif
++
++#ifndef XK_Codeinput
++#define XK_Codeinput            0xFF37
++#endif
++
++#ifndef XK_Kanji_Bangou
++#define XK_Kanji_Bangou         0xFF37 /* same as codeinput */
++#endif
++
++// Fix old X libraries
++#ifndef XK_KP_Home
++#define XK_KP_Home              0xFF95
++#endif
++#ifndef XK_KP_Left
++#define XK_KP_Left              0xFF96
++#endif
++#ifndef XK_KP_Up
++#define XK_KP_Up                0xFF97
++#endif
++#ifndef XK_KP_Right
++#define XK_KP_Right             0xFF98
++#endif
++#ifndef XK_KP_Down
++#define XK_KP_Down              0xFF99
++#endif
++#ifndef XK_KP_Prior
++#define XK_KP_Prior             0xFF9A
++#endif
++#ifndef XK_KP_Next
++#define XK_KP_Next              0xFF9B
++#endif
++#ifndef XK_KP_End
++#define XK_KP_End               0xFF9C
++#endif
++#ifndef XK_KP_Insert
++#define XK_KP_Insert            0xFF9E
++#endif
++#ifndef XK_KP_Delete
++#define XK_KP_Delete            0xFF9F
++#endif
++
++// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
++// multimedia keys. They are included here as not every system has them.
++#define XF86XK_Standby          0x1008FF10
++#define XF86XK_AudioLowerVolume 0x1008FF11
++#define XF86XK_AudioMute        0x1008FF12
++#define XF86XK_AudioRaiseVolume 0x1008FF13
++#define XF86XK_AudioPlay        0x1008FF14
++#define XF86XK_AudioStop        0x1008FF15
++#define XF86XK_AudioPrev        0x1008FF16
++#define XF86XK_AudioNext        0x1008FF17
++#define XF86XK_HomePage         0x1008FF18
++#define XF86XK_Calculator       0x1008FF1D
++#define XF86XK_Mail             0x1008FF19
++#define XF86XK_Start            0x1008FF1A
++#define XF86XK_Search           0x1008FF1B
++#define XF86XK_AudioRecord      0x1008FF1C
++#define XF86XK_Back             0x1008FF26
++#define XF86XK_Forward          0x1008FF27
++#define XF86XK_Stop             0x1008FF28
++#define XF86XK_Refresh          0x1008FF29
++#define XF86XK_Favorites        0x1008FF30
++#define XF86XK_AudioPause       0x1008FF31
++#define XF86XK_AudioMedia       0x1008FF32
++#define XF86XK_MyComputer       0x1008FF33
++#define XF86XK_OpenURL          0x1008FF38
++#define XF86XK_Launch0          0x1008FF40
++#define XF86XK_Launch1          0x1008FF41
++#define XF86XK_Launch2          0x1008FF42
++#define XF86XK_Launch3          0x1008FF43
++#define XF86XK_Launch4          0x1008FF44
++#define XF86XK_Launch5          0x1008FF45
++#define XF86XK_Launch6          0x1008FF46
++#define XF86XK_Launch7          0x1008FF47
++#define XF86XK_Launch8          0x1008FF48
++#define XF86XK_Launch9          0x1008FF49
++#define XF86XK_LaunchA          0x1008FF4A
++#define XF86XK_LaunchB          0x1008FF4B
++#define XF86XK_LaunchC          0x1008FF4C
++#define XF86XK_LaunchD          0x1008FF4D
++#define XF86XK_LaunchE          0x1008FF4E
++#define XF86XK_LaunchF          0x1008FF4F
++// end of XF86keysyms.h
++
++// Special keys used by Qtopia, mapped into the X11 private keypad range.
++#define QTOPIAXK_Select         0x11000601
++#define QTOPIAXK_Yes            0x11000602
++#define QTOPIAXK_No             0x11000603
++#define QTOPIAXK_Cancel         0x11000604
++#define QTOPIAXK_Printer        0x11000605
++#define QTOPIAXK_Execute        0x11000606
++#define QTOPIAXK_Sleep          0x11000607
++#define QTOPIAXK_Play           0x11000608
++#define QTOPIAXK_Zoom           0x11000609
++#define QTOPIAXK_Context1       0x1100060A
++#define QTOPIAXK_Context2       0x1100060B
++#define QTOPIAXK_Context3       0x1100060C
++#define QTOPIAXK_Context4       0x1100060D
++#define QTOPIAXK_Call           0x1100060E
++#define QTOPIAXK_Hangup         0x1100060F
++#define QTOPIAXK_Flip           0x11000610
++
++// keyboard mapping table
++static const unsigned int KeyTbl[] = {
++
++    // misc keys
++
++    XK_Escape,                  Qt::Key_Escape,
++    XK_Tab,                     Qt::Key_Tab,
++    XK_ISO_Left_Tab,            Qt::Key_Backtab,
++    XK_BackSpace,               Qt::Key_Backspace,
++    XK_Return,                  Qt::Key_Return,
++    XK_Insert,                  Qt::Key_Insert,
++    XK_Delete,                  Qt::Key_Delete,
++    XK_Clear,                   Qt::Key_Delete,
++    XK_Pause,                   Qt::Key_Pause,
++    XK_Print,                   Qt::Key_Print,
++    0x1005FF60,                 Qt::Key_SysReq,         // hardcoded Sun SysReq
++    0x1007ff00,                 Qt::Key_SysReq,         // hardcoded X386 SysReq
++
++    // cursor movement
++
++    XK_Home,                    Qt::Key_Home,
++    XK_End,                     Qt::Key_End,
++    XK_Left,                    Qt::Key_Left,
++    XK_Up,                      Qt::Key_Up,
++    XK_Right,                   Qt::Key_Right,
++    XK_Down,                    Qt::Key_Down,
++    XK_Prior,                   Qt::Key_PageUp,
++    XK_Next,                    Qt::Key_PageDown,
++
++    // modifiers
++
++    XK_Shift_L,                 Qt::Key_Shift,
++    XK_Shift_R,                 Qt::Key_Shift,
++    XK_Shift_Lock,              Qt::Key_Shift,
++    XK_Control_L,               Qt::Key_Control,
++    XK_Control_R,               Qt::Key_Control,
++    XK_Meta_L,                  Qt::Key_Meta,
++    XK_Meta_R,                  Qt::Key_Meta,
++    XK_Alt_L,                   Qt::Key_Alt,
++    XK_Alt_R,                   Qt::Key_Alt,
++    XK_Caps_Lock,               Qt::Key_CapsLock,
++    XK_Num_Lock,                Qt::Key_NumLock,
++    XK_Scroll_Lock,             Qt::Key_ScrollLock,
++    XK_Super_L,                 Qt::Key_Super_L,
++    XK_Super_R,                 Qt::Key_Super_R,
++    XK_Menu,                    Qt::Key_Menu,
++    XK_Hyper_L,                 Qt::Key_Hyper_L,
++    XK_Hyper_R,                 Qt::Key_Hyper_R,
++    XK_Help,                    Qt::Key_Help,
++    0x1000FF74,                 Qt::Key_Backtab,        // hardcoded HP backtab
++    0x1005FF10,                 Qt::Key_F11,            // hardcoded Sun F36 (labeled F11)
++    0x1005FF11,                 Qt::Key_F12,            // hardcoded Sun F37 (labeled F12)
++
++    // numeric and function keypad keys
++
++    XK_KP_Space,                Qt::Key_Space,
++    XK_KP_Tab,                  Qt::Key_Tab,
++    XK_KP_Enter,                Qt::Key_Enter,
++    //XK_KP_F1,                 Qt::Key_F1,
++    //XK_KP_F2,                 Qt::Key_F2,
++    //XK_KP_F3,                 Qt::Key_F3,
++    //XK_KP_F4,                 Qt::Key_F4,
++    XK_KP_Home,                 Qt::Key_Home,
++    XK_KP_Left,                 Qt::Key_Left,
++    XK_KP_Up,                   Qt::Key_Up,
++    XK_KP_Right,                Qt::Key_Right,
++    XK_KP_Down,                 Qt::Key_Down,
++    XK_KP_Prior,                Qt::Key_PageUp,
++    XK_KP_Next,                 Qt::Key_PageDown,
++    XK_KP_End,                  Qt::Key_End,
++    XK_KP_Begin,                Qt::Key_Clear,
++    XK_KP_Insert,               Qt::Key_Insert,
++    XK_KP_Delete,               Qt::Key_Delete,
++    XK_KP_Equal,                Qt::Key_Equal,
++    XK_KP_Multiply,             Qt::Key_Asterisk,
++    XK_KP_Add,                  Qt::Key_Plus,
++    XK_KP_Separator,            Qt::Key_Comma,
++    XK_KP_Subtract,             Qt::Key_Minus,
++    XK_KP_Decimal,              Qt::Key_Period,
++    XK_KP_Divide,               Qt::Key_Slash,
++
++    // International input method support keys
++
++    // International & multi-key character composition
++    XK_ISO_Level3_Shift,        Qt::Key_AltGr,
++    XK_Multi_key,		Qt::Key_Multi_key,
++    XK_Codeinput,		Qt::Key_Codeinput,
++    XK_SingleCandidate,		Qt::Key_SingleCandidate,
++    XK_MultipleCandidate,	Qt::Key_MultipleCandidate,
++    XK_PreviousCandidate,	Qt::Key_PreviousCandidate,
++
++    // Misc Functions
++    XK_Mode_switch,		Qt::Key_Mode_switch,
++    XK_script_switch,		Qt::Key_Mode_switch,
++
++    // Japanese keyboard support
++    XK_Kanji,			Qt::Key_Kanji,
++    XK_Muhenkan,		Qt::Key_Muhenkan,
++    //XK_Henkan_Mode,		Qt::Key_Henkan_Mode,
++    XK_Henkan_Mode,		Qt::Key_Henkan,
++    XK_Henkan,			Qt::Key_Henkan,
++    XK_Romaji,			Qt::Key_Romaji,
++    XK_Hiragana,		Qt::Key_Hiragana,
++    XK_Katakana,		Qt::Key_Katakana,
++    XK_Hiragana_Katakana,	Qt::Key_Hiragana_Katakana,
++    XK_Zenkaku,			Qt::Key_Zenkaku,
++    XK_Hankaku,			Qt::Key_Hankaku,
++    XK_Zenkaku_Hankaku,		Qt::Key_Zenkaku_Hankaku,
++    XK_Touroku,			Qt::Key_Touroku,
++    XK_Massyo,			Qt::Key_Massyo,
++    XK_Kana_Lock,		Qt::Key_Kana_Lock,
++    XK_Kana_Shift,		Qt::Key_Kana_Shift,
++    XK_Eisu_Shift,		Qt::Key_Eisu_Shift,
++    XK_Eisu_toggle,		Qt::Key_Eisu_toggle,
++    //XK_Kanji_Bangou,		Qt::Key_Kanji_Bangou,
++    //XK_Zen_Koho,		Qt::Key_Zen_Koho,
++    //XK_Mae_Koho,		Qt::Key_Mae_Koho,
++    XK_Kanji_Bangou,		Qt::Key_Codeinput,
++    XK_Zen_Koho,		Qt::Key_MultipleCandidate,
++    XK_Mae_Koho,		Qt::Key_PreviousCandidate,
++
++#ifdef XK_KOREAN
++    // Korean keyboard support
++    XK_Hangul,			Qt::Key_Hangul,
++    XK_Hangul_Start,		Qt::Key_Hangul_Start,
++    XK_Hangul_End,		Qt::Key_Hangul_End,
++    XK_Hangul_Hanja,		Qt::Key_Hangul_Hanja,
++    XK_Hangul_Jamo,		Qt::Key_Hangul_Jamo,
++    XK_Hangul_Romaja,		Qt::Key_Hangul_Romaja,
++    //XK_Hangul_Codeinput,	Qt::Key_Hangul_Codeinput,
++    XK_Hangul_Codeinput,	Qt::Key_Codeinput,
++    XK_Hangul_Jeonja,		Qt::Key_Hangul_Jeonja,
++    XK_Hangul_Banja,		Qt::Key_Hangul_Banja,
++    XK_Hangul_PreHanja,		Qt::Key_Hangul_PreHanja,
++    XK_Hangul_PostHanja,	Qt::Key_Hangul_PostHanja,
++    //XK_Hangul_SingleCandidate,Qt::Key_Hangul_SingleCandidate,
++    //XK_Hangul_MultipleCandidate,Qt::Key_Hangul_MultipleCandidate,
++    //XK_Hangul_PreviousCandidate,Qt::Key_Hangul_PreviousCandidate,
++    XK_Hangul_SingleCandidate,	Qt::Key_SingleCandidate,
++    XK_Hangul_MultipleCandidate,Qt::Key_MultipleCandidate,
++    XK_Hangul_PreviousCandidate,Qt::Key_PreviousCandidate,
++    XK_Hangul_Special,		Qt::Key_Hangul_Special,
++    //XK_Hangul_switch,		Qt::Key_Hangul_switch,
++    XK_Hangul_switch,		Qt::Key_Mode_switch,
++#endif  // XK_KOREAN
++
++    // dead keys
++    XK_dead_grave,              Qt::Key_Dead_Grave,
++    XK_dead_acute,              Qt::Key_Dead_Acute,
++    XK_dead_circumflex,         Qt::Key_Dead_Circumflex,
++    XK_dead_tilde,              Qt::Key_Dead_Tilde,
++    XK_dead_macron,             Qt::Key_Dead_Macron,
++    XK_dead_breve,              Qt::Key_Dead_Breve,
++    XK_dead_abovedot,           Qt::Key_Dead_Abovedot,
++    XK_dead_diaeresis,          Qt::Key_Dead_Diaeresis,
++    XK_dead_abovering,          Qt::Key_Dead_Abovering,
++    XK_dead_doubleacute,        Qt::Key_Dead_Doubleacute,
++    XK_dead_caron,              Qt::Key_Dead_Caron,
++    XK_dead_cedilla,            Qt::Key_Dead_Cedilla,
++    XK_dead_ogonek,             Qt::Key_Dead_Ogonek,
++    XK_dead_iota,               Qt::Key_Dead_Iota,
++    XK_dead_voiced_sound,       Qt::Key_Dead_Voiced_Sound,
++    XK_dead_semivoiced_sound,   Qt::Key_Dead_Semivoiced_Sound,
++    XK_dead_belowdot,           Qt::Key_Dead_Belowdot,
++    XK_dead_hook,               Qt::Key_Dead_Hook,
++    XK_dead_horn,               Qt::Key_Dead_Horn,
++
++    // Special multimedia keys
++    // currently only tested with MS internet keyboard
++
++    // browsing keys
++    XF86XK_Back,                Qt::Key_Back,
++    XF86XK_Forward,             Qt::Key_Forward,
++    XF86XK_Stop,                Qt::Key_Stop,
++    XF86XK_Refresh,             Qt::Key_Refresh,
++    XF86XK_Favorites,           Qt::Key_Favorites,
++    XF86XK_AudioMedia,          Qt::Key_LaunchMedia,
++    XF86XK_OpenURL,             Qt::Key_OpenUrl,
++    XF86XK_HomePage,            Qt::Key_HomePage,
++    XF86XK_Search,              Qt::Key_Search,
++
++    // media keys
++    XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
++    XF86XK_AudioMute,           Qt::Key_VolumeMute,
++    XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
++    XF86XK_AudioPlay,           Qt::Key_MediaPlay,
++    XF86XK_AudioStop,           Qt::Key_MediaStop,
++    XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
++    XF86XK_AudioNext,           Qt::Key_MediaNext,
++    XF86XK_AudioRecord,         Qt::Key_MediaRecord,
++
++    // launch keys
++    XF86XK_Mail,                Qt::Key_LaunchMail,
++    XF86XK_MyComputer,          Qt::Key_Launch0,
++    XF86XK_Calculator,          Qt::Key_Launch1,
++    XF86XK_Standby,             Qt::Key_Standby,
++
++    XF86XK_Launch0,             Qt::Key_Launch2,
++    XF86XK_Launch1,             Qt::Key_Launch3,
++    XF86XK_Launch2,             Qt::Key_Launch4,
++    XF86XK_Launch3,             Qt::Key_Launch5,
++    XF86XK_Launch4,             Qt::Key_Launch6,
++    XF86XK_Launch5,             Qt::Key_Launch7,
++    XF86XK_Launch6,             Qt::Key_Launch8,
++    XF86XK_Launch7,             Qt::Key_Launch9,
++    XF86XK_Launch8,             Qt::Key_LaunchA,
++    XF86XK_Launch9,             Qt::Key_LaunchB,
++    XF86XK_LaunchA,             Qt::Key_LaunchC,
++    XF86XK_LaunchB,             Qt::Key_LaunchD,
++    XF86XK_LaunchC,             Qt::Key_LaunchE,
++    XF86XK_LaunchD,             Qt::Key_LaunchF,
++
++    // Qtopia keys
++    QTOPIAXK_Select,            Qt::Key_Select,
++    QTOPIAXK_Yes,               Qt::Key_Yes,
++    QTOPIAXK_No,                Qt::Key_No,
++    QTOPIAXK_Cancel,            Qt::Key_Cancel,
++    QTOPIAXK_Printer,           Qt::Key_Printer,
++    QTOPIAXK_Execute,           Qt::Key_Execute,
++    QTOPIAXK_Sleep,             Qt::Key_Sleep,
++    QTOPIAXK_Play,              Qt::Key_Play,
++    QTOPIAXK_Zoom,              Qt::Key_Zoom,
++    QTOPIAXK_Context1,          Qt::Key_Context1,
++    QTOPIAXK_Context2,          Qt::Key_Context2,
++    QTOPIAXK_Context3,          Qt::Key_Context3,
++    QTOPIAXK_Context4,          Qt::Key_Context4,
++    QTOPIAXK_Call,              Qt::Key_Call,
++    QTOPIAXK_Hangup,            Qt::Key_Hangup,
++    QTOPIAXK_Flip,              Qt::Key_Flip,
++
++    0,                          0
++};
++
++#endif // KEYMAPPER_X11_H
+diff -rupN libqxt.old/src/gui/qxtglobalshortcut_x11.cpp libqxt/src/gui/qxtglobalshortcut_x11.cpp
+--- libqxt.old/src/gui/qxtglobalshortcut_x11.cpp	2010-07-18 15:32:53.000000000 -0400
++++ libqxt/src/gui/qxtglobalshortcut_x11.cpp	2010-07-18 15:41:25.000000000 -0400
+@@ -26,6 +26,8 @@
+ #include <QX11Info>
+ #include <X11/Xlib.h>
+ 
++#include "keymapper_x11.h"
++
+ static int (*original_x_errhandler)(Display* display, XErrorEvent* event);
+ 
+ static int qxt_x_errhandler(Display* display, XErrorEvent *event)
+@@ -83,8 +85,25 @@ quint32 QxtGlobalShortcutPrivate::native
+ 
+ quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
+ {
++    // (davidsansome) Try the table from QKeyMapper first - this seems to be
++    // the only way to get Keysyms for the media keys.
++    unsigned int keysym = 0;
++    int i = 0;
++    while (KeyTbl[i]) {
++      if (KeyTbl[i+1] == static_cast<uint>(key)) {
++        keysym = KeyTbl[i];
++        break;
++      }
++      i += 2;
++    }
++
++    // If that didn't work then fall back on XStringToKeysym
++    if (!keysym) {
++      keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
++    }
++
+     Display* display = QX11Info::display();
+-    return XKeysymToKeycode(display, XStringToKeysym(QKeySequence(key).toString().toLatin1().data()));
++    return XKeysymToKeycode(display, keysym);
+ }
+ 
+ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)
diff --git a/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
new file mode 100644
index 000000000000..99f7650913f3
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
@@ -0,0 +1,24 @@
+--- libqxt~orig/doc/doc.pri	2010-08-19 17:06:12.000000000 +0200
++++ libqxt/doc/doc.pri	2010-08-19 17:08:16.000000000 +0200
+@@ -1,5 +1,3 @@
+-SUBDIRS += tools/3rdparty/qdoc3
+-
+ win32 {
+     QXT_WINCONFIG = release/
+     !CONFIG(release, debug|release) {
+@@ -16,14 +14,13 @@
+ }
+ 
+ $$unixstyle {
+-    QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3
++    QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$[QT_INSTALL_BINS]/qdoc3
+ } else {
+     QDOC = set QXT_SOURCE_TREE=$$QXT_SOURCE_TREE&& set QXT_BUILD_TREE=$$QXT_BUILD_TREE&& $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3.exe
+     QDOC = $$replace(QDOC, "/", "\\\\")
+ }
+ 
+ adp_docs.commands = ($$QDOC -DQXT_DOXYGEN_RUN $$QXT_SOURCE_TREE/doc/src/qxt.qdocconf)
+-adp_docs.depends += sub-tools-3rdparty-qdoc3
+ docs.depends = adp_docs
+ QMAKE_EXTRA_TARGETS += adp_docs docs
+ 
diff --git a/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch b/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch
new file mode 100644
index 000000000000..b53c7ff10c1f
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch
@@ -0,0 +1,9 @@
+diff -Naur libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro
+--- libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro	2013-12-26 01:57:00.691752845 +0100
++++ libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro	2013-12-26 01:57:21.705969462 +0100
+@@ -4,4 +4,4 @@
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ SOURCES += main.cpp
+-!win32:LIBS+=-lXrandr
++!win32:LIBS+=-lXrandr -lX11
diff --git a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..afb072588478
--- /dev/null
+++ b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib qmake-utils qt4-r2
+
+DESCRIPTION="Extension library providing cross-platform utility classes for the Qt toolkit"
+HOMEPAGE="http://libqxt.org/"
+HOMEPAGE="https://bitbucket.org/libqxt/libqxt/wiki/Home"
+SRC_URI="http://dev.libqxt.org/libqxt/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="|| ( CPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="berkdb debug doc sql web xscreensaver zeroconf"
+
+COMMON_DEPEND="
+	dev-qt/designer:4
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	x11-libs/libXrandr
+	berkdb? ( >=sys-libs/db-4.6 )
+	sql? ( dev-qt/qtsql:4 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+
+S=${WORKDIR}/${PN}-${PN}-v${PV}
+
+DOCS=( AUTHORS CHANGES README )
+PATCHES=(
+	"${FILESDIR}/${PN}-use-system-qdoc3.patch"
+	"${FILESDIR}/${PN}-invoke-prev-filter.patch"	# bug 494448
+	"${FILESDIR}/${PN}-media-keys.patch"		# bug 495984
+	"${FILESDIR}/${PN}-xrandr-missing-lib.patch"
+	"${FILESDIR}/${PN}-gcc6-fix.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# remove insecure runpath
+	sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri || die
+}
+
+src_configure() {
+	# custom configure script
+	local myconf=(
+		./configure -verbose
+		-prefix "${EPREFIX}/usr"
+		-libdir "${EPREFIX}/usr/$(get_libdir)"
+		-docdir "${EPREFIX}/usr/share/doc/${PF}"
+		-qmake-bin "${EPREFIX}/$(qt4_get_bindir)/qmake"
+		$(use debug && echo -debug || echo -release)
+		$(use berkdb || echo -no-db -nomake berkeley)
+		$(use doc || echo -nomake docs)
+		$(use sql || echo -nomake sql)
+		$(use web || echo -nomake web)
+		$(use zeroconf || echo -no-zeroconf -nomake zeroconf)
+	)
+	echo "${myconf[@]}"
+	"${myconf[@]}" || die "./configure failed"
+
+	eqmake4 -recursive
+}
+
+src_compile() {
+	qt4-r2_src_compile
+
+	use doc && emake docs
+}
+
+pkg_postinst() {
+	if use doc; then
+		einfo
+		einfo "In case you want to browse ${PN} documentation using"
+		einfo "Qt Assistant, perform the following steps:"
+		einfo "  1. Open the Assistant"
+		einfo "  2. Edit -> Preferences -> Documentation -> Add"
+		einfo "  3. Add this path: ${EPREFIX}/usr/share/doc/${PF}/qxt.qch"
+		einfo
+	fi
+}
diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
new file mode 100644
index 000000000000..74322c998664
--- /dev/null
+++ b/x11-libs/libqxt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+<use>
+	<flag name="berkdb">Build the QxtBerkeley module</flag>
+	<flag name="sql">Build the QxtSql module</flag>
+	<flag name="web">Build the QxtWeb module</flag>
+	<flag name="zeroconf">Build the QxtZeroconf module</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
new file mode 100644
index 000000000000..2ddb5859f1ba
--- /dev/null
+++ b/x11-libs/librfm/Manifest
@@ -0,0 +1,4 @@
+DIST librfm5-5.3.16.3.tar.bz2 3304424 SHA256 326d6be04a39a25246800987299bc224385511c95190490f5bdf813242ec3753 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000 WHIRLPOOL 3b24c6d50232f291cb84db379cddbd489a31099a019f4d2c7159e3477ec4459ab0cc7d390b90aebb2a06a7a405d497ce569cdfb02cc43d06b0e210051120ef3d
+EBUILD librfm-5.3.16.3-r1.ebuild 898 SHA256 0deb2a1808477c7ef310d2569843faa954252f97d09252e3bc720d9b742315ec SHA512 356dcf6d5b042ac47a3b335c9da4626d807a1da5c9cb12321e5e35225a4976ecd270d87cd2e26366710dd8515c435cf9c26f949bd54c00f0b8326ab058a7ed21 WHIRLPOOL 439fc03ed75db230438cb778e5bad7a4a694652390e8b6f9e8860c0fc575e8e39e25145849947ee6873c7466b4495415c0f00925647b2d55eb081e4117b5fd16
+MISC ChangeLog 1312 SHA256 dbb6abc360cef77d52a3187d88d95db7fae19caf0d07a9c2a349eb079e07d7ec SHA512 e4841e232abf26d44c538e79babdbb589d33176cb51af471c152eafaa0ebe33fc834d1814736969cc40c320251d1f9c4b42e7ad9857bc6e1e0838333438f4ffa WHIRLPOOL 9f43ac6ae463ed9d6ae84fa73535d910354fa7643d260e25f81237fc1ee2173afd2418d3476a69d3205f2321a0e14b7dcabf53850b8b215125963f54f3dda890
+MISC metadata.xml 213 SHA256 4a27c52461818ea3cca70b39b830a924889f71bacaf27be84b5d2e50375df880 SHA512 afc62e5345c59bfbb6b11d40c122edba3bef3faaa2667881d88f51ceb83115ad19e69f7d99dfd75ca2561d0c5d9c26c4a8807c1a2002bdf6d6ae3e4bc3cec5a2 WHIRLPOOL 2bdf679d1c05341e5acb6466d60ad0ac959206d02e3f540052f0c8b90cbb380f09e143185d39c13f1fc0c4700c47299b6bdde5079cc2e19d837e728b545c6626
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
new file mode 100644
index 000000000000..ee20c76b2fe4
--- /dev/null
+++ b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P="${PN}5-${PV}"
+
+DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager"
+HOMEPAGE="http://xffm.org/libxffm.html"
+SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.22.5:2
+	>=dev-libs/libdbh-5.0.13
+	>=dev-libs/libtubo-5.0.13
+	>=dev-libs/libxml2-2.4.0:2
+	>=dev-libs/libzip-0.9:0=
+	>=gnome-base/librsvg-2.26:2
+	>=x11-libs/cairo-1.12.6[X]
+	>=x11-libs/gtk+-3.12:3[X]
+	>=x11-libs/pango-1.28.0[X]
+	!<x11-misc/rodent-5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
new file mode 100644
index 000000000000..4cf35b89a654
--- /dev/null
+++ b/x11-libs/librfm/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libtinynotify-cli/Manifest b/x11-libs/libtinynotify-cli/Manifest
new file mode 100644
index 000000000000..b85a3c72b3d1
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/Manifest
@@ -0,0 +1,6 @@
+DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
+EBUILD libtinynotify-cli-1.2.1.ebuild 796 SHA256 033b3e1c180ca11330fbb38bc671f5eabc11a6ee65db07811592ee8e544179a3 SHA512 0aaaf4316558cc08459a351ec8ad71b7a0b1c424843d72c671106e522439635637ee14e9259226eb5d0e8fe801ac5570d4b197ccd46404dfdfd020417256daf7 WHIRLPOOL cd252869969a2fdf27c7676d5656c917330123601373f7f9e076069c932425ddb42155bd45b8d979b4959e079edba251c18c3a3ae409165876c9943a1f13e144
+EBUILD libtinynotify-cli-9999.ebuild 834 SHA256 b2b7b55ae49b1909cc2d5f774ae254d3a060529d1076733777eb12215ab333a0 SHA512 bae0bb8c77f1804efd0ab9281366ad3063a319b2692185d10ea634a8ce6e10df21f0563ef650d3b7e4357ba3689ceaf1275abe927978e52ef83fc3059b269a68 WHIRLPOOL b98c4e0e278041a964fa1a67ccdc4fa694c99284925f98c8988a3e92e7e64eca02921642f6335adaff60d50830e815e5772374e1b484b6a03387ed302ebd85e5
+MISC ChangeLog 2971 SHA256 24c2f6b2dd263a954f7aa1cd060407e393fabe09d5e2a075a78ea89bbd7192d5 SHA512 edcf333c2e6129a88ac1eff6f00dae8a547b9656d488f98e75184f1466e57bb1c28db8ab533c223360b2cff31b2fcefaee75564b3b83540cf0f3c5bd664743df WHIRLPOOL 555c5796944b4dbe8f221a8713f1e6e1e1553405b9caed72d693511da3217afee08364d83b41f9a2c7e8427ff4137af281b8277e61c9d233afe068ba3ea04f32
+MISC ChangeLog-2015 1950 SHA256 3957fff827bb5fec025453dc77d791b3b278cbb42916db705843000c71951872 SHA512 ad0938568803d83dc04abfb51b2ff88cdb14b0d17a62ce0399f7ecb98df7ace675207d8fe74a3913396d0d1eea750b3c6757fca0ab713ebc6247363cf1b2b211 WHIRLPOOL e2fe848d48e5a1fab2e59c8242e02a33bba91aa6ff7d38eaaa1404e5af1a31467339218e48ceb4d6c1fd783499f74348ef61111b3c0343d36ef8ef6c217e654f
+MISC metadata.xml 519 SHA256 af175ca638a9f7a261688fb5ff8e0fe7b5344a1dbcc143f0a5d23c9da4ff7aae SHA512 06ce4c0f2e7b95504cad6f060befa1775845344d085f474497b2f65dc158a3fd6d37cb98317f5fc6d6fd9ebd3f2383b74e6357639a5ab038bb221519342c9bdf WHIRLPOOL 472675cc49e7d9be1c263043453b026bba7fe3d8f5f3e63bb18e25e412c1ddf2c6cb71b60e2a64742b2e8e25f8b679e5ae7e806475305c849fb5a8f33afbca43
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
new file mode 100644
index 000000000000..d71dbc25ec9e
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=tinynotify-send-${PV}
+DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
+HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
+SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+		--disable-regular
+		--disable-system-wide
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
new file mode 100644
index 000000000000..101e5c636161
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git"
+inherit autotools git-r3
+
+MY_P=tinynotify-send-${PV}
+DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
+HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.18
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+		--disable-regular
+		--disable-system-wide
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml
new file mode 100644
index 000000000000..59cabc032eb7
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to>
+		<remote-id type="github">mgorny/tinynotify-send</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libtinynotify-systemwide/Manifest b/x11-libs/libtinynotify-systemwide/Manifest
new file mode 100644
index 000000000000..df03f4e9840d
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/Manifest
@@ -0,0 +1,6 @@
+DIST libtinynotify-systemwide-0.1.tar.bz2 270071 SHA256 ae2c3bb845eec3eae8921b7887f0cbbc9f468012020c2d6e2c18e30f8d858217 SHA512 95516208485ed46e4702806bca467af509b9756a738f5f345cec712d878f14f4d9c84b78c33f0e4a41e0bf7be3b6e8e50dcd230da753c2827ae75793ca1c74aa WHIRLPOOL 4d40e217ddd44e64e45bcd47f7d0c0f59e7d3c545cd3f921bcec1f2697dd26ce8f2a2633b1382509616cbbb8402f47632b7b205f6820eee86e13002461b51bf9
+EBUILD libtinynotify-systemwide-0.1.ebuild 734 SHA256 8628023d847c4ea071799c3f6397da81e2a1f73db3f65981b514a40aa972a052 SHA512 eea53d38f575434dfd3644739d61e4ec809a24406d4af2f790b7bcabe399f08451bc315e94c2cb28dbdc928166a09d7c26c4f6c0810601a55750044e3c01cd8a WHIRLPOOL 483d7c44f7dfacb255b92df335dd17419b4272dec057b7dc7f61d7f62b220b4b78e67635e209388959f72041ab236a21531154ac18890324b8e533b5579b3b5f
+EBUILD libtinynotify-systemwide-9999.ebuild 781 SHA256 d01a22d3bd18a327033f642c1d730ad46c568993e59c16c3ff1bb6998d4bb4a4 SHA512 c2714ac7278600a487112bf7e61427a0124e9d892871c7ce32151bef56bfe2f9926b9e95df369c74568edf96ac5787b4e4a5cf51d14702d8224dd02279fe4ad6 WHIRLPOOL 6b95721dba904ba78c986b358fb8bb979d99aa21259ab4907cc77ccdfa60663ea9ad04ae059b12a88562d578e87d1b1641ccb4e7e47d443c67867139971cbd9b
+MISC ChangeLog 3099 SHA256 fb10a26ffa999c01affb19350c643469b044313312100771fdfd140bf958bab9 SHA512 c06815f1c8e0367eb97ae4281769f6bf716cbd41437af6bdfc67db149e37056fb264a54054e5c949a1f49276b677770c1ddf42a24271ea0e14e360e694048d4c WHIRLPOOL 9e856cf55e83021ba42075e837afa9ae8dbf117678434cf1f7b0083097f4e9e5b772e0d8e9a1b5dc66394b4e8ec333ad2f5a814bc6945e4e584ed717fee2931d
+MISC ChangeLog-2015 1650 SHA256 42b1ca61bce7de089d0fad7f4fc7bf572d5c10567fbbaf4123b71214c5d0eeb3 SHA512 926eb85b9373e02f1e9af6b84bf74fd0f0566ec128cd7b674f341101ae18c52ceba53f564621b989949bbfa325036aa56392a25fd8b8707fd6bacc5c775a2ad2 WHIRLPOOL 06790b7814e717bcddc5821b7423a738c52ba59da33a995c74eb62a8d1697663523c7318a34e509f911e55fbfe0b3360b945cd3d272ce251e977a2e9f63dfc45
+MISC metadata.xml 537 SHA256 8afc2624998ca23fbdde48773202ea0000a6dfead5eb12c499bade95c23a0f48 SHA512 31be52e470c741fff7b2d40c325e3310550a3f0816ca66d8be1318a56bc1283e39785e9544d99c241ed8c0bb07a224c162268f050888072cfb1b62e49f8c5cc2 WHIRLPOOL b2168637191433ffc0582f3d00a0ae26c9f7a0772931ba013fb65ad40154f0f3c0f98b3dda81c922da3c9e7b88332b0f041e6191a703ee913304a87165f0f1b9
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild
new file mode 100644
index 000000000000..4543af991c3e
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A system-wide notifications module for libtinynotify"
+HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
+SRC_URI="https://github.com/mgorny/libtinynotify-systemwide/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="sys-process/procps:0=
+	x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
new file mode 100644
index 000000000000..d4effe7755cf
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+inherit autotools git-r3
+
+DESCRIPTION="A system-wide notifications module for libtinynotify"
+HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc static-libs"
+
+RDEPEND="sys-process/procps:0=
+	x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.18
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml
new file mode 100644
index 000000000000..b393cf15509e
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/libtinynotify-systemwide/issues/</bugs-to>
+		<remote-id type="github">mgorny/libtinynotify-systemwide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libtinynotify/Manifest b/x11-libs/libtinynotify/Manifest
new file mode 100644
index 000000000000..7197e40856fa
--- /dev/null
+++ b/x11-libs/libtinynotify/Manifest
@@ -0,0 +1,6 @@
+DIST libtinynotify-0.2.1.tar.bz2 286167 SHA256 2fee7d2f1bb17f1a5c499d32490ded06c1fd9e4300d0edf1b65615c5914dd07b SHA512 4d1d4eb56a654aef523aa5a81cafd51b64f7bf44130f3043d5d6b6ea88fbc7681d96cbde3c16cd00eb141145cb551018129f4bab03f542bf88425beda41cdca3 WHIRLPOOL 6a507e95b8dd9f7884f55f000ef2d76102f5b28b99bfc15f15466487229204b685099a7e6edeb3be1c07203d9f2dc3a3a666e92a22d16d1dc709727aa29d102b
+EBUILD libtinynotify-0.2.1.ebuild 730 SHA256 46e39ebc1e166c627e029f57c193fc4b2a0ed88174a5aa565a3e0383df595d46 SHA512 41b3a4f1844466891429e06b751ac33430a69a47147f24ed8000a7cef6bb16385421d71e10b818a2cad7bed2377fc2aa8b48e28a716ea1af87c70eb490eafe16 WHIRLPOOL 7d1f5a009cf5833720c59bb226b0a1229ed0f7617d8cd1b2adaa230f215db7585a583d228147f7da2f6f1da95a46c59ff1fd7e430c9540ce3dbc300883cfe63e
+EBUILD libtinynotify-9999.ebuild 771 SHA256 c391a06277a126ae097639704e3b09ec07769670b89a56b3bf68f7820a55f2da SHA512 6b1f6f508b6cdd950f77796d6b31bf3495f71b22446b3e259d83c436ed9a39769468fe64ec1de62c5b1abc0117e1bb14cadb82e14b4caf7b1b7420e4b68ba518 WHIRLPOOL 29f392e4e1da3a5ea2ba176edac72158fffb3f53fc2014568fa34fb75db4085ffbfbf22cad3a0dfa1202758bc26bee74eb391f418b1cfb90c5ee002dbc265608
+MISC ChangeLog 2945 SHA256 31b7f129c5de9bbd88b071516f867166911b8b213d795cadd13f55b153936e24 SHA512 97c432233f250d6a97e0d62a07bb9edf309585b41aa44db64815bfeed7a362aef2cb740de7e37ca54d936de559bba4abd43b09d9f7b04881874bb6be1274a474 WHIRLPOOL 2faf6b61da22b4960fef7f22bd68c8db746de7eddc503e8de6d989f918f4e50e5532522c37ab7429542dc1bacfb510eb4210a62a3d0635d3c19635fe072d3137
+MISC ChangeLog-2015 2011 SHA256 3f6ac5ca5415b52c8e1f9c7f413160cf0ee63ac1dde33ed99ec4c7bfce7118e3 SHA512 2da96fbbaf0a4b222a35ca865b51201df8d8983a3715f06ca64899befece0726b45d3c747fe7f14a8347b062b3caaf3fd66aac1f54b25eed78456527e152c0e8 WHIRLPOOL 90968b3717f0cad4ae59a67aa6b5cb58cde259c4e6f0b7c7310c145d91a61b93d70603952b29366fdb9c54e84d5035dc07dd1b1ee281c8b24d8dd2f8cf2dec0f
+MISC metadata.xml 515 SHA256 2ad59f05aced41b099efe3cc1635d52d2936da0652f97ad4588c12ccd993fdfe SHA512 dd7762762cd42f07aa00f3326a2dc4f94fb99acdf973e1b9c0a9e4eb83b361daeff02f0d79bc553c44b2379f26ba0eeb1727b8d7715ec50e03cd155e13c62a03 WHIRLPOOL 30d78c94bac03d6cd6f9f25b1b41056b64df907a1de3acca61de71d8b497c81dcf61c9ed7cfc47bfd1699fc6c5f0f55cc3c8cfbe5b69a7550cfff736389db23c
diff --git a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
new file mode 100644
index 000000000000..b87cfbb96ab0
--- /dev/null
+++ b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
+HOMEPAGE="https://github.com/mgorny/libtinynotify/"
+SRC_URI="https://github.com/mgorny/libtinynotify/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="sys-apps/dbus:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+DOCS=( README )
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete
+}
diff --git a/x11-libs/libtinynotify/libtinynotify-9999.ebuild b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
new file mode 100644
index 000000000000..c2e029412ac2
--- /dev/null
+++ b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+inherit autotools git-r3
+
+DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
+HOMEPAGE="https://github.com/mgorny/libtinynotify/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc static-libs"
+
+RDEPEND="sys-apps/dbus:0="
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.18
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete
+}
diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml
new file mode 100644
index 000000000000..099105f604d9
--- /dev/null
+++ b/x11-libs/libtinynotify/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/libtinynotify/issues/</bugs-to>
+		<remote-id type="github">mgorny/libtinynotify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
new file mode 100644
index 000000000000..ec7d80a1b890
--- /dev/null
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -0,0 +1,14 @@
+DIST libva-intel-driver-1.7.3.tar.gz 1648659 SHA256 c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118 SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878 WHIRLPOOL 342f053d95f37cd9177bb90edb2ae31a49bda062fe85226f3cd1db58aee41a23eb5755e3110e9ca2c76be51e441753b26ab588b781bd8727ebcc8b79c69278b6
+DIST libva-intel-driver-1.8.0.tar.gz 2308240 SHA256 45a38641f3ddbd43d9c053bfd9cb809ecb2d5f5227f0e3c1c5a8d51dccf81b35 SHA512 fbf68ad5f7558366dadf6e8d834ed89665e86167676ca72fdca218023f5709b0bdf1b124f11ed3f7c10b60741a2574a8ea7c3e5607a6727d3b9cc2ed44981542 WHIRLPOOL 9907ba61a3ae7fb512a34c20a2e53a8e309b772a3cea6c898e4caec376646c27db80983ebbac1da1ab25da7e7c917e81379871ee91f58889a46c5d083175efee
+DIST libva-intel-driver-1.8.1.tar.gz 2309572 SHA256 0c591b31dce558f14d2be8a9ed0620704499159b7fe65b830e914b027fd73d58 SHA512 a7c414ce32f1724acf62dd67099e5b0642aae880434232adb26f228037ccd8f070a0d836a541841992513c2945520bf2e4dd70309d8d551a892d845303489baa WHIRLPOOL 8d9ed67fe72d21c4ffcd9e0f98274be8a5e0296c85184146ee3d19d57f99330d2a57729ccd22997e5ea9f3515babf4d97a7eb84273febf0d9a80af56785b9de9
+DIST libva-intel-driver-1.8.2.tar.gz 2309998 SHA256 8c7bba21abbb63cdbd3f5e7fb3b4ce9a2f9b7cdf22018f38e4cd7815c5e98793 SHA512 047362e2ca301e01db8bd73450595c91fd4da36da4737be2fe7ba32086a0ead3443e9247ae84f87034c9ded3f046c314af0d1baab8930bb03b77f22ad1fac9f0 WHIRLPOOL 401e64184c9acad41fc8bf2be3fdf0d9c1443ed71fa55b5336d5a924d85b3905d1077b5f5c732dad11017680f13f6f3046aaf95f9c3351bc515aa63d85370855
+DIST libva-intel-driver-1.8.3.tar.gz 2591242 SHA256 e837b6c704ce4bffa0e6d530431061d99e42d4e4df990092937af522ca04f000 SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990 WHIRLPOOL 86c74e971ae92c82609f919b18b6ff91444d6a4f8ff87821cafb1fe2d78cd7683b6b68da74efadb494ec0b3e6c847a13b8bbdecc3caf07b1cbead1fde6300cc2
+EBUILD libva-intel-driver-1.7.3.ebuild 1412 SHA256 ce2c09121b49e2edae9926c166bbb58ccbfc5e06590e64f2f5d92cc3a86c2a84 SHA512 82f35982511b9fd6d055333cfb1c0717e4a9e50d8785df0f589ecfb76452b443452264fdf6963241fb2104eb46fe3d074747137301cf43cfaedc6d764b4a4515 WHIRLPOOL f702b1ac831761c6d25ca5de2aac7fc556c5c659225c00ee1bc1f4dee193f299091d660fcbf3ad6a88337d5d02cf15a0a2048c09cb8114a29b7759ce64c9e1f0
+EBUILD libva-intel-driver-1.8.0.ebuild 1429 SHA256 594f3ea15c380d735d43e8de51c036bfcc4d3987b3662db3f078aa339db97eca SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5 WHIRLPOOL 03d0515b1710dfc47943f639e5f91950ab58c76fe230dfd5fedbaac9412065c5ad85f73fa4d2d95c860a33a2003d3d611dd3dfaecd24111c96a6676694dff1f2
+EBUILD libva-intel-driver-1.8.1.ebuild 1429 SHA256 594f3ea15c380d735d43e8de51c036bfcc4d3987b3662db3f078aa339db97eca SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5 WHIRLPOOL 03d0515b1710dfc47943f639e5f91950ab58c76fe230dfd5fedbaac9412065c5ad85f73fa4d2d95c860a33a2003d3d611dd3dfaecd24111c96a6676694dff1f2
+EBUILD libva-intel-driver-1.8.2.ebuild 1429 SHA256 594f3ea15c380d735d43e8de51c036bfcc4d3987b3662db3f078aa339db97eca SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5 WHIRLPOOL 03d0515b1710dfc47943f639e5f91950ab58c76fe230dfd5fedbaac9412065c5ad85f73fa4d2d95c860a33a2003d3d611dd3dfaecd24111c96a6676694dff1f2
+EBUILD libva-intel-driver-1.8.3.ebuild 1429 SHA256 594f3ea15c380d735d43e8de51c036bfcc4d3987b3662db3f078aa339db97eca SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5 WHIRLPOOL 03d0515b1710dfc47943f639e5f91950ab58c76fe230dfd5fedbaac9412065c5ad85f73fa4d2d95c860a33a2003d3d611dd3dfaecd24111c96a6676694dff1f2
+EBUILD libva-intel-driver-9999.ebuild 1429 SHA256 594f3ea15c380d735d43e8de51c036bfcc4d3987b3662db3f078aa339db97eca SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5 WHIRLPOOL 03d0515b1710dfc47943f639e5f91950ab58c76fe230dfd5fedbaac9412065c5ad85f73fa4d2d95c860a33a2003d3d611dd3dfaecd24111c96a6676694dff1f2
+MISC ChangeLog 7078 SHA256 1f25556a9c337c30c879f0567c5d713c0f0f4e74e72be1d7a789b697e084e97b SHA512 0c559e96c7c08f41124fc66cb31c5f2180a051ef3a5f174771da90e76886ac654d456dbecf6c91b7ff06e1047d8125b6f400d820f09ce4f2a0303f440b6e9bae WHIRLPOOL a56102bc5fff5b87d2ddb229e0be5a6bda9294d1244c07a5d00ca0547c2d6ea2e6995e6b695037dd03fce4cd5ead5f287d29f41ba5e7c6c50bda0adf798a8e90
+MISC ChangeLog-2015 8007 SHA256 9cee761d524e71309a729428815430b882c2e23510325e1fb4006afff82a5ad1 SHA512 d6b137c4db1ad7552ec825dd0074b66d46e0a5dd6435d90a0a27e828b8aee396cf8bae424fcc3fc421642668f59001f5350d8d4cf39897aa3b893254a79c0ac9 WHIRLPOOL a22d93ce1b9e3545eb2005f2efe5fa550027451836a0e5a10ddddbbec1fc3d9fc903a5c93aa4ab2adb3cbfa67dfb3fa7f9b0806197775716ffce44adcf5cde66
+MISC metadata.xml 421 SHA256 a17d8e98407882984393b95229d8174aab9a6293a86744f6ee59c67ea9bcf4e5 SHA512 a4a6264acc0467edc025240668f4ebcf7455e3ffc698dddfa69ae90da0946579ec55c96b346a4eec91e9b8985a12705594687c665df524375a9a8b0e0dbe35ae WHIRLPOOL 1b22265694b9f14fd3653b94682cee34dd72fc03c525abf2aebe3243e076a2a20eb3714966304229705a76bbad286198b1015eb73417cb7bd432aed76a0a825e
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.7.3.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.7.3.ebuild
new file mode 100644
index 000000000000..f50c52839325
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.7.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.7.2[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild
new file mode 100644
index 000000000000..053f134f8eb5
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild
new file mode 100644
index 000000000000..053f134f8eb5
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild
new file mode 100644
index 000000000000..053f134f8eb5
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.3.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.3.ebuild
new file mode 100644
index 000000000000..053f134f8eb5
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
new file mode 100644
index 000000000000..053f134f8eb5
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
new file mode 100644
index 000000000000..e2ecb4c8283d
--- /dev/null
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <use>
+    <flag name="drm">Enables VA/DRM API support.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">01org/intel-vaapi-driver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
new file mode 100644
index 000000000000..161a1c05aac1
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -0,0 +1,8 @@
+AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 SHA256 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301 WHIRLPOOL 801511b1d4d91ffc50f03c1ed53b5469db495fe62b88ea987857e2c109b53eb441aeabbd1043c0f265ff0bf020da090ff978239d3b8d4d2e89e5e2fff37ca591
+AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 SHA256 031f1a6b43c20fc3ac2f9da841eff02f6950569cb34f0b4be9fc93642d2dd927 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de WHIRLPOOL 2a28f72863c6fa0b36f99d398dead39051d895dfdbf3929809d3f5185a121569da96148c2c49a7ccd17cd3ded058f71de0be18fd9ade6844d0989c0d02be6ca5
+AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 SHA256 74b9ccd36e7fb90655e0855cf62111fd555390d1a396983af5687b9e8af64cd8 SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632 WHIRLPOOL 22ee9c6a5dbc9f62f28d6602ceaf9729753d45eb1b097005df1ab9cf4d4c06ea497dde8a6abeead13707a2c0412dc510a927bc44240771ff08adc82de74f96c1
+DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
+EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1135 SHA256 fff855d6b4bf3fee596631818986c2ec1dea3ac13836d6f77c45a7a307c4a0c9 SHA512 113fc968bc1e276d1f04df7d63add804cc619e345e333309f0c14c55a586512832c0e99b43f2732e9128b55321d42b39394f8b4e733baa07a66b4eecc3d1b1e8 WHIRLPOOL 64926a586010f13624bacfef4a93ab829911aefb45c9a480cd6f7a5869b9bc7d4d08278c5dda002c4f9d700dbfbff83acd30f8832bbf4cad48247e18c02de40d
+MISC ChangeLog 4595 SHA256 11fb62f1663f3b0c98c368db55a9b7ddb1dc329247edba61cc6e9a2bcdeffa9a SHA512 7bd899792bd1a49822426ae3a2c70990c9386f29d17c5333b8800446dd255eadd65ca71a4d5854b9985241c9173a2fe13946be9253ae5c862ddbbefeb01612e1 WHIRLPOOL 2b4997542dda45553066f09a39fec86a4b1c07160e631e046290ddb949996795bbef375b7b843a6b43c0680371e40ef807cd4afc1a0abd5e67f038a0cf9b83a9
+MISC ChangeLog-2015 5583 SHA256 8e24191f3488d7be1e70fccdcacca318fc6713c13622eeba663ac91f9b408e9d SHA512 f660ecffb7653caea2b1d22d66a7e226d4a86fd057d525cd4cb81caf569e30cdd808f3eb1c65124086b5dbbc48aec98ebe2e96ecb2404ed30c5884a9205a84eb WHIRLPOOL b0b780654ba59df85fdc7f1bea8e88cdeb182ea7a4be26e2f79a794478be9b4165896e08f0d8758d6cfc7abb5fe9bee19ac825145eb2eab86a5e78fff682b5d4
+MISC metadata.xml 354 SHA256 47431000bf27b89ea7fc385614736723629ffb54d9e4ab6936eaf3ccc943cd93 SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd WHIRLPOOL 83a91d522f07e16330fe3a42bc058cbf7981ab54038b033a9ebe3d97b6157ac800b0b32c8da2419b548107dcc80179b59691436074ce9c0be499802032d65484
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
new file mode 100644
index 000000000000..74caee3483df
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
@@ -0,0 +1,29 @@
+>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Fri, 21 Jun 2013 12:55:30 +0800
+Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
+ dropped from VA API
+
+The driver doesn't use them indeed
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ src/vdpau_dump.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
+index 899888b..610e7cd 100644
+--- a/src/vdpau_dump.c
++++ b/src/vdpau_dump.c
+@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
+         _(VAEncSequenceParameterBufferType);
+         _(VAEncPictureParameterBufferType);
+         _(VAEncSliceParameterBufferType);
+-        _(VAEncH264VUIBufferType);
+-        _(VAEncH264SEIBufferType);
+ #endif
+ #if VA_CHECK_VERSION(0,31,1)
+         _(VAQMatrixBufferType);
+-- 
+1.7.9.5
+
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
new file mode 100644
index 000000000000..221b9608fe44
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
@@ -0,0 +1,16 @@
+--- ./src/utils_glx.h~	2012-10-05 16:02:58.000000000 +0100
++++ ./src/utils_glx.h	2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++                    
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
new file mode 100644
index 000000000000..6d6d47ad0b06
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/517778
+
+--- src/vdpau_decode.c
++++ src/vdpau_decode.c
+@@ -1289,7 +1289,7 @@
+             driver_data,
+             obj_context->vdp_decoder,
+             obj_surface->vdp_surface,
+-            (VdpPictureInfo)&obj_context->vdp_picture_info,
++            (VdpPictureInfo *)&obj_context->vdp_picture_info,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
new file mode 100644
index 000000000000..3ca7e6224bae
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib eutils
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	>=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
+	!x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glext-missing-definition.patch \
+		"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
+		"${FILESDIR}"/${P}-libvdpau-0.8.patch
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
new file mode 100644
index 000000000000..e0c65e53b38c
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+<maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
new file mode 100644
index 000000000000..26d51d5fa237
--- /dev/null
+++ b/x11-libs/libva/Manifest
@@ -0,0 +1,14 @@
+DIST libva-1.7.3.tar.bz2 824490 SHA256 22bc139498065a7950d966dbdb000cad04905cbd3dc8f3541f80d36c4670b9d9 SHA512 ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0 WHIRLPOOL 9836b043d5ae3d9d19e97bf309396f3bae179bfe10fe0ce432ee9b4106b9608926430933c229e147fc4a391cbc12039281bfccadec0a0159b77a9afeddb4e6b8
+DIST libva-1.8.0.tar.gz 195261 SHA256 924ed467d50a24018428448071a311d6467e0d40dc94731e2164f9d5d61bac51 SHA512 0f1b527d67497bc501f2f1acdddcb2519f12a8682a6d98303e7d86dd88b6270eb25e3b0789179aaf5f3b4c70b7e8448eb5505cbadeb0b44c9727ac7cf77a51d6 WHIRLPOOL 220f4864835d11ae70457d76c549b03cbad35f285f697e3f470cec402573cfdf3811645ae7cea3ea7af96f77ba504ac9f563f3966e84a7108990122e5cee241b
+DIST libva-1.8.1.tar.gz 195281 SHA256 b8b876dc5571f278ce418ad81d9bfd689453e33ba39aeb681d5d53d226b17e36 SHA512 381267a1835a2c98a5fb093597aa795929afc4c64e2c5fa3aebb6497acf27428dff05ada5ecd698c25c74a350aa5bd9c42baacfcfe7028b2b420d52e10c78bfa WHIRLPOOL efb43f1b2aede1f91fbe30fe47123d87c3edc84370bea829d455faaae82dbe2b51cdbb53e0be77a5f5a55daab940e3ccbced0504d786fd6a641ad12e6497a335
+DIST libva-1.8.2.tar.gz 195281 SHA256 bce8a3b8f1274dcae3e42146416fd9d1231bab5c40666b7b8aa9e534faa9d400 SHA512 1cf6ab6155e53d09d13710e23bf7baf6dfc33fb121d2171792fc258a41a78bbb5741bf6860f72a832f15e027034aa1e19b4feac0a1ba02ce8b19b2081ac730a3 WHIRLPOOL 4ab45eabdd7b5dac1697d236b4fcc2ddb35a99e78af11b96934ed0da36f4f37ae850155ece3cd1a856c3f081052b757a932a1aa9f999966ea784db47309b3831
+DIST libva-1.8.3.tar.gz 186915 SHA256 5ac4b0156c39cbca78913ebc0ff823b1abd5faa41121204c0707d62c27f07285 SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea WHIRLPOOL 8d34b91a9a553ce871bf2f87cb5f06cd49cf63b8ee567f23a39e141a9420aa01c39ff45653a2662a0685881c383f0542063f47fea73e92a372fe3218ae7cdd5b
+EBUILD libva-1.7.3.ebuild 2419 SHA256 aa2cb5f7e4feb41dee00646e9cc117abb9a0ae19273a36102af240c58de98b11 SHA512 1ca4390f5f33a468751ece4e6fd0acb48a8791904b10cf7a3bfd6546adca38714561240efd675095bccacbe3dd5e887976a5f2bcc279f9d440059b6076eb75eb WHIRLPOOL 103199483c0fd3d1805a6b452833d463e3062475a47be383f18f438d3c0ce03eb9081a670f28a7f6724d018edc01ee9ca2cdac694f7aefde466699c13c3eec8e
+EBUILD libva-1.8.0.ebuild 2427 SHA256 a013fe0c65cedc262327e9cc00d35313822a1a971fda6214711fb457390b5fee SHA512 af7e4ead09e69df8f26f2b958bea2ca75fa8a44eafba77626aa64ba8480740f5d26e01b6f6ee9577830029aa4401f11bbc7d64179bb4d06029e5f06ab512f847 WHIRLPOOL 9ceabf55bf060fb73887d8a9d294f2ec36d89b5f0932905515dc61d7c749fc3ca65f33776a82fd6cb63097763ce66dabdedfe9553ef0585f9f8267c91d6f076e
+EBUILD libva-1.8.1.ebuild 2427 SHA256 a013fe0c65cedc262327e9cc00d35313822a1a971fda6214711fb457390b5fee SHA512 af7e4ead09e69df8f26f2b958bea2ca75fa8a44eafba77626aa64ba8480740f5d26e01b6f6ee9577830029aa4401f11bbc7d64179bb4d06029e5f06ab512f847 WHIRLPOOL 9ceabf55bf060fb73887d8a9d294f2ec36d89b5f0932905515dc61d7c749fc3ca65f33776a82fd6cb63097763ce66dabdedfe9553ef0585f9f8267c91d6f076e
+EBUILD libva-1.8.2.ebuild 2434 SHA256 36dd8ea4557a86d70bd003408f8830f874be630df5e646057c00b9b0775231b7 SHA512 94a636d73be9ef6e9625dd274037eeb28c5d7befd3df6be396d5ddf0dc47efc3a156e8e47566b1da67fba25456ac6b4d7d55509b7c91f86e9099848867c43507 WHIRLPOOL fea812bba5587e460214ccdca3443e8605aff127e21a87ae59fe554e7d98db1deda8561ae950d5096f6e647ae3f98be677aea449fe19203508e1f2f1ebb95d72
+EBUILD libva-1.8.3.ebuild 2381 SHA256 090b78cd3b9b6a7acce592ba8b612b703de103ab8de2fa2e326c7d34dc277758 SHA512 42cacd22b66ec66385a00e344555d1570b56a426d85a3025a46caab910d3b068e3e12127c7686dfb490a85e0b874e0488dea27a455a0a91e184fe61fcd879201 WHIRLPOOL ce5c4ec5cc3f846d9a9e7aa0c0ae8e282d03bafd36c14eb667fea6bdd95ba4cd78fe0a5cfdcbdb927c33649e303aa45b77ae30d924be6f965031db6253982a8d
+EBUILD libva-9999.ebuild 2381 SHA256 090b78cd3b9b6a7acce592ba8b612b703de103ab8de2fa2e326c7d34dc277758 SHA512 42cacd22b66ec66385a00e344555d1570b56a426d85a3025a46caab910d3b068e3e12127c7686dfb490a85e0b874e0488dea27a455a0a91e184fe61fcd879201 WHIRLPOOL ce5c4ec5cc3f846d9a9e7aa0c0ae8e282d03bafd36c14eb667fea6bdd95ba4cd78fe0a5cfdcbdb927c33649e303aa45b77ae30d924be6f965031db6253982a8d
+MISC ChangeLog 5687 SHA256 f84de19a5d88e1c0477aef678277bb6bfa1bb877158c1d9816b562da59b171eb SHA512 8a1e02c24b684720e72d83665c0322b3afe0ae0a31661eae049026c24c5234103a211768c1e5f7f4ebb5c92561c92de64232441c47290a767b85936c53020371 WHIRLPOOL 366249f758e7230221d05ede77141340fae7ea91571f13b483848ecba7676df12517720af05b57add5a46604300d5e8bc13601bc4155d9e24ebacacb5348f737
+MISC ChangeLog-2015 11227 SHA256 b8e6b85d701cccb86db9104d314f66b1d01cb44a243b31dbd09e407bd047a082 SHA512 0ae86a052b5f6e5eb8f3656c9f1e0d4bd1a54d298c2bafea2e5866c102cc26fb21658c3d6296b582b16bcabde270a1db3f5b7ddeb6ee29455e39753a225bd167 WHIRLPOOL 3e6974258bbc41f1b87ee9296d6fd35cd665fec93c455e8176a5f47164527c29ff69dc958d3a87c8ee846463f557a9778a950e500b1c77d31a465eb99699d210
+MISC metadata.xml 520 SHA256 7684ae10c30b24b7df3f5f34a580adfa55107783dce6997789ab5b44f93b599c SHA512 de563ce4e05a8410cf94f2b8776addece7ae152184422592c33bafb5bd946e36afed9e27c32177d6df169492246f22e22f8503c6f62051e701e42618b76dfec0 WHIRLPOOL 8c8885066e721901f8b176f479d3b80a69689bcc65b769e5ab3083b86372045cf645737d29e34ccf1d2d2741905a9c38688c850fa76b6d6481c2d896e910bf52
diff --git a/x11-libs/libva/libva-1.7.3.ebuild b/x11-libs/libva/libva-1.7.3.ebuild
new file mode 100644
index 000000000000..f35365ca9540
--- /dev/null
+++ b/x11-libs/libva/libva-1.7.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+
+VIDEO_CARDS="dummy nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.8.0.ebuild b/x11-libs/libva/libva-1.8.0.ebuild
new file mode 100644
index 000000000000..711ad8c9a1af
--- /dev/null
+++ b/x11-libs/libva/libva-1.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X utils"
+
+VIDEO_CARDS="dummy nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.8.1.ebuild b/x11-libs/libva/libva-1.8.1.ebuild
new file mode 100644
index 000000000000..711ad8c9a1af
--- /dev/null
+++ b/x11-libs/libva/libva-1.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X utils"
+
+VIDEO_CARDS="dummy nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.8.2.ebuild b/x11-libs/libva/libva-1.8.2.ebuild
new file mode 100644
index 000000000000..687996985436
--- /dev/null
+++ b/x11-libs/libva/libva-1.8.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X utils"
+
+VIDEO_CARDS="dummy nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.8.3.ebuild b/x11-libs/libva/libva-1.8.3.ebuild
new file mode 100644
index 000000000000..702170c3b9e1
--- /dev/null
+++ b/x11-libs/libva/libva-1.8.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X utils"
+
+VIDEO_CARDS="nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
new file mode 100644
index 000000000000..702170c3b9e1
--- /dev/null
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X utils"
+
+VIDEO_CARDS="nvidia intel i965 fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
new file mode 100644
index 000000000000..766c0b39c765
--- /dev/null
+++ b/x11-libs/libva/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <use>
+    <flag name="egl">Enables EGL support.</flag>
+    <flag name="drm">Enables VA/DRM API support.</flag>
+    <flag name="utils">Install VA-API utility programs.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">01org/libva</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
new file mode 100644
index 000000000000..09d8c665bcc0
--- /dev/null
+++ b/x11-libs/libvdpau/Manifest
@@ -0,0 +1,5 @@
+DIST libvdpau-1.1.1.tar.gz 541752 SHA256 5fe093302432ef05086ca2ee429c789b7bf843e166d482d166e56859b08bef55 SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb WHIRLPOOL a17e69104ef89606592e0242af9d2397e6d1647d55e14d02f2816e997d4d84c5a68cd2f9b7388abd47025abb850a09883f83a77585e194f3bac89ac190d47d46
+EBUILD libvdpau-1.1.1.ebuild 1240 SHA256 9b85bd7ec26abaf4def60bb1ce90a0c31d44fb83d4d4502a8c2f45ff730fe2fe SHA512 33facff0c76b3fd95d21c15ec3dbb59b59b744b31855d2de34ee622e4d8147c9620f3f1876bfe6ec3ed1e4e00a912b0b39bc30a0af24180d99cbb32e9bf84b28 WHIRLPOOL 468a7c1de1b797d48d0e192183acfe52d9c9c27e1c0b354b45dccc9a318550c19e70ee266b59759fdc24b90c9065e195d864ed7acb90a6351f5cfbe7f8907038
+MISC ChangeLog 4351 SHA256 e51f97f4221e964ef6074b3f7120158cf589408e9f33a5d99fff664c360f3e52 SHA512 5012638b7aeb16b0614820a18cbce0a24c5d22354a64a84665da6d18176a600bf2985416734ca2a161b01fdd359b72455219086aaf49566e06a0d8ef5960d543 WHIRLPOOL 31885dd0fc844f904941cb900970e86923a55e3377abeed6cbff2fa83e7e137882db85875737ac07db4e177e987db496039f22abb85dada922226dcf12b2232c
+MISC ChangeLog-2015 5720 SHA256 e7132e516e7fb77f346dbbae72cb1851b3dc5ec6e7b321310c8d5927ba3f25cd SHA512 4a5cca165b6fa6184011df1904a6a7bdbe0decbbc2539bebbee61e683b8d8058da2f2b0b991511d7210033f58f55bdc26ca78910bf7cba74ca741a1da016ef3f WHIRLPOOL 0ef5107b50fcd0950a75d5bb03e3bd1fa42c6f12e93bfa1f1206c15b0497543d84d94ec09d034c83e5f6cfe9b98e73484819c0e278e8e057c83d503cd6891d15
+MISC metadata.xml 244 SHA256 a65bfec176330796e1eeb3bb589b78ff60a123b947537decd4705ea71ca4e906 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db WHIRLPOOL 1164de6a99d8931ca3ae60cbb397be80b802eb473943ef777dbe8473d8d665a5f93d8b99175709bf09d8af856b3ea7aaf7c95a87aad37e48b85c06e618431a1f
diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
new file mode 100644
index 000000000000..a9837898069f
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+VIRTUALX_REQUIRED="test"
+inherit autotools-multilib flag-o-matic virtualx
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+	!=x11-drivers/nvidia-drivers-180*
+	!=x11-drivers/nvidia-drivers-185*
+	!=x11-drivers/nvidia-drivers-190*
+	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( >=x11-proto/dri2proto-2.2 )"
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable doc documentation)
+		$(use dri || echo --disable-dri2)
+	)
+
+	autotools-multilib_src_configure
+}
+
+multilib_src_test() {
+	Xemake check
+}
+
+src_install() {
+	autotools-multilib_src_install
+	prune_libtool_files --modules
+}
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/x11-libs/libvdpau/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
new file mode 100644
index 000000000000..e5c15f0077a5
--- /dev/null
+++ b/x11-libs/libwnck/Manifest
@@ -0,0 +1,9 @@
+DIST libwnck-2.31.0.tar.xz 630792 SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 WHIRLPOOL 369c0ce1f412a0874d2f3a09e387405632726259427fff013adc4d619f4f9f80b57e376252746bdc7fe54f27749e51127ccc0870a80629cb98afb45dc420f941
+DIST libwnck-3.20.1.tar.xz 693932 SHA256 1cb03716bc477058dfdf3ebfa4f534de3b13b1aa067fcd064d0b7813291cba72 SHA512 68e9ec8795a0c54edfb31299f48daed5b8c8aab9462a38fd6336f88c29cb96cff66bf852a6049fc34c28bd6cab2e5e6863a711b0ce726999ca7f8e9b07f0eaf0 WHIRLPOOL 2a3370a410203c92845fc65333566a176f6d69459f6aab0b4c31e08902b655284e4ecfde84fc116bc6b6d8db14b593a3faf9077f76b0f823ab283e12387d12f5
+DIST libwnck-3.24.1.tar.xz 821508 SHA256 afa6dc283582ffec15c3374790bcbcb5fb422bd38356d72deeef35bf7f9a1f04 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1 WHIRLPOOL a65658d8b17056609cce6a012ef7767f5fc6817fb68d7daae3d816de5dd911db31c0706c18bc737bc0d6db6fd459bd858c01f16ae2ee518caeba9c329c580a5b
+EBUILD libwnck-2.31.0.ebuild 1259 SHA256 09a2e681fc0cfc269ca07f54b576d3ca44bb97560234f6191b845fefb025a9df SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908 WHIRLPOOL e76f05cd49b564d35eb4554e3ec15dcc7f22cfa1203c89e3e74022f296528986ea69e2d98b83d21909f9536180dd7aefac1a77ed5cb3bb113b9fb5a5c3ff5378
+EBUILD libwnck-3.20.1.ebuild 1165 SHA256 b8dab7747d14ab604af18527fe90bcf48f9d6449517b74e9a893046561d9268a SHA512 32f9bca3d0a1b8dcfc3a086f0572d8a042ef7779dba599304caef2bdbf717565d05cae8ad3205cdd48a744e7a18429506c1b44c9325a542b4e682d78a841f25e WHIRLPOOL 6307fd009827ea03c38543eb6723166c46313cda87495924010ae2ec7e2ccc4ce1d77871697fc2455884425f009450d0f7fe9538ce98adc8d7e23bf8dd4c9731
+EBUILD libwnck-3.24.1.ebuild 1163 SHA256 e970578466360ed7aa580d0f7f5f702141efa566da80afbee3d56c04b382ab6b SHA512 8c2d9de455489d7948349166b056cf37a07c6b9f613421036674251540f2815bd5f093d3a2b64c9f47f9a575a4a82db7ecc6c35701e9bdce7d36bb2501777f72 WHIRLPOOL 34486f3fbef56bb7c86693066d9d60e4060263d9ce5cc5594a1f0849b983e513bbae31411152278dae4b89630b59a77c442bd8ac2a028c906a3bfbce768ad06d
+MISC ChangeLog 4949 SHA256 442577ee06186856a61862c35c8bd4e58667e7347616c48af75ef226f1dec014 SHA512 9497ae80616969a56836a2995bc169ebe71c4740be6adf14b2cf51da74549960c41ca90c104d05ba00b26514977eef15a7079d1e7fd1b3261ad909f95ce55a7b WHIRLPOOL 827b7196e1ff742c007cb4b372c79932dc41ba8ce5ed8ecc72915b558257a8eb6fa79805efa1b913c8490c6b4555c11a21305e031a3f64ec3615fc5aa06eb2ae
+MISC ChangeLog-2015 42563 SHA256 87ebd024f1d3501fb47277c10c899b431084582dbd1cc05ebd1a88c24cc9648d SHA512 f46c91c306903aa240be72b4353e07620a4247f07ddc1a1202557b90d9ec55664d3d84ee891fd4d688a0fa5cefbf4378a70078ded4ba6772e1f4027b97eee0f1 WHIRLPOOL dfbc0d2243106a94524492ed5f20c5c9b95f3733609a12c0fad73c111e7674debc58ecf0baa30320e1fc5abb05679f9db39762677f2342a02bfa4a5207293ec6
+MISC metadata.xml 364 SHA256 1981d19fcf3a6c2643689e504c78b78d06a17181b94da31aac48e7eff4923713 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce WHIRLPOOL f5956658a78d8f91fd8859016e297a482e879aee497f54e48cf5b5ca0d5a68158192efb267707c74985f8fcb62462338908f7d09fbb2032a8cf43978c73ded38
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
new file mode 100644
index 000000000000..5a6db92b21ff
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="LGPL-2+"
+SLOT="1"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.19.7:2[introspection?]
+	>=dev-libs/glib-2.16:2
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs
+#	gnome-base/gnome-common
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Regenerate pregenerated marshalers for <glib-2.31 compatibility
+	rm -v libwnck/wnck-marshal.{c,h} || die "rm failed"
+
+	gnome2_src_prepare
+}
+
+src_configure () {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/x11-libs/libwnck/libwnck-3.20.1.ebuild b/x11-libs/libwnck/libwnck-3.20.1.ebuild
new file mode 100644
index 000000000000..8cca04622fb4
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.20.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification tools"
+
+RDEPEND="
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=dev-libs/glib-2.32:2
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs
+#	gnome-base/gnome-common
+
+src_configure() {
+	# Don't collide with SLOT=1
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable startup-notification) \
+		$(use_enable tools) \
+		--program-suffix=-${SLOT}
+}
diff --git a/x11-libs/libwnck/libwnck-3.24.1.ebuild b/x11-libs/libwnck/libwnck-3.24.1.ebuild
new file mode 100644
index 000000000000..c34de53769af
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.24.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification tools"
+
+RDEPEND="
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/glib-2.32:2
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+# eautoreconf needs
+#	sys-devel/autoconf-archive
+
+src_configure() {
+	# Don't collide with SLOT=1
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable startup-notification) \
+		$(use_enable tools) \
+		--program-suffix=-${SLOT}
+}
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
new file mode 100644
index 000000000000..edf87c6f6e80
--- /dev/null
+++ b/x11-libs/libwnck/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3
+			command-line tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
new file mode 100644
index 000000000000..ba56cdf16be4
--- /dev/null
+++ b/x11-libs/libxcb/Manifest
@@ -0,0 +1,7 @@
+AUX libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch 8094 SHA256 e61b4e54ce479a9512c4429bb5ac633830c2ad8813a09276bf0d609fedf4bb4b SHA512 0775a4c98bda6d37a44c83ed67d8ec7c8bece1d4a7b0f3d06d7f7c16596cb5de27a77e1ef1f40921555a60a3054124c8c1192c8b4747a3a84d16d847341379b7 WHIRLPOOL 183ad51704bcaff08389a3434228b6fbaa2ef04e55d2d29e3f0e0f1d2550693b6d1847a23636fb2aa18cb65dbe0ea5af48d31a35f293afa2299b1de79fca378f
+AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 SHA256 fef834cb600cdeafac052be9535f9e84e5e71d2434bdd43deef8b116a459123b SHA512 ad3b9d9b16b42756a72e583b7d42bd670ef581b614cf185de667badb6121524b84f2738933d2ea1e5da3d135b3a5f2296eb62206463bedc9e4d3f8343f476f85 WHIRLPOOL d99abee5011965dbac58da5a87399865078f403cbf15614cd558195fb12e2ab052bd154076fd9520f256c3d456bb3f17645f78e1f90511159ad416c84c950a71
+DIST libxcb-1.12.tar.bz2 613822 SHA256 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896 WHIRLPOOL b2dd2d6e441c20458c9a4a372f9bb336dd2bbd2865de7b63cc223977af86cf80f13f0afb42f3e71bb1ad6b9ea10dc62df9df5e12c54f7822087fad0c107adf87
+EBUILD libxcb-1.12-r2.ebuild 1794 SHA256 8e7f7737d71c05c2a4ed6620064caee2003a8762799cc833225cb54d10592440 SHA512 7f1d8573eef31fbb309d5914c0b31df5c5f43083446263b7d88ef3683535f1f2e7e8194ee0b8e9a633eb1d52a3533a1f967d317b2e42589443269abc9c94dce3 WHIRLPOOL 3bc90f139ed4f9864155671910e26ef2dde1af6d469cf616962361577f452e6aa66c684babcb74e7630fa1312141f6e716777c5efb5bebdb2e2eaa2dedd200f8
+MISC ChangeLog 9758 SHA256 5d1f0fbaf91c87b98e0edd21e44f9e42891ac43d0d29945426c2cc44c83f7001 SHA512 cb6a6dbbe566461cf745e7924d7a535bb7316a253fc71e76baabd65ddefafa9ebf9d7cc16e851426dacc0ebbcea936c9ef35e2556a09dbf7ea36b6c42703db87 WHIRLPOOL 8475ca72cdb5d8340b9558ba0b563c0dddb17d3b15d06b13b0b2a45d9d480ea34a943b890f6c80721783e42e68acb42632cfc46f19db2166e2b462fac5ee9294
+MISC ChangeLog-2015 20133 SHA256 4b033f2a4ce2dd9044d70c2be95cf23bcaace9af58c365abf669fdeac879f7a9 SHA512 cec26ee62dab347ce04a0e2967962460c755efd0c2660ee2c6d6a4466737023e5747898b3fd9cb929f257f061c5cec7f45af3f2576a53dffe436ccea66e1b8f9 WHIRLPOOL 9776f01bf172c73ef5af47e4e2080d97a2a6895137c0b1ba353a2856d6ee0555eb6797b299dcb43aa942c06ce2aaf787d8fb5460fd76ef25d82c9716058da321
+MISC metadata.xml 319 SHA256 ea9cc5ece3a6d44468b0316b9743c14bce12b5566754e2f1c8dfaf6d3b28a41a SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e WHIRLPOOL 0321899be2dae25bdbc3c66883283c2a986d93d5d2b6cdb1e644b28af3afb83dae090c49ef7bed8cc7aafdcbb428db37890bb06244d23e48ef1e0c20791ef2a8
diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
new file mode 100644
index 000000000000..0f8aa1198234
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
@@ -0,0 +1,257 @@
+From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 29 Dec 2014 20:18:22 +0100
+Subject: [PATCH] Don't install headers/man pages for disabled extensions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://bugs.gentoo.org/show_bug.cgi?id=533906
+
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ src/Makefile.am | 52 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5a3c52a..774ad8e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la
+ 
+ # FIXME: find a way to autogenerate this from the XML files.
+ 
+-EXTSOURCES += composite.c
+ if BUILD_COMPOSITE
++EXTSOURCES += composite.c
+ lib_LTLIBRARIES += libxcb-composite.la
+ libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_composite_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_composite_la_SOURCES = composite.c composite.h
+ endif
+ 
+-EXTSOURCES += damage.c
+ if BUILD_DAMAGE
++EXTSOURCES += damage.c
+ lib_LTLIBRARIES += libxcb-damage.la
+ libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_damage_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_damage_la_SOURCES = damage.c damage.h
+ endif
+ 
+-EXTSOURCES += dpms.c
+ if BUILD_DPMS
++EXTSOURCES += dpms.c
+ lib_LTLIBRARIES += libxcb-dpms.la
+ libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dpms_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
+ endif
+ 
+-EXTSOURCES += dri2.c
+ if BUILD_DRI2
++EXTSOURCES += dri2.c
+ lib_LTLIBRARIES += libxcb-dri2.la
+ libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dri2_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
+ endif
+ 
+-EXTSOURCES += dri3.c
+ if BUILD_DRI3
++EXTSOURCES += dri3.c
+ lib_LTLIBRARIES += libxcb-dri3.la
+ libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dri3_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h
+ endif
+ 
+-EXTSOURCES += present.c
+ if BUILD_PRESENT
++EXTSOURCES += present.c
+ lib_LTLIBRARIES += libxcb-present.la
+ libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_present_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_present_la_SOURCES = present.c present.h
+ endif
+ 
+-EXTSOURCES += glx.c
+ if BUILD_GLX
+ lib_LTLIBRARIES += libxcb-glx.la
++EXTSOURCES += glx.c
+ libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_glx_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_glx_la_SOURCES = glx.c glx.h
+ endif
+ 
+-EXTSOURCES += randr.c
+ if BUILD_RANDR
++EXTSOURCES += randr.c
+ lib_LTLIBRARIES += libxcb-randr.la
+ libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
+ libxcb_randr_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_randr_la_SOURCES = randr.c randr.h
+ endif
+ 
+-EXTSOURCES += record.c
+ if BUILD_RECORD
++EXTSOURCES += record.c
+ lib_LTLIBRARIES += libxcb-record.la
+ libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_record_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_record_la_SOURCES = record.c record.h
+ endif
+ 
+-EXTSOURCES += render.c
+ if BUILD_RENDER
++EXTSOURCES += render.c
+ lib_LTLIBRARIES += libxcb-render.la
+ libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_render_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_render_la_SOURCES = render.c render.h
+ endif
+ 
+-EXTSOURCES += res.c
+ if BUILD_RESOURCE
++EXTSOURCES += res.c
+ lib_LTLIBRARIES += libxcb-res.la
+ libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_res_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_res_la_SOURCES = res.c res.h
+ endif
+ 
+-EXTSOURCES += screensaver.c
+ if BUILD_SCREENSAVER
++EXTSOURCES += screensaver.c
+ lib_LTLIBRARIES += libxcb-screensaver.la
+ libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
+ endif
+ 
+-EXTSOURCES += shape.c
+ if BUILD_SHAPE
++EXTSOURCES += shape.c
+ lib_LTLIBRARIES += libxcb-shape.la
+ libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_shape_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_shape_la_SOURCES = shape.c shape.h
+ endif
+ 
+-EXTSOURCES += shm.c
+ if BUILD_SHM
++EXTSOURCES += shm.c
+ lib_LTLIBRARIES += libxcb-shm.la
+ libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_shm_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_shm_la_SOURCES = shm.c shm.h
+ endif
+ 
+-EXTSOURCES += sync.c
+ if BUILD_SYNC
++EXTSOURCES += sync.c
+ lib_LTLIBRARIES += libxcb-sync.la
+ libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_sync_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_sync_la_SOURCES = sync.c sync.h
+ endif
+ 
+-EXTSOURCES += xevie.c
+ if BUILD_XEVIE
++EXTSOURCES += xevie.c
+ lib_LTLIBRARIES += libxcb-xevie.la
+ libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xevie_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
+ endif
+ 
+-EXTSOURCES += xf86dri.c
+ if BUILD_XFREE86_DRI
++EXTSOURCES += xf86dri.c
+ lib_LTLIBRARIES += libxcb-xf86dri.la
+ libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
+ endif
+ 
+-EXTSOURCES += xfixes.c
+ if BUILD_XFIXES
++EXTSOURCES += xfixes.c
+ lib_LTLIBRARIES += libxcb-xfixes.la
+ libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
+ endif
+ 
+-EXTSOURCES += xinerama.c
+ if BUILD_XINERAMA
++EXTSOURCES += xinerama.c
+ lib_LTLIBRARIES += libxcb-xinerama.la
+ libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+ endif
+ 
+-EXTSOURCES += xinput.c
+ if BUILD_XINPUT
++EXTSOURCES += xinput.c
+ lib_LTLIBRARIES += libxcb-xinput.la
+ libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
+ libxcb_xinput_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
+ endif
+ 
+-EXTSOURCES += xkb.c
+ if BUILD_XKB
++EXTSOURCES += xkb.c
+ lib_LTLIBRARIES += libxcb-xkb.la
+ libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+ libxcb_xkb_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
+ endif
+ 
+-EXTSOURCES += xprint.c
+ if BUILD_XPRINT
++EXTSOURCES += xprint.c
+ lib_LTLIBRARIES += libxcb-xprint.la
+ libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xprint_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
+ endif
+ 
+-EXTSOURCES += xselinux.c
+ if BUILD_SELINUX
++EXTSOURCES += xselinux.c
+ lib_LTLIBRARIES += libxcb-xselinux.la
+ libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
+ endif
+ 
+-EXTSOURCES += xtest.c
+ if BUILD_XTEST
++EXTSOURCES += xtest.c
+ lib_LTLIBRARIES += libxcb-xtest.la
+ libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xtest_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
+ endif
+ 
+-EXTSOURCES += xv.c
+ if BUILD_XV
++EXTSOURCES += xv.c
+ lib_LTLIBRARIES += libxcb-xv.la
+ libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xv_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xv_la_SOURCES = xv.c xv.h
+ endif
+ 
+-EXTSOURCES += xvmc.c
+ if BUILD_XVMC
++EXTSOURCES += xvmc.c
+ lib_LTLIBRARIES += libxcb-xvmc.la
+ libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
+-- 
+2.2.1
+
diff --git a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
new file mode 100644
index 000000000000..bbac9a96fc3b
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
@@ -0,0 +1,55 @@
+From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@NetBSD.org>
+Date: Thu, 19 May 2016 17:31:18 +0200
+Subject: Fix inconsistent use of tabs vs. space.
+
+Needed for at least python-3.5.x.
+
+Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+
+diff --git a/src/c_client.py b/src/c_client.py
+index 57de3fb..043338d 100644
+--- a/src/c_client.py
++++ b/src/c_client.py
+@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
+             _c('    unsigned int xcb_align_to = 0;')
+         if self.is_switch:
+             _c('    unsigned int xcb_padding_offset = %d;',
+-	       self.get_align_offset() )
++               self.get_align_offset() )
+         prefix = [('_aux', '->', self)]
+         aux_ptr = 'xcb_out'
+ 
+@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
+         _c('    unsigned int xcb_align_to = 0;')
+         if self.is_switch:
+             _c('    unsigned int xcb_padding_offset = %d;',
+-	       self.get_align_offset() )
++               self.get_align_offset() )
+ 
+     elif 'sizeof' == context:
+         param_names = [p[2] for p in params]
+@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
+                     # from the request size and divide that by the member size
+                     return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
+                 else:
+-		    # use the accessor to get the start of the list, then
+-		    # compute the length of it by subtracting it from
++                    # use the accessor to get the start of the list, then
++                    # compute the length of it by subtracting it from
+                     # the adress of the first byte after the end of the
+                     # request
+-		    after_end_of_request = '(((char*)R) + R->length * 4)'
+-		    start_of_list = '%s(R)' % (field.c_accessor_name)
++                    after_end_of_request = '(((char*)R) + R->length * 4)'
++                    start_of_list = '%s(R)' % (field.c_accessor_name)
+                     bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
+-		    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
++                    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
+             else:
+                 raise Exception(
+                     "lengthless lists with varsized members are not supported. Fieldname '%s'"
+-- 
+cgit v0.10.2
+
diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
new file mode 100644
index 000000000000..5310bf7c71f8
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_EAUTORECONF=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="https://xcb.freedesktop.org/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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"
+IUSE="doc selinux test xkb"
+SLOT="0/1.12" # Locked down for now to 1.12 to avoid further rebuilds on no ABI changes (e.g with any upcoming 1.12.1 bugfix release), bug 576890
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+	doc? ( app-doc/doxygen[dot] )
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	$(python_gen_any_dep \
+		">=x11-proto/xcb-proto-1.12-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
+	"${FILESDIR}/${P}-fix-inconsistent-use-tabs-space.patch"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc devel-docs)
+		$(use_enable selinux)
+		$(use_enable xkb)
+		--enable-xinput
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
new file mode 100644
index 000000000000..c68f9e8922a7
--- /dev/null
+++ b/x11-libs/libxcb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="xkb">Enable the XCB keyboard extension</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
new file mode 100644
index 000000000000..173117b165da
--- /dev/null
+++ b/x11-libs/libxkbcommon/Manifest
@@ -0,0 +1,9 @@
+DIST libxkbcommon-0.6.0.tar.xz 608700 SHA256 69235ec3a13194dea9555d7994bc4548b3ee20070e05a135af5372a958149ef0 SHA512 b70ff4b3b85f03cc2875622ccfa60ba6f1b86a07be90df8be73b867771dd08a85740df95fe8dfef2bacf4356a6dfc9c51523ec6ce60d197184860577b39586c4 WHIRLPOOL f2f07b96912ed91790511fab4da3ef11492b74dd9059d1f3df35c58def3d8bffec8857be5c24835662aabe25cdc2c13437e2721a8200736d90e1d6c557fac7d3
+DIST libxkbcommon-0.7.1.tar.xz 622384 SHA256 ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b SHA512 9f209214d5d7f9334cabb2cd7e0d9b9b0392c1fae06b60e92a03398875399fe48754b543389f78b8b06dd28a86dfd440720e534bae309ca8ef882eb874dce4e1 WHIRLPOOL cc397b6e24c943ea506400789d2fca501d62eb03ead929662c037175c98d2f5b7bc723e4f967b48692646e25b74d1e2120de213014d26b74cc7a85e127bda733
+DIST libxkbcommon-0.7.2.tar.xz 630276 SHA256 28a4dc2735863bec2dba238de07fcdff28c5dd2300ae9dfdb47282206cd9b9d8 SHA512 4a06f9d719393a34689fdd74b0cce80af20e26cc5bd6e1b34fff4093a4f8f103704bdc54f0245b62903cdd7529cd8d59864924b9f4ddab314d152804da4da649 WHIRLPOOL 9bf843b03a6a03411d57fa6e0a3f643e3c58b1fdf5f810ef597c4fbde9813059b8d4ea98b556c5c7af2383d0c6b78c8d67b9234105c6f9322fbccfe0a075e9f5
+EBUILD libxkbcommon-0.6.0.ebuild 951 SHA256 ae1080dc0af1ac56e85d3940258db27660ec13bfaf07b089af95392ddd169665 SHA512 de65aee937a33286f600d70aa94d75b312c3ef54f1234054b26414db5699927108d20ed1b43fd1f4a4e6bb1fa165ca0d568da18b1aee840c40d1a19b25f548ca WHIRLPOOL 50cad9ac1c59fd8ea5bb9dd8ed332fb5fb0e751fb0f78a70aea6551478b82bdd3d90a339d399980d2b7bc7c5530a57a524331dbea96bc0d7eec17fe62d79e274
+EBUILD libxkbcommon-0.7.1.ebuild 987 SHA256 2772b18257ebb8290d60bb8213b2bde8670fe54f501ed4b19406bcbe1f6f078e SHA512 806cd4dbbf80cebbbc214aabf53f0de9b2100825c50e68686c0139fad75a1d33ce333f5ee5cd993a65517e857b80365f2212e643af348db4f67787c727865f61 WHIRLPOOL 4205f24eccf70c63b33ef5e635c0c4fdaa2f0af98f5aa0a7fcd6d75619ee49963b13f0070e5cca2c93fbf839bc387556e05310bd599262eb16f8b4d2b48eb8a5
+EBUILD libxkbcommon-0.7.2.ebuild 995 SHA256 577309747a88ed767d8006ab6d313f4296e03e585ff2e5abc8e8825011994e23 SHA512 b6fcbfe5723191ebf1390b63b21c49142f952b138e703c5715f693670a8eb8039f5808135ef7ee57d7b84f038d6d12be4c47d758f4aa91e079b37abd56c6f543 WHIRLPOOL 0a6b4dda18c4ecd8b752135fedc25409d93a438850c32a05dbcb77115a88dfe3584efe127935403ace2d795617418d556dce3078f912ee326392d456804d1404
+MISC ChangeLog 4646 SHA256 e65920bad94bd431e81ec234473957912043f9ba5b2ee6caa8d4ba5a88f1b584 SHA512 f8b3cc3e56ec223d22d1a26f04a4d39faf09b07db1a0f42fb5b624e42b9f065350b2a1e0bdb65ee72f06b5373420b71128575b60a5a21333f696b668ef19ecfc WHIRLPOOL e7725506726997c0a651291d49235644713d9a593d2bee92c13b7f34ab58ba30340d9c9f5b4345bec11021ed8d762c7c4a9abd3d626ab189ebed953645fa5b55
+MISC ChangeLog-2015 3122 SHA256 38416a1bacc78464dc30dabe2420ec2a287671c95468157c23870b2fadef259f SHA512 c46c0ea16141696f1e770d7dc0ebda2b3930261eacb03b523edb33ef83bfb366ca95b93f8f4c20db5f35cd398329f7a721f8366bf2c515dd6e341b7ee110fdb9 WHIRLPOOL 46b022e1abdfb024f913f96c9b344fbc5606d9fa8abfb682610cd301640f7d3c432ef6944f3a04c7bc0ed4b9947d68f1f6a423cb37efe21cfc2dd6262f57e17a
+MISC metadata.xml 234 SHA256 900f23c261ef4bbc25ef3d591263a70142c3c6f1cf833d1e66301936532399e7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b WHIRLPOOL 362d1afca87746963dbde2f7b3a6d4cfdf0948f9347fef9eca5510c04e2c6c9b9e6f5f9a934ba0939e261f472a1a74111d70a4cc87a8590f38ceff7692fdca79
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
new file mode 100644
index 000000000000..69ff6c0b4422
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_EAUTORECONF="yes"
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	XORG_BASE_INDIVIDUAL_URI=""
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+HOMEPAGE="https://xkbcommon.org/"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="X doc test"
+
+DEPEND="sys-devel/bison
+	X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(use X || use_enable X x11)
+		$(use_with doc doxygen)
+	)
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
new file mode 100644
index 000000000000..dfd5bab5d30b
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	XORG_BASE_INDIVIDUAL_URI=""
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+HOMEPAGE="https://xkbcommon.org/"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+IUSE="X doc test"
+
+DEPEND="sys-devel/bison
+	X? (
+		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+		>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+	)
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(use X || use_enable X x11)
+		$(use_with doc doxygen)
+	)
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
new file mode 100644
index 000000000000..0a4987e6ce5a
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	XORG_BASE_INDIVIDUAL_URI=""
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+HOMEPAGE="https://xkbcommon.org/"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X doc test"
+
+DEPEND="sys-devel/bison
+	X? (
+		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+		>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+	)
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(use X || use_enable X x11)
+		$(use_with doc doxygen)
+	)
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
new file mode 100644
index 000000000000..7a7bbf810544
--- /dev/null
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
new file mode 100644
index 000000000000..d0537240bec7
--- /dev/null
+++ b/x11-libs/libxkbfile/Manifest
@@ -0,0 +1,8 @@
+DIST libxkbfile-1.0.8.tar.bz2 335788 SHA256 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a SHA512 1d8766db2a15fe0a1f3775d38422eabd572ec8ba8417cde9f1ec95b0065e1acb6036fcf9a8e54f2e0517b358f9f3fe6f8b419554ec7688c24ec4072939c5e099 WHIRLPOOL f2a27fecabadffd8aa28434ab98254473191a6d5c211acbe8776287bec2306d3dca4137004db0ddea14a66910a2934030d9b6f67a08bd7d566ad79f7fb7a2202
+DIST libxkbfile-1.0.9.tar.bz2 348009 SHA256 51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1 WHIRLPOOL 5d8168ae089e15e3a43dd4cfc36445987b7dd995743807dbc184e3ac137e33da5ef1517715a7c6635bab44d94819c1260836d3a7ace66d57f64da322933f786b
+EBUILD libxkbfile-1.0.8.ebuild 479 SHA256 37190e9e0dd74445f25cbab7fb5a98a47dd45c6f3c278dc4e8c3fcc6b420c4d1 SHA512 df18550be78415f78ca07a3f8d2f2f33cc6509ff4f0c6539c3d65da0409e878a5e838ac65cfa8a7656aa9257c69528cb17479865242c3617f731f204d791a1c2 WHIRLPOOL d008c70ee20eaeba72c385082d395bb15369eab21f1af3255cde736dbcbfb8805a47209598efa27fa905666b2b890a2046c2f327fc1efa18e6ccea158f45f86f
+EBUILD libxkbfile-1.0.9-r1.ebuild 548 SHA256 e379b2945d465cbf872f4a8dbe45b1a3c625248dae53b86fd2babd40fa16124f SHA512 8b97a8e7c59601c22ae37031a308b98228b071a2c8734135ae74407912bab625e88c1bf0bb858830090098f20eda25e5e13eb1ecdfbf3f979df57bb9f260e922 WHIRLPOOL cd1c321b49c199ccf6059496671a56257b342448cddc91d0888c604746f9eec2518f4a3d7743fb137c1df311362b764f9326352e509d649f976915175541fff5
+EBUILD libxkbfile-1.0.9.ebuild 481 SHA256 75b450a9244c57f034a08cdb3acf6d7ed71c33b943ab19e6b42211d06e6b5f71 SHA512 699f1c1b354f820c126118385a8f5322b8d3609f36b3ee4f51d3bb74de85e2e0e64c1bd9f8e71e60bef08685b7011f0f4fd1199797f014f00b9c78883319a323 WHIRLPOOL 0496c72221aefad6ca79aaf93a44c32f4aeb004ff6ac1e4a06154a87e99a6893bad2eb98b04794195694336537f104c53847ce7a949b3c5a91ea7d5a3b560d5a
+MISC ChangeLog 4044 SHA256 737c6f5552f3d7e707a57c26724357671ec8965461180cf47835137131f4021c SHA512 b42df0c51aa61878e84159e8f6726afa6eb20aff8421762d27067052d738be2ba36a46b08a6613a42c6e122eaf4c41e15e4f47500f3d6252c8da3e9a42fdad97 WHIRLPOOL 96914941cfbb9f6a9b502b4235f6a0fe27a33f5408b643fb1021710e748e421ce6c7f84c17848cef9dc063ba959db11319d9bfd5df1227954c439cfc19588498
+MISC ChangeLog-2015 9642 SHA256 d5602185ae42cb547bbef137f10478ca997755223fb99a7f8a37644f40e6f2f3 SHA512 fa9eda29bc2f3a4395a0b9a0d3d95497a8223d13f8a343ba3e2752cfef22036c8d262f4d61213fd4fbfe397bcb3d96216a74c81c74b27c1502e0e96c2aa6e0b7 WHIRLPOOL 10f434f5fb751287b2ed3d0977d569532fd1a1ef3281db677102bd2264a8e3b9072c6e4a86a70000dd7cad1fd8275d002f3df34245d804bf145327bdd7fcba90
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
new file mode 100644
index 000000000000..b27dd96546e6
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbfile 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..0f7e6b384d1a
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
@@ -0,0 +1,15 @@
+# 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 xkbfile 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-proto/kbproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild
new file mode 100644
index 000000000000..f5e0823304ec
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbfile 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest
new file mode 100644
index 000000000000..418c8232020f
--- /dev/null
+++ b/x11-libs/libxkbui/Manifest
@@ -0,0 +1,5 @@
+DIST libxkbui-1.0.2.tar.bz2 221435 SHA256 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214 SHA512 ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d WHIRLPOOL cc63816196b5e48ec369307a31cea8c6b3277592d7ba017b418370d914de31e42e02ad02dfe3a6bca3439d7284d0aefe3ce680b5880e0eea457982fd4c67d519
+EBUILD libxkbui-1.0.2-r1.ebuild 410 SHA256 2e7e5630b7a54c0a63043803d946e6803123128db1561aa6615f51dce6987b61 SHA512 16e4a02c134d16c9b9bb07b071b51e4ed9a0d0dfd3099edf310745f0144fb70c9e871baf0c59ce51096cf30c3185b41e3bebfc6abd28107cf9900cfb371a016a WHIRLPOOL bad8c7ec45e445d8f9b3e91f36dee88a943538cba8799203f72e52ccc94b5e8a5c522aaa29a8edec688d262af6679f349caa46fb911a98e36cacf45088f34a50
+MISC ChangeLog 2436 SHA256 2ff45d8cd31fb00a6c2b963b7cdd80ff2d9e4a11af1c607e1c0c5b99137749c0 SHA512 9777ae9af4ad6d96c5b8541856ca9f174ab2aa666216547f5f8dc32fb3602a2d29de6361a6b8749c84886a9c25a099fbf696125cd11f698f82a30c4c6b235859 WHIRLPOOL 8025fd5bba4e2f5091d110d1f8605773c9a00ebf2bec2a8031a26170b58e60a4fe0028f0d83cf21e9f81038f9ef3a36b38220d516f545dbce5bd90bd0979247e
+MISC ChangeLog-2015 4965 SHA256 4951b6a262de2083baa94d013e139ae97fdb3d59343ae91b59af823bd84fd64d SHA512 ddbc5995ae0a059ab2ee538afeedb39c0d8aa5d355bd6314680ec249429806d84fdff938e49ac696a62a5b76ea96c420ba91b3d9b18b490520ff088d87d43127 WHIRLPOOL 256368030f6ec5744a8ea1926a318ec751033554db78e91f60a5bc7dbc9a0f7959e0ed38935e87fd514ed135827599a1aac2ea3487da165b69a51b4260ca2e02
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild b/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..01a06ba109a1
--- /dev/null
+++ b/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbui library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+	>=x11-libs/libxkbfile-1.0.3
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbui/metadata.xml b/x11-libs/libxkbui/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libxkbui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
new file mode 100644
index 000000000000..622690d0d3e7
--- /dev/null
+++ b/x11-libs/libxklavier/Manifest
@@ -0,0 +1,8 @@
+DIST libxklavier-5.3.tar.xz 315684 SHA256 ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404 SHA512 7bec94aeedbe80aec2c44c9e2a3b7ea170618970fff3c1b5e677f1b292241e208b74eabd825d477eeab25bb0ee1d27f9b55f986a19ea8aacb078651a0c83b289 WHIRLPOOL e9f64343e750397e2ec55311ce8ed650bfb71fb09eccdf3563cd8ac5a83f4203d79d00695978f7d27c0a91a03d67fd29c4842b401fc8b23621121cd9e9b0d84b
+DIST libxklavier-5.4.tar.bz2 390428 SHA256 17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae WHIRLPOOL 93e2b73d8035e6ef01c0286c98e36d8f0ad5981238de49c9e93fedd97efc5247feadefa30cfc8fbf924980aa0e95fe6f24d1702b00171e0fdb3f4a430bab1a1f
+EBUILD libxklavier-5.3-r1.ebuild 1178 SHA256 183ce7119cc96a02a1d29b570dac1b5f9c3cfc4c1144bcf982792de8a7e7e581 SHA512 74dd647b2e1ce0c2788de30da4b82aaecb3fc63bcdc2074efcd09640b10ec11528d81144fb45e95de06246750163a8d4a288089bc3fe87bbe58b2c1262c6ab26 WHIRLPOOL 0f356986b8ce1f19719d76505fab256eed29a62050d0afc78b08f0868829dc90e83c3a9ed3bf33f05d246b6ec57ca2cb7a15793ea993cf15864d30160bd815ea
+EBUILD libxklavier-5.3.ebuild 1279 SHA256 cda95d69f16e97341508a0228d7a59b0b1ad85925df24a4b029816c2364c74a6 SHA512 5b2e76069674dfde5fd44201a3af4dfc3202ace10393fc95cdb4dc1fb74cab834521bcf4813d3f4248452348c3c3d3d849082fd811412a1a21915ccd1f3030f4 WHIRLPOOL d2b4fd1ee605cab644f71f76eef12c127a58d21fb052b776f1aa4a86855bc97f756fba3e28903b1f1c749ce3523185b1f80d06bc4280e61985e6971947cb5b97
+EBUILD libxklavier-5.4.ebuild 1355 SHA256 ed798d856ef9a415b214ad2d14388298c162d0580f78f9d480aa6079ba185083 SHA512 f4b4f2f71c3e34e88406602b415a256249d0f3dca4128c18fbb2ed9a4ce22e975edf7c6fb354dfea0177436b820262c6a1ec77483adc6571379fbbe35fdb358e WHIRLPOOL 5e68572dd30943308f1950802151d0bbb86bdc88be38ba5a23c92093af1dcb7367663050e4ad70df403003de0febe566453f789fdbe84d6d1a1139b9b7d7b4d1
+MISC ChangeLog 4879 SHA256 17f3ae03e4a48bc159670ba6ea2e7cc9e12b68bf01428a9b1aaf22b65f112ed6 SHA512 cf5b9498f5ec106be0cbc9f2765c9709af04b1693d3d0716b464c7d2d5fe8978afd07a3f5b3db3d673c7800cce6581b0dab9bc969f1aacd078aa77a5eac65424 WHIRLPOOL 61c0672fcb18e804e58ac08d11e04a9fbf7782a833e1abf65a4a0173f52d8e1e14d2c2a7fd1fb15e8359f3f3c6b80b53b878fb97d53a99434363cd37fca74ec4
+MISC ChangeLog-2015 22386 SHA256 e6d5027dacc712036fbc14e00315a7c2088be30bfebf5f2828c8a29659bb88ae SHA512 a8b617f4e9a3ce7c5775b580638dbe6e4d3c9de5b856703f8fa9bc0c4472e75e096a634604198ef68450e636543f0bb4fd3bdfa1a54eea6eccca4dca1ff1543a WHIRLPOOL 0cbd75fc7f6301d811c7343c8b0d8fc5ead960c2eda7bf1abb369b02317728061cd3f6d9a03b0562e51ca4ad25062528345a8d808d53afb74363404be377998b
+MISC metadata.xml 232 SHA256 6f828dfe6278daec9b0b3a9eeb589d072d79dba873dca6a50422e554c2f3582c SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 WHIRLPOOL 95b029eb4fea616dbf4f41cb372a67a13b7f5d67d9dad52bc27b4597bd1cf73b00fa34ddd8637495337a469162e3086075e8e69734a2147eb89d940fe048159a
diff --git a/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild b/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild
new file mode 100644
index 000000000000..5ba9ae0f55af
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome.org libtool xdg-utils
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier"
+
+LICENSE="LGPL-2"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+introspection"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2:2
+	x11-apps/xkbcomp
+	x11-libs/libX11
+	>=x11-libs/libXi-1.1.3
+	x11-libs/libxkbfile
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_enable introspection) \
+		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+		--with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog CREDITS NEWS README
+	prune_libtool_files
+}
diff --git a/x11-libs/libxklavier/libxklavier-5.3.ebuild b/x11-libs/libxklavier/libxklavier-5.3.ebuild
new file mode 100644
index 000000000000..710f7361483c
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils gnome.org libtool
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +introspection"
+
+RDEPEND="app-text/iso-codes
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	x11-apps/xkbcomp
+	x11-libs/libX11
+	>=x11-libs/libXi-1.1.3
+	x11-libs/libxkbfile
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+		--with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+	default
+
+	nonfatal dosym /usr/share/doc/${PF}/html/${PN} /usr/share/gtk-doc/html/${PN}
+
+	prune_libtool_files
+}
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
new file mode 100644
index 000000000000..bad391397de1
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool vala xdg-utils
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier"
+SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.16:2=
+	dev-libs/libxml2:2=
+	x11-apps/xkbcomp
+	x11-libs/libX11:=
+	>=x11-libs/libXi-1.1.3:=
+	x11-libs/libxkbfile:=
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	elibtoolize
+	xdg_environment_reset
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+		--with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+	default
+	dodoc CREDITS
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
new file mode 100644
index 000000000000..f3cab85cf603
--- /dev/null
+++ b/x11-libs/libxklavier/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
new file mode 100644
index 000000000000..13b93a0c6e63
--- /dev/null
+++ b/x11-libs/libxshmfence/Manifest
@@ -0,0 +1,7 @@
+DIST libxshmfence-1.1.tar.bz2 291347 SHA256 dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe SHA512 ed3aae4a44849c11ce041df53d47667606dba5357059c13d5c0989205df57dfa626598db6ad66432114a80e69ab4118fb067877ea275897aab64d4bbf9bcd346 WHIRLPOOL 79014c8c617aa49296610eb66274aa4f0e86dc4b19d587bd46bf34f496a7cc21697927d8023a510fdb3c631988678fd5fe8d450e652159d9a847ec05ce0f35ae
+DIST libxshmfence-1.2.tar.bz2 267170 SHA256 d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c SHA512 340a6dff5c7ce7f0fe89d8094ee91a0572c8bf0da888861c5262d6a65a13ecad0e2a079949ccc115e15a2d0d108c4f1ba1743874289cacbbc17aa3a05cd8e072 WHIRLPOOL 16916da6d04fc7155f4c5a7f98703385c19dcb3aadb84ec6f52a7887f37cc4d5d38dc280480153dec8327762b10bdd01a562127cc4c550d858312aa9b4f7f7a8
+EBUILD libxshmfence-1.1.ebuild 464 SHA256 b41b1fd65a1636c390588307a1bcbdf840262d646044f8ea7440024563b5372c SHA512 d4bb938b7975702ea7d979c93c27a34e6e6181c445325b4a750322ef181e3b564f4ba9e08cb797a475bfbb29bb4fd47735c0cd6f8fa299f57b73c1b43134453b WHIRLPOOL 23d2e556bcbbef3a35d0c948ea70453218975f6b5c2ccd89a72f0b8ee167979a748238f2a017edae465fecd2bd530dba23c42667228a6d48715212bc18ad529e
+EBUILD libxshmfence-1.2.ebuild 466 SHA256 dc0ec1ea491faf21f41d2f59504a2b22b72f4bd9ac2ae2bf1fc5f8e2b293607f SHA512 4003a74a9b05c1813cd078eec0a25c56b6efdc5bc43721a8ae9fa1570a6c9de31ce027d2a8b5615b99c03dc55a9e0dc38eb95212bcd4f2563eecc6b901dbfdb7 WHIRLPOOL c19c19c35b61c7041d7436f8b31c8b170db21dc90ae24c3182bc5a90680086b79c10f15be18d8e160716fc76800646d98a3faccae608ee83377257b09a967772
+MISC ChangeLog 2496 SHA256 a891718a4a47fee2d310da6d19a4da4f2cc1eb4f39b5e9d9ba2bc81525226879 SHA512 07a0c2cac54ffd3ace7b6015990403134e84d7d3f5a939dd0b24b432977ba4e5743360b84a3d1be834973b1470eca18898f097cd12057e82f251ca4076033b35 WHIRLPOOL aa75312491bebabe308fdec12b435b074eca9d5c98271b0820b0febfb025665cabeaf9625ad9f2df0ba0bf61e72a563856e76634364922e52b1103c89936d7a8
+MISC ChangeLog-2015 3503 SHA256 8b9d42c86a958764b60a27a3852173f55a440da915309953806f1349c96d3c69 SHA512 1e3a3c0b76ea52bd3d2a365abd7c2676618af9b1bfea8c3ee4b21d4df7448d57e7d1334906f21695f6c94493a0184d7ab7ed77a70abc13ebce4b92b4c9e7eeff WHIRLPOOL e3a688acf20b977861de99b2854a10f0baca771590b453bad9d02a0cc8bde3fbbf3f0fcbb36c4e56121febf35191440249131abd8ed7aeba58644ae654ccc5e8
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
new file mode 100644
index 000000000000..b94851a8c876
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
@@ -0,0 +1,15 @@
+# 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="Shared memory fences using futexes"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
new file mode 100644
index 000000000000..8006b0c50cfa
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
@@ -0,0 +1,15 @@
+# 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="Shared memory fences using futexes"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	${RDEPEND}"
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest
new file mode 100644
index 000000000000..70aba466a856
--- /dev/null
+++ b/x11-libs/libyui-gtk/Manifest
@@ -0,0 +1,7 @@
+DIST libyui-gtk-2.44.5.tar.gz 291294 SHA256 934e91fa9cecfd932b71b37a29b485236162799d31ebb9d39ca5c14c845de94b SHA512 8493d46ea78b8e6cd28275c4c2a051c6eaec14d3cbfb20a6bb18346fe9e899c7c9ce4a156fb215c986baf69d398ccab00c3be017d5a30594cdfbb77df4e1e882 WHIRLPOOL 8bb61042b5c4ea9b3bccd4f14c47c258db46d5390e72a4813225cf59a2224ad664e1817a548530e76c75e924f60d7483ee1e7aef8eddf71a513251803a0cb26e
+DIST libyui-gtk-2.44.7.tar.gz 292368 SHA256 329e134a7102d87d32c9c196812ce62367bf56e58474c1f3e75983b3f281a92d SHA512 d7031205f32bef3524b97c06d79d0dbebb6bfdd6071f03968b5862959f060f63d4241b56bca2f655a96281e32a9c160f7090ab96b7a32c7d00c31f93e9d26c4e WHIRLPOOL 1cdc7b269b8bfa5d053cd9ab54f7c7ae6faf2c8d92e6419a1f515cabe206ab9a44bc08ab91cafe9b298de63ca632ff91a12b0ecf31e61a0280cf9f4096de7dab
+EBUILD libyui-gtk-2.44.5.ebuild 1157 SHA256 9132455d0d6531396098567706468c069110359d488886af3ca55ca22456fce5 SHA512 de252546451b446dc3ab0b1fa2cf91a9ba94adc80cdc84a2e38a9e07254298e90a27c632e5e84379368344f4ab4814ffba6f7db514a0bca1760c8a8326f2dc25 WHIRLPOOL 887ee942ac18c7572534928899580fe434bb5a5f94bc5689fe7e701a3569ca7812afb1128d43c3c7d79fb2f99b8d55593532a046016147a8dfcdeae545568ab5
+EBUILD libyui-gtk-2.44.7.ebuild 1157 SHA256 25984b46bce42e4d630d8320953826abc47732b26ae3340d9045511d238927e8 SHA512 0cfb3720dc12a8498573156c1bfbcf0732ec577c51f371c27f42cfe96bdf074549e91824720019b28946bde5b2f0b5de6ee7821deafc68f98101e89d8deb82c1 WHIRLPOOL 9a5115f639d957a43e886b246f590a25e7ef09b94b5f919ba7a2933dddc37f468cd3d0b1de78940dfdfd4a5345896b3c6cdf750b777e62f98de1ffd5065f9a22
+MISC ChangeLog 2384 SHA256 69840afd1b3a9f0be6f864ea9b8fb0daae58f728987c3f17000f2b8d5c7af2e5 SHA512 fba5e93d40912d07a802f48d10b235e93c6547e82b998b407daa576ec3a5f1cf38dd9eaeb02506af7e75446e4f842af0802e8b1a2d04b42bf9a00d675eef2536 WHIRLPOOL 6d3770594c5c1557bc888597f4eb46ae5668d9d24f7b47dfa8781b7f6b266cd077f0cc00419e6acfd9b3454cc6ab866f45254a5888413523c6e3588c67aeb6cc
+MISC ChangeLog-2015 583 SHA256 17d50aa63aece4cc3279fd49973458d17d5f248ef389172307231c1784df9b0d SHA512 5a4d49e5684a62a429bccb0483c8a85a070b8095a52b86bc0ed0f40dcf161fa89ff1bf457e15249391b4de708712eea82f04412324d6a5d73b03ea0c8c2466ec WHIRLPOOL a652367cd5aa1499b7c6d340211499023c58a937e62d4396cc1070c7430573d85c9c72ce8488b48fc0cf1b9a3880382aff4b4bec2c7f6f767ab06a22af9df4a6
+MISC metadata.xml 545 SHA256 95c0750d0c70a7bff8bec248cc8fc7acd71dd2b93715140025efe249bd578a7b SHA512 5b8576074945c6497e1b3cc800897061e1144890c47f5c28695d2c0b567d3a757fc690e00254d792f87e2dbe27e4bfee7658592d9f21d0abfd0c24d650f93b7e WHIRLPOOL e95a8962dd18039d2c8cb91907ea20be86176197b975a123aff70de3738ec157ad22b1cabcc07f79b8eddeacc4bf20ac68a343c2acb44846158f367f84522a9b
diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild
new file mode 100644
index 000000000000..96a7fa6d082b
--- /dev/null
+++ b/x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - GTK plugin"
+HOMEPAGE="https://github.com/libyui/libyui-gtk"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.7.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.7.ebuild
new file mode 100644
index 000000000000..0f148ebcad94
--- /dev/null
+++ b/x11-libs/libyui-gtk/libyui-gtk-2.44.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - GTK plugin"
+HOMEPAGE="https://github.com/libyui/libyui-gtk"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml
new file mode 100644
index 000000000000..0b731370b09a
--- /dev/null
+++ b/x11-libs/libyui-gtk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>miska@gentoo.org</email>
+		<name>Michal Hrušecký</name>
+	</maintainer>
+	<longdescription lang="en">
+Gtk plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+	<upstream>
+		<remote-id type="github">libyui/libyui-gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
new file mode 100644
index 000000000000..76c160e411b5
--- /dev/null
+++ b/x11-libs/libyui-ncurses/Manifest
@@ -0,0 +1,8 @@
+AUX libyui-ncurses-2.46.4-tinfo.patch 934 SHA256 fb40a69eed1cb135720e57479e779657d5245fa6ad3876c117b35797f83d43be SHA512 cdfad23f199dc4c94c53718aa5f86a9caaaa0b93121ccdabcece10023af0a5a74ace836b9c6610aa5bded7cacf9ad529a9a048124c4e3e891ecd32c9cb305ce4 WHIRLPOOL b974b14bc7e959dff639eae78f224a1bab2ddfbe92b18cef7370e56631927315cff97002790268cef2277f9966f864f54d058040bc9c6630fe260b97fe3b713b
+DIST libyui-ncurses-2.46.4.tar.gz 181155 SHA256 3b2ec425277f5d4658c3318339076b72b9ee5e229569014ad69fd99948d8dec9 SHA512 9e03aa29ea7660c20d4ce36b7ebcac02af152185af3e91650d0d59379d3b2779515aa0b2325155a4eaaa02a1addc2ac25cf8a13d0e67a32fe94191da06c1b483 WHIRLPOOL fac47b00f9a8fe7c0293dd89f5cc6949104d4ee910487ef55cf0f323724d8079da5b880c8f8f99ba298fa385bc866a3377d21c198e52215d4b22d0d1df72d2f7
+DIST libyui-ncurses-2.47.6.tar.gz 188365 SHA256 fdec4c7ac4b67ade9b7490988ab4e7be553707a77d35966d92f5d729bc8d0132 SHA512 c11b4ac6e7d2e5fce52e39abbea5c9c280128071802ee925c00560642cb03e734393b348dc57d3aaff29993b36cdbc371f5766839640162a6e1310810c66e343 WHIRLPOOL 77c3bccf34d88cec96f18a0638ed9476e50930c780ebb974657c9ee268d94813d4e5a9993ae22c6da1062968ce4d46224b6168b5b4a3e1c4a44fd483281772ff
+EBUILD libyui-ncurses-2.46.4.ebuild 1210 SHA256 658e65538222152f4c4bc9647a614e19611a17690a6c8dba8beade98772c995e SHA512 888e68b1a94d39a7938d2f32e044d0e2de8436707264e43955c691e48122085b9009c68951aca7bd1d78da8cd159510a88db0b247f943f0ce1891959cc248e50 WHIRLPOOL 1c0babaa0daa642837fc5a5258c274ac3ef86870fbc12b333f97aae60a3668dda2a3df7f3ff583a8bac12d60eedececa94d1f5ab5f267549ca8abfd2d72cd639
+EBUILD libyui-ncurses-2.47.6.ebuild 1218 SHA256 12eb13d01fb3d616afb965d31736437d05df66d1f66ca4339ab9143350451b33 SHA512 358958c7686410fc0235041fb574bf28a03edf0d292d72bdb13e6d64211e61a01baaf434484c82042b0daeb756542d7f09e30c3c367e4bca5afcf8669ae681e0 WHIRLPOOL 53e536ed5194204cc29b99bbe66c945da3e0e668de1671698d5cc01db7a1453b71194ccf2a4ee82a247bd24fcc138a1072172d7d2367d5980fa2815860144055
+MISC ChangeLog 2517 SHA256 7fcc11c7637d2e9a4a7a900afaed63544e564c28d949eaaba686a0300bfeb115 SHA512 0468ac97f08c07360fb078536587ddd83c5cb0a9e91562ea6e29d3151d2b1e45785db2f0bf20ae9a84e819e7cdd13ec04d726350b620d901c2cb4d0bde447604 WHIRLPOOL af2e9d731a738c5b7eec76ed4addf5e77ca60d953cb98e599c9aaeaf21b60d0442f023a971accd75af011b1ca4b7eebad995a4489d6bf181b6e6292ce4ea1b22
+MISC ChangeLog-2015 995 SHA256 34941729862ac4e2949705614c2596edc8a927da5a4dda4b1ece4f816203b88c SHA512 ed485547f916085cfd67d586409fc25c9f2880f3aae8b3e434ba0c27d985f2f3cc01c0583a3f4287222393dbe56f1324c6e547ad1678b7ab142e29f87de72038 WHIRLPOOL ac0d43813197c723224dfd1b3d8817680654168583038f372d43794423c633bb0664b9e0507078f37d71b0f7104ea3ba355d7aedb4f76ace97e0f6e65cef54bd
+MISC metadata.xml 553 SHA256 f0c3ea0265abb08087913364f7bea4a84436652aaba0ad8b0cb43abbc4eacda8 SHA512 512065e44bedcc9af975d7d16f0ac5e2093c76367e19abbbbeaf9b0db3eca2068e2af2a641304336361c054a42d3e4d282ef87629cd8176b9061df2363802bf6 WHIRLPOOL 15c0f7305e4e6b8202ce42cbeca22daf21e4c8577f7642e33a6bb3ed5cb46de118fd756729e05ca771d13b8a5e677a95940997bd713246779ee13c07c4aca24d
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
new file mode 100644
index 000000000000..b69aafe797b1
--- /dev/null
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
@@ -0,0 +1,21 @@
+Fixes building with sys-libs/ncurses[tinfo]
+
+--- cmake/Modules/FindCurses6.cmake.orig	2014-09-25 16:32:20.000000000 +0400
++++ cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
+@@ -11,11 +11,12 @@
+   FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
+ ENDFOREACH()
+ 
+-SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
+ # tinfo is optional (in 12.1 is not there)
+-IF(${CURSES6_TINFO_LIBRARY})
+-  SET(CURSES6_LIBRARIES "${CURSES6_LIBRARIES} ${CURSES6_TINFO_LIBRARY}")
+-ENDIF(${CURSES6_TINFO_LIBRARY})
++IF(NOT ${CURSES6_TINFO_LIBRARY} STREQUAL "CURSES6_TINFO_LIBRARY-NOTFOUND")
++  SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY} ${CURSES6_TINFO_LIBRARY})
++ELSE()
++  SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
++ENDIF()
+ 
+ FIND_PATH(CURSES6_INCLUDE_DIR ncurses.h PATH_SUFFIXES ncurses6)
+ 
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
new file mode 100644
index 000000000000..2fb7b74a66b5
--- /dev/null
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - ncurses plugin"
+HOMEPAGE="https://github.com/libyui/libyui-ncurses"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="sys-libs/ncurses:=
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild
new file mode 100644
index 000000000000..ea1993c22752
--- /dev/null
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - ncurses plugin"
+HOMEPAGE="https://github.com/libyui/libyui-ncurses"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="sys-libs/ncurses:=
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+PATCHES=( "${FILESDIR}/${PN}-2.46.4-tinfo.patch" )
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml
new file mode 100644
index 000000000000..55be7e510572
--- /dev/null
+++ b/x11-libs/libyui-ncurses/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>miska@gentoo.org</email>
+		<name>Michal Hrušecký</name>
+	</maintainer>
+	<longdescription lang="en">
+ncurses plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+	<upstream>
+		<remote-id type="github">libyui/libyui-ncurses</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
new file mode 100644
index 000000000000..29e0cd508ada
--- /dev/null
+++ b/x11-libs/libyui-qt/Manifest
@@ -0,0 +1,5 @@
+DIST libyui-qt-2.46.21.tar.gz 167324 SHA256 0c0e622fa796169b9feaed4512586469b6553e80ca5186c9794514c145fc7b5f SHA512 715154efd9fa2753f528e5a809fd2a3c635751b9bee3d511e396051b04a55086446510dbec5c70e753b1926c35faf84aaf05ea92a2a7f089f9b95dce9ee1a77f WHIRLPOOL 55539cee83f6a36a9f13c25c02bef27e65929f8129e32a1ee543b1bbd81826688cb52d5756271f0e4c594947ee37ee975082d112a77a44cfa652bded05f281de
+EBUILD libyui-qt-2.46.21.ebuild 1272 SHA256 7b7931180a8a7d3fd934725da4611a307559912f506dd4b34eb6c8d8bed758bf SHA512 aaf49b735478abcb128bdea5d579f4a2549e834729202ea3115f67f8519290554a5b7f158b520053cda5aee8eb16856e5fa788fdf72f76c747fcf47da9e97ba8 WHIRLPOOL a174fb120916741d163d97f922f9f96bffb7326e23969ff0e69a4ae94c242c473e5bacb2bda2e6034ccb36f24f360cf9901f7dbd5fcf20ae22e6e7b075bd344a
+MISC ChangeLog 2382 SHA256 2e76fd1b5e332f96e7e091300ca5c92fcda00f25fb364da77ed7db9aa2095e46 SHA512 48b7496d3859c983479dc2458e7c6018246e3c7c1c7e20664083ade24c275446cbb68a3c38baf0982dbf13d44bed176a72858209bf09cda768fce694f54fdf9f WHIRLPOOL b43592971748c913af51a75ff8276873a4c8cfb0bb0f863ff48332c2e9b9177256d7dde8d62ce739f7341a5015a43e9d73025814fe5a475e2cd1e3f16a86b49a
+MISC ChangeLog-2015 924 SHA256 003d6ecb3fda81cb1e79fea924035e0d9b45664dd9ea8f220f54f0287d3d9b77 SHA512 c547323270140ec2a3f1f4f680565a225369a18acd889c69262ccea81eb34c47405134735b715fb5efd89e680b04b6595eb48b4ff5a9ba571a158a2200633bcd WHIRLPOOL c4860c1fa7cfec5ac194e078c923e395c4bec3f7db53d4fc32b7bed958a407bfb11660c12ccdc808a902c1ec742ad379232af3a2a5b7c9d4b566baa95c002e88
+MISC metadata.xml 543 SHA256 219ed7f4106bc7f494d4dcfa4e95563694b3b0abd938f29c6ebe1d17f9714e95 SHA512 0d946fcf6d015b5ef2607abb4e6f0bef9956f4d8764435e8539d16ca25904996f0eb0cd582cce74105ab73ccd1a70c93b72a6e674a8686d4d732c31f31180458 WHIRLPOOL a37d3e8aff86a707d89d575b16ad7ff77697ba1a9eab71f1572a43f3d210235c8863d4e8d8656f3b4c8a140be677d4a6d38e3c30b300cd5582035d9221b5c558
diff --git a/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild b/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
new file mode 100644
index 000000000000..885e3886395d
--- /dev/null
+++ b/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - Qt plugin"
+HOMEPAGE="https://github.com/libyui/libyui-qt"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+# QtSvg headers only required, no linking
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-qt/qtx11extras:5
+	dev-qt/qtsvg:5"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml
new file mode 100644
index 000000000000..b109010eaca2
--- /dev/null
+++ b/x11-libs/libyui-qt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>miska@gentoo.org</email>
+		<name>Michal Hrušecký</name>
+	</maintainer>
+	<longdescription lang="en">
+Qt plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+	<upstream>
+		<remote-id type="github">libyui/libyui-qt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
new file mode 100644
index 000000000000..7edfedfc7f09
--- /dev/null
+++ b/x11-libs/libyui/Manifest
@@ -0,0 +1,10 @@
+AUX libyui-3.0.13-fix-qt-libs-check.patch 1352 SHA256 86ac6525d29a7d413da295ef93c3593e99759643dc5f96904f2b89f9ed79d473 SHA512 8e37ec5692ca49e21ccafc187d6bd7b97ee213d940f382835e7ab5436eacf8893479160659556f719154f59f895fe8dea4aa7072d8d5fc1143107472ed3c2299 WHIRLPOOL 0ff87b0256f3c203a8088e9aead4d5575614d3de3e8d2ebf1f884b91176435e811dce0d61f7b55108ede51bb60d41b0af38516f162a4cce448568044644cdb0f
+DIST libyui-3.0.13.tar.gz 204028 SHA256 aa3d961f4424365efdfffd4de1facdcd870570890681ebc9e59d16ea3687e44f SHA512 b698c4d44d9fa1d888b52f8d5e2216ff4a490ef97c153fac52674a237527807140663d87ceac7b36b0c6092e9035eaec7bfe7a2e1e93922de106873130a69c66 WHIRLPOOL a7c01af68f800e1f27ce5631c0b34ea35d3f82c3d173caea1516887de9bef557662ce0e577daa6ffb2003070adac40f958c7f3dd9c64d32b46fc11d4fed72b15
+DIST libyui-3.2.5.tar.gz 218517 SHA256 0fa6bc8f226ff74c5658fea27dfea532ca1c3199bd4ed9f70b3c1bb76cca5387 SHA512 174ec6893f749bc81495c2ee620e8c7d85e9cdb61db08d4f7d800c13306eb76e0f40d20a1eafeb579344b35d99f9735b65e63525ddd804cbe30ab7f4c18bec43 WHIRLPOOL 4bd63127753f329b4e8a8d8937c80b61eecdc1d634d2985e0f97d0d5497896c853042af319721d9c86ffddfe7802f2e4ef3c41f650d30428d7c5dfd91caa8ecd
+DIST libyui-3.3.3.tar.gz 230452 SHA256 37b0ccd93f7226248cd228a669f5f61ced5f615d17e9fb88db46470213b948f2 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f WHIRLPOOL c6e0d163a2881c289a592d9153d28157298e1fb9c50e122771338d719ace38356087531f1f1ef5586308efb0c44a2cde5eb2660e205346863da6fcc537205ab2
+EBUILD libyui-3.0.13.ebuild 1265 SHA256 7dbebf9b2a05eafde160c389ea680c43366d346444399726d3141fd6d697cb43 SHA512 b074e88ea19f88741b1f0190a5df79e2f62e72fdfdb2e42e042289e6364c5367480281f9db336d302f66e95e1620c587302b9e17de7f51dac7e630ca969d3a1a WHIRLPOOL 7ae2bd7c7b06c130e12392daef95bdb3eae1b97ef712f1061d95b4b97d8c58e1b777de9ca2b64f13cd15c40027bc59a7e4ad197a5b45874aa8b34f356c1b9a19
+EBUILD libyui-3.2.5.ebuild 1273 SHA256 c78bf96e0e8ee6b26524886ea0b8b86f3c5cde11c529b1d01be3d918e04cdb9e SHA512 2af655bf748f39c720dec6904123cde97c4ada91c3ba7b22fd8c36d12ab9d9ed1fa0639386bc716944218212a553d4c2d5245654426d92e19cc9d152da5a8510 WHIRLPOOL f1876fdc3b8e2877068ac8c6260b45772d95654c03d37aa0ff72600276e71f932feb825eab06f698ef94fcf84bbeb6a169d7e2a6c82101e3ddf6778084e4741f
+EBUILD libyui-3.3.3.ebuild 1148 SHA256 83d5d491b964a856b6186eecd5e733aac71dd4e13c56f636b82a0d4b701ca07e SHA512 0e64747ebd1d178c75044d7ba0d7029384aab450e2e748c04547d4aa681e93737fb03607a08666edd7c6f460563b830cf30ca420c4d29ebb55991e629eaaaf02 WHIRLPOOL 600a7c19dabfdff0dcebc72917b1d25e2067be73156dcbd77d4048bad6cf804b5dcb8c7153f71f9dc7c9455aef63cdfa89357429671b2acfb1dffbe07751afeb
+MISC ChangeLog 2409 SHA256 9cf6a47fec0001ac112ffd5831ebcef3ef09f43a3fa143ddf3d14cb03b718170 SHA512 08e782317d9353a262d1b42e984f422ca31d5277692e4200d98c8b421efab489b1b9a643ddb0951a657b4e65221b5e112711ecf97052565164fe2c53a654d8f5 WHIRLPOOL bcc727e530b6198c2d8be5cf68e1b198ebf4ecfd75ee6dc2da02136b82bd83dbc9d9d0dcd68e30e8e18ace26c17c001698dfc6f19ad9ce63461ac16168adfcdf
+MISC ChangeLog-2015 900 SHA256 569ea8eb6c6e619423cf72b5d5b55d004133e882e42d7e95494330f05684c37e SHA512 e9ca87ef8e686b0e7e81a0629b0b333c74afc0ea261dc2ed0ef4c4f04100db5ecdab962750327d0cddd739084b7276f3fbe1faa7dd059a89cf59e40d9fb47c27 WHIRLPOOL 70f6b8f9d8e989048bab2af0a2873918a8b5b2009dda6b9cd11c6cc8813e22fdbe71a5d34664906904c68deb079e624fffb1b66209f6dcfe4137ae9374f2b44e
+MISC metadata.xml 588 SHA256 04a94b7be42174196f980df3e03f6431b6d352182a68953746a3432487a64704 SHA512 529890c10bc0fd3830c07851a525ccf695a2392718445e7a28ca6a6ec974faa0ae413ba43fa85546eb310bef04af6125f1ba583afb0a8f726c20b95b79c09aa8 WHIRLPOOL 583030d32d2f116b09ae24dae765a63e9ad254134827696d11484c6cb753c8b6e530d0ee333aec5be06fd11b067de69c31449ca9b9ef3599904c8c6a0dbd01bd
diff --git a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
new file mode 100644
index 000000000000..63ac43ee1af9
--- /dev/null
+++ b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
@@ -0,0 +1,34 @@
+--- buildtools/LibyuiCommon.cmake	2014-02-10 19:41:45.000000000 +0400
++++ buildtools/LibyuiCommon.cmake	2014-09-10 23:16:10.317115440 +0400
+@@ -245,12 +245,17 @@
+ 
+ MACRO( FIND_LINKER_LIBS )	# try to find all libs to be linked against
+   FOREACH( p ${LIB_LINKER})
+-    FIND_LIBRARY( ${p}_LOOKUP "${p}" )
+-    IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
+-      MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
+-    ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
+-      MESSAGE( STATUS "${p} found" )
+-    ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++    STRING(FIND "${p}" "Qt" ISQT)
++    IF( ISQT GREATER -1 )
++        FIND_PACKAGE(Qt4 4.8 REQUIRED ${p})
++    ELSE( ISQT GREATER -1 )
++        FIND_LIBRARY( ${p}_LOOKUP "${p}" )
++        IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++          MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
++        ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++          MESSAGE( STATUS "${p} found" )
++        ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++    ENDIF( ISQT GREATER -1 )
+   ENDFOREACH()
+ 
+ ENDMACRO( FIND_LINKER_LIBS )
+@@ -616,6 +616,7 @@
+ 
+     QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} )
+     QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" )
++    LINK_DIRECTORIES( ${QT_LIBRARY_DIR} )
+ 
+   ENDIF( QT_FOUND )
+
diff --git a/x11-libs/libyui/libyui-3.0.13.ebuild b/x11-libs/libyui/libyui-3.0.13.ebuild
new file mode 100644
index 000000000000..5ed10cadaf74
--- /dev/null
+++ b/x11-libs/libyui/libyui-3.0.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library"
+HOMEPAGE="https://github.com/libyui/libyui"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk ncurses qt4 static-libs"
+
+# Only Boost headers are needed
+DEPEND="dev-libs/boost"
+PDEPEND="
+	qt4? ( x11-libs/libyui-qt:${SLOT} )
+	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
+	gtk? ( x11-libs/libyui-gtk:${SLOT} )
+	"
+
+PATCHES=( "${FILESDIR}/${P}-fix-qt-libs-check.patch" )
+
+REQUIRED_USE="|| ( gtk ncurses qt4 )"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp buildtools/CMakeLists.common CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui/libyui-3.2.5.ebuild b/x11-libs/libyui/libyui-3.2.5.ebuild
new file mode 100644
index 000000000000..b5c8ddfa6166
--- /dev/null
+++ b/x11-libs/libyui/libyui-3.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library"
+HOMEPAGE="https://github.com/libyui/libyui"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk ncurses qt4 static-libs"
+
+# Only Boost headers are needed
+DEPEND="dev-libs/boost"
+PDEPEND="
+	qt4? ( x11-libs/libyui-qt:${SLOT} )
+	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
+	gtk? ( x11-libs/libyui-gtk:${SLOT} )
+	"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.13-fix-qt-libs-check.patch" )
+
+REQUIRED_USE="|| ( gtk ncurses qt4 )"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp buildtools/CMakeLists.common CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild
new file mode 100644
index 000000000000..66ac31371916
--- /dev/null
+++ b/x11-libs/libyui/libyui-3.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library"
+HOMEPAGE="https://github.com/libyui/libyui"
+SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk ncurses qt5 static-libs"
+
+# Only Boost headers are needed
+DEPEND="dev-libs/boost"
+PDEPEND="
+	gtk? ( x11-libs/libyui-gtk:${SLOT} )
+	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
+	qt5? ( x11-libs/libyui-qt:${SLOT} )
+"
+
+REQUIRED_USE="|| ( gtk ncurses qt5 )"
+
+src_prepare() {
+	cp buildtools/CMakeLists.common CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}"
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_WERROR=OFF
+		-DRESPECT_FLAGS=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml
new file mode 100644
index 000000000000..18160984a06d
--- /dev/null
+++ b/x11-libs/libyui/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>miska@gentoo.org</email>
+		<name>Michal Hrušecký</name>
+	</maintainer>
+	<longdescription lang="en">
+YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). This can be used independently of YaST2 for generic (C++) applications.
+</longdescription>
+	<upstream>
+		<remote-id type="github">libyui/libyui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml
new file mode 100644
index 000000000000..875590a5fe54
--- /dev/null
+++ b/x11-libs/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-libs category contains various X11-related libraries.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-libs enthält verschiedene Bibliotheken für
+		die X11-Programmierung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-libs contiene varias librerías para X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-libsカテゴリーには様々なX11関連のライブラリが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De categorie x11-libs bevat allerlei aan X11 gerelateerde bibliotheken.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-libs chứa các thư viện liên quan đến X11.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-libs contiene varie librerie per X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-libs contém várias bibliotecas relacionadas a
+		X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-libs zawiera biblioteki powiązane z X11.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
new file mode 100644
index 000000000000..46f8125e2b77
--- /dev/null
+++ b/x11-libs/motif/Manifest
@@ -0,0 +1,12 @@
+AUX Mwm.defaults 536 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab WHIRLPOOL dbef57a2fb37b93f38993aa4ca04b082a4e8fbde3142867c11c4acd2e7a53ffdb65ef299d8f96cc06eb6572aa29ae8e6db8f3f9499aa46669f199f9f35023db1
+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 SHA256 e14bf48a46a9dfcaba5cbece799691835a1797e930127a3b5cd5765b17dd9140 SHA512 d509681101969f0e25aa6525ccabd82d772d05f9bb4f8a6504fbcd68d7b6f1fd859d3ed6b54c531ceced115201364b17e06471ca13217f15b798b25ddeea534f WHIRLPOOL bd14366def3b77f6aa4c6f561e1de72f4cf68c6c092c01416a6ef02e818df90e64a4d469360f454312b1e5ae144f1e4a2f2ab84472b5fa3a4bcdd91c015365b7
+EBUILD motif-2.3.6-r1.ebuild 3468 SHA256 d17309b7b71c906927fcac30ec26f92e389944ba46f7e99143fad561d249a32b SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828 WHIRLPOOL be443f5d65f50bfee19f876cd6f72f465b64570d22040868613c91b170d966125c19f640b7e2044c85bf3ca61af851ae87b04d080cebc9a5d08ecfd7921a70b9
+EBUILD motif-2.3.7.ebuild 3484 SHA256 59e420054d180a68f936d0f4043972c8e7a2c8611c22167dcf378bd8085d4a0b SHA512 86c18a4e1db68c69171f480bce9c1f0260dfc15cc9894ccd0150ba17abc90f7963c3ee1bffd19db2612d836cc8ceb3a2ac2c35a655c3a2123f6581be8eeda7d5 WHIRLPOOL ce57235c52b11903daca1712dcccda16b238525efc8be2803ce8e79eaf4ee78755800308ce4e7d96d19fad88999d1396ab9dcf13ec5ceb0f6191a33b3720e725
+MISC ChangeLog 4964 SHA256 297bf78b68fb8910b709b1a3091041c6bdb4319e3c1f8e8a8b5b2c3fc45a2f95 SHA512 6befd40959d75a958f1e17cf54d12b329a3c23d310af38783b697892e41f20bc1983df6bd59ab90151b387b670915c41e18a965f420091f52c1d45d2fb152430 WHIRLPOOL 14d91b7f8c04e051398d42b808b63e83707d2be5c44e05c4e82f35a01f8cea4d735ef0ba0d5449223a86febaf6ec432d12c6a02f78fd4c265b2e48ee4adf7d92
+MISC ChangeLog-2015 50215 SHA256 9f5f5eb863c4de12d6700f6f0388cc231b0570bcffc067a66ae107d7e119e620 SHA512 a3092801a506bd293acae3b3ada5a838c78bd91a2b87b018942293c9b655bfc9ce2865f507723013f3e6cf898be704e2ca0fbcaebbe0cff7081691f7e51ee7ab WHIRLPOOL ad2665a5ec5849ad54b8a568048156d10e1a3986593fe6a7280a5f68dfc1af6f482d951eba968a3bb46981521ac0830e6c5f08d4f28ebcdb23e50b618a223e0e
+MISC metadata.xml 394 SHA256 d57fe54e03da85dfa88af5418fb75fe8281298b87803401e2c342a8888d6f56c SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c WHIRLPOOL 8166c67b8d031c34710fcfdfe3320bb7fd9d2606bd386cdd5c7900eec5db5b08fc15b149651415ab5daee2ed73c8c171e6ef896180824c28ed72e4cc03a2ddb4
diff --git a/x11-libs/motif/files/Mwm.defaults b/x11-libs/motif/files/Mwm.defaults
new file mode 100644
index 000000000000..ea91b6fb8d86
--- /dev/null
+++ b/x11-libs/motif/files/Mwm.defaults
@@ -0,0 +1,14 @@
+Mwm*fontList:			variable
+Mwm*iconClick:			False
+Mwm*iconPlacement:		top left
+Mwm*moveOpaque:			True
+Mwm*rootButtonClick:		True
+Mwm*foreground:			#000000
+Mwm*background:			#B8B8C0
+Mwm*enableThinThickness:	True
+Mwm*enableEtchedInMenu:		True
+Mwm*menu*fontList:		-adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
+Mwm*client*title*fontList:	-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*icon*fontList:		-adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
+Mwm*feedback*fontList:		-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*multiClickTime:		300
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
new file mode 100644
index 000000000000..40ef2c33fec6
--- /dev/null
+++ b/x11-libs/motif/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ulm@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">motif</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
new file mode 100644
index 000000000000..c511707f1a96
--- /dev/null
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal
+
+MY_P=openMotif-${PV}
+DESCRIPTION="Legacy Open Motif libraries for old binaries"
+HOMEPAGE="http://motif.ics.com/"
+SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
+	mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
+
+LICENSE="MOTIF MIT"
+SLOT="2.2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXaw
+	x11-misc/xbitmaps"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	# This replaces deprecated, obsoleted and now invalid AC_DEFINE
+	# with their proper alternatives.
+	sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
+		configure.in acinclude.m4
+
+	# Build only the libraries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
+
+	AM_OPTS="--force-missing" eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --with-x --disable-static
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install-exec
+}
+
+multilib_src_install_all() {
+	# cleanups
+	rm -rf "${ED}"/usr/bin
+	rm -f "${ED}"/usr/lib*/*.{so,la,a}
+
+	dodoc README RELEASE RELNOTES BUGREPORT TODO
+}
diff --git a/x11-libs/motif/motif-2.3.6-r1.ebuild b/x11-libs/motif/motif-2.3.6-r1.ebuild
new file mode 100644
index 000000000000..7ffa37ea1482
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.6-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-2.tar.xz"
+
+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"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+	x11-misc/xbitmaps"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	# remove header file which shouldn't be in the tarball #578168
+	rm lib/Xm/Xm.h || die
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
+			&& use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
new file mode 100644
index 000000000000..ec09b0590406
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
+
+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"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+	x11-misc/xbitmaps"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	# remove header file which shouldn't be in the tarball #578168
+	rm lib/Xm/Xm.h || die
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
+			&& use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
new file mode 100644
index 000000000000..72e91bd5862a
--- /dev/null
+++ b/x11-libs/mx/Manifest
@@ -0,0 +1,6 @@
+AUX mx-1.4.7-gl-types.patch 1730 SHA256 1529d27ecf45dc9073e2e3fef1360c37a63f630b771147d71a407f26d8d036b5 SHA512 bbb2e8fc95b054b23982ff031f6298b2a9addebec557ab234ef88ef6fe67ac4cc1bd35545c73aee162e59113b0c49f8337e5f98efcb997d22a6f4b2410fdbbfe WHIRLPOOL c83e67aac377a5971a08568e332be5f8961e9dfdfa0a53c44646f7394329a54ea15e2fad282706d713d08d28b20c46216e334cd5797267e83099d7bf8644c193
+DIST mx-1.4.7.tar.xz 939672 SHA256 1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349 WHIRLPOOL bab7df74f07569b06a7793a42980c8fe56c337fae0ee05d752b7382db6c31c086a1388dfedfe628e97902d9cb44514aad9ea1def199ddfe3e866dd63215ff4ea
+EBUILD mx-1.4.7-r2.ebuild 1356 SHA256 30a5cd0c692b170e987e356ff4ed16cddc829ef2bc307a0491f6ea47d6ada598 SHA512 15e6e63f755e39b132c3fb105930f27653c083a70e287fb3d82e398594e12a8d3ac34f703b5422fdbcf6d04e1512b571776b6472fa3f44236742afd71a74fa08 WHIRLPOOL 87fa39ab35c2c747113a4baa7777d6d429d3cc803f49ad1c6aa0fb7bc47c0ad553b507c290ab0a238ed7347c78a6f1596346d8c9b025663fda6a3bb031a065f0
+MISC ChangeLog 2658 SHA256 7931a359533fc26705722d0f5ae9c05ca62adcbd265c07a787ae74b6d2e65c2b SHA512 b947bfa5b9df44530342fa5533d0452d709e9fe438a0b378ab9f0d146227b6f9595e4877da79bd5ced6b031b423210837d0cd780778f5ae89e708d8b80b118bb WHIRLPOOL 2366fa67160677f37cd0da3e98866eac0ac91ad70098b627236ec9d1464134ec6563c2a7f1028629d37ea7a1d077bfbfac9d60b29d7b2403d85619655c075deb
+MISC ChangeLog-2015 3095 SHA256 63db2f548c55517f739bd28035d495a2d508e494d75fda6ce23d6d05305e7607 SHA512 6a589f76b42c97f8160c63b26e79158a6a2fd48cc3159744138c3390a1f68a998d9704ffa509fa213bea9dc8d4ff8afbdb33e74af0129a6d255681017cc8aac0 WHIRLPOOL 559fea2e604d2e14801e5366ab384d0699d79335c2f1b34c40cbf24064ce65c2292577f2446f4a033ca2d4abbd05f778e15f508dd3d5d924e97839d739a70912
+MISC metadata.xml 336 SHA256 188ac61c63b50de01080ec394f28f7606d41854bd94d1a734649e6837a71132b SHA512 aeac1b46fd9bba7bfc87813dceffe14128763f931816e7b9e320c9e75631d383a097e499e73f0b50d3e6a6e375605fa30b147b1e8f2f8db972aa8a707e593249 WHIRLPOOL d05730cd7a0b4473617d7d27c7d6f8926be6019d0337f4647afe5bcf50822ab7043f747dbc5de46a0eb26154183dcaf5f5316feb078708714bc6e7367431b17b
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
new file mode 100644
index 000000000000..85c691378d84
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
@@ -0,0 +1,53 @@
+From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
+From: Brian Pepple <bpepple@fedoraproject.org>
+Date: Sat, 25 Aug 2012 17:41:59 -0400
+Subject: [PATCH] Replace GL data types with equivalent glib types.
+
+---
+ mx/mx-deform-texture.c | 8 ++++----
+ mx/mx-texture-frame.c  | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
+index 93c54d7..466cc9f 100644
+--- a/mx/mx-deform-texture.c
++++ b/mx/mx-deform-texture.c
+@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
+ static void
+ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ {
+-  GLushort *idx, *bf_idx;
++  gushort *idx, *bf_idx;
+   gint x, y, direction;
+-  GLushort *static_indices, *static_bf_indices;
++  gushort *static_indices, *static_bf_indices;
+   MxDeformTexturePrivate *priv = self->priv;
+ 
+   mx_deform_texture_free_arrays (self);
+@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
+   priv->n_indices = (2 + 2 * priv->tiles_x) *
+                     priv->tiles_y +
+                     (priv->tiles_y - 1);
+-  static_indices = g_new (GLushort, priv->n_indices);
+-  static_bf_indices = g_new (GLushort, priv->n_indices);
++  static_indices = g_new (gushort, priv->n_indices);
++  static_bf_indices = g_new (gushort, priv->n_indices);
+ 
+ #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
+ 
+diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
+index bde57ff..a88985f 100644
+--- a/mx/mx-texture-frame.c
++++ b/mx/mx-texture-frame.c
+@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
+ 
+ 
+   {
+-    GLfloat rectangles[] =
++    gfloat rectangles[] =
+     {
+       /* top left corner */
+       0, 0,
+-- 
+1.7.12
+
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
new file mode 100644
index 000000000000..6838de46e0f3
--- /dev/null
+++ b/x11-libs/mx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">clutter-project/mx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
new file mode 100644
index 000000000000..f412af69564d
--- /dev/null
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="A widget toolkit using Clutter"
+HOMEPAGE="http://clutter-project.org/"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus +gtk +introspection startup-notification"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=media-libs/clutter-1.7.91:1.0
+	media-libs/cogl:=
+	>=x11-apps/xrandr-1.2.0
+
+	x11-libs/gdk-pixbuf:2[introspection?]
+
+	dbus? ( >=dev-libs/dbus-glib-0.82 )
+	gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.9 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Tests are interactive, no use for us
+	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
+		-i Makefile.am -i Makefile.in || die
+	# In 1.4.8
+	epatch "${FILESDIR}/${P}-gl-types.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-winsys=x11 \
+		--without-glade \
+		$(use_enable gtk gtk-widgets) \
+		$(use_enable introspection) \
+		$(use_with dbus) \
+		$(use_with startup-notification)
+}
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
new file mode 100644
index 000000000000..6186a8bb9039
--- /dev/null
+++ b/x11-libs/neXtaw/Manifest
@@ -0,0 +1,5 @@
+DIST neXtaw-0.15.1.tar.gz 577459 SHA256 7cfe6706b9a76620389e04a7a87f06786c8a6606829c3157c3e9e45a805bb584 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1 WHIRLPOOL 5750610fc3533131f560543092fb36513bff41bb0d4e4a7921f8dccdde88c5422ac926229fd53cae093084a6cbe48d9b71ab0df227941af57ed5036f6d49be85
+EBUILD neXtaw-0.15.1-r1.ebuild 757 SHA256 19930e0c77325a110f60354fe667e0ee4acc96b2b4710ad05a1bd2e35e4ed995 SHA512 cc96b5d3579ee917ec8b2986e598a97d4edba46475096af4c5c0435c9a8594fd95c0bf5948623c9dd7865754c2ef36caf51bd59d0dd9c666baf3b200f5cad31e WHIRLPOOL 990cc6a609d363ea0d4776775847dc7ad63c3ed617fdfd7ddb8f4f6c087c7857a672a6da2643da91fb7a3565dfdf9d52b315e6dbe8e421bb9fed8df978f3045d
+MISC ChangeLog 2527 SHA256 a5a474c8876a93bbb2d3b8692dcf392b9058d2d457c0cab7f7914ef352ad495f SHA512 0bf6c0c5dcf77dee9a8f8b80c74ce114b3be86f4e309551a69e7b53b3adba07ffa65f95bb89c700be1f55c6377559b4219b87ebacaa1ef41a913d0d4c5073e43 WHIRLPOOL 155404af22469bb2394785689ca21deee82b8fa313e55cf9c1b5203354effaa79041067313510b7b36de3ace1b03d217050005f1413b984f8bd2c325542ef37b
+MISC ChangeLog-2015 3938 SHA256 9ad95d69dc17120e4c8bf209d4c4773d3e8dc63fb1de1d36011698edc783f36d SHA512 96008810d7137349e003ea9f6328dba3a880a1dfe96cc589d78fed3bffc1abf8481baa4752f6bc1d0e81d5b52ceeda4c3697cd7ebf1928cb7c2ecd63940858e6 WHIRLPOOL 2994c8f52d6b5f5645047be51107a484f2e4d3bfe09c0c02c0dba6554430deb1fc57d9d22bd7608523748a36bae4671309051e412cbcb51958a6dac5ea785f2c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-libs/neXtaw/metadata.xml b/x11-libs/neXtaw/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-libs/neXtaw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..4328ed862442
--- /dev/null
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
+HOMEPAGE="http://siag.nu/neXtaw/"
+SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libxkbfile
+	x11-libs/libXpm
+	x11-proto/xextproto
+	x11-proto/xproto
+	!<x11-libs/neXtaw-0.15.1-r1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
new file mode 100644
index 000000000000..cac61362a1d1
--- /dev/null
+++ b/x11-libs/pango/Manifest
@@ -0,0 +1,17 @@
+DIST pango-1.40.11.tar.xz 854372 SHA256 5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a WHIRLPOOL f1985fc2e4763a49e29e69337d086f9ae51464db4efe4cb2bde72cccfd9b7fc83fdb8d4fd1cb2d0f0ec2fd6682622bd84515e91e45a94ba87dfe6c6e3af6c2b5
+DIST pango-1.40.12.tar.xz 856228 SHA256 75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d WHIRLPOOL 8c0a64d15dde5cdd578ef16f19b4154ac0bc318f6bb8b280ba0ce53a9ea499d7ebcd6058b8a235ea9afde562f9b737734e988fe3cc25cd8b96bad2d36ae0e9cc
+DIST pango-1.40.3.tar.xz 1061044 SHA256 abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27 WHIRLPOOL ba160e7a9f5ecfbb4d88f780b4a9a5f555f38407d4f50f6ae0b0d276a3d4100dce4af519ceadce8b95c3432976af4409e119cfd18bd7c636d70e6c33ed7c5b4c
+DIST pango-1.40.5.tar.xz 1065152 SHA256 24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d WHIRLPOOL 8d8eec25ba18096ce9c5fae2ce9f1d54e908784482669daa8f505863f7b5529c50fd432fb93c3d8d6bb3ef2ac311c59e68667393dc0442335a97171c480d2294
+DIST pango-1.40.6.tar.xz 832040 SHA256 ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7 WHIRLPOOL 45f32e02007c53f079499c5d4b92c67ed528e3c2108f414b3ef18b53c8114a8fe2ae4f71707ecb977e224e86a5b05d8e048f39f8deef41d6342194b19a84d6e3
+DIST pango-1.40.7.tar.xz 841268 SHA256 517645c00c4554e82c0631e836659504d3fd3699c564c633fccfdfd37574e278 SHA512 225175d23053cf96657f572a44415029c00a76d8d8a82a3d146ee678984aea36492518ed327b271d30826777674d9b25a770ea9b66d7eb025883022c0ea7d58c WHIRLPOOL 990af8f086da2c6118379bfcd2ab178dce58998e4bdf9c70006f1dfcdf8470655a71251e009e7384743de573d8be45f56260bcdab0b065d7fcecef0650d2ca57
+DIST pango-1.40.9.tar.xz 850840 SHA256 9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16 SHA512 fcfb6f047dbc1b265447beade2880c4618c1f8ec0111c2191cb44866407dd95fcda662e56f568fd95c47ceba90340346e57ab51413e459866518f1d35173eeba WHIRLPOOL 1642b720c4bb15ac2583c7928491c1f207430434420c182ea843497c844410067dd826c3c687c15c7b23a4e4a248199784e311107f2e33cf2f42086183aab597
+EBUILD pango-1.40.11.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
+EBUILD pango-1.40.12.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
+EBUILD pango-1.40.3.ebuild 1710 SHA256 c8ef2c66ac9ae7e509a043b189d90d9e553b4feb447c909f4bb7007853835cc5 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139 WHIRLPOOL b5888c87b1ecdc4ed219bb10fbfac97684d0d88d262d42bb2dfd9ebfa50424fb8c5a270716318e57010bc3bf072e3df2d978ea50d9e927be81dc22cbb1bdb981
+EBUILD pango-1.40.5.ebuild 1702 SHA256 ede80a0661b346b4162753e918b15951fca82eed7244c84eb08f9f0fa232e2b4 SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be WHIRLPOOL 510e51d5e24e32be3dcaf8534d14a3d320b5d955fa3135a09b750fb15e811b1cf81ba8e61ff604807744fef0d70dc6e33221c6e27f36baf579eb2a01ad37af4e
+EBUILD pango-1.40.6.ebuild 1704 SHA256 0005f6a92f087cd57c08862791e366423d8f84e3d2a030d170a48c70d9307458 SHA512 500a793235784f3e3622261446c9209e81abd7bca5b7b1ec8e1a5b99f06bc1b11c5a1b0cdf003aa011c64ccc8a8d457a2f5c13c2728f49abb48ad707e3ef546e WHIRLPOOL de6fd9d880f68d7db69fc6a4c70dd57b4d972bafa2acd9f353d852d32826a38bc3c313d4d56f03be8aa24646bb90ff5618fd16d50325bddeb7f0c349506f120b
+EBUILD pango-1.40.7.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
+EBUILD pango-1.40.9.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
+MISC ChangeLog 7537 SHA256 7c240545b3057191c8c21d869e75f5e9adbb6b08467ec1f2e06eefc99f6f291e SHA512 f6a8f82ce7c1ca396fc2381b8659f7cd010ede8290f4b68aa6f36f2fb49ebd26436cc38b8d7215e7db96881c7df71a951a6d6908e3ef4781bcf468f7bad711db WHIRLPOOL 4a10d6f548a5be7da38d1a0ea15f11c13af930c07ffaccfc3151ed1151f8edccb2a7ac144cfa2883e3547897237175b7bc4821a1e4182888a42622228f24b4a1
+MISC ChangeLog-2015 55303 SHA256 d2425a236b8e768ab4026f52c3ff754c0c90fbcc916f2c912b80b5687f992bfe SHA512 afd5a358a1e1304c7e25508691ddc607082de989f9178305600bb14d8da65dfb4c71b55eba358a8824afea034f90d88f005569ad0169ff6dbdb5e1f3e6b9b324 WHIRLPOOL 4be71330b75a50197fefb6797322dd8f2c883494c432d6a572dee714ae56cf3966ee8b208d17183233711905329b90fd3e29798a88014474103ed64923c53bfb
+MISC metadata.xml 412 SHA256 ae0b5d751de8eb7b3896f1216fd5596763a4f1d7c1130ff33ed8a97f720cc1a2 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e WHIRLPOOL 451263c524b780e6696a0c8cf40f6797c29549493f49caffb70508e3ccca12af3cb1365d25c742dd228c34c5b1c1800bbbbfafaa083627924f949922328f77e6
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
new file mode 100644
index 000000000000..ce9f853c7f5b
--- /dev/null
+++ b/x11-libs/pango/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+  <flag name="X">Build and install the legacy pangoxft library</flag>
+</use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.40.11.ebuild b/x11-libs/pango/pango-1.40.11.ebuild
new file mode 100644
index 000000000000..0b59c658a54d
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.12.ebuild b/x11-libs/pango/pango-1.40.12.ebuild
new file mode 100644
index 000000000000..0b59c658a54d
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.3.ebuild b/x11-libs/pango/pango-1.40.3.ebuild
new file mode 100644
index 000000000000..04d6674732f7
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.5.ebuild b/x11-libs/pango/pango-1.40.5.ebuild
new file mode 100644
index 000000000000..2b45739d6f2c
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.6.ebuild b/x11-libs/pango/pango-1.40.6.ebuild
new file mode 100644
index 000000000000..bc8369565dee
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.7.ebuild b/x11-libs/pango/pango-1.40.7.ebuild
new file mode 100644
index 000000000000..0b59c658a54d
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pango/pango-1.40.9.ebuild b/x11-libs/pango/pango-1.40.9.ebuild
new file mode 100644
index 000000000000..0b59c658a54d
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
new file mode 100644
index 000000000000..6a336d97c47b
--- /dev/null
+++ b/x11-libs/pangox-compat/Manifest
@@ -0,0 +1,6 @@
+DIST pangox-compat-0.0.2.tar.xz 267396 SHA256 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3 WHIRLPOOL 35d3eca57ce09c399204ca8d33e9f3fb44761b042e6b3c2672bdcab4d21bf4c772966664b7545288d7dfb6bce7dd712a5904805f662cf8da2690f247de089959
+EBUILD pangox-compat-0.0.2-r1.ebuild 937 SHA256 e862f8a3545965c23a5465cde50694a5ac9b4cf4fedad34cda2f0606b92daf82 SHA512 f8f4d5cf1a867468c7e17d8fbc2858054cc20043281096ffbabe6cb667ab2df3f1ab493b56d406ec840058351bb6b7d2cb8a9b6251bb76694ed5dd4aaec06c1f WHIRLPOOL e548856e5220f0410fd851ebda1abf8a6a373be2b75a1b6777aea15844fce3fd69ce70c14fa14795575c052dc0cc02f0e5411e7044025ab2b58f982425492943
+EBUILD pangox-compat-0.0.2.ebuild 657 SHA256 5f1f0d89608e320958d028de6c6782f6c79b307193a786b346cf3a844bf6e5a3 SHA512 afa7f9f7cdec3aad745c95f9a6f63ebe869ec7253c7661d2b6ec06b1a5d717b142a63f92fa0beb90ed67e1491e0e6e00d25a4ae62f4cecd61fe910a31fdf0228 WHIRLPOOL ea77738cef9954310e1b261dabbb4bb0c96cc4c8a6a38165b1abff60bc14b9d504583e989d4bc0cf84eb5425228405bfa2772c7eadfc5a24f4c333b99f074e0e
+MISC ChangeLog 2515 SHA256 da6591f7157728a98f3c7bc44cb51da9f8dacbd8cee5fa5ed6f43686d8021efd SHA512 cb3aae1bf34065dc413975e550c7118dd2e90877f4a6137cc8c4cf2e016566593a5c57380a621ecb4c00a8c42c1e7448b283685ac51cb257af6e17f42fe9fe84 WHIRLPOOL 700c5f0ec8875b11feb5f87cce675b992407a6932e07cf9d051e95fca2baa5f6b6638c7a3cb667954e4843168fc568075e24c623cdca350c2e0b9ebaa3d07904
+MISC ChangeLog-2015 3842 SHA256 228ae9da2028b394c9a2dd28f1e112c3c89d9bd491dceaebd667361bf2910177 SHA512 51d6e11815c4d49680efaac505a22dc25715c30f362dad6e8086c1780e44ed4096f769a9b7044c5dc35275b8686159ac1583f8c6ea98c57c20cdb7c4844f3e64 WHIRLPOOL b49ee1537cd095663a2c97b608874f7257afb949f5266098e4f1e40e0bb9d060f87f80cdf24a674cafab7f7dda9e119476b5321a68fc62d8441e9a91bf47ecbf
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/pangox-compat/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/pangox-compat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..052e36a4474b
--- /dev/null
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="PangoX compatibility library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} gnome2_src_configure --disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
new file mode 100644
index 000000000000..a079bc01d1de
--- /dev/null
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="PangoX compatibility library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.31:2
+	>=x11-libs/pango-1.32
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	G2CONF="${G2CONF} --disable-static"
+
+	gnome2_src_configure
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
new file mode 100644
index 000000000000..234acee8fb90
--- /dev/null
+++ b/x11-libs/pixman/Manifest
@@ -0,0 +1,6 @@
+DIST pixman-0.34.0.tar.bz2 739656 SHA256 39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418 WHIRLPOOL c5aa0abc6f09b667cbb91b926536ffa9c2d88ef61b7d4d2377bd57dd6844689db61a9ef1ef6282878bbfec1068454d3d4f188b1ff269e86e3b77d95b261c4c06
+EBUILD pixman-0.34.0.ebuild 985 SHA256 a955811280da324324a369d0a57d74f2bb2c89006fa24fc188e5bb9ce55323c8 SHA512 447485399d2818149526993c184b2c3d9272c4dd5f03b19d2e33345394d7715477e92fbce620a3b443c37c342ccbf59b41e12964f57b42726eb83bda0033a5dc WHIRLPOOL ae6b265252f0bd903bc81e1901efc40387b6eda2418ea14128b849c3c18674d33f78eff782992714178455b283f2e3258e3124991a2b89943d20f28320112c28
+EBUILD pixman-9999.ebuild 995 SHA256 07dac0917c00ef9e30a70b6d092658aeb31d2e2fdf2a180fb0e1666e90e80726 SHA512 802f11a5e00590e76fc2c09ffb136a3b14af92898903b90dbe398518213461a692652cef10cfc6acccef41424e7c64499175be67105ca920e146459cf9e8c358 WHIRLPOOL d0dcac1f6b3e3cd021581dd1d0f7de5323d95e57b2760b95cb7ec778649fb5ba5c289397ec8648a12933a87c24cce01439bba59ab5753d95f7b76cc133ead23b
+MISC ChangeLog 6928 SHA256 1fd75daf2c12866f5babffbb091a209db1837951e4a1741e5bd7ed3a06d9a3cc SHA512 9d6d13e45473af641ff5b8394c3fbd49662538f773d87265162ba5c6e0e2c4b74076125f678a9432076938a8721d3c1103c389400d8ce21a7385ab236a90eb89 WHIRLPOOL 948836b6de07de70785ee061d0c488d2b374c59d94de8d17993ba8ae1d7c6366a3206fcc4160acf878c2cc770abac5c1994b1fda3b61823641f47fbd6a298f2c
+MISC ChangeLog-2015 26398 SHA256 772224cd0014b0910681481a47bca076bd98e9b36800e1f1b7610816b011dbd9 SHA512 c1efebc2d499f6d8c0e26bd90380a90fa7907f12a5a4e7434386eae5d8d82b2753be5c9b8704f8d3e2fdcffe391f585100cc6fcca954e71de93085eefe4605ef WHIRLPOOL 755dbf3bc80d70d3d457991eedb8531531f21f8649160c2e852366847cfe2954e1c006c2f1072b5940a99ec46b51d60b72ae7f4093b20ce41b91e23dbbd9f285
+MISC metadata.xml 391 SHA256 251ef049abce3c0e7d76479988f4ecb4e836e90015e05ae1bd25c7f5b82e54fb SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc WHIRLPOOL a1d45b3b9a12612a1619f054763eff649bb4516c7a81c3fbab2f1961eec242c2356d7fcea6cec64e190e21a05977ef1a894e8692c23ba08c3619799534bcef0f
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
new file mode 100644
index 000000000000..46b4979bd90c
--- /dev/null
+++ b/x11-libs/pixman/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<use>
+	<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
+</use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/pixman/pixman-0.34.0.ebuild b/x11-libs/pixman/pixman-0.34.0.ebuild
new file mode 100644
index 000000000000..7ea8007f19cf
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.34.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/pixman.git"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+if [[ $PV != 9999* ]]; then
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable iwmmxt arm-iwmmxt)
+		$(use_enable loongson2f loongson-mmi)
+		--disable-gtk
+		--disable-libpng
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
new file mode 100644
index 000000000000..983516d40153
--- /dev/null
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/pixman.git"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+if [[ $PV != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable iwmmxt arm-iwmmxt)
+		$(use_enable loongson2f loongson-mmi)
+		--disable-gtk
+		--disable-libpng
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
new file mode 100644
index 000000000000..7011bbf4e8d9
--- /dev/null
+++ b/x11-libs/qscintilla/Manifest
@@ -0,0 +1,9 @@
+DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
+DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
+EBUILD qscintilla-2.10.1.ebuild 2396 SHA256 a5cb62fb39e0ccb7c31fcb7e288081b2821e30713a6711275e8c0b824d7a130a SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8 WHIRLPOOL 1559a93f0715db45058117757532207f386ce99d0dccd003f5846797fdfb97e9d0bc0ea8b5af88188a692f9dca44bf7ffbac365f601581c7a4680492d90e0e32
+EBUILD qscintilla-2.9.2-r1.ebuild 1777 SHA256 1f7bd7a8f06f07e8e778f9295fb62246cbf690298f99066ea00fc37e7d9d7d41 SHA512 ede8971a07ae607c1c4fea4270bd24ff2631fea7511b0baf1417d41f082fac3b64b5aae8db95ee3ddcd2c4d97fbb04e55632f86b8605689eb8f99d9791420c95 WHIRLPOOL 7f4ec51cf244bfe0fdd30ab3f165819c646c36706e393ddabd0d75fe1d292ce9d23a69243574b8ed012993ab0dd3c47c47295ea1f3536944b7a80a5b06835e01
+EBUILD qscintilla-2.9.4.ebuild 1998 SHA256 949f87c4e2e2034e0027af644a3f137c2e7534f90d02c2ebc3b3212eb41f4301 SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635 WHIRLPOOL cd6e7baa030e5e5f917a827e8e69be3a46d5b3a4c5b819f1f8e3e7df22c8374401d96ccb979ce7f3e47473c66569baee5d604c0313ec61634ed2209acaf3ee5c
+MISC ChangeLog 3865 SHA256 34fce0992e4657060bf5daf948d10129fcff1d81952264ee0f95f5462fc64709 SHA512 0359bf04fbf3830660bec3e9e5734791a6a1a600ae57078c1c4936928181fe0c19d0a59e6abd0d58d4f13f80cf8f0fb94893b558768004a9581a78fb75d4ef2f WHIRLPOOL 8c4ec2082187603e27453774300702c694fa4f7b21acffba2c6dc4ea8c0103796dee52d27978d9f52273ba9b4507df728e8b65ff86b300037ec1f7f592b028b7
+MISC ChangeLog-2015 25822 SHA256 a32a6b9f68f38489e3d8fa11e94ab71fb591fd0d9406c2a37de7c21c4f5cbc55 SHA512 ecf838408ea0990002758dd3a1e4804ccf9de4d0c2893a55d2740af86a96437e297074018e8f0646c89888141578753e19527a7a4a29cd9cfc1489feaa7e6943 WHIRLPOOL 8ffdfdec545ec1b6ca2ad2a8188da05fefb14051745c41f2e86afe8389f571a63689695893fd9847682eb5dca73ee3aa5e527cc2255f3aa693e858e3e474c0bd
+MISC metadata.xml 741 SHA256 2384c2c322b1f1798aa774af7937d432e263134cd4d47e79fc2b38ee05b338ae SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a WHIRLPOOL 68a66be849c4450b9e6dd1d5fd2ed4f5788841555bc8697b6396efb7833bf849e10e62ce1bee74e8d86aa55c1f229af76b6b04661b7fd6d3af4b52d03daa9ca7
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
new file mode 100644
index 000000000000..29550d86338f
--- /dev/null
+++ b/x11-libs/qscintilla/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="designer">Build plugin for Qt Designer</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
+		<remote-id type="sourceforge">pyqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
new file mode 100644
index 000000000000..eb99746332b8
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multibuild qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+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/13"
+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
+
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+	multibuild_copy_sources
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use qt4 && append-cxxflags -std=gnu++0x
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_configure() {
+		qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
+		use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_configure
+}
+
+src_compile() {
+	qsci_compile() {
+		qsci_run_in Qt4Qt5 emake
+		use designer && qsci_run_in designer-Qt4Qt5 emake
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_compile
+}
+
+src_install() {
+	qsci_install() {
+		qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+		use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..c6c36a38c427
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
@@ -0,0 +1,81 @@
+# 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"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	designer? ( dev-qt/designer:4 )
+"
+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() {
+	qsci_run_in Qt4Qt5 eqmake4
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
+		qsci_run_in designer-Qt4Qt5 eqmake4
+	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
+
+	dodoc ChangeLog NEWS
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/html-Qt4Qt5/*
+	fi
+}
diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
new file mode 100644
index 000000000000..66c077633535
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -0,0 +1,91 @@
+# 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/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
new file mode 100644
index 000000000000..3e3444178e00
--- /dev/null
+++ b/x11-libs/qtermwidget/Manifest
@@ -0,0 +1,7 @@
+AUX qtermwidget-9999-nofetch.patch 1236 SHA256 6bc62d62f05549fd51d7fe450b06f6249863efa397a74379603bbe8fa1db504c SHA512 b7fe3cc1effb00fc8f6a62cc6284de756e6a6b671ae8c803dfdb89f7af74055570711b7d8d8985695c7ca40fb419768721ec8a748f7658590304c90a07053c84 WHIRLPOOL 3381aaf86bdf0e1e8dff2fda7adc719d82a8be8040244a4a5b4c31411031d7e2f1709b875ad20efaf1f1de880c0f123420fca01973813c6717c96e7050c0a666
+DIST qtermwidget-0.7.1.tar.xz 158172 SHA256 82b2f4d7cb58a34e866cf37b512e313f5f01c1d8a84ba532f0adf50e6d834d45 SHA512 a8660ca5355103cf9d9f72ec5213f3c04d02dff44ceaa26297960def07335596eba6b125a7b3ca1a02f8c19a99edffdee68c57ff0c3f357cc3df149d3e9c5c99 WHIRLPOOL d1cf25a9dcb173a96e779b8b382b7705e200aab9db351e22f3b78fe1d8427a831a2e505fa76159399945dc569877941a00a12809bbcfa9e7e8d1ffbadb5228a8
+EBUILD qtermwidget-0.7.1.ebuild 447 SHA256 db23afce71dc1644886beb7d0900939d86d4201b5b637227b14c4356e4e87b74 SHA512 bdc88cd3b2b0921e91cd0fca026bdecb3a4a1b6f2afac9152d4f132ff1807fc65466f50ff3c91f04f09f363d3772dc9ce0fb03ad201757874338a9797180e7c2 WHIRLPOOL 01869ad2cb5ad5b9bf7157e01378c61569c8e8f8a3eac0752fc3270e4bed09bbadf3d0c2e331b9df04f727fe6c6f5900c42215a882e8b8ced58a65ff2deed9dc
+EBUILD qtermwidget-9999.ebuild 494 SHA256 f8140544b98f82c4622f3ec0842177faf91f0c80b36ec79bec0e1b9d8c695473 SHA512 b646927ef608b429b0c878398a8563e2a781aa747f9d8ae9d9ac039d0f88a98efe127be70381f88fddf3fd08312e6a58532d5897f7168dc41effc4e225121eb0 WHIRLPOOL ea5a19a797975a7575c01711c71b6d92e3ae1cd7cc0484e98182a248dc001125b058f81f4faaad6ca8972d87b161f228d79b761ec9ee30255e2c33b834322ede
+MISC ChangeLog 3955 SHA256 cb57758d6f32c30316ce0f3ff8e0df58d908b23bf33547eb0ec6b6c246eb73b1 SHA512 2876c83f0aa58f1a87a7b89c06234613704427cb8c1b06e673f5d6e78f89811eb8633270bf0ff5352fabf477d549fd2cc5cd80ede0926fd8fa368cba1d30c962 WHIRLPOOL d0cacf5e22063acdd5fb07fede193e4a899b5d372f4a609f7ec2b08193f1cedfb13baa198e5cb395a3045d73a965de95d9e7f196126b25fed8ba3f81d4176d5b
+MISC ChangeLog-2015 2196 SHA256 db909af40292c0bd3691855e8fa90c2dbf9732b15f22b209ca46e9ceed73c5fb SHA512 6a931b9b8fa095c852a05cd9e2bd82ca320b5390021499cdce1ca53b470978c2f56bea03dcb0d9dce8da28517295067324e19b6e5da22d50f78ac9d612ea16d9 WHIRLPOOL 5f9319551943584c7188442187e6615ac47494c1d18e44007af870f38467232cc24447b45e7b9b15cec839f6e5fb6e7678de9cdbfaf3efab2b439dfbc427cfc1
+MISC metadata.xml 601 SHA256 0b407956c2d14c20f4d2b1c4c5ea1dff4b2261606fd9b0454a05d0f021492f6a SHA512 529451269b457fa56a9cab375f946849779035786cfb4ee2955b7cdeacbad3303408f31fbad6eadbc3d4fc983e3ab20ec48f47237863c1166aa10d44be90527d WHIRLPOOL 2326b5554ac98db55dbe75939ff868e08b14490c158b4a3cfd5bb82ebf9640e1fbbc20077dd598b939675a6db604ee566a733ce834f6e647200253c946db6ea7
diff --git a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
new file mode 100644
index 000000000000..a4827d6dbb8b
--- /dev/null
+++ b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
@@ -0,0 +1,41 @@
+Do not fetch translations using git at build time.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,9 +29,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+ find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED)
+-find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED)
+ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+-include(LXQtTranslateTs)
+ include(LXQtCompilerSettings NO_POLICY_SCOPE)
+ include(LXQtCreatePkgConfigFile)
+ 
+@@ -117,26 +115,6 @@
+ qt5_wrap_ui(UI_SRCS ${UI})
+ set(PKG_CONFIG_REQ "Qt5Widgets")
+ 
+-lxqt_translate_ts(QTERMWIDGET_QM
+-    TRANSLATION_DIR "lib/translations"
+-    UPDATE_TRANSLATIONS
+-        ${UPDATE_TRANSLATIONS}
+-    SOURCES
+-        ${SRCS} ${HDRS} ${UI}
+-    PULL_TRANSLATIONS
+-        ${PULL_TRANSLATIONS}
+-    CLEAN_TRANSLATIONS
+-        ${CLEAN_TRANSLATIONS}
+-    TRANSLATIONS_REPO
+-        ${TRANSLATIONS_REPO}
+-    TRANSLATIONS_REFSPEC
+-        ${TRANSLATIONS_REFSPEC}
+-    INSTALL_DIR
+-        ${TRANSLATIONS_DIR}
+-    COMPONENT
+-        Runtime
+-)
+-
+ add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM})
+ target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
+ set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
new file mode 100644
index 000000000000..d1448f78dfc3
--- /dev/null
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	QTermWidget is an opensource project based on KDE4 Konsole application.
+	The main goal of this project is to provide unicode-enabled, embeddable
+	Qt widget for using as a built-in console or terminal emulation widget.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">qterminal/qtermwidget</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild
new file mode 100644
index 000000000000..5d568599545c
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/lxde/qtermwidget"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
new file mode 100644
index 000000000000..0c383aa50cf9
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils git-r3
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/lxde/qtermwidget"
+EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${DEPEND}
+	dev-util/lxqt-build-tools
+"
+
+PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
new file mode 100644
index 000000000000..c740a333b127
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -0,0 +1,6 @@
+AUX qtscriptgenerator-0.2.0-arm.patch 2601 SHA256 8ca35c7066ef51b9cb3c61bb9da46cb105ba4eec51de635d10e462d193b491f9 SHA512 285ca3c10e452407a40d000f8fd352d38fa7414a5fb9fdefc0af20cc3da541459c33eb1fbd97320846acf1e86163e1e57a1ac4258a326f6fe8ab5f4c29df62b0 WHIRLPOOL 43a8a1648793e5dded0077a14a56beef2110af4fee3744d64e94135b13a5966cb7e126933a76206c992d6e6ec0a7f790bfaeb831e32f54529ce7e2a93244bcbb
+DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 SHA256 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69 SHA512 54b91562d275b634b50ae8f6ae024cf738605efadeb3085527087ebdc8b6b86559088972ab5dafb7ff1ede6d18dc135f935ac1fb307a17ea1975b4f7629cc0fa WHIRLPOOL 7d52a0f88b89f1a374a175b946ef304752c1ced67fa4123f1dd87da35160221c4495834a4012d05a2f8628344b1a58e39ad46e697a16ca358de07406b9db27ec
+EBUILD qtscriptgenerator-0.2.0-r1.ebuild 1380 SHA256 aa58a02df36378a3add2cc757ff879f14aefdfc04915542c750e487eae2814cc SHA512 12cbcfadd0b847c795557bbab55f41c0f5b5f64cb4a3807b2275fb7a8c3170ae921f508056d1286a3839babdd637ebee5f03fd94b7ca1f05f8bfb42a46d3af5f WHIRLPOOL afaaf2c645aeff8a9d47d0fe6eba9caff790f193ae4f4ffc4431f875e4e8ed0a8faf34097449a3e857803c35545eb636f25aef55a1a3605ddbe3b7db6d075072
+MISC ChangeLog 3000 SHA256 782413ecf710786e5de54c9cdba59f67aad40dc0632b9633abf098e883d3f62b SHA512 1cab05a52242ed07392d1712c74652ee73789c8314abce37a8c6701142efee9580f0b52a616aabf196cc909519543eeb399bffefe4dd8505610e0ecc9a88e61f WHIRLPOOL f149841925dd83e7cdf68e67471081ab7c8fd5224eddb26a05022f94a2a528dc77afa3988fa8bb610b7d47ac348a1d78335342ff4b9552ed04073a75af08b558
+MISC ChangeLog-2015 5377 SHA256 2a1ebb39f3d0d5a468160e502ca501ff0fd8fea01f672e8e10a63b2adbdb6ec4 SHA512 111b824a93f51a6b0ae28729a3ffc9ac3cb4f249d9671a52c6ec6c552608599e2f0b001727e3a6d4ee8cf2a6dac2cb291ca9480b483887f13db479459f4ecd6f WHIRLPOOL 5e3f7f8600f29f87e497804cdb4381ad4b676a4525a0ea17287853fee0b24c59ec77caf81c33a8f820781041de1c343eeb4cfe3108dd2876ba5db697e4d28235
+MISC metadata.xml 357 SHA256 49ca667bc86f311b74bc68de80d33dc76f3e783c60d7a61a2df8c993c4d7a2ff SHA512 a7daf9cc8bbd6a7887782cf1a74fe4f26098bf596982cfbb2df44ff46ae565e8a89bd8ebf6f2fd494f5fa5f4647c5afbd07f018f843e4a0ddf75ee4b9a31e244 WHIRLPOOL 1196dec77ffaa1fb437f1217ab631d865fac71e6f5165cf2c4e3746600d38891611dfb929e431ffa2e5347e2fa5bf3461c97214fce76c8e2132532bf5b4b19eb
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
new file mode 100644
index 000000000000..6305c9ad2a27
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
@@ -0,0 +1,41 @@
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml	2012-03-08 05:36:14.342528441 +0100
+@@ -921,6 +921,7 @@
+   <value-type name="QEasingCurve">
+     <modify-function signature="customType()const" remove="all" />
+     <modify-function signature="setCustomType(double)" remove="all" />
++    <modify-function signature="setCustomType(float)" remove="all" />
+   </value-type>
+ 
+   <object-type name="QAbstractAnimation" />
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml	2012-03-08 05:41:37.492524499 +0100
+@@ -1447,6 +1447,7 @@
+     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="setCustomType(double)" remove="all"/>
++    <modify-function signature="setCustomType(float)" remove="all"/>
+     <modify-function signature="customType()const" remove="all"/>
+   </value-type>
+ 
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml	2012-03-08 05:39:53.932524942 +0100
+@@ -1388,14 +1388,12 @@
+   </value-type>
+ 
+   <value-type name="QEasingCurve">
+-    <modify-function signature="customType()const" remove="all"/>
+-    <modify-function signature="setCustomType(double)" remove="all"/>
+-  
+     <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
+     <modify-function signature="operator=(QEasingCurve)" remove="all"/>
+     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="setCustomType(double)" remove="all"/>
++    <modify-function signature="setCustomType(float)" remove="all"/>
+     <modify-function signature="customType()const" remove="all"/>
+   </value-type>
+ 
diff --git a/x11-libs/qtscriptgenerator/metadata.xml b/x11-libs/qtscriptgenerator/metadata.xml
new file mode 100644
index 000000000000..6ad9903ca517
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..cc3d62015cd6
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Tool for generating Qt bindings for Qt Script"
+HOMEPAGE="https://code.google.com/p/qtscriptgenerator/"
+SRC_URI="https://dev.gentoo.org/~johu/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="debug"
+
+DEPEND="
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4[accessibility]
+	dev-qt/qtopengl:4
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4[accessibility]
+	dev-qt/qtxmlpatterns:4
+	media-libs/phonon[qt4]
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# remove phonon
+	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
+	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
+	sed -i "/qtscript_webkit/d" qtbindings/qtbindings.pro || die "sed failed"
+
+	use arm && eapply "${FILESDIR}"/${P}-arm.patch
+}
+
+src_configure() {
+	cd "${S}"/generator || die
+	eqmake4 generator.pro
+
+	cd "${S}"/qtbindings || die
+	eqmake4 qtbindings.pro
+}
+
+src_compile() {
+	cd "${S}"/generator || die
+	emake
+	./generator --include-paths="$(qt4_get_headerdir)" || die
+
+	cd "${S}"/qtbindings || die
+	emake
+}
+
+src_install() {
+	insinto "$(qt4_get_libdir)"/plugins/script
+	insopts -m0755
+	doins "${S}"/plugins/script/*
+}
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
new file mode 100644
index 000000000000..8dd255a0c1ab
--- /dev/null
+++ b/x11-libs/qwt/Manifest
@@ -0,0 +1,10 @@
+AUX qwt-5.2.3-install_qt.patch 963 SHA256 e497e1bdbba7700b28e7cbe99faa196d76115bcfad588495a41f0a05672b5740 SHA512 e4bd767fd0942dbac0a585f4c6b588faa99f1f38d02fe8db6c3be181c7a7c6955abc874df916ed446dde537f6090ca81610ae49ba55766033bd8bd801808e8e9 WHIRLPOOL 1723c57b40061938158977f5ab183caab26b71ed610b5eaef8f90c53596753089719f3a7d345ccc6c6feec86f7ae8f50c7c3154d37bb5b4502a84880d1167d9b
+AUX qwt-6.0.2-invalid-read.patch 9447 SHA256 d063b36170af2c2ca12c44fa283cc1b387b97ce6c53f02f101db45ebed975b43 SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 WHIRLPOOL 0a71af42f61e605f03c648dd21b74a3b3e6864ca956c9adf84eafe7d98ca6aec49ec23316137ea60a9d0c078f06ec39ac6ae3e02fc217b56b0d3f3f4608564f2
+AUX qwt-6.1.1-pc-destdir.patch 498 SHA256 45f56f496dd50bf30e541605e97659a30c55b60b8aab9241cb8738ee180224cf SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769 WHIRLPOOL c68cca8380ca2c049419c574bec89ce61668f379b1e8ed47c79266c7430e8fcf1a325946f04bc1600538aeb353d7a8c03147759eccb47832aaab0f019eda9f6c
+DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
+DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c
+EBUILD qwt-5.2.3-r2.ebuild 2613 SHA256 f42e13b1ec019603cd93b217e5db6c939630806bbe54c40d3e61454b88a0a58e SHA512 d1cde98eaebe87e74f0b40f4743d3ba0dd4a446c9998694083bd8514d125dc16cabef377c8a83a24301f51fe7013e3bd1171320a6aaeb6338eed5d0472f4356f WHIRLPOOL 36ad396eb8384292c04977fcddb9ec72e1238f2bc97033e10ee9e5ead396f9d6cf38348ade4f27de0e0340f5090d80dd035a89ac453ae852353fba4e94e7914f
+EBUILD qwt-6.1.3-r1.ebuild 5238 SHA256 a879318d818b1e4308d4dbd9767aee83916286e098744fefd0822d729905a156 SHA512 1ae81490e6f49e58fa03df9c06e1105f41d2a243632dd83390a525c090a4c58d84bd60614f1e3c35b293d3bd272f8c2443cbfe908a6a2e5cea153560955a2c88 WHIRLPOOL 2256a13508a71470dc45c5a8a8c89b617fdf3c333a2ef9d0a4f2bb10d812d5446543a2e0625018a5223fe9bccd75f199dc24d7614309ac89919e18e76dc5dd9e
+MISC ChangeLog 3839 SHA256 18a4a5c7a4acfa43da61c4c6f9ab976f24057d992be75a6d1f2b390ddfbe0b28 SHA512 91540f579972fa56c3272bd0d230e0d7e3a622c56853be7229b4e79a63a8e2c700a1f7504aca8d96012938837ce133acf7b34cf39fdada51b41fdf6d2d52eaf5 WHIRLPOOL 3c2c90027da97ecbcb3955357df84743628edaa7f3d3a9443dab8f9a77990eb28b58e888a49d88bf5f76452a136dbaaf64b118b485709e11a824562df6b6456f
+MISC ChangeLog-2015 19038 SHA256 83db1e8558fc51466d501fa2475236072167f71751375820bd0acfcb74d89519 SHA512 ac4bdce06fee516a2c15c677924ab8fffc60212cdba4b1196927cec2f3249f73d9324ec613872815f448b85396711fc585ee32d3334005e5cf04ba0b3fe6e436 WHIRLPOOL d48b384b68b3789e5414782b5327cbb4c283b08234cabaa60be5e4f1ce7a6a351d6bde9a2198445d165caf41130106cce76c4ef782c2adf0e9d2a869e8f6150b
+MISC metadata.xml 870 SHA256 592529b9f7b70dd59cfd9044a9ffe1e97be15be067efe1308f6a2794ce147a99 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43 WHIRLPOOL 5f1fc0740549ab51cabc2323b3f25afb439e31aadbb63ce186c30a7cbccbe05d136c1b8667e2299098ad73b232ef4e1ef589770b4539159d94b4379c11f4b2e4
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
new file mode 100644
index 000000000000..48e9385811f8
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
@@ -0,0 +1,28 @@
+diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
+--- qwt-5.2.2/designer/designer.pro.install_qt	2011-08-01 04:28:22.000000000 -0500
++++ qwt-5.2.2/designer/designer.pro	2012-08-14 11:11:22.569229749 -0500
+@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
+         else {
+             SUFFIX_STR = $${RELEASE_SUFFIX}
+         }
++        LIBNAME         = qwt$${SUFFIX_STR}
+     }
+ 
+     TEMPLATE        = lib
+@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
+     INCLUDEPATH    += $${QWT_ROOT}/src 
+     DEPENDPATH     += $${QWT_ROOT}/src 
+ 
+-    LIBNAME         = qwt$${SUFFIX_STR}
+     contains(CONFIG, QwtDll) {
+         win32 {
+             DEFINES += QT_DLL QWT_DLL
+@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
+ 
+         # Qt 4
+ 
+-        TARGET    = qwt_designer_plugin$${SUFFIX_STR}
++        TARGET    = qwt5_designer_plugin$${SUFFIX_STR}
+         CONFIG    += qt designer plugin 
+ 
+         RCC_DIR   = resources
diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
new file mode 100644
index 000000000000..a225350990a0
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
@@ -0,0 +1,250 @@
+--- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp	2012-12-01 00:22:46.752106265 +1100
++++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp	2013-01-31 14:29:30.590197611 +1100
+@@ -4421,7 +4421,10 @@
+         if ( ok )
+             return value;
+         else
+-            qWarning( "Could not convert %s to form", value_str.toLatin1().data() );
++        {
++            QByteArray value_str_ba = value_str.toLatin1();
++            qWarning( "Could not convert %s to form", value_str_ba.data() );
++        }
+ 
+     }
+ 
+@@ -4658,7 +4661,10 @@
+                 continue;
+             }
+             else
+-                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() );
++            {
++                QByteArray value_ba = value.toLatin1();
++                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() );
++            }
+         }
+ 
+         // Relatively sized column, but we failed to parse the factor. Treat is like an auto
+@@ -5167,7 +5173,8 @@
+     double factor = factor_str.toFloat( &float_ok );
+     if ( !float_ok || factor < 0 )
+     {
+-        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++        QByteArray value_ba = value.toLatin1();
++        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+         return 0;
+     }
+ 
+@@ -5196,7 +5203,8 @@
+         unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok );
+         if ( !unit_ok )
+         {
+-            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+             return 0;
+         }
+     }
+@@ -5368,7 +5376,8 @@
+             return ( int )( em * factor );
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5384,7 +5393,8 @@
+             return ( int )( ex * factor );
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5406,7 +5416,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5428,7 +5439,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5450,7 +5462,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5466,7 +5479,8 @@
+             return i;
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5478,7 +5492,8 @@
+     if ( float_ok && i >= 0 )
+         return i;
+ 
+-    qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5503,7 +5518,8 @@
+         return ( int )( base * factor / 100.0 );
+     }
+ 
+-    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5528,7 +5544,8 @@
+         return pt_size;
+     }
+ 
+-    qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5737,7 +5754,8 @@
+ */
+ static const QwtMmlOperSpec *searchOperSpecData( const QString &name )
+ {
+-    const char *name_latin1 = name.toLatin1().data();
++    QByteArray name_latin1_ba = name.toLatin1();
++    const char *name_latin1 = name_latin1_ba.data();
+ 
+     // binary search
+     // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name
+@@ -5789,7 +5807,8 @@
+         if ( spec == 0 )
+             continue;
+ 
+-        const char *name_latin1 = name.toLatin1().data();
++        QByteArray name_ba = name.toLatin1();
++        const char *name_latin1 = name_ba.data();
+ 
+         // backtrack to the first instance of name
+         while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 )
+@@ -5918,7 +5937,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() );
+ 
+     return QwtMml::NormalMV;
+ }
+@@ -5938,7 +5958,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::InfixForm;
+ }
+ 
+@@ -5959,7 +5980,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::ColAlignCenter;
+ }
+ 
+@@ -5984,7 +6006,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::RowAlignAxis;
+ }
+ 
+@@ -6018,7 +6041,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::FrameNone;
+ }
+ 
+@@ -6030,7 +6054,8 @@
+     QStringList l = value_list.split( ' ' );
+     if ( l.count() != 2 )
+     {
+-        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() );
++        QByteArray value_list_ba = value_list.toLatin1();
++        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() );
+         if ( ok != 0 )
+             *ok = false;
+         return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) );
+@@ -6089,7 +6114,10 @@
+         else if ( value == "bold" )
+             fn.setBold( true );
+         else
+-            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() );
++        {
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() );
++        }
+     }
+ 
+     if ( font_attr.contains( "fontstyle" ) )
+@@ -6100,7 +6128,10 @@
+         else if ( value == "italic" )
+             fn.setItalic( true );
+         else
+-            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() );
++        {
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() );
++        }
+     }
+ 
+     if ( font_attr.contains( "fontfamily" ) )
+@@ -6150,7 +6181,8 @@
+ 
+     if ( ok != 0 )
+         *ok = false;
+-    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() );
+     return fn;
+ }
+ 
diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
new file mode 100644
index 000000000000..f00ea604f5f4
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
@@ -0,0 +1,15 @@
+ textengines/mathml/mathml.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
+index 7032366..b1372f7 100644
+--- a/textengines/mathml/mathml.pro
++++ b/textengines/mathml/mathml.pro
+@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
+ 
+     # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
+     # with including pri files: better don't use it
++    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
+     greaterThan(QT_MAJOR_VERSION, 4) {
+ 
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
new file mode 100644
index 000000000000..5fa861212232
--- /dev/null
+++ b/x11-libs/qwt/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The Qwt library contains GUI Components and utility classes which are
+  primarily useful for programs with a technical background.
+  Besides a 2D plot widget it provides scales, sliders, dials,
+  compasses, thermometers, wheels and knobs to control or display
+  values, arrays or ranges of type double.  
+</longdescription>
+  <use>
+    <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
+    <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qwt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
new file mode 100644
index 000000000000..73b753b76ec7
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-macos"
+SLOT="5"
+IUSE="doc examples static-libs svg"
+
+DEPEND="
+	dev-qt/designer:4
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install_qt.patch
+	sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die
+
+	cat > qwtconfig.pri <<-EOF
+		target.path = "${EPREFIX}/usr/$(get_libdir)"
+		headers.path = "${EPREFIX}/usr/include/qwt5"
+		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV}
+		QWT_VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+	EOF
+	sed -i -e 's/headers doc/headers/' src/src.pro || die
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+
+	MULTIBUILD_VARIANTS=( )
+	use static-libs && MULTIBUILD_VARIANTS+=( static )
+	MULTIBUILD_VARIANTS+=( shared )
+
+	qt4-r2_src_prepare
+
+	preparation() {
+		cp -rf "${S}" "${BUILD_DIR}" || die
+		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
+			echo "CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+	}
+
+	multibuild_foreach_variant preparation
+}
+
+src_configure() {
+	multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		eqmake4 examples.pro
+		emake
+	}
+	multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm doc/man/*/*license* || die
+		rm -f doc/man/*/{_,deprecated}* || die
+		doman doc/man/*/*
+		doins -r doc/html
+	fi
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+			LIBS        += -lqwt
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}5
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
new file mode 100644
index 000000000000..8d6468047b2d
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multibuild qmake-utils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4 and Qt5"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6/1.3"
+IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	opengl? ( virtual/opengl )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
+		opengl? ( dev-qt/qtopengl:4 )
+		svg? ( dev-qt/qtsvg:4 )
+	)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+		opengl? ( dev-qt/qtopengl:5 )
+		svg? ( dev-qt/qtsvg:5 )
+	)
+"
+RDEPEND="${DEPEND}
+	!<x11-libs/qwt-5.2.3
+	!x11-libs/qwt:5[doc]
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( CHANGES-6.1 README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+)
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+	EOF
+
+	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	MULTIBUILD_VARIANTS=( )
+
+	if use qt4; then
+		use static-libs && MULTIBUILD_VARIANTS+=( qt4-static )
+		MULTIBUILD_VARIANTS+=( qt4-shared )
+	fi
+
+	if use qt5; then
+		use static-libs && MULTIBUILD_VARIANTS+=( qt5-static )
+		MULTIBUILD_VARIANTS+=( qt5-shared )
+	fi
+
+	multibuild_copy_sources
+
+	preparation() {
+		if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then
+			echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+		fi
+
+		case "${MULTIBUILD_VARIANT}" in
+			qt4-*)
+				cat >> qwtconfig.pri <<-EOF
+					QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt4_get_plugindir)/designer"
+					QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt4_get_mkspecsdir)/features"
+				EOF
+				sed \
+					-e 's/target doc/target/' \
+					-e "/^TARGET/s:(qwt):(qwt6-qt4):g" \
+					-e "/^TARGET/s:qwt):qwt6-qt4):g" \
+					-i src/src.pro || die
+
+				sed \
+					-e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \
+					-e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \
+					-i qwt.prf designer/designer.pro examples/examples.pri \
+					textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+			;;
+			qt5-*)
+				cat >> qwtconfig.pri <<-EOF
+					QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
+					QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+				EOF
+				sed \
+					-e 's/target doc/target/' \
+					-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+					-e "/^TARGET/s:qwt):qwt6-qt5):g" \
+					-i src/src.pro || die
+
+				sed \
+					-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+					-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+					-i qwt.prf designer/designer.pro examples/examples.pri \
+					textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+			;;
+		esac
+		default
+	}
+
+	multibuild_foreach_variant run_in_build_dir preparation
+}
+
+src_configure() {
+	configuration() {
+		case "${MULTIBUILD_VARIANT}" in
+			qt4-*)
+				eqmake4
+				;;
+			qt5-*)
+				eqmake5
+				;;
+		esac
+	}
+	multibuild_foreach_variant run_in_build_dir configuration
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		case "${MULTIBUILD_VARIANT}" in
+			qt4-*)
+				eqmake4 examples.pro
+				;;
+			qt5-*)
+				eqmake5 examples.pro
+				;;
+		esac
+		emake
+	}
+	multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+	rm -f doc/man/*/{_,deprecated}* || die
+
+	multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
+
+	if use qt4; then
+		mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die
+	fi
+
+	if use mathml; then
+		sed \
+			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
+			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+	fi
+
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	einstalldocs
+
+	mkdir -p "${ED}"/usr/share/man/ || die
+	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+		rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}6
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
new file mode 100644
index 000000000000..0abd2783002b
--- /dev/null
+++ b/x11-libs/qwtplot3d/Manifest
@@ -0,0 +1,11 @@
+AUX qwtplot3d-doxygen.patch 1089 SHA256 04114570357018265d32bd8a0fd3d96dae6735dde4aaec07ea62f2382e97ff54 SHA512 d424ede7e78ddbeeb8bcd2270a83956164d5cf8f574b9a478a9b527c28ed6488edc2324b72dbf3e3c1973e7aae16c1baeb63d0dc3e3e97ecc9d3679fd06db7d7 WHIRLPOOL c0f2aa9dea0c18e5627e7d6ecc725f770f90ac3e9cc1e723abb54ae94537c61344d1f0f85c946193ce6a14487fe307324f20d67744547e7a0c2d57810a9e770d
+AUX qwtplot3d-examples.patch 4764 SHA256 ddd2f6f9a3d075237e4908806e64318580496c856465749ce605f8506ca0e6de SHA512 b1100942e85df8347a439083a7c2ed1fc86edde2115fba9ec6657f2a8a10ffea937e28d2cb4bfcd377f3f75cb098cac923cb4a254116a56e3d914daa05cc504f WHIRLPOOL fb79ae201f11282270d55808784b9c4384561a3305a786791731ebcf5cf711e88fb4251cc4c2ca8f3bcf7b3d9752fa2096557009ea192a4b346bb60727dbc6f0
+AUX qwtplot3d-gcc44.patch 440 SHA256 bf376db9e365df372a0c75c95e52fe80d30abb554e9acbf3cb5c6a35c2dfd840 SHA512 4f10bfabc68ec313aa8f3f624632c59bfad18f701bc802cd222607ac551b2ad6736dca14e3b63bd238c9c2b68128cb0b66eb1801dc6efebc800e71b0d03cbd31 WHIRLPOOL 0a86eed94192c3e3f655fcc6111685e96db5ea7e05830ad152fbc8e008968ebfdf7acaa7916a39f55c507b879663306ad3facf8c2f281f43c9bff70a6cdd74bc
+AUX qwtplot3d-profile.patch 717 SHA256 4fcbc15ae0e33317b03270b8d4534ea7f2d68d02ccc588813acc20af5b2ca1ac SHA512 59fb2d36056074ce16380b7c3c64e63bd0ec8735f0a81c4d37cc3e1daa446721efbe4fd3dd6facf57c62365ae6542d6b9e97ca820d73f89b835b82a23f082728 WHIRLPOOL 8bb9f439a20efcf74c14b8ba00d838358d294cc9421627b8add52e75e03cc74e7b9fb6a314b89c55df7ac4c237a1810e10e6ee95a815829b5a4f186364b8c215
+AUX qwtplot3d-qt48.patch 414 SHA256 72e5cd487738abe1777d951b9e7f0a5921011af47ebb8ebe9979514b9f8c2a73 SHA512 85ef986a35917428cda4929f321a4af11dbf88a71c6adbbb75ab5db7fe392c4df1f0e9631c3f646ee07220747b613068a63f7c2ebef73150c846e11c5ffe89a4 WHIRLPOOL 1169d07366e5c956686256559052c5bdfef0ea795c1d25311a6b00ec976672576e013719b92a22c1687036e9bd1a87a872b0be30e08dad2104ecf1b998ad362b
+AUX qwtplot3d-sys-gl2ps.patch 915 SHA256 e60958353524c67c61d04a249e38fbf92ca82c75a24b3f10ed733876410e830d SHA512 a15870bdc215145e57f1eef3bc6c56060ac2f3bc5e8cd134a72188a17088b986b843965cc81065663e72bf69b48912935c88b14babea4b28b7b4265eba86f96f WHIRLPOOL 0f0615361f3e558e634976cf6bc9989b4db6e4821906f89e299bd53d3767162eba70c330e89ee057667780b2358504b16e992f079ccf06733ae37333d5f648e7
+DIST qwtplot3d-0.2.7.tgz 183836 SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c WHIRLPOOL 275287e771364080abe504657d09d1f5cb73828d76418f577beaadd8b80f0fca1fd6f82f0d5c05ca20f4c2b60e6537be78287534d73b8897e610fbeb4a147651
+EBUILD qwtplot3d-0.2.7-r2.ebuild 1185 SHA256 41d159e33608d642c8344079b772744429ddd8d1957e1652f3cb76d3b49ae105 SHA512 c82803d2884ea999c9be1796c9f092870275bcf7ac2fba4e63c319ab68a333dbb8f525f8623525c2680b2f179a71ed830c336ebd6c573c786bb1ee0f7c83c67e WHIRLPOOL 3ee3f2c8ced0b433553234012362b89dc043025636ae2bc73990c123ea0d5348d32a75030fafb777804d1e7560e67e3fbe1a7aa10613a007ad0f817086de8997
+MISC ChangeLog 2635 SHA256 b28394f46a8d1299fcc1bb3ee3761412391b2b592c73a0683945449e0c5aaf27 SHA512 807cf6b870ba652f0d5cdaf7537b86dbefa720e73890a2857782408acbc21bf1f6cadb779c1d0280c098906a24f9722ae93ea188f848dca47400806472149a30 WHIRLPOOL 9a0b7daa46f94ca961ec6e75b27f0f50e3b8b89abc77b98550af3887c7039aac470d7c45edc31dd2d53fa0b7d5cbe0c5b5ed59b019fa2dd720224feafa376a77
+MISC ChangeLog-2015 4168 SHA256 0471339af4d6b3f333ee535b7d0ba93c5469d3a91de174aaf2df00e4b73eafaa SHA512 9e9b1a96271c9857d3f77adf758c770502e96bdf40d5c35bc7d4b71d5c794aabc07a4b0314cc296b9ff29ae3b605812d7898eaa108581f1c39788df672da0b99 WHIRLPOOL a1909e25b823537f79a1414e99356aa0fce82b254e0e838b052cd6ae135ff13a23e953703a8cc79478de724a46be2d29aeacb595a8230cfa0f4419f6b09f12d9
+MISC metadata.xml 507 SHA256 9b15c9d51c3af2eec6a0e8054c7fbd7b8282cb54ae9bec48bdd802db62cdb705 SHA512 89c14aa63b5b6f7d9e0cdabc16aa5328de38ee28fb6ff26df4bc8f9cf6c313a7b545d16ca49404d6453b1f86d6c6826671741f309452076b0f357ba9c014207b WHIRLPOOL 804eb67f4848c60c0af2b2cebd2857759d87ee87e7e91ee5227da908849a6ed2ac919e6e473eb38799fbd7fe3b36ac79227a4d1131f8c615b551027d0939d4bf
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
new file mode 100644
index 000000000000..b0632a380a2a
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
@@ -0,0 +1,28 @@
+--- qwtplot3d/doc/Doxyfile.doxygen.orig	2007-11-26 22:30:57.000000000 +0000
++++ qwtplot3d/doc/Doxyfile.doxygen	2007-11-26 22:30:03.000000000 +0000
+@@ -116,7 +116,7 @@
+ HTML_ALIGN_MEMBERS     = YES
+ GENERATE_HTMLHELP      = NO
+ CHM_FILE               = qwtplot3d.chm
+-HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"
++#HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"
+ GENERATE_CHI           = NO
+ BINARY_TOC             = YES
+ TOC_EXPAND             = YES
+@@ -181,7 +181,7 @@
+ MACRO_EXPANSION        = NO
+ EXPAND_ONLY_PREDEF     = NO
+ SEARCH_INCLUDES        = YES
+-INCLUDE_PATH           = V:/cvs/qwtplot3d/include/
++INCLUDE_PATH           = ../include
+ INCLUDE_FILE_PATTERNS  = *.h
+ PREDEFINED             = QWT3D_NOT_FOR_DOXYGEN \
+                          QT_VERSION=0x040000
+@@ -212,7 +212,6 @@
+ GRAPHICAL_HIERARCHY    = YES
+ DIRECTORY_GRAPH        = YES
+ DOT_IMAGE_FORMAT       = png
+-DOT_PATH               = V:/graphviz/Graphviz/bin/
+ DOTFILE_DIRS           = 
+ MAX_DOT_GRAPH_WIDTH    = 974
+ MAX_DOT_GRAPH_HEIGHT   = 10000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
new file mode 100644
index 000000000000..f142c3379274
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
@@ -0,0 +1,125 @@
+diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
+--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:21:56.000000000 +0000
+@@ -9,7 +9,7 @@
+ 
+ #include "axes.h"
+ #include "axesmainwindow.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+ 
+ using namespace std;
+ using namespace Qwt3D;
+diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
+--- qwtplot3d.orig/examples/common.pro	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/common.pro	2007-11-26 23:43:33.000000000 +0000
+@@ -1,13 +1,13 @@
+ TEMPLATE     = app
+-CONFIG      += qt warn_on thread debug
++CONFIG      += qt warn_on thread
+ UI_DIR = tmp
+ MOC_DIR      = tmp
+ OBJECTS_DIR  = tmp
+-INCLUDEPATH    += ../../include 
++INCLUDEPATH    += /usr/include/qwtplot3d
+ DEPENDPATH	= $$INCLUDEPATH
+ DESTDIR = ../bin
+ 
+-unix:LIBS += -lqwtplot3d -L../../lib
++unix:LIBS += -lqwtplot3d
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ win32{
+@@ -25,7 +25,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])
+ 
+ !isEmpty( ISQT4 ) {
+-RESOURCES     = ../images.qrc
++#RESOURCES     = ../images.qrc
+ QT += opengl
+ }
+ 
+diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
+--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:22:48.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ #include "enrichmentmainwindow.h"
+ #include "enrichments.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+ 
+ using namespace Qwt3D;
+ 
+diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
+--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/colormapreader.h	2007-11-26 22:23:19.000000000 +0000
+@@ -5,7 +5,7 @@
+ #include <qframe.h>
+ #include <qpixmap.h>
+ 
+-#include "../../../include/qwt3d_types.h"
++#include <qwt3d_types.h>
+ 
+ #if QT_VERSION < 0x040000
+ 
+diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
+--- qwtplot3d.orig/examples/mesh2/src/functions.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/functions.h	2007-11-26 22:23:47.000000000 +0000
+@@ -2,8 +2,8 @@
+ #define __EXAMPLE_H__
+ 
+ #include <math.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_function.h>
+ 
+ using namespace Qwt3D;
+ 
+diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
+--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/lightingdlg.h	2007-11-26 22:24:41.000000000 +0000
+@@ -3,10 +3,10 @@
+ 
+ #include <math.h>
+ #include <qapplication.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_surfaceplot.h"
+-#include "../../../include/qwt3d_enrichment.h"
+-#include "../../../include/qwt3d_color.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_surfaceplot.h>
++#include <qwt3d_enrichment.h>
++#include <qwt3d_color.h>
+ 
+ #if QT_VERSION < 0x040000
+ #include "lightingdlgbase.h"
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:25:33.000000000 +0000
+@@ -33,9 +33,9 @@
+ #include "colormapreader.h"
+ #include "lightingdlg.h"
+ #include "femreader.h"
+-#include "../../../include/qwt3d_io.h"
+-#include "../../../include/qwt3d_io_gl2ps.h"
+-#include "../../../include/qwt3d_io_reader.h"
++#include <qwt3d_io.h>
++#include <qwt3d_io_gl2ps.h>
++#include <qwt3d_io_reader.h>
+ 
+ using namespace Qwt3D;
+ using namespace std;
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:26:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ 
+-#include "../../../include/qwt3d_surfaceplot.h"
++#include <qwt3d_surfaceplot.h>
+ 
+ 
+ #if QT_VERSION < 0x040000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
new file mode 100644
index 000000000000..a76fe831ab91
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
+--- qwtplot3d-orig/include/qwt3d_function.h	2009-07-25 18:18:58.000000000 -0400
++++ qwtplot3d/include/qwt3d_function.h	2009-07-25 18:19:19.000000000 -0400
+@@ -2,6 +2,7 @@
+ #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
+ 
+ #include "qwt3d_gridmapping.h"
++#include <cstdio>
+ 
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
new file mode 100644
index 000000000000..831ad558d2f4
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
@@ -0,0 +1,27 @@
+--- qwtplot3d.orig/qwtplot3d.pro	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/qwtplot3d.pro	2007-11-26 23:45:18.000000000 +0000
+@@ -3,7 +3,7 @@
+ 
+ TARGET            = qwtplot3d
+ TEMPLATE          = lib
+-CONFIG           += qt warn_on opengl thread zlib debug
++CONFIG           += qt warn_on opengl thread zlib
+ MOC_DIR           = tmp
+ OBJECTS_DIR       = tmp
+ INCLUDEPATH       = include
+@@ -21,7 +21,7 @@
+ win32:CONFIG -= zlib
+ 
+ linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
+-unix:VERSION = 0.2.6
++unix:VERSION = 0.2.7
+ 
+ # Input
+ SOURCES += src/qwt3d_axis.cpp \
+@@ -92,4 +92,4 @@
+   DEFINES += GL2PS_HAVE_ZLIB
+   win32:LIBS += zlib.lib
+ 	unix:LIBS  += -lz
+-}
+\ No newline at end of file
++}
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
new file mode 100644
index 000000000000..4e558eda7c96
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
@@ -0,0 +1,19 @@
+ include/qwt3d_openglhelper.h |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
+index e5499c2..a7ecddc 100644
+--- a/include/qwt3d_openglhelper.h
++++ b/include/qwt3d_openglhelper.h
+@@ -8,6 +8,11 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+ 
++#if QT_VERSION < 0x047999
++#include <GL/glu.h>
++#endif
++
++
+ namespace Qwt3D
+ {
+ 
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
new file mode 100644
index 000000000000..81a77e13249f
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
@@ -0,0 +1,31 @@
+--- qwtplot3d.pro.orig	2009-04-07 19:45:29.985645378 +0100
++++ qwtplot3d.pro	2009-04-07 19:46:50.095747068 +0100
+@@ -80,13 +80,11 @@
+            include/qwt3d_graphplot.h \
+            include/qwt3d_multiplot.h
+ 
+-# gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+-         include/qwt3d_io_gl2ps.h
++# gl2ps support taken from system libs
++HEADERS+=include/qwt3d_io_gl2ps.h
+          
+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
+-         3rdparty/gl2ps/gl2ps.c
+-
++SOURCES+=src/qwt3d_io_gl2ps.cpp
++unix:LIBS += -lgl2ps
+ # zlib support for gl2ps
+ zlib {
+   DEFINES += GL2PS_HAVE_ZLIB
+--- src/qwt3d_io_gl2ps.cpp.orig	2009-04-07 19:44:38.536418391 +0100
++++ src/qwt3d_io_gl2ps.cpp	2009-04-07 19:45:03.685133854 +0100
+@@ -4,7 +4,7 @@
+ 
+ #include <time.h>
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+ 
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
new file mode 100644
index 000000000000..2725f60bd4c3
--- /dev/null
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<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>
+	<upstream>
+		<remote-id type="sourceforge">qwtplot3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
new file mode 100644
index 000000000000..917693ee34ce
--- /dev/null
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
+HOMEPAGE="http://qwtplot3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc examples"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	x11-libs/gl2ps"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-profile.patch
+	"${FILESDIR}"/${PN}-examples.patch
+	"${FILESDIR}"/${PN}-doxygen.patch
+	"${FILESDIR}"/${PN}-sys-gl2ps.patch
+	"${FILESDIR}"/${PN}-gcc44.patch
+	"${FILESDIR}"/${PN}-qt48.patch
+	)
+
+src_prepare() {
+	qt4-r2_src_prepare
+	cat >> ${PN}.pro <<-EOF
+		target.path = /usr/$(get_libdir)
+		headers.path = /usr/include/${PN}
+		headers.files = \$\$HEADERS
+		INSTALLS = target headers
+	EOF
+}
+
+src_compile() {
+	qt4-r2_src_compile
+	 if use doc ; then
+		 cd doc
+		 doxygen Doxyfile.doxygen || die "doxygen failed"
+	 fi
+}
+
+src_install () {
+	qt4-r2_src_install
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+	use doc && dohtml -r doc/web/doxygen/*
+}
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
new file mode 100644
index 000000000000..9ea4eb786575
--- /dev/null
+++ b/x11-libs/qwtpolar/Manifest
@@ -0,0 +1,5 @@
+DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621 WHIRLPOOL e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
+EBUILD qwtpolar-1.1.1-r1.ebuild 1511 SHA256 edf4724970364b71e8ce9f3a3ccd8dfa9605fe0cd1e85041584b0a5f59df17be SHA512 67dc81e5899408b04ff6a4164aedaf128e5035053e39d5ff9d42ae3d24914e3e62c5ca7a78b9e6af9fc0fcadda83066a73f3fde803b66a1c4d2caadfc4994063 WHIRLPOOL 51d5e64f7d01296ca1f8b852890eec98ca1e71c96fafb2ef85397feeba779cfdac4c31cbfdbf92de05cf406b5140e9a47071856cf4d839808f69d8b4fd4c5e10
+MISC ChangeLog 2600 SHA256 a68523db93275463ba99b0f81025f4d479f2170d656a02a0a543f49863b02cf3 SHA512 e484833bb9019e5b905e2727e23df4c901723288cd282927bf11abfe34f06e0f1f957bc92fe094089adb5215192a2fefd8fd5973f1eadf5e0877ed92c0b27272 WHIRLPOOL 8d1fdca5dbebc5d702e92fa05fee1760fbf2a2d33733840fcad8a69ff8f7b1258bb0178797c1ef74abc8e501183722ef67fe81917d86de18dd595d385fa67026
+MISC ChangeLog-2015 1429 SHA256 9368c3c43b55807a7bcf4035cdb8a2f246f18d647e4049a26fc750f34802c5ce SHA512 f986b515ff168d0ad5492bdfdb4df14d1a11957a54c1f9c71f79d6d740d9caeff2d120965b311ea92bce723766af6523461071f91c853c54ca503ae946b24293 WHIRLPOOL 7dbdebc472ac4de1a4717af79df6d54d212da8a61ed6932c0fda030123e09a2890aafa960321045118dfbc4a8807e7a887da2b798131e1368ceeb17c761eacf4
+MISC metadata.xml 347 SHA256 cf010651b95b216838701b430c02e49f7c31072bc76205bfebaddeedb2df761c SHA512 854d3d9237d44a1afc6926805c9efb4444326a87bf68fd0c2e636d44b4f3e012490f327921f0e3174579657b7177e231d64c983412d8f09cd4b99592d311986e WHIRLPOOL 07ae5928ee2a8303c0c8fbdb1f5cfe00b6e86ff6cd469a07f632681b2a076608ec59651987a4510a45f349d70af68f95b5ad7b93d195884aea4cc876b227e3df
diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
new file mode 100644
index 000000000000..5b5806a77b80
--- /dev/null
+++ b/x11-libs/qwtpolar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qwtpolar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..92b8ca54a3b0
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
+	qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	local qtplugindir="${EPREFIX}$(qt4_get_plugindir)"
+	use qt5 && qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
+
+	sed \
+		-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+		-e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+		-e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+		-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \
+		-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \
+		-e "/= QwtPolarDesigner/ d" \
+		-e "/= QwtPolarExamples/d" \
+		-i ${PN}config.pri || die
+
+	sed \
+		-e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+		-i src/src.pro || die
+	echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+	cat >> designer/designer.pro <<- EOF
+	INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+	LIBS += -L"${S}/$(get_libdir)"
+	EOF
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
new file mode 100644
index 000000000000..a5a9d58496af
--- /dev/null
+++ b/x11-libs/rep-gtk/Manifest
@@ -0,0 +1,7 @@
+DIST rep-gtk-0.90.8.1.tar.xz 251652 SHA256 aebb2ae356cb11a2a5a6516703f1b5c6d1d71c48715bc340c13db98b9bd1a650 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b WHIRLPOOL c76745c3fef4d839b9834940181c5618ad038927f597e866821ee9faf1e6256053d6f60e94776d2a7afb46f9892a1cfcb9b9da229cdd117b1b788922e90771a4
+DIST rep-gtk_0.90.8.3.tar.xz 120616 SHA256 a96575db45794eefd0564172967a38ef2d7fec3ae2644c478e9f7d54b99ff341 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac WHIRLPOOL 23144629026650331495cbd1c29df24282e0ea27194dd02efde5d7c61fe70159c0f31bff227366acd965eacd7489ebe4d4b0e093d4b823b77dc56390a903ce09
+EBUILD rep-gtk-0.90.8.1.ebuild 1163 SHA256 226dfd78b88e5001f9dc3b706c3ec9ff93e6c44973b89331e972e355181221e1 SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4 WHIRLPOOL 9ffc496f033c22eef16f099dd22ecf9295800a4769393e29ce3043f226d78ced79750a81792166910743ff3cba9795396a88e6c6e7ddc059e10d98a0f6ca722b
+EBUILD rep-gtk-0.90.8.3.ebuild 998 SHA256 090a691fca378ddc3c0f6591c0a92500c2fc9c4c678765d7b4b152284a61734d SHA512 a79c5d472b51cd1a080efb92b9526877db499c0781a17824aa41821b873d6411cf29b75850c1bd127ab6d50781f23435e02c76ad3dda2ab99ca57ce6d839ee69 WHIRLPOOL 8ba47921f44a370b4e93cec92bd90406d5d389eddd90583f2adacd670eee094b1b12a7825a03accddab4c68204fcd1fbcf2559d042f86a1631d0369b84043c05
+MISC ChangeLog 2748 SHA256 95db39b1006473ddd78d5ef71dd832c0738ce2476c2758636437bb2880dff687 SHA512 388363409a915541bc0b917f089f721391344e356966027c1e237b06ae6622044f006259088884c04e329110a83e37fbdb2f6b438b933e77935f4a58cd3ac7e3 WHIRLPOOL e6bd9de4eb6eb491d588cef8998a720ef2ab5a713f58d78b6c762155d7af4c1a6805de44b066df1cf8cf64b6e4cf284ee2586037cfe7b53c69e7dd8933568ca3
+MISC ChangeLog-2015 12252 SHA256 89639117be2b3558555fefb59454e312ea30b4ec46f72fece308ddabaf3843ab SHA512 5b6c6a54c2a0b32ece7657cc83c72f6bb038be8bd633b8782a8cb2aa39a5c59e32a8c3cba235189033c670ab0024c5c0426f57a71015cc25b65309d90a8d9695 WHIRLPOOL 71ef2b0e6c9d53a511e1bcedcc886831bd36e18220e53eddf17c0db4e44f3d19447576004c809b7db22e18136c2344caa13bc9cac3d8639fc1197818c87ba44f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-libs/rep-gtk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
new file mode 100644
index 000000000000..03812c54a2cd
--- /dev/null
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
+HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
+SRC_URI="http://download.tuxfamily.org/librep/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="gtk-2.0"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/librep-0.90.5
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.24.0:2
+	>=x11-libs/gdk-pixbuf-2.23:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/xz-utils"
+
+#src_prepare() {
+	# Fix undefined symbol problems like bug #367623
+	# http://listengine.tuxfamily.org/lists.tuxfamily.org/sawfish/2011/09/msg00026.html
+	# TODO: Doesn't apply, if some people still get the failure, try to push a bit upstream
+	#epatch "${FILESDIR}/${PN}-0.90.7-implicit-def-new.patch"
+#}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+	dodoc AUTHORS ChangeLog README* TODO
+}
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
new file mode 100644
index 000000000000..05d6cb5aca71
--- /dev/null
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="GTK+/libglade/GNOME bindings for the librep Lisp environment"
+HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
+SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="gtk-2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/librep-0.90.5
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.24.0:2
+	>=x11-libs/gdk-pixbuf-2.23:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/xz-utils"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog README README.gtk-defs README.guile-gtk TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--disable-static
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}
diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest
new file mode 100644
index 000000000000..5766b5ffd671
--- /dev/null
+++ b/x11-libs/scw/Manifest
@@ -0,0 +1,6 @@
+DIST scw-0.4.7.tar.gz 410761 SHA256 2d2e14f5c9ca9cdb0014a5fd970b29f0e50b5170ffee4376ec2de60f8453d0cc SHA512 bf042396cfeb7a4266a5e7156c618a533cbccd21ae499154c704e233b719a7031f051f421b3ed9371a60f2a1ba0ca3a86b5a665de1ef5443bbd12063ce013f8f WHIRLPOOL ea910d30bb2d986118eadcde81b8e499e91187cebf87cba9197bd1fa151d883defd0bbb7d7cb023e490d19a21385a3f4e31c9d2a5b29e7ad124b64efc945cd35
+EBUILD scw-0.4.7-r1.ebuild 519 SHA256 d42d96a688a0bbeef986eb011dfcdbca2bf6918c202bb389d5fba6abd8b14fa7 SHA512 0ede080f7fe7eacfecc12f10eec15288a878ed94c40abbb897887154a8f5efb3bb641d0548f97a16447da4526e9818a67e1b52c15f3b4bb794084df42553a03c WHIRLPOOL a7ed6ebe95cbc4ce0ba5443fc38de349b8ab6b84c8a77873844e58a510230dc008a0caf7b19f15b975a371a8c9fd069f9affb47d1728ef1ce5eb69c636a43552
+EBUILD scw-0.4.7.ebuild 630 SHA256 9f8a9774880b3503404c68492fa62449ea9eaf2c74e4d67a0b095fd892aa3343 SHA512 b9cffc20a093b2d2f075a14d10efacbbd070db848a0d642aa1c545725afd77eb9b1209a6e267f8910eafb45fa5a255c114232eef7757ce882617d42653f58c10 WHIRLPOOL 7e04f40faf4039236e2dc23fd4430d66462420b6f4662dfe143efba0535f1e258a0cc047bda26242f1f46b28d9868b778f800c45d5f5376322d02e5fca18f2a7
+MISC ChangeLog 2510 SHA256 2814d435e4898a9269e3f577f37526d15e8b3a48ee4b328433e3a4caf3e72c9e SHA512 4feac9d49b5d5cfeb2ef65c3527caf584860d57224459cba16423460bfa7b1279598fcdd951f2868683cc7d17dadc13ef9c2f38ff6c2c5ba53f6cc8c9a5b8935 WHIRLPOOL ef44493088cc63dcdda5b43e2556ef913c398666ddd80bdb6ae935c60d421c632dbe9eba44155dbcc7dcecb3f2da8db0144500e2313e25d2820c6fff13938e8f
+MISC ChangeLog-2015 1673 SHA256 e83e4e1e5c67bd168ee6300d5f13ae783c8fcf31da146c822f0732cc650f03f6 SHA512 284135a4253723b31e9f193c2f827851a6719fa7cd6941fd14cafc96528ffc0c797d8ac443825dbcdfab60f56ee95b0c9b3f7a5c6ff6722671a5706fd8bb6457 WHIRLPOOL 3d1282e984d23bf2a91cdcbbf7dd30ab18b9933e4f6228a5d60c89797351d261424db9590a1785e9f4a816d1b0f3d29e43882eb6b5357750a6c4a900d454065e
+MISC metadata.xml 313 SHA256 6a729d037fe5e6f4589006502035f5faf43f743581476803a4ac028d2b91146b SHA512 88293932281dbd3587e85abe6602aed94678efd91ab737e597f30f8f16b0747c77440ed2e99389f78070aae0f89fff575879561220647e0683895ba2867c5466 WHIRLPOOL d0e4e33b68d3d40e043ff4df64e482a87a1ca198a05730b3bfa31ad4c0f0af37dbcd5ec8e2155db0be418c69faaac060d363068cc34d2b4294604b9a92ea07bc
diff --git a/x11-libs/scw/metadata.xml b/x11-libs/scw/metadata.xml
new file mode 100644
index 000000000000..e58da27d9105
--- /dev/null
+++ b/x11-libs/scw/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Scw is a widget set specifically designed for chat programs. It extends
+		the Gtk+ widget set.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..c1868e7ecc57
--- /dev/null
+++ b/x11-libs/scw/scw-0.4.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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)
+}
diff --git a/x11-libs/scw/scw-0.4.7.ebuild b/x11-libs/scw/scw-0.4.7.ebuild
new file mode 100644
index 000000000000..d31965b84bcf
--- /dev/null
+++ b/x11-libs/scw/scw-0.4.7.ebuild
@@ -0,0 +1,28 @@
+# 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/snorenotify/Manifest b/x11-libs/snorenotify/Manifest
new file mode 100644
index 000000000000..31ccf97ca6e1
--- /dev/null
+++ b/x11-libs/snorenotify/Manifest
@@ -0,0 +1,5 @@
+AUX snorenotify-0.7.0-desktop.patch 1517 SHA256 7ace5e23e51473b2ec2cfe906740ad43a899e52ab1bb0ca5887b78527fd6b7a7 SHA512 be7663b95e7884f9b77891bf175ae87bae33d2aeec1076538428785aa496b60a7dbe5f48aae8ab443100cba4cd90f4638545df80184df9d98f2c0222775da072 WHIRLPOOL c87999e0c7d4ce360e57d2ec45ce0cf31c4db8d3fcbbe80edc4860da183f08f31a86022d2f7e69546f1966258d3bd1e55f46e8e9e21c91cde2a199c7e45e77ef
+DIST snorenotify-0.7.0.tar.xz 200032 SHA256 6d411ba6e31a73db56d298195f8336f66f8fe4fffd64d5fde3f14090e68ee64b SHA512 2030a7b6bc69d3803e83e1a6d26efa5bfdd3facf53dcaade6059b85cea3db879ea49b9e02dbce3b043b4ddded21509a6d5859a4002cfd57a870a0e39cd11011a WHIRLPOOL f9be5e7d22724e31d82b633bfc5943a0f767e567d68c4c98edcfb8dadd1797c7c3e8942ac88282d0bb40612e886d70d5874a1c5407631001aa26fcb03c8da5e7
+EBUILD snorenotify-0.7.0-r1.ebuild 1089 SHA256 0ab45c2d5988a8397718b408e488c93b4e3871d36727621dd923820f2bcd59db SHA512 b2eb19dd00b0d66793953cfc7132bcb6de67d5cc788790d64bb7737f2bf03c40fa2a31fa2f31fa996f6b8bcd708bb5f2f0e7fbb64676a1a7273f2517637ecc74 WHIRLPOOL 1ecb767582fb234b8c106910ebb0705a8239af895d71bc4681afc661ab9d2519cb860cbee82f49333b66f5d29d73b6fa091eff906eef4cee63bb1f60523c8ed8
+MISC ChangeLog 1788 SHA256 1943a16438103fd496229a3e9dd43ee283c46208ffe68f9bbe79fc73ff8b3937 SHA512 9daaa87094d86ac32b8c1c1fd37c979ff01510eaac1025508a76c514ea52575465b0ee27e4bbc6d37c66d2777346dcdec73cc28bbc374569b4a23de26bc6e69a WHIRLPOOL 1da828b3a2b02e8961b662215aa4a92001e2385d0e17cf971745bbc615c95d60ca009756eccd8083ff2ba0c02036e0b24f6006cc0ea3c9a2b7e45dbd27aad556
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch b/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch
new file mode 100644
index 000000000000..914288d82348
--- /dev/null
+++ b/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch
@@ -0,0 +1,41 @@
+From 897a64b18f8727c951dac8ca91ebf43f2c18f908 Mon Sep 17 00:00:00 2001
+From: Javier Llorente <javier@opensuse.org>
+Date: Sat, 13 Feb 2016 12:20:03 +0100
+Subject: [PATCH] Fix desktop categories, remove version (see
+ desktop-entry-spec), add a newline at eof
+
+---
+ src/daemon/snorenotify.desktop.in     | 3 +--
+ src/settings/snoresettings.desktop.in | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/daemon/snorenotify.desktop.in b/src/daemon/snorenotify.desktop.in
+index 83f0e3f..9fc1876 100644
+--- a/src/daemon/snorenotify.desktop.in
++++ b/src/daemon/snorenotify.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+-Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@
+ Name=SnoreNotify
+ Comment=A daemon redirecting desktop notifications to one or multiple additional backends.
+ Icon=snore
+ Exec=snorenotify
+-Categories=Qt;System;
+\ No newline at end of file
++Categories=Qt;Settings;Qt;Utility;DesktopSettings;
+diff --git a/src/settings/snoresettings.desktop.in b/src/settings/snoresettings.desktop.in
+index 823bb2d..497d119 100644
+--- a/src/settings/snoresettings.desktop.in
++++ b/src/settings/snoresettings.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+-Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@
+ Name=SnoreSettings
+ Comment=Settings client for applications using libsnore.
+ Icon=snore
+ Exec=snoresettings
+-Categories=Qt;System;
+\ No newline at end of file
++Categories=Qt;Settings;Qt;Utility;DesktopSettings;
diff --git a/x11-libs/snorenotify/metadata.xml b/x11-libs/snorenotify/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/x11-libs/snorenotify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..ad78029107e1
--- /dev/null
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils virtualx
+
+DESCRIPTION="Multi platform Qt notification framework"
+HOMEPAGE="https://techbase.kde.org/Projects/Snorenotify"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="sound test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sound? ( dev-qt/qtmultimedia:5 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package sound Qt5Multimedia)
+		$(cmake-utils_use_find_package test Qt5Test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
new file mode 100644
index 000000000000..f72abd8f2818
--- /dev/null
+++ b/x11-libs/startup-notification/Manifest
@@ -0,0 +1,7 @@
+AUX startup-notification-0.12-sys-select_h.patch 928 SHA256 82cf80d37b25c4f2aefba9d2acd781e08f23c233d236f24680f80a63b5e40782 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd WHIRLPOOL 6f286f81670fe60c72f130ffefb1044998e5710027b2f5d9d4ad67eaf3df04b7056830f85c8da3dd61568653509356c31d1b3f75c33f6e9b23b34bc107f7b515
+AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 SHA256 1e2054e5de412c377a985fada277814a15d494096605a6e574ba508f1e26e97f SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d WHIRLPOOL f81bc30c92cc8c2351c9ed0ae64f31b518f465fd454bd14a31e54a01f729dc21513381061849c71c614391ab25d36d8f1f4f94006b2891492f2f2c9ce1d6769b
+DIST startup-notification-0.12.tar.gz 355285 SHA256 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab WHIRLPOOL 3ce5fa69c618785443837df43261a5ed7edb9f0b3c13bf19638b1b7db90814957780099014bd61af51562874dd2c1fafea9134fe0af11521dfbc864d1abc9b88
+EBUILD startup-notification-0.12-r1.ebuild 908 SHA256 ca3665e2f72b1fcdfc15a78ac6cb99ce5d499c2d36d01c2c1ec398a4a37fe150 SHA512 9dcfc75f4180849c5fbb7b37aa27948db995a164de9d99d4da2e2924f648b93b42358a7ff8c353056044c7ae2c20c21c6e8eb5daabe4530a7abf70ae6e8a6d37 WHIRLPOOL 00b02ddaf949b2bce9f7dfce64e9537d92ba3f01e82f192fea3f2d1a64d319d08a62d1d4f5bcb7ea714fc9e19980918c9a635f800493e952e10fb29233df10a5
+MISC ChangeLog 3650 SHA256 1fa88a4f3e828af9bb9baebf7aa465b69d81b2e2b4ec85dff060fab077eb208f SHA512 ce9f679069351d6c76a7b26dcd086349ff248cbfd798b6b5b5a866c6ccc9fe67686a0530be5d14c682f1edce66ee891cc18123f10756375d9d013824cd0cfdf9 WHIRLPOOL bb0d234c18638f5e11809c08be78ac1efc245a910b8e9d9cb2e9737e0f76d05c300f9885b996ee9307178ee9f5b9855e7884fd33829d5429077bc233293a90f3
+MISC ChangeLog-2015 11742 SHA256 bfb0a8eaf1d0e132490422b50c64001df4672832f91cc4627d6bec68de2bd90e SHA512 989d00436adef4423785089c794b525e502d2d058fb68a997aa0deca0c662c9738e9a8ad20e7592da9ff953f0f8323afee4fcdd411a0fc9778735da380fca0ae WHIRLPOOL 76b991357e1a8b0cf9ddab6c940eaac6e482ddf4f6addc1b39a5a341b73e97bb0e7dd984c3a73f5f9f2c9f6b5c06f78fb5f9f66b59e5b85e90278090728e4f02
+MISC metadata.xml 224 SHA256 154bec891472fe5526579d16d7e5e5e9eb3f352512a17555a459aa6029bcbbb2 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 WHIRLPOOL 541aeaf2a7c858734aaae366846865ff70e6c898204bbfc9f39f58fbdb53d9b37dc8c898c23870859a9d4f5596e7898e21874c9ef529a447953a35e4d7bc13e5
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
new file mode 100644
index 000000000000..8c579a71522f
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
@@ -0,0 +1,30 @@
+From ea9f7e4cc6fd8c08d175ed7774ed2c5bd11c8ef0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 17 Feb 2014 19:37:09 +0000
+Subject: Add include of <sys/select.h> for previous patch
+
+Unfortunately while the standard says that <sys/types.h> is the
+correct header to get suseconds_t, at least with glibc, that requires
+-DXOPEN_SOURCE.  Which is problematic for a public header, because
+then all *users* of startup-notification will be required to define
+that.
+
+Poking around a bit, it looks like at least with glibc, <sys/select.h>
+will give us an unconditional define.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index 2f639df..cea4e12 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -28,6 +28,7 @@
+ #define __SN_MONITOR_H__
+ 
+ #include <libsn/sn-common.h>
++#include <sys/select.h>
+ 
+ SN_BEGIN_DECLS
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
new file mode 100644
index 000000000000..710d29e93976
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
@@ -0,0 +1,66 @@
+From a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc Mon Sep 17 00:00:00 2001
+From: Federico G. Schwindt <fgsch@openbsd.org>
+Date: Mon, 17 Feb 2014 14:48:12 +0000
+Subject: Fix crash on 32bit architectures where time_t is 64 bit
+
+This is an ABI change on platforms where sizeof(time_t) doesn't equal
+sizeof(long). For most platforms this change shouldn't make a difference
+at present. OpenBSD recently switched to 64bit time_t on all architectures
+to avoid time_t overflow in 2038 on 32bit machines.
+
+This fix extends to consumers of startup-notification, for instance
+the window manager of XFCE, which is how I got involved in this.
+See http://mail.xfce.org/pipermail/xfce4-dev/2014-February/030611.html
+and follow-ups. The XFCE devs pointed out that my patch to fix a
+crash in XFCE's window manager depends on this startup-notification patch.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c
+index 2a9ad16..f419bc1 100644
+--- a/libsn/sn-monitor.c
++++ b/libsn/sn-monitor.c
+@@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *sequence)
+  **/
+ void
+ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+-                                        long              *tv_sec,
+-                                        long              *tv_usec)
++                                        time_t            *tv_sec,
++                                        suseconds_t       *tv_usec)
+ {
+   if (tv_sec)
+     *tv_sec = sequence->initiation_time.tv_sec;
+@@ -386,8 +386,8 @@ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+  **/
+ void
+ sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence,
+-                                          long              *tv_sec,
+-                                          long              *tv_usec)
++                                          time_t            *tv_sec,
++                                          suseconds_t       *tv_usec)
+ {
+   /* for now the same as get_initiated_time */
+   if (tv_sec)
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index b58581f..2f639df 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id        (SnStartupSequence *se
+ int         sn_startup_sequence_get_screen                (SnStartupSequence *sequence);
+ 
+ void        sn_startup_sequence_get_initiated_time        (SnStartupSequence *sequence,
+-                                                           long              *tv_sec,
+-                                                           long              *tv_usec);
++                                                           time_t            *tv_sec,
++                                                           suseconds_t       *tv_usec);
+ void        sn_startup_sequence_get_last_active_time      (SnStartupSequence *sequence,
+-                                                           long              *tv_sec,
+-                                                           long              *tv_usec);
++                                                           time_t            *tv_sec,
++                                                           suseconds_t       *tv_usec);
+ 
+ void        sn_startup_sequence_complete                  (SnStartupSequence *sequence);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
new file mode 100644
index 000000000000..fb76b944f2da
--- /dev/null
+++ b/x11-libs/startup-notification/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
new file mode 100644
index 000000000000..6467a3f570eb
--- /dev/null
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils xorg-2
+
+DESCRIPTION="Application startup notification and feedback library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/startup-notification"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~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"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.4.3
+	>x11-libs/libxcb-1.6
+	>=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sys-select_h.patch \
+		"${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
+	elibtoolize
+}
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
new file mode 100644
index 000000000000..df137a9a66a9
--- /dev/null
+++ b/x11-libs/tslib/Manifest
@@ -0,0 +1,6 @@
+DIST tslib-1.0-patches-5.tar.bz2 6602 SHA256 5b4f4183de0bcc9ceb09565d55a2f6f08f3befc0962af423f9a4fd809d36db2f SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de WHIRLPOOL fe14ce85a6f5f92e7c919fefcfc6cd303ede10d45670b150bc7baa3db99f64bb6d55f05416a3a8545cca205513fd80a0ebbe76c1ef8715e32235b91780e1374c
+DIST tslib-1.0.tar.bz2 47522 SHA256 9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8 SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c WHIRLPOOL 176346c7d5ac9fb36c25bfc3b98699c26acd642ab4621c0a8e5b01999a9451e0ad7f3a87c8268b7c82b326fc6f1867fb2a132810c2a17aa417a245b2efbd3ec3
+EBUILD tslib-1.0-r3.ebuild 1108 SHA256 ffb3a9d7a219b89b46bcc013a5ac638d9a587bcc228934419a81cf3d15688064 SHA512 2c81cc2dae62e36ee7330e696340a564619ab9c9a01713ad511dc973f7bcbebbba3c4835ed54b9b5c14a80210c8e503c69b39eee897ba0eb03a4b9d4900e54b7 WHIRLPOOL 197008a73f4bcc0ee0462a7d84e255973f5a6c74514b0a6055ea90a7a0a5a57c4291c6ff66a4df51680556db16b1951f060d110cbb6cad75bb186284d83a578e
+MISC ChangeLog 2577 SHA256 ab4d9db7bfd7560a07c7aea0d854349c7249b469bb0fca746ee00ad8f1be3cd2 SHA512 68d27788020336848ba680408979af268d52b0399518f1ffc64a550710115f1a775197c0ecf8d6eec0935cda5c1e4e35a6996ea5fdc64fa371454ad8e9943739 WHIRLPOOL 4188e82219719d9569371080b102fb0fa4457c3cbe61be771d0496676ae6f4b7a972851cb6a813a3b715c61f22cbf857833974f2c5a24fa91890f9e9c8a7d878
+MISC ChangeLog-2015 4381 SHA256 483a897030f582cb40596a80fb149c5a77fa1a8151d5525ceb72569132994609 SHA512 e40d39716442fd914f531ca5591ee54fb849695579e405f01840e0dcde1f5e3bab35254cf536edf96a1d60a18e25c86538bd95f1f797a92df723b1e03436068e WHIRLPOOL 2ee9c592bd38bbe26f70933d8eee1d1949e16c819287ffc8cc43a7f39ef410279ac420d34a310c675098ebd6e58d925fecb69f7002a27299d6ed39aacc3de640
+MISC metadata.xml 329 SHA256 cab930344a0c18b5e83f3a22c7f0e380bf3a7ffdff36fefc246b70929edb00ab SHA512 cf3b3310e40c72fa30927c8877d2bcdbf66f38adb2e43a82f7bbea771f4e7f1c292948c03a292b550db0dc8d2e3ef2e12ddb9d676e3bc5663d40714325d0c044 WHIRLPOOL d4089440df0971f3d0c0d4a0a13d5ffa5979b0b4849406b59fa3ea97fef0a1035284522209a1cbb22be51d4d43e9ce558dbdef09d6104b3a5fa5f38959b77fb0
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
new file mode 100644
index 000000000000..7407021b7ce5
--- /dev/null
+++ b/x11-libs/tslib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kergoth/tslib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
new file mode 100644
index 000000000000..e585e7f17409
--- /dev/null
+++ b/x11-libs/tslib/tslib-1.0-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools multilib-minimal
+
+PATCH_VER="5"
+DESCRIPTION="Touchscreen Access Library"
+HOMEPAGE="https://github.com/kergoth/tslib"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	# patches come from buildroot + openembedded + suse
+	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# compile everything. INSTALL_MASK= what you don't want.
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-linear --enable-dejitter \
+		--enable-variance --enable-pthres \
+		--enable-input --enable-shared \
+		--enable-arctic2 --enable-collie \
+		--enable-corgi --enable-h3600 \
+		--enable-linear-h2200 --enable-mk712 \
+		--enable-ucb1x00 --disable-debug
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
new file mode 100644
index 000000000000..45075a6181d8
--- /dev/null
+++ b/x11-libs/vte/Manifest
@@ -0,0 +1,18 @@
+AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
+AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
+AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 SHA256 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec WHIRLPOOL 5aed1b127b364e02a127b4d90bdfcd4d2cdb5b646b0ca1097401f8037cc28d5c309c8138070982378ef30bd0bb4e20795bb14bea536cebbc7d3734c5a5c6355a
+AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
+DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
+DIST vte-0.36.5.tar.xz 1017504 SHA256 c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6 WHIRLPOOL 22be408deecedfb7c674fbc49bac2852e5e1c28f25cd7998d20042f15a905158b2698f3e2a0a8fd4a78b89929e773779787dff9af9c6c5e006ee30ed6efdc59d
+DIST vte-0.46.1.tar.xz 989164 SHA256 8800cf8bc259704a12ad1853fb0eb43bfe3857af15242e6fb9f2c3fd95b3f5c6 SHA512 04b3f8ce922c4326d92bef605a0dbe195764946cd5f1acf28fd6d69c0cdb2ee661cc7e424436c72380da5d0250790ae658ac49d761b567dea88d92157285889d WHIRLPOOL 7947982c2e9eba1481f302da8bf3433156490537c9e7ab1ef8da8d399b3dccec0911253b8973712be77fa89f7eb9451e09b65ffd6cc2ccc6e2bea9fb9f2997f8
+DIST vte-0.46.2.tar.xz 989756 SHA256 cad246b336e8a20855bf130348ad996ddd28489444128647f9cfc901d9c0cc0f SHA512 abcf94752094314b01eb14156e894bedb24f959d4faf84bb070b34eb2745f01d029859ef959ddf1475776605a1721e4d011ae7ad57fc4937d8bfcbecc8b0cf61 WHIRLPOOL 1b700708fb0eb0ca148d72aaa7d761e0fef962d4c59cb65b8fb295c5dff5c5e206e91f6afcc058b74b726967e1c3c4034b572e36558840b9f4d05952e9c737cb
+DIST vte-0.48.3.tar.xz 1009364 SHA256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 SHA512 3037b61a759cfcf56838bc7804df5a211da416bff9ddc5791f8a8d5157b90926985cfe57d7edbab42de64945d5e668470fe4129a218fb9c7af546648e1660c72 WHIRLPOOL f288b988de9fa1a1ff36f6c9c5031dc7660de311657ce0a83070df6ce0cc2a9ad4e1333a9696a1febb0f91799dc31ca692c3d7ac78699b986ac1ceeb8c215292
+DIST vte-2.91-command-notify.patch.xz 6012 SHA256 b99ea46c410030f0d0ffe85a9034f27ba9c1a93bc80b4ac6a51657685f49d9a1 SHA512 e6a8955f99c98183c60df770b5c6826c5a456aaac3c83a8d0fa5037d2dd250450c8287dff335e22ca32332645d13d298cecc5d2c884c7c9da65d09dfd2a79054 WHIRLPOOL fcebe53b0b631a0d4670b91385ede0c5f2e14f7bbf006385e812160f03a118ac6783229c5f1a41f8ca0e0d3a4262b385f2c872b5a8e7b6b44bd8d04aa571be02
+EBUILD vte-0.28.2-r208.ebuild 2973 SHA256 d25c229897764598d07711b4644d79f541afda0e7e8057446b759cfa699dfa19 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560 WHIRLPOOL a447845126ec2e6af5ad5636826b455fc930834df01aefeba7a25576e9a2f7a3d2eee7ff6b0d9b265a51d4cd13fd336ae38c0447b7542fd2ea138768224533cb
+EBUILD vte-0.36.5.ebuild 1695 SHA256 c84c27f306a285979178d856f4243a70cc67a58b6a99b6e60e786ff187501a90 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba WHIRLPOOL 8a38294e9468a779df1b74dc797d101c0999844ded28fb632149db7c9f915d44ca47acb13a448b0c2d4f80e09b4a10c0b41ef455addb53417e3e191c56cd3af6
+EBUILD vte-0.46.1.ebuild 1898 SHA256 1da31f1f28461c3bcac037b45cf369742eb542caf3878eed9db36a5feeb88e5b SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d WHIRLPOOL cb0166031ce638d0de0c876abd1f4330552fbf19ed9c1eb28389085132df744506dc29ebdb29161841b13c78c0f612f1df2012f94d456382c3323afc963a8451
+EBUILD vte-0.46.2.ebuild 1902 SHA256 524f75fd28022773b3e6b1605ec2341f62058b500a2d65e2c16060b099a5d91e SHA512 8adb67da193d401f48c126b45ea9b97c186526c544fa49b719d20e02eeb020f757b5af07d844437b2000118d8669f575befe2d77bfbd889cc336a045043ac017 WHIRLPOOL 898fcc4926a660124bdca0501b61ccc5a7158751c9f3d32ccd4b31c7ac53676a4779d8dc7414aeae3cf70a1a1588589bb1350346709edfbc836e7f1452f973e8
+EBUILD vte-0.48.3.ebuild 2343 SHA256 b630a9e0709d6a95528b55e6602d4419fdb4aca903dee16147b79858eae2d193 SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb WHIRLPOOL 03dab3f52e1b71328859e7bd17a74f3a1456e16c9934060bf32df409ab2efbf87b7d8e69eff30e63b68e89b9fec7549460365d4a4be977072eda1db8b7b8a5ac
+MISC ChangeLog 12740 SHA256 a95015795d0f34275827e24625ee923e4426263dbcb0604362ea8f070f97d0d2 SHA512 c27b5d62a3fbd4b0b550e2ca4bee4917aa315a5f4986655d13faabeb74e28f284cd19a3e376f7d986f984da05b04f7eddf94fce34188d20c818556c7f8f20608 WHIRLPOOL 54fd57c7358ff253a2a0397549b896c6ce0d186c8c3b58f60cc5cb8f4231cf581d2e61c8ae2234c90f544e438cdc431a8b451b9a29ab97e03f8a113e0dd9001b
+MISC ChangeLog-2015 55694 SHA256 b82586cfbd6b1268c3795822eddc032254d66867cc5ee84750c31e87605e9eb5 SHA512 260cb689bee30cf2c1970f98f34d8bcd0d8fdd6f6419513c5098fea80a9de759dda50e925950516b570e38403b74d3b787e26738a5a4530c06160912d3cbdb64 WHIRLPOOL 8983100c2dca9e9261511c237af5e84afd8132fec63042af20b6e7abc04be4623e58446caa9408dcabf0fa77079227b12dc9180b0912f8e9be8a227e27ea7d7c
+MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138
diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch
new file mode 100644
index 000000000000..c54d46ebc3dc
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-interix.patch
@@ -0,0 +1,51 @@
+reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
+
+diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
+--- vte-0.26.2.orig/configure.in	2011-08-17 08:30:55 +0200
++++ vte-0.26.2/configure.in	2011-08-17 08:35:42 +0200
+@@ -362,7 +362,11 @@
+ 	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+ fi
+ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
++dnl if the first check didn't find floor, it caches the "no" value,
++dnl and doesn't recheck. this makes the below check fail always on
++dnl systems with floor in -lm. thus we unset the chached result.
++unset ac_cv_func_floor
++AC_CHECK_FUNCS([ceil floor round])
+ 
+ # Look for tgetent
+ 
+--- vte-0.26.2.orig/configure	2012-04-30 20:02:55.000000000 +0200
++++ vte-0.26.2/configure	2012-04-30 20:03:16.000000000 +0200
+@@ -13277,7 +13277,7 @@
+ 
+ fi
+ 
+-for ac_func in ceil floor
++for ac_func in ceil floor round
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
+--- vte-0.26.2.orig/src/vte.c	2011-08-17 08:30:58 +0200
++++ vte-0.26.2/src/vte.c	2011-08-17 08:38:09 +0200
+@@ -63,6 +63,18 @@
+ #include <locale.h>
+ #endif
+ 
++#ifndef HAVE_ROUND
++# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
++static inline double round(double x) {
++	if(x - floor(x) < 0.5) {
++		return floor(x);
++	} else {
++		return ceil(x);
++	}
++}
++# endif
++#endif
++
+ #if GTK_CHECK_VERSION (2, 90, 7)
+ #define GDK_KEY(symbol) GDK_KEY_##symbol
+ #else
diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
new file mode 100644
index 000000000000..fd454079390f
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
@@ -0,0 +1,40 @@
+From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 17:36:09 +0000
+Subject: emulation: Limit integer arguments to 65535
+
+To guard against malicious sequences containing excessively big numbers,
+limit all parsed numbers to 16 bit range. Doing this here in the parsing
+routine is a catch-all guard; this doesn't preclude enforcing
+more stringent limits in the handlers themselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+diff --git a/src/table.c b/src/table.c
+index 140e8c8..85cf631 100644
+--- a/src/table.c
++++ b/src/table.c
+@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
+ 		if (G_UNLIKELY (*array == NULL)) {
+ 			*array = g_value_array_new(1);
+ 		}
+-		g_value_set_long(&value, total);
++		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ 		g_value_array_append(*array, &value);
+ 	} while (i++ < arginfo->length);
+ 	g_value_unset(&value);
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 457c06a..46def5b 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
+                               GValueArray *params,
+                               VteTerminalSequenceHandler handler)
+ {
+-        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+ 
+ static void
+--
+cgit v0.9.0.2
diff --git a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
new file mode 100644
index 000000000000..86e547103ad7
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
@@ -0,0 +1,86 @@
+https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
+
+From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001
+From: Micah Cowan <micah@cowan.name>
+Date: Tue, 22 Oct 2013 23:30:43 +0200
+Subject: widget: Fix invalidation region
+
+When the sequence handler moves the cursor into the restricted scrolling region,
+the bbox needs to be reset, too.
+Fixes glitches with interspersing writes to the bottom line with scrolls of the
+upper region, and also fixes missing screen redraws when using mosh.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=542087
+https://bugzilla.gnome.org/show_bug.cgi?id=686097
+
+diff --git a/src/vte.c b/src/vte.c
+index 9f6d7d8..a4d9d25 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal)
+ 	long wcount, start, delta;
+ 	gboolean leftovers, modified, bottom, again;
+ 	gboolean invalidated_text;
++	gboolean in_scroll_region;
+ 	GArray *unichars;
+ 	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
+ 
+@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal)
+ 	cursor = screen->cursor_current;
+ 	cursor_visible = terminal->pvt->cursor_visible;
+ 
++	in_scroll_region = screen->scrolling_restricted
++	    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++	    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
+ 	/* We should only be called when there's data to process. */
+ 	g_assert(terminal->pvt->incoming ||
+ 		 (terminal->pvt->pending->len > 0));
+@@ -4194,6 +4199,8 @@ skip_chunk:
+ 		 * points to the first character which isn't part of this
+ 		 * sequence. */
+ 		if ((match != NULL) && (match[0] != '\0')) {
++			gboolean new_in_scroll_region;
++
+ 			/* Call the right sequence handler for the requested
+ 			 * behavior. */
+ 			_vte_terminal_handle_sequence(terminal,
+@@ -4204,12 +4211,21 @@ skip_chunk:
+ 			start = (next - wbuf);
+ 			modified = TRUE;
+ 
+-			/* if we have moved during the sequence handler, restart the bbox */
++			new_in_scroll_region = screen->scrolling_restricted
++			    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++			    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
++			delta = screen->scroll_delta;	/* delta may have changed from sequence. */
++
++			/* if we have moved greatly during the sequence handler, or moved
++                         * into a scroll_region from outside it, restart the bbox.
++                         */
+ 			if (invalidated_text &&
+-					(screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
+-					 screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
++					((new_in_scroll_region && !in_scroll_region) ||
++					 (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
++					  screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
+ 				/* Clip off any part of the box which isn't already on-screen. */
+ 				bbox_topleft.x = MAX(bbox_topleft.x, 0);
+ 				bbox_topleft.y = MAX(bbox_topleft.y, delta);
+@@ -4229,6 +4245,8 @@ skip_chunk:
+ 				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
+ 				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
+ 			}
++
++			in_scroll_region = new_in_scroll_region;
+ 		} else
+ 		/* Second, we have a NULL match, and next points to the very
+ 		 * next character in the buffer.  Insert the character which
+-- 
+cgit v0.10.2
+
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
new file mode 100644
index 000000000000..bd364be5846c
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c |   15 +++++++++++++--
+ src/keymap.h |    2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
+ };
+ 
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++		GdkModifierType mask)
++{
++	if (modifiers & VTE_META_MASK)
++		modifiers |= VTE_META_MASK;
++	return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+  * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ 	} else {
+ 		fkey_mode = fkey_default;
+ 	}
+-	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+ 
+ 	/* Search for the conditions. */
+ 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ 		return;
+ 	}
+ 
+-	switch (modifiers & significant_modifiers) {
++	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ 	case 0:
+ 		modifier = 0;
+ 		break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define VTE_META_MASK		GDK_META_MASK
++#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
+ 
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+-- 
+1.7.8.rc3
+
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
new file mode 100644
index 000000000000..e72feac7249e
--- /dev/null
+++ b/x11-libs/vte/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
new file mode 100644
index 000000000000..9ff769292a1c
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-2.20:2[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	x11-libs/libX11
+	x11-libs/libXft
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+PDEPEND="x11-libs/gnome-pty-helper"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	"${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
+	"${FILESDIR}"/${PN}-0.28.2-interix.patch
+
+	# Fix CVE-2012-2738, upstream bug #676090
+	"${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
+	# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
+	"${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
+)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_prepare() {
+	prepare_python() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	if use python; then
+		python_foreach_impl prepare_python
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	configure_python() {
+		ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir configure_python
+	fi
+
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Do not disable gnome-pty-helper, bug #401389
+	gnome2_src_configure --disable-python \
+		--disable-deprecation \
+		--disable-glade-catalogue \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		--with-gtk=2.0 \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	compile_python() {
+		cd "${BUILD_DIR}"/python || die
+		ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
+		mkdir -p "${BUILD_DIR}"/src/.libs || die
+		ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
+		emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir compile_python
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	install_python() {
+		cd "${BUILD_DIR}"/python || die
+		emake install DESTDIR="${D}" \
+			CPPFLAGS="${CPPFLAGS} -I${S}/src"
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir install_python
+	fi
+
+	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.36.5.ebuild b/x11-libs/vte/vte-0.36.5.ebuild
new file mode 100644
index 000000000000..7aeb7122d3af
--- /dev/null
+++ b/x11-libs/vte/vte-0.36.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.90"
+IUSE="debug glade +introspection"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+	>=dev-libs/glib-2.31.13:2
+	>=x11-libs/gtk+-3.1.9:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+	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
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	# Do not disable gnome-pty-helper, bug #401389
+	gnome2_src_configure \
+		--disable-deprecation \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_enable introspection) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_install
+	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.46.1.ebuild b/x11-libs/vte/vte-0.46.1.ebuild
new file mode 100644
index 000000000000..a9cad9a2bd1b
--- /dev/null
+++ b/x11-libs/vte/vte-0.46.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit eutils 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	>=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() {
+	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
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(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 "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild
new file mode 100644
index 000000000000..afb64229521e
--- /dev/null
+++ b/x11-libs/vte/vte-0.46.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit eutils 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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	>=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() {
+	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
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(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 "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/vte/vte-0.48.3.ebuild b/x11-libs/vte/vte-0.48.3.ebuild
new file mode 100644
index 000000000000..69d239356618
--- /dev/null
+++ b/x11-libs/vte/vte-0.48.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-${SLOT}-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-util/gperf
+	dev-libs/libxml2
+	>=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}/${PN}-${SLOT}-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
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		--with-gtk=3.0 \
+		$(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 "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
new file mode 100644
index 000000000000..a4bf22087b85
--- /dev/null
+++ b/x11-libs/wxGTK/Manifest
@@ -0,0 +1,24 @@
+AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2 WHIRLPOOL ac8f565adeaee0110e6e2b229cd9c5afd3edf3bc3b7abb8aba5347dac64021a255a63dbf879b5ddcbc658f6f78518c988435399af0af1f5fd437f36dc102cfc8
+AUX wxGTK-2.8.11-collision.patch 5712 SHA256 33cbfadeb9890d4790c4c912512f510c93b985a1afad8a6ebc7863dbf5171eb3 SHA512 55a5e55a7233e0ca99f7604bcd6c71816d2ba7630056c8c67d78c2b6080e26c010f6b3120b7d46b32818ce6dc1b09d97b8295fe23628c561e2079483922baf13 WHIRLPOOL 0a842206ce6d7f45bb897c75fa1c222b5a931a82aa1521f2c3675a421ac26e7999ecc663891ef417c85bfbe819c3cfa775fa405189d36a4437aea0162e407935
+AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86 WHIRLPOOL 710ac8ada38a42d762ea1d271540b9eb47aae36a072b1b63310b4c1e970afc7b0b485cc55a50691d69f92712e3b772d35d72ae1e24dc550a9e0b60db8c20ace5
+AUX wxGTK-2.8.12.1-autoconf.patch 1140 SHA256 2e5149490f98780a53ca6d313c103b55c846ce8d00a5cfd148e8bca6418bf3b3 SHA512 533c6c2f3611b8af4b6dc954aa09a3c70197ad7fe7fb1874c7c6f61b48e45355c41bdb7fb4379fea9e418ed0f547332d6083f60c6382d090b1700f213ede9b20 WHIRLPOOL 0f31c75e79e0dae6eb12709f5f5119a927e401883a2a78e7a966d4c1d2f92aadcd0d5b4a404fabe4dfb2a9a1330b0266c07c39e1382b66d6dfb186b63626ad1b
+AUX wxGTK-2.8.12.1-bakefile.patch 653 SHA256 1c1446fd783c5c6bf0c62013997f99f6c81489cbb97a1706219d2b395fce035b SHA512 9235ab4ff1117bb15ae88a4f9a836e30af3cee6b897031a8a89bbe1ee87df7a700bd2d6a2dce01e8e96ced2aff52ea4265490103a80a18e8fc54d4e7e59dcc08 WHIRLPOOL bb9c88918f47a73ebf761c2dfc10c209141b3e28c6b0b374ef7313e2e23023880fd0b2778ed0960b9f98b0fc968913996ee7ddb9dffa3efd04319f8506d61221
+AUX wxGTK-2.8.12.1-fix-c++14.patch 4518 SHA256 42ce51e6e73a1035908cba7b0c6d4a675705d9c79a735f8be197571c8f15e23f SHA512 cd7fc58e883ff9ef185bc8deff333f7a785d8bd3e8abebef741b598436bc486f2904540be7d2c891ef070b45008f2e5f5961c7978b0a8166ef259e17b7481739 WHIRLPOOL 9061f79d131181f434963ee6ffcc31de7a4c46417bec16271eeab5800e68a8786ef347e95c1ed810a1d7c88ef1851e80da236efa23f32d71b1e733a1a18a36d4
+AUX wxGTK-2.8.12.1-libdir.patch 13266 SHA256 11ab90519588c7ba601bc6b7f239d7230f75cab19afd2f41ae11839b9528ed70 SHA512 15eb72936176bfe03b5acb7d52c4158fe4f6bdf9870e72aab8d41e1689ee9886aa3bc8216e782abb756d06607bcedbec184575a2e9634f67f6add1b930297671 WHIRLPOOL e8a8f123bbd92e28a18de86e0c34694406c3eca52e78cfb5b937d49cc0c9a5d1f9d467870076d0c6d3ce973e5c4bfad8b1618d7f2f0a4051241361d94514cb79
+AUX wxGTK-2.8.7-mmedia.patch 518 SHA256 c313fec2d7eca6099aeaa90e047eb475a9ebcdc191a922cb095a3757fdde116e SHA512 8577a701f5d0d03296d2d2dbb3a041023cf7adffc2d09492d2ebd094e0a6796e27abe1f442fee92e661f0f1ea6268499c37ace042cc1434b80aac58639bbc56c WHIRLPOOL 484dc4e09a94296cd0b85bc80a0c2d3070640e547f5900547aee4cd51b020d72578ba544a8f6b2a26ed14882e70a130b0fdce9cbbf01255a96c4e794efbbb6e3
+AUX wxGTK-3.0.0.0-collision.patch 6237 SHA256 9bfd909e4f953810b84e068b0ec5c709f3ff0a286c3d599fc7b1b26b96bef8d8 SHA512 c68ac400ddc4531d81a251acf1efc4440a5a17d78d9767427121f4ca0425a179a9cdfa94f22ecad0f2cd8f4bf3a4c799a4e21878e93367b57e206f2504a2724f WHIRLPOOL 1d9f7eba01e72bd662eb4c94a92a0bc7193b60f79559b00d2844dffa3c43c748c718491769daffc140c39895382621ca0c59229933f694d948d74379a1756d65
+AUX wxGTK-3.0.2.0-gcc6.patch 1077 SHA256 6e659eb4f1cfbfe31e0da0c8719e496e16efa5be36265388a639964e4b39cf78 SHA512 6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585 WHIRLPOOL cb35ef7ae5da54a95f1e493027832f92b001c8c3ed353f5ca47785b3e666c9106237908ebd81280c0d49a9715da74ef3bef029db6429d93fb576cc6c56c57749
+AUX wxGTK-3.0.2.0-webview-fixes.patch 9132 SHA256 964124da1affd2aa62bbbd12298ff692e69e4e149d9c25062d6fa40f3f8995a1 SHA512 61ff21971d1527cd721f8d2c525e2d55de65f1935135c3cf6c20e0097ef08518f43a7bd96e3d49e22de19dc68462896ab4f7c8679c9632f392b8a0a64df9bc90 WHIRLPOOL c6ac4adfa2f0644859ebf91d5d8b843262bda18119d02a604291c073c72eac3773387b5891fa43b3ac6a6b72511acdb89b181b0c2fb1c2ddd887cb83f6675918
+DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715
+DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
+DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
+EBUILD wxGTK-2.8.12.1-r1.ebuild 4151 SHA256 0a0a84551d4cb5b0d74fd80e2aabe87cb1cf10412c6088dfa657b1ee9242c9c8 SHA512 1443d388b8628d7d12c4ac8b4731142c47bc2d81a72edf14f1d502b251b8bff4e46e02843432bf139a4480f5d2ee824b680f955c752546bcb033fd8b086b4f4b WHIRLPOOL acfd903a2402a49558dd60a238117234474ac8ef651482a649253ba562b459f1c4876dbc03c187e72382778ca12aa35422206215347080d4d0fbe04142d1ca1a
+EBUILD wxGTK-2.8.12.1-r2.ebuild 4797 SHA256 29b3747dc7822e01c4a1577c23c912ff1115169e034cf8f3271ae723730e4463 SHA512 6d5c3f1a751184b97f748ea4e66967d48488d68818f6ecd8907f9c517b307b6a5e98199a2feafd3c064a2eaa9ddfa6b3f3566b5844cbbf4be5ae6271d8d887d5 WHIRLPOOL 7ed4f397092d3933ac940e115a974970ecc14efc93e52dd0984fed73072b68e966f497c86578213e455760ee716befab39884c7425930db1378db8304fb9208c
+EBUILD wxGTK-3.0.2.0-r1.ebuild 4050 SHA256 6c75e6956ca184e34bb00957fb018738fdaf30ee34e77680550e18fc8d9dff7a SHA512 29bb0f8a4ee4a395b07e03f97edba208eb23455ac5301f8125aaf838cb23152e269ff94f6690b03c54fe7b40ffea0e71495b10b3ef4fa480ac8e7bfacc95d1e7 WHIRLPOOL 11f54f4ee367f1e5f0a7cf7bc9b53685517e8a219a9f029367cdedd697ebe95da2d8089288afa6a04cd15b203b560d16fae8aedb7a4e6be39ee58184dfb538dc
+EBUILD wxGTK-3.0.2.0-r2.ebuild 4320 SHA256 1a480296e19b553d8375ce80af027f0736f7c14fda103239009e68bca6e9c4b9 SHA512 de38e3260dce0be34b363e40c562421fac18250fb69937e62f81b32863a2b3a6e5e416bf56b3d8783fc8c9eb7fe27482be2d1695293217231a0b380f00a23753 WHIRLPOOL 1279002ce1a7a475d030b1f5dc3a2a63eab3c64cc4708745eab7106588a3e4881ad8540a7f8d0ad40b0d3eec9a838a5fc24d7bc0db24f1d8dfcfd2ad2b7f7943
+EBUILD wxGTK-3.0.2.0-r3.ebuild 4546 SHA256 9579864d5eb45e1f837c9f2368afaf350daddf8cf769f129b8a15f5c06ac3905 SHA512 81d76b4b9e8f970d270dc44aa794282566d87a71f21b2a2fc3bccd21035029b14c3451ce7c6e7ad46b3c8ad5795a329d459e324e5ab7b4b9d0a53d459ee5e51b WHIRLPOOL 623095e91e0d85fd57e4992c7c834422bc3b209ea83388be8d0803ec73b6c53a16c2276f394f51dddf59fb2840eac04f9deb456aa1f1b35556405c8da9c48126
+EBUILD wxGTK-3.0.2.0-r300.ebuild 5061 SHA256 70cff1ba81a54f596009696b7af6f80091d388fda1569bff286232c2350bbe6d SHA512 471536934d7655541c1962745897c414667c5e3adf1b0b4cc1bd0efffddd123936f164b030eb1f71d77f095b06f64e796c0253f8c7d235de6908585845746d55 WHIRLPOOL 4169fe472dfdbcf1bf3092ad81b386036108cd1179ce7d1fb61180b42e1737ed4104f5e3d39c0f0c2582917d84ca8b50074d6b028a0a8ff5746ea6bbf4c59592
+EBUILD wxGTK-3.0.2.0-r301.ebuild 5291 SHA256 e1ce55ceb57fd7d4c0f1045d35320f6e9f8d7fb01502c53a3a823e6009e905fc SHA512 4f676e491500026cc9bac53d2c02f6cc6fe39a127b50d2a407cc0ba4dc6465980349ef87c383b111d997379d812ed647f4b76ce58285a93c7d332a10300f7d4d WHIRLPOOL 26abd8a92c4af38a7e13c3e744dcad5634469deb9c500a7e5b6ad09ee259222170f96e0f9bfbcd0b4062a7b8ce2dd9e0bfe088e75c50efc862d4f92a4bc0f91a
+MISC ChangeLog 8466 SHA256 6f3dbb1da8163b5a82e19644aeca0c6efe63b1cbde44460144a37ca4172b478f SHA512 67ad03b635a82a26f06681911898cd2fe51098cc0531260cc56364aa4b0f7bba3987ffa213be0ae25449315a945f346cc8d9fe5b7ae356ae33e4415bc159dfba WHIRLPOOL 6c27c95e2d94233b3b6fff1fd63635ae09ed20821cf4993fb2d2087047cce9b5b400a13d124153cac52771cc8376a9a785aaf232c3e6c224200e4448b95282b2
+MISC ChangeLog-2015 51140 SHA256 33dec29a979f11894bec04d7a3fac0f64ef402e089a3ce80822790cfa922e555 SHA512 415ef31c4937cd3024a27b8e64463d1d9a38997c1e09fa007072a32a9d64b4fccd324731276f500ce388eb1189268ff0fa8e78e42ef1d8fe9cba283bb3b1850a WHIRLPOOL c89fb3370b227c0b3d5ca0addc9e1f01cf20cbc6cf5c4dd6611b0a890cb71878b57ddcbd0361c85726211b0d60f5b2d9da5b730fc4f895928aea7c61bc2ceb17
+MISC metadata.xml 856 SHA256 e0404abad32321aea90893545bbb40c0ca1958b1cc05ba9b761d290af8de130d SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb WHIRLPOOL 50f33b82303e32f48001139070c4412b8c4b5b2aa0772e707dc25dff0235fbc2c0f4a2e0d601d067c4924f56f013739f4cb5e382b83b1482ffd405e1c257c27d
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
new file mode 100644
index 000000000000..3636b64f976a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
@@ -0,0 +1,39 @@
+unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef
+declaration instead of preprocessor #define macro definition.  This breaks
+the preprocessor checks in this include file.cpp, causing the source to fall
+back to older types instead, leading to compile time errors like this:
+
+db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to
+‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
+...
+dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to
+‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’
+...
+
+This change hard-wires the new names, breaking compatibility with ancient
+(pre 2001) unixODBC versions.  This change may break other ODBC implementations
+but in Gentoo only unixODBC is supported.
+
+References:
+http://bugs.gentoo.org/310923
+
+2010-03-23 Martin von Gagern
+
+--- wxPython-src-2.6.4.0.orig/include/wx/db.h
++++ wxPython-src-2.6.4.0/include/wx/db.h
+@@ -134,15 +134,6 @@ enum enumDummy {enumDum1};
+     #endif
+ #endif
+ 
+-#ifndef _WIN64
+-#ifndef SQLLEN
+-#define SQLLEN SQLINTEGER
+-#endif
+-#ifndef SQLULEN
+-#define SQLULEN SQLUINTEGER
+-#endif
+-#endif
+-
+ const int wxDB_PATH_MAX                 = 254;
+ 
+ extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME;
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
new file mode 100644
index 000000000000..a5c574cb2d6a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
@@ -0,0 +1,74 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  Unversioned wrapper scripts are installed with
+    eselect-wxwidgets.
+  - Version wxstd.mo and modify AddCatalog to find it. (this might need more
+    work but no one has complained yet)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \
++	$(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+ 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12454,8 @@ install-wxconfig:
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12463,7 @@ locale_install:
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
+   m_initialized = false;
+ }
+ 
++#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+                     const wxChar *szShort,
+@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName,
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -120,7 +120,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
new file mode 100644
index 000000000000..d272247091b8
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
@@ -0,0 +1,13 @@
+Allow odbc to be used with unicode builds.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ 	$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \
+ 	$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
+-	$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \
++	$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \
+ 	$(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS =  \
+ 	$(__odbcdll___win32rc) \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
new file mode 100644
index 000000000000..2701500d7ad9
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
@@ -0,0 +1,27 @@
+From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim@wxwidgets.org>
+Date: Thu, 17 Jun 2010 22:30:27 +0000
+Subject: Backport fix from bakefile svn for autoconf 2.65.
+
+Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work
+with autoconf 2.65.
+
+This is a backport of r1337 from bakefile svn to allow people to use autoconf
+2.65 immediately and will become unnecessary when we update to the next
+bakefile version.
+
+git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
+
+diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
+index 4cc4a67..ec0f711 100644
+--- a/build/aclocal/bakefile-lang.m4
++++ b/build/aclocal/bakefile-lang.m4
+@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform
+ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
+ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
+ [
+-    AC_PROG_$1
++    AC_REQUIRE([AC_PROG_$1])
+ 
+     dnl Intel compiler can be used under several different OS and even
+     dnl different architectures (x86, amd64 and Itanium) so it's easier to just
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
new file mode 100644
index 000000000000..f497665cef8f
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
@@ -0,0 +1,25 @@
+From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:38:39 +0300
+Subject: [PATCH 2/2] Fixed bakefile version
+
+---
+ build/aclocal/bakefile.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
+index 88478ca..aa04b16 100644
+--- a/build/aclocal/bakefile.m4
++++ b/build/aclocal/bakefile.m4
+@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE],
+     AC_SUBST(OBJCXXFLAGS)
+ 
+ 
+-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
++    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+ 
+     dnl includes autoconf_inc.m4:
+     $1
+-- 
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
new file mode 100644
index 000000000000..dc9b14359107
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
@@ -0,0 +1,77 @@
+Fix building with C++14, which errors out due to narrowing conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592442
+
+Patch by Francesco Turco
+
+--- a/src/gtk/bdiag.xbm
++++ b/src/gtk/bdiag.xbm
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+ static char bdiag_bits[] = {
+-   0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+-   0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+-   0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
++   (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
++   (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
++   (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01};
+--- a/src/gtk/cdiag.xbm
++++ b/src/gtk/cdiag.xbm
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+ static char cdiag_bits[] = {
+-   0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+-   0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+-   0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
++   (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
++   (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
++   (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81};
+--- a/src/gtk/cross.xbm
++++ b/src/gtk/cross.xbm
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+ static char cross_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
+--- a/src/gtk/fdiag.xbm
++++ b/src/gtk/fdiag.xbm
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+ static char fdiag_bits[] = {
+-   0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+-   0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+-   0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
++   (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
++   (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
++   (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80};
+--- a/src/gtk/horiz.xbm
++++ b/src/gtk/horiz.xbm
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+ static char horiz_bits[] = {
+-   0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
++   (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
+--- a/src/gtk/verti.xbm
++++ b/src/gtk/verti.xbm
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+ static char verti_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
new file mode 100644
index 000000000000..db9571438d86
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
@@ -0,0 +1,304 @@
+From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:37:36 +0300
+Subject: [PATCH 1/2] Backported new libraries search code
+
+---
+ acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++---
+ configure.in | 96 +++++++++++++++++++++++-------------------------------------
+ 2 files changed, 107 insertions(+), 64 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index a44747c..1e307c9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include;
+ ])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
+-dnl to the full name of the file that was found or leaves it empty if not found
++dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
++dnl sets ac_find_libraries to the full name of the file that was found
++dnl or leaves it empty if not found
+ dnl ---------------------------------------------------------------------------
+ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
+ [
+   ac_find_libraries=
+-  for ac_dir in $1;
++  for ac_dir in $2 $SEARCH_LIB
+   do
+     for ac_extension in a so sl dylib dll.a; do
+-      if test -f "$ac_dir/lib$2.$ac_extension"; then
++      if test -f "$ac_dir/lib$1.$ac_extension"; then
+         ac_find_libraries=$ac_dir
+         break 2
+       fi
+@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
+   fi
+ ])
+ 
++dnl ---------------------------------------------------------------------------
++dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
++dnl
++dnl Tests in a variety of ways for the presence of lib-name
++dnl
++dnl On success, returns any novel path found in ac_find_libraries; else "std"
++dnl             and any cflags in ac_find_cflags
++dnl On failure, ac_find_libraries will be empty
++dnl ---------------------------------------------------------------------------
++AC_DEFUN([WX_FIND_LIB],
++[
++  ac_find_libraries=
++
++  dnl Try with pkg-config first. It requires its lib-name parameter lowercase
++  fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
++  dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
++  PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
++  PKG_CHECK_MODULES([$1], [$fl_pkgname],
++    [
++      dnl Start by assuming there are no novel lib paths
++      ac_find_libraries="std"
++
++      dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
++      dnl inside the macro
++      dnl
++      dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
++      dnl should become:
++      dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
++      dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
++      eval ac_find_cflags=\$$1_CFLAGS
++      eval fl_libs=\$$1_LIBS
++
++      dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
++      dnl added) We only want the path bit, not the lib names
++      for fl_path in $fl_libs
++      do
++        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
++          dnl there shouldn't be >1 novel path
++          dnl return it without the -L, ready for WX_LINK_PATH_EXIST
++          ac_find_libraries=`echo "$fl_path" | cut -c 3-`
++        fi
++      done
++    ],
++    [
++      if test "x$ac_find_libraries" = "x"; then
++        dnl Next with AC_CHECK_LIB, if a test function was provided
++        if test "x$2" != "x"; then
++          AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
++        fi
++      fi
++
++      if test "x$ac_find_libraries" = "x"; then
++        dnl Finally try the search path
++        dnl Output a message again, as AC_CHECK_LIB will just have said "no"
++        AC_MSG_CHECKING([elsewhere])
++        dnl $3 will occasionally hold extra path(s) to search
++        WX_PATH_FIND_LIBRARIES([$1], [$3])
++        if test "x$ac_find_libraries" != "x"; then
++          AC_MSG_RESULT([yes])
++        else
++          AC_MSG_RESULT([no])
++        fi
++      fi
++    ])
++])
++
+ dnl ===========================================================================
+ dnl C++ features test
+ dnl ===========================================================================
+diff --git a/configure.in b/configure.in
+index 021845d..9c78ba3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
+             x_includes=$ac_find_includes
+         fi
+         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
++            WX_PATH_FIND_LIBRARIES(Xt)
+             x_libraries=$ac_find_libraries
+         fi
+     fi
+@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+         dnl test for external libxpm if we're configured to use it
+         if test "$wxUSE_GPE" = "yes"; then
+             AC_MSG_CHECKING(for gpewidget library)
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
++            WX_PATH_FIND_LIBRARIES(gpewidget)
+             if test "$ac_find_libraries" != "" ; then
+                 WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+                 dnl -lgpewidget must be before all GTK libs and
+@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+             fi
+ 
+             dnl AC_MSG_CHECKING(for gpe library)
+-            dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
++            dnl WX_PATH_FIND_LIBRARIES(gpe)
+             dnl if test "$ac_find_libraries" != "" ; then
+             dnl     WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+             dnl     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
+@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+ 
+ 
+         AC_MSG_CHECKING(for Motif/Lesstif library)
+-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
++        WX_PATH_FIND_LIBRARIES(Xm)
+ 
+         if test "x$ac_find_libraries" != "x" ; then
+             AC_MSG_RESULT(found in $ac_find_libraries)
+@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+         dnl test for external libxpm if we're configured to use it
+         if test "$wxUSE_LIBXPM" = "sys"; then
+             AC_MSG_CHECKING(for Xpm library)
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
++            WX_PATH_FIND_LIBRARIES(Xpm)
+             if test "$ac_find_libraries" != "" ; then
+                 WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+@@ -4192,41 +4192,23 @@ dnl ---------------------------------------------------------------------------
+ dnl wxDisplay Sanity checks
+ dnl ---------------------------------------------------------------------------
+ 
++USE_XINERAMA=0
+ if test "$wxUSE_DISPLAY" = "yes"; then
+ dnl ---------------------------------------------------------------------------
+ dnl Xinerama (for unix ) - Brian Victor
+ dnl ---------------------------------------------------------------------------
+     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+-        AC_MSG_CHECKING([for Xinerama])
+-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
++        WX_FIND_LIB(Xinerama, XineramaQueryScreens)
+         if test "$ac_find_libraries" != "" ; then
+-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+-                LDFLAGS="$LDFLAGS $ac_path_to_link"
++            if test "$ac_find_libraries" != "std" ; then
++              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++              if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                  LDFLAGS="$LDFLAGS $ac_path_to_link"
++              fi
+             fi
++            USE_XINERAMA=1
+             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+-            AC_MSG_RESULT([yes])
+-
+-            AC_MSG_CHECKING([for Xxf86vm extension])
+-            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+-            if test "$ac_find_libraries" != "" ; then
+-                AC_MSG_RESULT([yes])
+-                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+-                                 [
+-                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+-                                 ],
+-                                 [],
+-                                 [
+-                                      #if HAVE_X11_XLIB_H
+-                                        #include <X11/Xlib.h>
+-                                      #endif
+-                                 ])
+-            else
+-                AC_MSG_RESULT([no])
+-            fi
+-
+         else
+-            AC_MSG_RESULT([no])
+             AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
+             wxUSE_DISPLAY="no"
+         fi
+@@ -4243,17 +4225,16 @@ dnl X11 session management
+ dnl ---------------------------------------------------------------------------
+ if test "$wxUSE_DETECT_SM" = "yes"; then
+     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+-        AC_MSG_CHECKING([for -lSM - X11 session management])
+-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
++        WX_FIND_LIB(SM, SmcOpenConnection)
+         if test "$ac_find_libraries" != "" ; then
+-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
++            if test "$ac_find_libraries" != "std" ; then
++              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                 LDFLAGS="$LDFLAGS $ac_path_to_link"
++              fi
+             fi
+             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
+-            AC_MSG_RESULT([yes])
+         else
+-            AC_MSG_RESULT([no])
+             AC_MSG_WARN([libSM not found; disabling session management detection])
+             wxUSE_DETECT_SM="no"
+         fi
+@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then
+             AC_CHECK_HEADER(GL/glu.h, [
+                 found_gl=0
+ 
+-                AC_MSG_CHECKING([for -lGL])
+-                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL)
++                WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
+                 if test "$ac_find_libraries" != "" ; then
+-                    AC_MSG_RESULT([found in $ac_find_libraries])
+-
+-                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                    if test "$ac_find_libraries" != "std" ; then
++                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                         LDFLAGS_GL="$ac_path_to_link"
++                      fi
+                     fi
+ 
+                     dnl don't suppose that libGL and libGLU are always in the
+                     dnl same directory -- this is not true for some common
+                     dnl distributions
+-                    AC_MSG_CHECKING([for -lGLU])
+-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
++                    WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
+                     if test "$ac_find_libraries" != "" ; then
++                      if test "$ac_find_libraries" != "std" ; then
+                         WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                         if test "$ac_path_to_link" != " -L/usr/lib" -a \
+-                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
+-                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
++                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                         fi
++                      fi
+ 
+                         found_gl=1
+                         OPENGL_LIBS="-lGL -lGLU"
+-                        AC_MSG_RESULT([yes])
+-                    else
+-                        AC_MSG_RESULT([no])
+                     fi
+-                else
+-                    AC_MSG_RESULT([no])
+                 fi
+ 
+                 if test "$found_gl" != 1; then
+-                    AC_MSG_CHECKING([for -lMesaGL])
+-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
++                    WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
+                     if test "$ac_find_libraries" != "" ; then
++                      if test "$ac_find_libraries" != "std" ; then
+                         WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+-                        AC_MSG_RESULT([yes])
+-                    else
+-                        AC_MSG_RESULT([no])
++                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++                        fi
++                      fi
++                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                     fi
+                 fi
+-            ])
++            ],, [ ])
+         ],
+         [],
+         [ ])
+-- 
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 000000000000..cbe3103a0bce
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in
+--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in	2007-07-27 17:57:27.000000000 -0600
++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in	2007-12-28 17:34:28.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia
+ 
+ all:
+ 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
new file mode 100644
index 000000000000..a2c6c6e1a8e3
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
@@ -0,0 +1,75 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
+    installed with eselect-wxwidgets.
+  - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(DYLIB_RPATH_INSTALL)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -16101,7 +16101,7 @@ install-wxconfig:
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16109,7 +16109,7 @@ locale_install:
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -137,7 +137,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+ 
+ bool wxTranslations::AddStdCatalog()
+ {
+-    if ( !AddCatalog(wxS("wxstd")) )
++    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+         return false;
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -125,7 +125,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
new file mode 100644
index 000000000000..119175c624d2
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
@@ -0,0 +1,39 @@
+From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Sat, 20 Feb 2016 00:08:14 -0500
+Subject: [PATCH] Fix STC compilation with GCC6
+
+Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
+with ambiguous overloads.
+
+Closes #17147.
+
+Closes https://github.com/wxWidgets/wxWidgets/pull/222
+---
+ src/stc/scintilla/src/Editor.cxx | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
+index cd72953..2081df2 100644
+--- a/src/stc/scintilla/src/Editor.cxx
++++ b/src/stc/scintilla/src/Editor.cxx
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ 
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-	if (abs(pt1.x - pt2.x) > 3)
++	if (std::abs(pt1.x - pt2.x) > 3)
+ 		return false;
+-	if (abs(pt1.y - pt2.y) > 3)
++	if (std::abs(pt1.y - pt2.y) > 3)
+ 		return false;
+ 	return true;
+ }
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
new file mode 100644
index 000000000000..727fda16ddc1
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
@@ -0,0 +1,140 @@
+Backport various webkit-related build fixes:
+
+a309157a	Don't include "webview" in "standard" libraries.
+d24f711f	Only link webview library with libwebkitgtk in wxGTK, not the core one.
+bde287ba	Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition	
+037f6977	Report libraries in EXTRALIBS_WEBVIEW in wx-config output
+
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
+ EXTRALIBS_SDL = @EXTRALIBS_SDL@
++EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
+ CXXWARNINGS = @CXXWARNINGS@
+ HOST_SUFFIX = @HOST_SUFFIX@
+ DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
+@@ -15493,7 +15494,7 @@ distclean: clean
+ @COND_SHARED_0_USE_STC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ 
+ @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
+-@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
++@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
+ @COND_MONOLITHIC_1_SHARED_1@	$(DYLIB_RPATH_POSTLINK)
+ @COND_MONOLITHIC_1_SHARED_1@	
+ @COND_MONOLITHIC_1_SHARED_1@	$(__monodll___so_symlinks_cmd)
+@@ -15750,7 +15751,7 @@ distclean: clean
+ @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
+ 
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
+-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(DYLIB_RPATH_POSTLINK)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(__webviewdll___so_symlinks_cmd)
+--- a/build/bakefiles/config.bkl
++++ b/build/bakefiles/config.bkl
+@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here.
+         <option name="EXTRALIBS_GUI"/>
+         <option name="EXTRALIBS_OPENGL"/>
+         <option name="EXTRALIBS_SDL"/>
++        <option name="EXTRALIBS_WEBVIEW"/>
+         <option name="CXXWARNINGS"/>
+         <option name="HOST_SUFFIX"/>
+         <option name="DYLIB_RPATH_INSTALL"/>
+@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing.
+             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
+         </set>
+         <set var="EXTRALIBS_SDL"/>
++        <set var="EXTRALIBS_WEBVIEW"/>
+ 
+         <set var="WITH_PLUGIN_SDL">0</set>
+ 
+--- a/build/bakefiles/monolithic.bkl
++++ b/build/bakefiles/monolithic.bkl
+@@ -26,6 +26,7 @@
+         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+         <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
+         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
++        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
+         <library>$(wxscintilla_library_link)</library>
+     </dll>
+ 
+--- a/build/bakefiles/multilib.bkl
++++ b/build/bakefiles/multilib.bkl
+@@ -183,6 +183,7 @@
+         <sources>$(WEBVIEW_SRC)</sources>
+         <library>coredll</library>
+         <library>basedll</library>
++        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
+         <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+     </dll>
+ 
+--- a/build/bakefiles/wxwin.py
++++ b/build/bakefiles/wxwin.py
+@@ -51,6 +51,7 @@ EXTRALIBS = {
+     'html' : '$(EXTRALIBS_HTML)',
+     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+     'media' : '$(EXTRALIBS_MEDIA)',
++    'webview' : '$(EXTRALIBS_WEBVIEW)',
+ }
+ 
+ def mkLibName(wxid):
+--- a/configure.in
++++ b/configure.in
+@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
+                               [
+                                 USE_WEBVIEW_WEBKIT=1
+                                 CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+-                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
++                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
+                               ],
+                               [
+                                 AC_MSG_WARN([webkitgtk not found.])
+@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then
+         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+     fi
+     if test "$wxUSE_WEBVIEW" = "yes" ; then
+-        STD_GUI_LIBS="webview $STD_GUI_LIBS"
+         BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
+     fi
+     if test "$wxUSE_XRC" = "yes" ; then
+@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI)
+ AC_SUBST(EXTRALIBS_OPENGL)
+ AC_SUBST(EXTRALIBS_SDL)
+ AC_SUBST(EXTRALIBS_STC)
++AC_SUBST(EXTRALIBS_WEBVIEW)
+ AC_SUBST(WITH_PLUGIN_SDL)
+ AC_SUBST(UNICODE)
+ AC_SUBST(DEBUG_INFO)
+--- a/samples/webview/Makefile.in
++++ b/samples/webview/Makefile.in
+@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+ EXTRALIBS_SDL = @EXTRALIBS_SDL@
++EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
+ CXXWARNINGS = @CXXWARNINGS@
+ HOST_SUFFIX = @HOST_SUFFIX@
+ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+@@ -163,7 +164,7 @@ distclean: clean
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ 
+ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
+-	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
++	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+ 	
+ 	$(__webview___mac_setfilecmd)
+ 	$(__webview___os2_emxbindcmd)
+--- a/wx-config.in
++++ b/wx-config.in
+@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@"
+ ldlibs_xml="@EXTRALIBS_XML@"
+ ldlibs_adv="@EXTRALIBS_SDL@"
+ ldlibs_stc="@EXTRALIBS_STC@"
++ldlibs_webview="@EXTRALIBS_WEBVIEW@"
+ 
+ 
+ # Order the libraries passed to us correctly for static linking.
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
new file mode 100644
index 000000000000..e8b0e7257496
--- /dev/null
+++ b/x11-libs/wxGTK/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>wxwidgets@gentoo.org</email>
+		<description>All modifications to this package must be approved by the wxwidgets herd.</description>
+	</maintainer>
+	<use>
+		<flag name="gstreamer">
+			Enable the wxMediaCtrl class for playing audio and video through
+			gstreamer.
+		</flag>
+		<flag name="gnome">
+			Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks.
+		</flag>
+		<flag name="sdl">
+			Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
+			audio.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">wxpython</remote-id>
+	</upstream>
+	<slots>
+		<slot name="*">Slots reflect MAJOR.MINOR versions which can
+			be installed in parallel.</slot>
+	</slots>
+</pkgmetadata>
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
new file mode 100644
index 000000000000..c2906c3f8b18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib versionator
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+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="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
+
+SLOT="2.8"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?   ( dev-db/unixODBC )
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		dev-libs/glib:2
+		media-libs/libpng:0=
+		sys-libs/zlib
+		virtual/jpeg:0=
+		x11-libs/gtk+:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gnome?  ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		)
+	aqua? (
+		x11-libs/gtk+:2[aqua=]
+		virtual/jpeg:0=
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		opengl? ( virtual/glu )
+		X?  (
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+
+	# x32 https://bugs.gentoo.org/421851
+	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+	# prefix https://bugs.gentoo.org/394123
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
+		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+		configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+
+	emake
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake DESTDIR="${D}" install
+	fi
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
new file mode 100644
index 000000000000..3f56f877fe18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic versionator multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+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="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
+
+SLOT="2.8"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	odbc?   ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+	X?  (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libXinerama[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		gnome?  ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] )
+		gstreamer? (
+			gnome-base/gconf:2[${MULTILIB_USEDEP}]
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)
+	aqua? (
+		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)
+"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+	epatch "${FILESDIR}"/${PN}-2.8.12.1-fix-c++14.patch        # Bug #592442
+
+	# Bug #421851
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	epatch "${FILESDIR}"/${P}-bakefile.patch
+	epatch "${FILESDIR}"/${P}-autoconf.patch
+
+	# prefix https://bugs.gentoo.org/394123
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
+		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+		configure || die
+
+	epatch_user
+
+	mv configure.in configure.ac || die
+	eautoconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src || die
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src || die
+		emake DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	cd "${S}"/docs || die
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dodoc -r "${S}"/docs/html
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
new file mode 100644
index 000000000000..21ee7e0f2d62
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+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"
+
+SLOT="3.0"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0=
+		sys-libs/zlib
+		virtual/jpeg:0=
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libSM
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gstreamer? (
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
+		libnotify? ( x11-libs/libnotify )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		x11-libs/gtk+:2[aqua=]
+		virtual/jpeg:0=
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu )
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+	# https://bugs.gentoo.org/421851
+	# https://bugs.gentoo.org/499984
+	# https://bugs.gentoo.org/536004
+	sed \
+		-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
+		-e 's:3\.0\.1:3.0.2:g' \
+		-e 's:^wx_release_number=1$:wx_release_number=2:' \
+		-i configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
new file mode 100644
index 000000000000..b77e2b3dd25f
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+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"
+
+SLOT="3.0"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+	X?  (
+		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		gstreamer? (
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X?  (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+	epatch_user
+
+	# https://bugs.gentoo.org/536004
+	sed \
+		-e 's:3\.0\.1:3.0.2:g' \
+		-e 's:^wx_release_number=1$:wx_release_number=2:' \
+		-i "${S}"/configure || die
+
+}
+
+multilib_src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(multilib_native_use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install_all() {
+	cd "${S}"/docs || die
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dodoc -r "${S}"/docs/doxygen/out/html
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
new file mode 100644
index 000000000000..9bb65a6e57f9
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.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"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+	X?  (
+		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[${MULTILIB_USEDEP}]
+		gstreamer? (
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X?  (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+	epatch "${FILESDIR}"/${P}-webview-fixes.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+	epatch_user
+
+	for f in $(find "${S}" -name configure.in); do
+		mv "${f}" "${f/in/ac}" || die
+	done
+	AT_M4DIR="${S}/build/aclocal" eautoreconf
+
+	# https://bugs.gentoo.org/536004
+	sed \
+		-e 's:3\.0\.1:3.0.2:g' \
+		-e 's:^wx_release_number=1$:wx_release_number=2:' \
+		-i "${S}"/configure || die
+
+}
+
+multilib_src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(multilib_native_use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install_all() {
+	cd "${S}"/docs || die
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dodoc -r "${S}"/docs/doxygen/out/html
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
new file mode 100644
index 000000000000..0266dca9e66d
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+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}-gtk3					# 3.0.2.0-gtk3
+WXVERSION=${WXSUBVERSION%.*}			# 3.0.2
+WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
+
+SLOT="${WXRELEASE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+	X?  (
+		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		gstreamer? (
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X?  (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	# Versionating
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
+		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		utils/wxrc/Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+		configure || die
+
+	default
+}
+
+multilib_src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-gtk=3
+			--with-libpng=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(multilib_native_use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install_all() {
+	cd "${S}"/docs || die
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dodoc -r "${S}"/docs/doxygen/out/html
+	fi
+
+	# Unversioned links
+	rm "${D}"/usr/bin/wx{-config,rc}
+
+	# version bakefile presets
+	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
+	for f in wx*; do
+		mv "${f}" "${f/wx/wx30gtk3}"
+	done
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
new file mode 100644
index 000000000000..61856901093a
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+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}-gtk3					# 3.0.2.0-gtk3
+WXVERSION=${WXSUBVERSION%.*}			# 3.0.2
+WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
+
+SLOT="${WXRELEASE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+	X?  (
+		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[${MULTILIB_USEDEP}]
+		gstreamer? (
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		webkit? ( net-libs/webkit-gtk:3 )
+		)
+	aqua? (
+		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X?  (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${P}-webview-fixes.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+
+	local f
+	for f in $(find "${S}" -name configure.in); do
+		mv "${f}" "${f/in/ac}" || die
+	done
+	AT_M4DIR="${S}/build/aclocal" eautoreconf
+
+	# Versionating
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
+		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		utils/wxrc/Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+		configure || die
+}
+
+multilib_src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-gtk=3
+			--with-libpng=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(multilib_native_use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install_all() {
+	cd "${S}"/docs || die
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dodoc -r "${S}"/docs/doxygen/out/html
+	fi
+
+	# Unversioned links
+	rm "${D}"/usr/bin/wx{-config,rc}
+
+	# version bakefile presets
+	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
+	for f in wx*; do
+		mv "${f}" "${f/wx/wx30gtk3}"
+	done
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
new file mode 100644
index 000000000000..6fe53772d89f
--- /dev/null
+++ b/x11-libs/xapps/Manifest
@@ -0,0 +1,6 @@
+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
+EBUILD xapps-1.0.2-r1.ebuild 1102 SHA256 18148651005e49ab8b3fc816755c72546953be2a0323c7101f81ad606991f1d7 SHA512 a2e535740527a0063a1df101c89b4588af6ec7eab08e88796436dd1d91462bcb8ab2dd61dfb6b69afd9b0cda25318c6d7feedb04263b312f9e957a87c037c9a3 WHIRLPOOL b4b1c85208d87ef6d34e0cb7052edf3c6d29b165bc276dc5e2c5a5e40b64e9023c5f2edac4c1e0edaffbcb0ee87d12e94af77a7655b6d1c76cf877bbce8f8ea6
+EBUILD xapps-1.0.3.ebuild 1188 SHA256 abb8d9e16164039bbfdb27f0806753f7e37e521fb31b8d5f9d4ee05c7b140ebb SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7 WHIRLPOOL 827491929d592045e89d86a72d5763fa2c7ca35447ed94fc3f057211a8892738221d9802b95810e6aab34de3aee6b4d406f990375e5a906122820cecb24b35b3
+MISC ChangeLog 680 SHA256 304baf901fa6d6caff9a30a75cf4c282a3706dbf66fc123364da8261b786ec98 SHA512 79c14ba0241c5dddcf42f0738b88ad31063fd6c4236be4a888e94cf85b8adb711187002ec70abcbd9a0b093003268dd10725848ef1d51adf6ceb35a23b9dbbd2 WHIRLPOOL f3d6c9e3fa1dc227d43806af14d9abaae3719c9df906e0639add812f34b810ec5658409df46f8c01a8dbc4139fc89628a45992d470293b55160cd60940f6981c
+MISC metadata.xml 332 SHA256 dec355aceb1e2e67a65c693f375da782adb8de18aeb6d9f0d65e45321fb32354 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2 WHIRLPOOL 471572478278a0e4f24444d101f847cc660726847a26efd66819092cd915d9861cf233cf5a75e2ffb711313f7c31ec946916589ca030a7da40ab7b6c941b624d
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
new file mode 100644
index 000000000000..deeb183ce8c1
--- /dev/null
+++ b/x11-libs/xapps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/xapps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/xapps/xapps-1.0.2-r1.ebuild b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..84722da2379b
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(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/xapps/xapps-1.0.3.ebuild b/x11-libs/xapps/xapps-1.0.3.ebuild
new file mode 100644
index 000000000000..c72b5f1df5d4
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.0.3.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
new file mode 100644
index 000000000000..6b4f4689cfc1
--- /dev/null
+++ b/x11-libs/xbae/Manifest
@@ -0,0 +1,8 @@
+AUX xbae-4.60.4-Makefile.in.patch 824 SHA256 fa45eaff3ae3c2342b5f509fb028b7ffeacb46ddadb0384b17c310e95586ecd4 SHA512 5cae2c85b471324b136957236829f0fd416bc82e654ba752bf0b8de07918ec65e2e6a3879cac5a4508d9ef6d08355069db34e0281af0b56ea36b536201b9c7ba WHIRLPOOL 4a4b0a1772bd5f35fcc2a9bc5e3652492468e7e2e761dbb90a8c0d9920adc00ae838610160a25f61a49f4630e6cbe4d6793ec6baef4e56ac817af08a2746a1dd
+AUX xbae-4.60.4-lxmp.patch 437 SHA256 7c61dfbc26491d7655d82277994001ff4ae81c9d67d455483c7fd135ac14785a SHA512 79eae095bc565b67030590bcac0ef1f9e75def35774a8214c5be4227a764e418e9db2e2c1617d2f38f29ea70923e1daad7bc343785800f9e2f96c5a64b11b142 WHIRLPOOL cd8ec1e872accf840bcbb163016237882ff9780a411e86437176479458399790d1a69b94d3e0a64f9b25d58ed990f755a62665c0f46e02bf2662d6f152e5aba1
+AUX xbae-4.60.4-tmpl.patch 255 SHA256 be3893a4a083419a7e1e2b95fef7fa523a92887f14d4b691a87402d1b54fa32b SHA512 03bb77bd5ad97b8bf38149a8421ba5cb80e7fdd6488ba69566ba74df1a8025b1078ecff1acffaf19c3d835fc23a44260ed59d2d81fbcfc7ccde5b7d5e678b433 WHIRLPOOL aeedb38d2859e898d6ac2b4f6759799b37523486a8a1dee62178adfd3f0197390cb2f0730e1a58c1d8290b053fdb0cefe8f49bd5c84b2e01d767f9219c7b6c5c
+DIST xbae-4.60.4.tar.gz 1770938 SHA256 eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16 WHIRLPOOL 450621768a496149738511998cf6e357ad3d78684d41b4c651ebd7e389be1bd57e20e3b2c3aed156d987dbf07836dae8313f6339529ab5663f5dbe1d5f44105b
+EBUILD xbae-4.60.4.ebuild 1283 SHA256 5b0654160186303af98f9d1a3d89108e45b4d6cf5fab0242863b9206808235cf SHA512 5c0b0c13bdc30fcdc7c3f18cb621424709a6366aa2e1ca6d6a4c9eb0fa75ec5c237b55949328fb08870336caddc2e84d5a10a52de34db438a3230268377b6072 WHIRLPOOL 613a20e6d7c9b2d16a876b7e0fa3df3cfc3217368f27d89aeb63b0eb81dfa08945a65b5442dadba78d24eba955de74c2c515b0b9d1e04adead16f7556a4dd883
+MISC ChangeLog 2522 SHA256 226ccd8ba55910ccd730ca43883ed36156b4691ce27026ad50df347e50b52cb9 SHA512 6102d988a09be8868b6fe520d3ce361df2b8ac056bf6193cd21cabb91d56918dd5973c97e6cf7bc1d2f511d47ab7680ba1171bce506d5aca6cbf04266fe86236 WHIRLPOOL 79dceba935ff25742251494fe1f0de32ed79377cadcb1fd906a2ea4c1a3c517290cd39b33a29297b9716de598a82fe2a4244539af64bc4346cc689e4bfb5a4fe
+MISC ChangeLog-2015 2506 SHA256 35a046a94200bd4f56f10e8e750fd10ac5939528dcee5d436794a25465523e52 SHA512 56aa2a1201bcd208e9f1761bf8c957f8f02eb437e072b0e96336bd814bc9c89ebc03059fe93ea6685adbe759a9892e78a93e3d72f9a16146b1c187668ae72892 WHIRLPOOL bf8fb6dc0f222b079ccf7cee05baae0d9d4ab6018bf7aba8e4ed88d230dde4532fcf6994e2a46101d1d020baffbfcb62ba95ae9a683fed8584f37af41b6435ab
+MISC metadata.xml 974 SHA256 2593af58181b2e287f201bb4e58231a73d20ad00d188739955f17e9ea9036332 SHA512 e77c535823154352bf687daffb103d8e65387dcf15574dd09a3981c740eb0d3e2a0a700db01b2328c7def77f26aa0bba3f69ba388c3d7cd79f80daee2606da07 WHIRLPOOL beccf5375bf2558c75d8f76725796510c86dd0f56a97c186f9b2114d5dcd6cf0070b14d3372785b5d7293788a33489380c573b55d5e75c3ce39310264112b6ab
diff --git a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
new file mode 100644
index 000000000000..aa0625b815af
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
@@ -0,0 +1,27 @@
+--- Makefile.in.orig	2007-04-03 15:06:53.066980500 +0100
++++ Makefile.in	2007-04-03 15:16:53.795027250 +0100
+@@ -230,14 +230,13 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
+-SUBDIRS = include src examples doc scripts
++SUBDIRS = include src
+ EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules \
+ 	CVSMake
+ 
+ aclocaldir = @ACLOCALDIR@
+ @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
+ docdir = $(datadir)/Xbae
+-doc_DATA = NEWS README
+ 
+ #
+ # Some convenient targets for users of Exuberant ctags
+@@ -657,7 +656,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-aclocalDATA install-docDATA
++install-data-am: install-aclocalDATA
+ 
+ install-exec-am:
+ 
diff --git a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
new file mode 100644
index 000000000000..d5b66015eb0c
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
@@ -0,0 +1,11 @@
+--- examples/Mri/Makefile.in.orig	2007-04-03 14:52:55.326625000 +0100
++++ examples/Mri/Makefile.in	2007-04-03 14:53:12.731712750 +0100
+@@ -219,7 +219,7 @@
+                 -I$(top_builddir)/include @MOTIF_CFLAGS@ @X_CFLAGS@
+ 
+ LDADD = ../../src/libXbae.la \
+-	-lWc $(link_motif) @X_LIBS@ -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS}
++	-lWc $(link_motif) @X_LIBS@ -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS} -lXmp
+ 
+ all: all-am
+ 
diff --git a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
new file mode 100644
index 000000000000..0e87ba3da39c
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
@@ -0,0 +1,11 @@
+--- Xbae.tmpl.orig	2007-04-03 14:45:54.548519000 +0100
++++ Xbae.tmpl	2007-04-03 14:46:12.053613000 +0100
+@@ -13,7 +13,7 @@
+ 
+ #define DoNormalLib		YES
+ #define DoSharedLib		YES
+-#define DoDebugLib		YES
++#define DoDebugLib		NO
+ 
+ #include <Library.tmpl>
+ 
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
new file mode 100644
index 000000000000..a1dd8627a079
--- /dev/null
+++ b/x11-libs/xbae/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<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>
+	<upstream>
+		<remote-id type="sourceforge">xbae</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
new file mode 100644
index 000000000000..b4d5e7e4ae29
--- /dev/null
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
+HOMEPAGE="http://xbae.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc examples static-libs"
+
+RDEPEND="
+	x11-libs/motif:0
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+
+DEPEND="${RDEPEND}"
+
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tmpl.patch
+	"${FILESDIR}"/${P}-lxmp.patch
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	)
+
+src_configure() {
+	local myeconfargs=( --enable-production )
+	autotools-utils_src_configure
+}
+
+src_test() {
+	cd ${AUTOTOOLS_BUILD_DIR}/examples
+	emake
+	"${S}"/examples/testall
+	emake clean
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	insinto /usr/share/aclocal
+	doins ac_find_xbae.m4
+
+	 use doc && dohtml -r doc/*
+
+	if use examples; then
+		find examples -name '*akefile*' -delete || die
+		rm examples/{testall,extest} || die
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
new file mode 100644
index 000000000000..b5243dc4b2c3
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -0,0 +1,9 @@
+DIST xcb-util-cursor-0.1.1.tar.bz2 280852 SHA256 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652 SHA512 599f9074a9801615a29374a96649c2d9d8de8abd053b7ddb245b7cc50a1c9c94610a8df996a7a79a831ade3d903335fdf7ac299e6b33e735ab087c3fe5923d71 WHIRLPOOL b73856c19e451af35b07de3bc3706ab0374c3c79dcbbc5d19f3cb03324a86d5422a46d51e63a916f53afb5f45d3b689d25d4ea58baa880d42a13fb0dd6693108
+DIST xcb-util-cursor-0.1.2.tar.bz2 289714 SHA256 ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a SHA512 13b9dc0e9f8a61fc72ef6ec722d574ba46c5eacdaf0785d301a3cca00de00b772b6b7fa0b6484f54b4ee19d384a46b3bbf29935bf15ffdde23b004567fc4a85e WHIRLPOOL 7f484e976600dac89762c70135d913ab6a003fd87415f06c92faebca24e5022c561131e3e7e7741df04bd2fd00d6d7ce9b0adf1e803ff705e94fb48dcf624581
+DIST xcb-util-cursor-0.1.3.tar.bz2 295224 SHA256 05a10a0706a1a789a078be297b5fb663f66a71fb7f7f1b99658264c35926394f SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21 WHIRLPOOL e7c0c586e3b64237d6ba8ce94d90c4c42e8c2bf555a433d44a000ea547c527808d4ea37d58c7dd1c2abf6c1b901c07b49a0e7716bcbb5059a49f1d26acceb404
+EBUILD xcb-util-cursor-0.1.1-r1.ebuild 1088 SHA256 b4035b0cf28818e2aad31b822e4c3fd165708cb0b554c1419833ca1e8bba3680 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c WHIRLPOOL 0bc00b001f0b5c8c573ac1d37a0d927b1dd96e55d5b3113da3636450f88e0660f2bb3d1765e6e695d0de1f02c30a1ffabfcb076ddecd7bfc5221b6ae017564fc
+EBUILD xcb-util-cursor-0.1.2.ebuild 1088 SHA256 b4035b0cf28818e2aad31b822e4c3fd165708cb0b554c1419833ca1e8bba3680 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c WHIRLPOOL 0bc00b001f0b5c8c573ac1d37a0d927b1dd96e55d5b3113da3636450f88e0660f2bb3d1765e6e695d0de1f02c30a1ffabfcb076ddecd7bfc5221b6ae017564fc
+EBUILD xcb-util-cursor-0.1.3-r1.ebuild 1348 SHA256 7ed15ce42117e9fc952d690f75aac154adca2a47e331617ea59347b758f4a457 SHA512 16a786751e5a67c6ecd9541c4c8766cb4f96eb495ded24e3f5fea58c62b202c94d1108c58dd9cb1a85fb9aef92e2e164d3533ef6c8d1e28d6cf1829e9157b7f9 WHIRLPOOL e46a0c4154ec01b2f12826af53c18e3e0685e4a18f8edd28c00a1996856fb518ad9d7fca15b0cbc86b827fbf72d3ca6d392349a54e08aa2124eb16c3eba4c22c
+MISC ChangeLog 7103 SHA256 42880f6d3167021b8e2c5baf396369a1481dee4507e8297ecb074550f909c0f5 SHA512 9b7a29292813528737555a8142a1dd5e7486a56a48093632a0d9a1fcae213152d91896d82153fb24ceafb6a0dfc593d72243b215485ca2d32fe97f0e860131a8 WHIRLPOOL bdcdf03dec0c35e9489d5e8a8f9e0df77163efaff7d7aad40de0c950932873142c984ef548eee69bec49fe04c1e1953b29d76adaa230f8cd60a603decf18a9a1
+MISC ChangeLog-2015 3475 SHA256 57a48b1f695f36952b228382c2cbd82feb089c687deaa42899a4be518b08a5fa SHA512 9eab8f692fcdfa9d378fdf4779ac0c37363c72e951b43d39e52f4d89285d3fa295c5e8130e7e81bf72e28629cc77be09dfb234f6f338cfc30679bd99e13e7080 WHIRLPOOL 6d9292f1fadc9336614353f991d635891b5c2540491b691129f6145059edc6e48129e3ddeabec89f156f0f36cf021d8326e6910f327f23ba7c01e13260abb8d6
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..0b93b5f3d406
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
new file mode 100644
index 000000000000..0b93b5f3d406
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..1729b1717639
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+		--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'
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
new file mode 100644
index 000000000000..ec7dc52f1f17
--- /dev/null
+++ b/x11-libs/xcb-util-image/Manifest
@@ -0,0 +1,5 @@
+DIST xcb-util-image-0.4.0.tar.bz2 327891 SHA256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f WHIRLPOOL aaf72ca6cc1599aa66d1638fca53df46b443d07baab4589577576c9c89d24c9e59bc6968e8e9faea3a9b4e69e009f0bf23596fcb462cc13f3e5153000158bb2c
+EBUILD xcb-util-image-0.4.0.ebuild 958 SHA256 c478c6d26df11902cef01bd4c7b15a580430c8352c1d9e87ee748a168769ab5d SHA512 ad10fb839095e1bc3d06ebae80b9fb08fe16b79f589cd359d13ee82925d7e8652f89632257428638cfefae36bbc01b6e57c5934589d11920905919de3b8a2c1b WHIRLPOOL 6cb672d5e85b1d8af444197bb5a4b72beed5519e1a5528ca9dbf99c3b2944fbf01f80257862ce2c313540bac81c5662f50ac108f5ee88a2a381912642695cd66
+MISC ChangeLog 3597 SHA256 64599fbbdffba2b56c73325a24d3932953b9027f00ca91e8ea8fc57220203c3a SHA512 86a2d8688a2461452d00377d2ba8a8d60629cf1a5bfa1024aa1cad62262e44b99ce3a1fccc03ff303e257fc0b756ac2b48ef2333f8c6619a19d608911a44ff59 WHIRLPOOL 0b93ebe28299207c8258303dd1b1cc5738f395e3ed569b0b0e62d48cbb52bddb8089bb0d0a69942de5368d5b96a29c02f815a66919fc1d74276c163fa547350e
+MISC ChangeLog-2015 4362 SHA256 18f7d5ae37c1dbbb1fdd1db219870dd623b50611bd86623fe89c97a0799d8bea SHA512 a85930e11414c1072e31e2ade3823403f40a6d13bfef81e014a56ced0a25aae85f863bd839c90bc1f45f6ba5108a212ac819e1bd725f7762ff905a294ab187b6 WHIRLPOOL bdd13f929fa96e163917537d5a4bd7fc3aaaec0e612fe5b859591f50e16774d3e9bab8ee2bdabce86eea0fbb77ac50a5d25a583e820583a05cd675f9992a4240
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util-image/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
new file mode 100644
index 000000000000..193b84cdd4bc
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-image.git"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
new file mode 100644
index 000000000000..7be8cec0547a
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -0,0 +1,5 @@
+DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 SHA256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4 WHIRLPOOL 19659fc2e3445df04cedc7e45c8cccf94f00e84077540838727e52effe7f6621f74a106916efdbc460f4abc50b493244a4381735d63ba86a46991d058ce17b0e
+EBUILD xcb-util-keysyms-0.4.0.ebuild 903 SHA256 95f2bd5f74d438751798e3980f5246616fb83fd7a51b3e9a23c43f271b4012b0 SHA512 c514d811aad038cdff23628cc9a15c9acfdb713c734f6ca39c86f8e9abe7b60acec83016797bd280023810c051819150df102c8dd6e66dfe27bd71ea4a1fa85d WHIRLPOOL dec5e9ff4690618d4c6464c2c387cd6c6e66fcd96d2acbb91d27647d6aa85c72881ae6d153283847bc261c5ace21ff68c524bdf9e383f314fc7486b4c1eb45a3
+MISC ChangeLog 3568 SHA256 739574dcbe4266a5c8ec41a74ee95a44fb780b9e059c65c7f8234056073a1d3c SHA512 abeadf283efa2e8f736329e631c4b91c7c8def2139f8ac2df2af1b57f830bc3fcebd989e842125f75baa6f096ad5c7256b2a3148570fd981e54a0fd336c887b6 WHIRLPOOL 95ef60878ef0a531e15ff5afba83b5bf93c12df435ec5f78a434046adfab5cdec8dd7cba025df2982233ffb7694ffb3037dddd0131156fb8e173936aca742c22
+MISC ChangeLog-2015 4260 SHA256 3dfc3a1cc196f7c2a62bafe9b53bf2d28ce2cb81a84dd8664ee2197236a8b428 SHA512 5dbbd6662a14eafab919dc344927b102307186c5d22db169762e72fcbf06fe140ae087874b8b9ac70e407f5f86cd2364b99a0aaf6412ea726b0468a1a852ca95 WHIRLPOOL 78f5344b0d4228027267ffad8aeb873eeeb79648b13393780f426734b8c490c2a1b20874e1a3b0e33195de06e687c07fd39cdf9c5d5eb19ca992b1f9bb288b82
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
new file mode 100644
index 000000000000..ac33aa169bb9
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-keysyms.git"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
new file mode 100644
index 000000000000..0add74b9fe67
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -0,0 +1,5 @@
+DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 SHA256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc WHIRLPOOL 4c503898720aff7f81a75424d4d8f8351044aaa5fef446637474987264ee7487ba0f07b1f92f3f6d2c36495bad9086cc190d085fe7bf83281f2ce9b67a13cfb5
+EBUILD xcb-util-renderutil-0.3.9-r1.ebuild 939 SHA256 f12129b29c5c1017902d64477c51e75d90bdeaacd592e8fd98e6be69a9972ba3 SHA512 a87b2fb345743c463867aa2d345d0ec804f8bd54a2d5d4d68eac5b6fea718847148696cc5c719901bd1154fcc565364802324d8f24b9e2aa8042d1c000fe9053 WHIRLPOOL 37e528bc1824915947b41a100d5f6f3c00d54fc08afe207e77f853db86f635df1fdc65ca1728f31362ba1da90a317712ab711d9bd51c61cb78e5dcf71d773399
+MISC ChangeLog 3598 SHA256 f2ccff300268ae83120d721fbdbfca8bd27b161e78ff7f12dc915b77868a21fe SHA512 40b978ff305d4ed76c163209bf58eafb4649448ca4433f32c51051778135e94f9e0d1100a72d6cbd92e9eff9319658d37a83000a7a5b9a55eeb615a614365816 WHIRLPOOL 3392f09bcad6cd5c28c3cb5e4e424e30581abe367125fbc727aea046220f9870770dc75e8d06fa8114d3b0f4781c87387b0b87642d4ebcafebfd0d20f23a38fb
+MISC ChangeLog-2015 3355 SHA256 ffd61f82eb89a4a539a495c3f0bbf6fccba014043431636cad15a7463993365c SHA512 ec5d6529270e6aebd94e13224bb4faa7968309029f6313b3aa9a1740db7b177cbf90f659561ebdffde54b766c694b069ae5f807630d105006ef51d1839a1ba16 WHIRLPOOL 98a2786ac7237b2d40118b5ab5763bab1b7e7e1f9471c9f68ea9e6e51f5d042de539a08e20ac65d625ec1f6371d6559ef9cf1d5ed6ca62d44690c1d1316d1ec1
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..7f8a056ea0b5
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-renderutil.git"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
new file mode 100644
index 000000000000..bf9b041c8cb1
--- /dev/null
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -0,0 +1,5 @@
+DIST xcb-util-wm-0.4.1.tar.bz2 321855 SHA256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326 WHIRLPOOL aca91af78ccfee5a4bb6658133da4beb7b03b08779b0ed9b73fda95ab1919deef6169f1772f8a2b95aee31ae6c58fb5cb41ab20dd82b190b944d2a4094130f0f
+EBUILD xcb-util-wm-0.4.1-r1.ebuild 919 SHA256 47473ee21acc3b3972e4903ea1e5f523cc742b5b20da15d750a0f16233e644cd SHA512 9350c9822fd8a9e5c4fce77e4b974a013b2a6c41f1a1694c2105aa830e6f9ec10dc15c33c90a6ab1cfd709344a723a4775c7b0569b69cf7854d5709a7e686d7b WHIRLPOOL 1f5a7e34e23ccf9ecbb8913a382ada6b7f5fbd9f499bcba271d973848ea208ea1b17418e665926ea1b5dffe8760dd54ce648bca61b675871986b22edcdf05cd8
+MISC ChangeLog 3605 SHA256 ba5225779643f64ffcc80eec87f4c9e09995a46b113c7e07d8591f8b4d9db147 SHA512 4cf54f84cea737ed322b10bf3a3aa50c7fd0d0ac6f6843d1f2c82d97fed0f599ccf43cc60ea5bfe16768c2fc606e46f772bc7c2c843f41d1ecfaccdc69cc4ed4 WHIRLPOOL f02d0ee7c701590f3b2b2739054acc198038d42ae272e93bc6a6d4ae3e3103db622ecd9e461fc9d5daf6ce39ab122f595b76089788dc607df85d422484c17315
+MISC ChangeLog-2015 5341 SHA256 6a98aa4aafc71af1d0d63f3c21473da3e9fafc06d70b68ffb32d03e285544440 SHA512 247103663c199a2c2bc766822b8af07c95d8912bfca231d5905ae38352bdc567461c29abb7cb73b54c95e3c2289e28efbc342ee79d9d559fbb048fe95bdcd479 WHIRLPOOL 9c0e801f77099c0bc0cca37e60d6c889e2c886ea2d2e3d44640d268df46d91b7b557bd0f29c5b2df63a9c27341aa1baf0481a0a2b32d11fcd109b5b5136038bb
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util-wm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..a3a84ca25fbf
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-wm.git"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
new file mode 100644
index 000000000000..109df5e9a04c
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -0,0 +1,6 @@
+DIST xcb-util-xrm-1.0.tar.bz2 327196 SHA256 9400ac1ecefdb469b2f6ef6bf0460643b6c252fb8406e91377b89dd12eefbbc0 SHA512 b49d97b018a231b5642bb05a287eb7720d9e1ffe15024d46a4c7ebf2f9cc37a0a4a3262d9aa963fe9554ca801ba013ad6cb5d3f87b67daf4d69efd180d7ba8fd WHIRLPOOL d6ed2eb13730f01813792bbe2a165dcc9dc228681c7e6fb9494c8f500bd2f9f4ce20b47b1ce63cd2a5eed8853385d6667664685fcf87813d1ae5c2d4d4a3e973
+DIST xcb-util-xrm-1.2.tar.bz2 324708 SHA256 f75ec8d909cccda2f4d1460f9639338988a0946188b9d2109316c4509e82786d SHA512 c6031844d3a197b234cb1b22166c02fe8d03f8a8def836b8c974324a0b6b453889680011406c7940bd04fde1389c5a2ff508f84b080f811ca69cbdb0334994e8 WHIRLPOOL 8fb79d595bdcbb6b9ce9d3c28894e195ed5a18e98b3955e2d8d1618afc2c535e4305a19452b94e1e6cf605e9f1ac26d5565fe10f050382928be19cc9fab12c82
+EBUILD xcb-util-xrm-1.0.ebuild 616 SHA256 a0b3d18fda17d9c264cc73322b9451eb5dd69612201b854fb8c6f7b26627b2e5 SHA512 e9f2431c09ffc6eaf1c581730be68497503e192240714c2ea7b21aa38a34ba26f27a8eadc441a6fcd5954684f01d5f641076297c5225080d1e317dab6408642c WHIRLPOOL 01f82891de3d1f04f55538d9f3e59672b20a4dc77811d8320ffdef1f03cbc100ca51488c92186c56d10f5ac3f0b48811b4a8e53019b4836d5efd262eb0cdb9bd
+EBUILD xcb-util-xrm-1.2.ebuild 616 SHA256 a0b3d18fda17d9c264cc73322b9451eb5dd69612201b854fb8c6f7b26627b2e5 SHA512 e9f2431c09ffc6eaf1c581730be68497503e192240714c2ea7b21aa38a34ba26f27a8eadc441a6fcd5954684f01d5f641076297c5225080d1e317dab6408642c WHIRLPOOL 01f82891de3d1f04f55538d9f3e59672b20a4dc77811d8320ffdef1f03cbc100ca51488c92186c56d10f5ac3f0b48811b4a8e53019b4836d5efd262eb0cdb9bd
+MISC ChangeLog 339 SHA256 b6594ba79b7cbe777b17b9101836cd84a9381e73152d0a94dcee8a3de07d7bce SHA512 eacc580b8c984ab0baaf0e4d49d51d2d7bdcd8418a9cee7ac88e4012c9057476cb6f4d58c278dac40674a9bcc4914217a198eca315361c613ac3b5f111d98ff2 WHIRLPOOL cb0415a43e67afea70a5a73cefb5e126590dd6325e7af93773a0851a312f8c1fe26f7f3f6bb4d91f2b0d3e55fc129bd14342c82b1b0285885126c4606084e5d8
+MISC metadata.xml 784 SHA256 69f67cdd1cd6fc6b50d75a434f81bd4d1279c2cb7750e93c6dada3f733c29430 SHA512 c9c5f617e17bd3d25005a5ebf3c394939055f0376ef0e4e68be19fdffa9716fe2bd57a4d5b912cbc4d908b0498e189d484266872dd7afa41e5dfa54570b75509 WHIRLPOOL fbd181044a798a3aef6be3bb1188fa9e46076e5666a9ba4af0b8762afc0f5e74ae847300cd49408a846936e9e00c5d8cb535742412fb371594ff9d48f5842eb5
diff --git a/x11-libs/xcb-util-xrm/metadata.xml b/x11-libs/xcb-util-xrm/metadata.xml
new file mode 100644
index 000000000000..2b0c7132c378
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		The XCB util modules provides a number of libraries which sit on top
+		of libxcb, the core X protocol library, and some of the extension
+		libraries. These experimental libraries provide convenience functions
+		and interfaces which make the raw X protocol more usable. Some of the
+		libraries also provide client-side code which is not strictly part of
+		the X protocol but which have traditionally been provided by Xlib.
+	</longdescription>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Airblader/xcb-util-xrm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
new file mode 100644
index 000000000000..5263c0f25ed5
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_BASE_INDIVIDUAL_URI=""
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
new file mode 100644
index 000000000000..5263c0f25ed5
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_BASE_INDIVIDUAL_URI=""
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
new file mode 100644
index 000000000000..3377cf708221
--- /dev/null
+++ b/x11-libs/xcb-util/Manifest
@@ -0,0 +1,5 @@
+DIST xcb-util-0.4.0.tar.bz2 297412 SHA256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e WHIRLPOOL b8aa70c9bbdbc4b1faaf93cca7b82ccd23ae1075283b6ca4e06f07add3b353f2ae04b7880551e447d5bdae2c4a9ce162339a18ba46ff14af767fd543da8d0e10
+EBUILD xcb-util-0.4.0.ebuild 1196 SHA256 01140dcca9a51a00e96a685985e5c85d9112709b4b34c8f7d94915bf42320014 SHA512 342083a849dbe8f62f97f217481db89e1485b4412c57353d08047cd56b1bd2e7a46a3af2c96ff6207a644381e963b90466ad222341c057afbabadadb695b5a12 WHIRLPOOL 2ea55491fa9943babd691f3e576f13012be7c769def74792dfc3ce62386d1c8ba193ef2784843e8d8a96866c2fb36fe436ce5047679a6e4bf0b6f55b8e822d5a
+MISC ChangeLog 3484 SHA256 3f9c896219f3e05ee70a55962bc3fddb2274c791d23ebe539e09a331e9fe4bf5 SHA512 f5708466879b1275eed7f46bbeeb22dec205cf5e9d5f9ca0e808f036ad925ba1b01b7b908c69750c12b4f15f9998d7cfe4267d559cc9b79a11dc9b6735e3f7bd WHIRLPOOL 7cb6a6b2639eafc1b87cb6a283f933c93f7d7dff2190e3ab16c7103391198ceb925e0bb71cc6b4de4f16d16cc0bc31920e07b8118dd6a702397cf7fcc868c661
+MISC ChangeLog-2015 10014 SHA256 b171fd314c86ef9573c5f63331bbfccad2f791770e48a414b3c635adafbcd281 SHA512 c259890da029bc27c9ca2012786c6cbb5733763b0d1a4543efbdfdcb3f5cbb509ce2a92ae50f2b814421d4390bd8f2617ae9b3faf80b25c957333ebbc8762ce6 WHIRLPOOL 3bae8463bf637f13bfd6dde63b1d2763d217aba08e23f884e88fb2584a1894a4baf78b35fc2f84338b1bc8bb016166908562665c28f377a0e4c8c27e28db4cbc
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xcb-util/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
new file mode 100644
index 000000000000..30030133f96d
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util.git"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+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"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+PDEPEND="
+	>=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
+"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
new file mode 100644
index 000000000000..79d015a0c92d
--- /dev/null
+++ b/x11-libs/xforms/Manifest
@@ -0,0 +1,5 @@
+DIST xforms-1.2.4.tar.gz 1438503 SHA256 80b3c9f30678135cada4de7676789413ac7d4417d32db0f77c8f0f49998012f6 SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa WHIRLPOOL 84a5d1b8c88cd181a1b3477d6468bd8ce1a2546dd951481dd5793baba384629fd19062068b3dba840d46026d70171f4d4a2d4331da6128d221bf67cebb8689e1
+EBUILD xforms-1.2.4.ebuild 896 SHA256 4d70eab4a0ad3f6c8f13afd200ffd74d6cea8cbd6a423e02d31f0553d5bb7832 SHA512 a73ca05aa5a019019d35b38661d077c7b9131dcaa035dfef9ab32c77d216ab8948bee5bfec536e0729a279044aa40e73fc9134af1d6eeb635d43739718665ce8 WHIRLPOOL 8ff1549625c882a28888414d6779f0de46c0a06166b4e212c40f193ad84a501b155c2ac78627bd85277d4e3dd466b14b215a046b557f77d8ed33dc35fb8235ca
+MISC ChangeLog 3242 SHA256 683d67dfc17a0e877fe4bf5cdde6530e78b6b73d4f12b65b2e1fb08f03b88012 SHA512 f62e18fe3bbe505bcfd45b2ddcba9a4351ca864b8beaae11eec5a7216afdcfb74efa1772e59260176348c01c7f450bab996d310c079109766af1c09ef6e1fdac WHIRLPOOL cca3352b0c15aa161144139f0be17e1b40dccde1df64c3331407e3edf8925e8ddb85e1ee4dfbccd485380c8502e39af9665d88a3af474a6914bd673f6b4fa9de
+MISC ChangeLog-2015 8673 SHA256 4ecab26428a639f8af54ee51ce15bcbe831de401a3d28a8e6ec0ac4eaac3c049 SHA512 5ce01ab638459aaa4b3686fe40b3dd03f0b037a0bf4d374200bddf0b77fbe69c1ccc3e3be22d8c9e73d7fbb3e9d4970992776ba21623a77815a7b9ea1dd0775a WHIRLPOOL 28abb17d2ef6b97e74de50a004329815d05cc496d201eaab37cdfe3476e348f821a543bc4ca2169abfc969617700819b0e1ecd23446273886955ff4a84475c2c
+MISC metadata.xml 251 SHA256 65fefc8f357a2115f90604fc64897190bd846e558d3e81cda31e1f435817e2a8 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da WHIRLPOOL dd811640d6aea5a34e2768fd7ffad5e505ef6a4bd4b22949d2c736016ab6d0175beb01d11308abe16125abb0d98c6c85a88fd218c78064f23b42beb2fbadd2f3
diff --git a/x11-libs/xforms/metadata.xml b/x11-libs/xforms/metadata.xml
new file mode 100644
index 000000000000..58c1077b82e4
--- /dev/null
+++ b/x11-libs/xforms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild
new file mode 100644
index 000000000000..787761f1260f
--- /dev/null
+++ b/x11-libs/xforms/xforms-1.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="A graphical user interface toolkit for X"
+HOMEPAGE="http://xforms-toolkit.org/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="doc opengl static-libs"
+
+RDEPEND="
+	virtual/jpeg:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXpm
+	opengl? ( virtual/opengl )"
+
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	default
+	AT_M4DIR=config eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
new file mode 100644
index 000000000000..d602170c187a
--- /dev/null
+++ b/x11-libs/xosd/Manifest
@@ -0,0 +1,13 @@
+AUX xosd-2.2.14-m4.patch 242 SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015 SHA512 022be1d08f8798b98f647023f7c90774bd6a12959de0c2a621ff730e8470af109e9dce06bcdbaae64145ade4a277bf301dff3129597cda7baf6059a35873eecc WHIRLPOOL df49d01ed958cff1c98313625d06e6d3cca4aabf4fb3a4d6fb631f4c966e14d3f7ec0c252d8f0610cef06d9463ad73e18075318991400823243204019e9f5a13
+AUX xosd-2.2.14-makefile.patch 480 SHA256 d0b1e1fdf38041c8cef9d10ebe777a6eeda7150528697fbbaa612ace8d7d7ceb SHA512 3a51c49358d432e4fe8a28aabfcfa5a457b8334815298fa8b9b313ca6c2caacbb261e65fcf92df71f4e5fd0042a43ac02d06bc842cf299ba59c182d6de21c249 WHIRLPOOL dacc5d647c5d600cece3b61eb0dce0cf2e8042de4bf672ea4aab869e6e11aa4969a1ec6fc70ece5369989fbb50e9907c5f7a3ce547828e2a679fc3b8539e6187
+AUX xosd-config-incorrect-dup-filter-fix.patch 520 SHA256 d95916960a195d907d90fe5f51dfec4d216c77c87e861e5b41a18308de6db7bb SHA512 cd7726a0c616d11d20eabefca3ff4a63c76e49b1e725ddc5f3ab3452e64a46e94e5584e0779cdc4b23705fb1b17a8d2535bdbb22fd1b0ee88782bca1d4d5c248 WHIRLPOOL 39f3fbbff4d8fdca19ea246c21c525c77df07108d2ef43d07eaf90f65fa7173d3a955969ca4927a8b696f075b7c593a0521b4c20de87df9a8e454f8ba1510590
+DIST xosd-gentoo-m4-1.tar.bz2 5043 SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483 WHIRLPOOL 413fd7e89094bacb9c6538304e9b2a4d2bcf9dea67f123d5fd7903ddc6a36321ae5b97e44d626f93b90dab2fed8501b0def9f48cfe9233999aac316b99188a3f
+DIST xosd_2.2.14-1.diff.gz 8616 SHA256 1b74a379030a2a8a1c36b6589023445bc1f620dbfa12ef799590568505f390b2 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e WHIRLPOOL 3ef3c0e5a8fbc31a8e81e7f8ba1f7272672cf6c1cd4f9300ef2c82a91afbd840c4a5b506ad7322e9bec6272beb039f752be564a8fca77b67641cb82ebf200b47
+DIST xosd_2.2.14-2.1.debian.tar.xz 17276 SHA256 ccde8324c909d75e60b124146d1e20c6a586385934dc15df02b7209f7324322d SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee WHIRLPOOL 0cbf30b4a8e3eba6fcf89afc29d3c02a0cfa1be0c87866378c6d07c1ebb43429f187624daf9eb364669f6b566a16710bf2bcb7a4f56c4cba19321b6710af0259
+DIST xosd_2.2.14.orig.tar.gz 418331 SHA256 4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508 SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473 WHIRLPOOL 64c93f9fedcd9442ccb78980cb157e9ea5db84edaaa1d6965f6a9ac45c6f773b24596da46b153449d6bc3208213d799ab48fe8dc0b67a260c0ccf88568c24b36
+EBUILD xosd-2.2.14-r1.ebuild 1148 SHA256 7c9d3024d514d7f174170e9092c441187a6dbdeadd5c9bcf84507be6dfc4eb2f SHA512 432862114a8ece95cab5f5a7b3988dee8a7cc546d6f00a47a47846dca1d2cb1f71933ce462bd635c8eaf898820ad873495d2b82a068b2a0e02dafc31f1755d00 WHIRLPOOL 1d0b64786757e35cdc90e9dd87c2473362aed92dee4b1989fa8749e24b504b6aee80dab8b6f59bb68b43cb4cf95abc32d146a5c60b966180daa296fa7abf2a8f
+EBUILD xosd-2.2.14-r2.ebuild 1239 SHA256 a5e58d7c34b3eb6b653936022e55c4ac684e462dd741c11b89bff68aeb185d34 SHA512 95966ace6adec85673c9a71c34cc4501706d11cfe65b78232833733dea278d38f6f041ca474164b76392341f9935f8482e1aa14b97ce01628df6ee5c326b98ca WHIRLPOOL 23bd3dad69086b58740f5413d65a90cdc47f10808c4b73e073a3f3ed06dd7e7994857ece1eaf64fd1449069f776b3dc491c4a25453409b41e11930ece32031e5
+EBUILD xosd-2.2.14_p2_p1.ebuild 1356 SHA256 1745722c30b3bcfab4b4bb92006b18060c8a5043205c7a7746c252e1ae7d5600 SHA512 d0ad103f468b1fdaf720f4d3adabcef8d4eca235828fef7bb6767654d10a3f2334e81ce1c0e22a84d7cf4e588bce85354bd423e5023fd53dda993dee22b0f0c1 WHIRLPOOL acd4090007536e956017e3d799d1b60467cbb54968707ca909a740357799133b3aa15d6a03a8bba493b1a61a90ce7c5e0e8ec13379bdb964c84c674c281972e8
+MISC ChangeLog 3368 SHA256 0749b1da434947880e012019ebac561d4b5aae75c98fdecfa952a8cf2c1c7bb5 SHA512 ba5e81289b41fa5e07e499b5cd7d2903039c667727224730f9142427afe1a5a7498a63505f4e57cc368a50b723573f07e53f79e63b441d2e671a2ab1d3ab5e91 WHIRLPOOL 70434e8cc7eb71fd039f2dcd22d48920aaa2c51a99d01b4041c253c5dfacadcca2aa0339d52dc41dfdbdd4e4868a26c680db28e42ce20fa4769b2d0398e7c781
+MISC ChangeLog-2015 10898 SHA256 de50fc5e57cb45235701803cf06b63d4f5e3e0b2f8aefdedaab6da519b45b12b SHA512 646124326cd68d31be770822dc9a60bb2682946e2dbe4876b0ac5ecefac5abc052fe13b8c1bcc8448ef18aaa09a0fdb87105d6db5079c19347db74ac5e527f91 WHIRLPOOL 05591b1cf32270287ba5f34372aa1a32f5f4d95bc71e522ca692dd1304b921d3541161fea2be304f538d8196de024bd2afb1db48854e950b3b1487fa7cedb5b2
+MISC metadata.xml 216 SHA256 c8445a9369ee9402bfea443f2bef617a8854b0d01b7402a9599296272897384b SHA512 8b8a55269a3c1429d2f13a0056d9e500cf3b176584b9dc259eaccc2e68a3eb86234e522fdd960e9ee35d6039ce1e747c6bb986ef00af259279537a29a15adfc7 WHIRLPOOL 656ba7880fd6bf68c08d3da3c1eda9be41acaedc4ab7b559a99afaee73c1b74821cc9587d30898cfc6e2186657a2be5241d92a6681f813ed0f4edf73353a5d01
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
new file mode 100644
index 000000000000..3e529728f8b3
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warning:
+/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
+--- xosd-2.2.14/libxosd.m4
++++ xosd-2.2.14/libxosd.m4
+@@ -8,3 +8,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_LIBXOSD,
++AC_DEFUN([AM_PATH_LIBXOSD],
+ [dnl
diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
new file mode 100644
index 000000000000..ed6da80fbb61
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
@@ -0,0 +1,11 @@
+--- xosd-2.2.14/man/Makefile.am
++++ xosd-2.2.14/man/Makefile.am
+@@ -3,7 +3,7 @@
+   xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
+   xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
+   xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
+-  xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
++  xosd_set_horizontal_offset.3 xosd_destroy.3 \
+   xosd_set_bar_length.3
+ 
+ EXTRA_DIST = ${man_MANS}
diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
new file mode 100644
index 000000000000..8446297f15ce
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=286632
+
+This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now.
+
+written by Andrew Savchenko
+--- script/xosd-config.in.orig
++++ script/xosd-config.in
+@@ -161,7 +161,6 @@
+         fi;;
+     *)
+         case " $af_other_flags " in
+-        *\ $i\ *) ;;                                  # already there
+         *) af_other_flags="$af_other_flags $i" ;;     # add it to output
+         esac ;;
+     esac
diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
new file mode 100644
index 000000000000..4f449373c059
--- /dev/null
+++ b/x11-libs/xosd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">libxosd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
new file mode 100644
index 000000000000..557f70b50cd4
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
+HOMEPAGE="https://sourceforge.net/projects/libxosd/"
+SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+IUSE="xinerama"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	media-fonts/font-misc-misc"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
+
+	AT_M4DIR="${WORKDIR}/m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable xinerama)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
new file mode 100644
index 000000000000..4625a7e33e1f
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
+HOMEPAGE="https://sourceforge.net/projects/libxosd/"
+SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="xinerama"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	media-fonts/font-misc-misc"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
+	# bug #286632
+	epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
+
+	AT_M4DIR="${WORKDIR}/m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable xinerama)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
new file mode 100644
index 000000000000..c255a3e1ee6e
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools versionator
+
+MY_PV=$(get_version_component_range 1-3)
+MY_PATCH_MAJ=$(get_version_component_range 4)
+MY_PATCH_MIN=$(get_version_component_range 5)
+
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
+HOMEPAGE="https://sourceforge.net/projects/libxosd/"
+SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}-${MY_PATCH_MAJ/p/}.${MY_PATCH_MIN/p/}.debian.tar.xz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="static-libs xinerama"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	media-fonts/font-misc-misc"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README TODO
+)
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/*.diff
+	# bug #286632
+	epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
+
+	eapply_user
+
+	AT_M4DIR="${WORKDIR}/m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable xinerama) \
+		$(use_enable static-libs static)
+}
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
new file mode 100644
index 000000000000..a3e70db1f723
--- /dev/null
+++ b/x11-libs/xpa/Manifest
@@ -0,0 +1,11 @@
+AUX xpa-2.1.18-makefile.patch 3382 SHA256 fbecba93f079427e1f95e2e3e726bd87f108915bf083d076d8bbcbb52b54adb2 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392 WHIRLPOOL 49c974f628b9a1b7e7ba6d529e4b1e5c66bf33f79604392567b2e84cd9acfc30f51dd931192a31e304902cae6efd4a486aa395878396f78d1426028ccfc79315
+AUX xpa-2.1.8-makefile.patch 2594 SHA256 24c4470674e4ada96f73461aef267e8fe02846b872c068cdd542e5c24890ee17 SHA512 e36e57ffb8ea86c3f646c4cdd7d3e8e304b6fe48f810cc4081a1dde2a367acfb70846160fef75cf020222002961963126e4c8b5a19f7d5cb5796cbee7429ec5e WHIRLPOOL 1eb4adec97afcc2993cd1f79e1093be326a508f2b90e3a0e73d6b7de8b31690e01dc0f126c6577b55c7fb6ee3c2a4a0b240950c72933a17b0c1b29f5975e47f3
+DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f
+DIST xpa-2.1.17.tar.gz 900465 SHA256 c95ae1d6c5353226a90f29007822e98da42a036af2f7326a21d2f66189c49751 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50 WHIRLPOOL 7426629091bc73d82ea87ce3db64b6f18f98f47bf98a45cc89971dbd0a88b44ee9eabe3e34e645e62a046fdb5b84258668f04616c38a34482f061e59b85445fb
+DIST xpa-2.1.18.tar.gz 900579 SHA256 a8c9055b913204babce2de4fa037bc3a5849941dcb888f57368fd04af0aa787b SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19 WHIRLPOOL aa195e0121b3a5966932a796a3a67a5900b687f34507de4ac41c7d3cff37371497be0fffdc314be69a1dffa99cb9d17abd75a93659cce3b5a0d47ff9137c0802
+EBUILD xpa-2.1.15.ebuild 1269 SHA256 d55367706acc0fd7f206f8788e208d2e3ea2b27540c4dc83fca32fd4a8e574eb SHA512 d7c83f117056e0331d9d27ad76fbff444a56e83a44ac52633fe4b6aeda56814169d133a3f6a19a48856fa8298835402ab745b5962bf8a6df3db1ecb2f72933e2 WHIRLPOOL db14309b883fddb99633a0dabf4a9430da04156c0bc235f9b33e64558ea23af6ee9948a3942582252cc48ca90c91b12aabd1cd16a0ac7301806389ecc522c6ed
+EBUILD xpa-2.1.17.ebuild 1260 SHA256 052464442b8630b38da32600b72bca951bc53bb357b4588972be02f7b38594b5 SHA512 782df296c3dfb3b9b2c827af44f6096c3c3b55048297c1299410ad3b0eb4c2c8be0bf3e26aaa39eb3c8f1ee98ca531c591153b4afa1c30588f39134544d2b605 WHIRLPOOL 276345461f44fd7a33173bcc01ce9cdaecba31b2c27c20f4c269d78b6bc49452cfecd9f53fc7b1c258b4b1ba078c8ca57874095040ac4e1d5d7aea7dba9b4185
+EBUILD xpa-2.1.18.ebuild 1174 SHA256 7fd07906be23d7a550233a7f116c7c6f95651f8988d9b08ddbca092cc2fc3eda SHA512 984e00cccaaa108ad212f5c4589cc3f6075f89633c824fa3146838c70a661fdd467511a7d10ac9a19e9d780f1f4d1084b3d323c632a7925ad5cfe3a9a2264da5 WHIRLPOOL 63985ba7e0255683d3db38cbef275c915fb3118aff79aec0a1305bfad103fc69404652b73357167b1842e0a9249cd7709ec5c8c7344eddba8f341e5fd1afe522
+MISC ChangeLog 2603 SHA256 8baa068bb9b06d08e5f11669895fba467d267e800718348bce45c9dbb4625d07 SHA512 af20d60865e56ee8b0bc51cc8e938a5ae0d5002fdb3dbcfcb89f5b758f3ba5a2025e3942e7cc54c8ac67fe922cac5c245fd680d5e34fe26c805d4f3ed14fcb5a WHIRLPOOL ebacef89efe5a9ddcbb153acb252b14764147f6ce4a7d3724b465ee5b73273d6c68fa05879f97661478b5c822c7d8ed2ef19a474203675c213c2bf02a91ddd16
+MISC ChangeLog-2015 1876 SHA256 ae7516fd5fea8529f8ba398b10c11c45b4450ae01b530347ee4caaf99ff81128 SHA512 25058b6795d89763f2f3c325e51144b7a08b41fe1a8450a5b5cca68a5943e1825b9baafcb08673ea1102ff2d8adb304fe6d972b0e2941a6d3012b792bb9e85d5 WHIRLPOOL b1fff75a2d2bf62ead9ae3125c6f15c76557649d6af23a64fbbf26175710877f8c74c6c8f0dc7b60bfe0a1be33a5ef68a6918f4879919000e890d819d59ca425
+MISC metadata.xml 1072 SHA256 a05f2468b9d42608a0db5d854080cd23e0e797cbab2a84cb71250138eb8e2dbf SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7 WHIRLPOOL 507c686ede278b3ca7891d05062aa5655c02af82d62d3279bf2a2ee8e203437d304c8e1fe9ef75f96b65eda17d31be64dfd8be4504e8cd2f2e5dccd26518a353
diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
new file mode 100644
index 000000000000..34aeed5b39dd
--- /dev/null
+++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
@@ -0,0 +1,110 @@
+--- a/Makefile.in	2016-12-19 19:21:28.566222982 +0000
++++ b/Makefile.in	2016-12-19 19:23:23.795246443 +0000
+@@ -28,6 +28,11 @@
+ 
+ prefix =		@prefix@
+ exec_prefix =		@exec_prefix@
++bindir = 		@bindir@
++libdir = 		@libdir@
++datadir = 		@datadir@
++mandir = 		@mandir@
++includedir = 		@includedir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -37,19 +42,19 @@
+ INSTALL_ROOT =
+ 
+ # Directory in which to install the .a or .so binary for the XPA library:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(libdir)
+ 
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(bindir)
+ 
+ # Directory in which to install the include file xpa.h:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
+ 
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
++MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)/xpa
+ 
+ # Platform-specific X compiler flags (include file specifications)
+ X_CFLAGS = 		@X_CFLAGS@
+@@ -177,7 +182,7 @@
+ 		$(RANLIB) $(LIB)
+ 
+ shlib:		$(LIB)
+-		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
++		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
+ 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
+ 		rm -f lib$(PACKAGE).tmp/xt*.o; \
+ 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
+@@ -193,7 +198,7 @@
+ 		-lwsock32
+ 
+ tclxpa:		$(LIB)
+-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
++		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
+ 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
+ 		rm -f libtclxpa.tmp/xt*.o; \
+ 		CC='$(CC)' CXX=$(CXX) \
+@@ -275,7 +280,7 @@
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -297,7 +302,7 @@
+ install-man:
+ 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
+-	    mkdir $(MAN_INSTALL_DIR); \
++	    mkdir -p $(MAN_INSTALL_DIR); \
+ 	    chmod 755 $(MAN_INSTALL_DIR); \
+ 	    else true; \
+ 	fi;
+@@ -308,7 +313,7 @@
+ 		M="$(MAN_INSTALL_DIR)/man$$E"; \
+ 		if [ ! -d $$M ] ; then \
+ 		    echo "Making directory $$M"; \
+-		    mkdir $$M; \
++		    mkdir -p $$M; \
+ 		    chmod 755 $$M; \
+ 		    else true; \
+ 		fi; \
+@@ -462,7 +467,7 @@
+ 
+ dist:   	configure
+ 		($(RM) -r $(DISTDIR); \
+-		mkdir $(DISTDIR); \
++		mkdir -p $(DISTDIR); \
+ 		cp -p *.[ch] *.tcl $(DISTDIR)/.; \
+ 		cp -p pkgIndex.tcl $(DISTDIR)/.; \
+ 		cp -p Makefile.in $(DISTDIR)/.; \
+@@ -484,13 +489,13 @@
+ 		cp -p install-sh $(DISTDIR)/install-sh; \
+ 		chmod 755 $(DISTDIR)/install-sh; \
+ 		cp -p README INSTALL COPYING $(DISTDIR)/.; \
+-		mkdir $(DISTDIR)/doc; \
++		mkdir -p $(DISTDIR)/doc; \
+ 		cp -p ./doc/*.html $(DISTDIR)/doc/.; \
+ 		cp -p ./doc/*.ps ./doc/*.pdf $(DISTDIR)/doc/.; \
+ 		cp -p ./doc/Makefile $(DISTDIR)/doc/.; \
+-		mkdir $(DISTDIR)/doc/sman; \
++		mkdir -p $(DISTDIR)/doc/sman; \
+ 		cp -p ./doc/sman/* $(DISTDIR)/doc/sman/.; \
+-		mkdir $(DISTDIR)/man; \
++		mkdir -p $(DISTDIR)/man; \
+ 		cp -p -R ./man/* $(DISTDIR)/man/.)
+ 
+ release:	dist
diff --git a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch
new file mode 100644
index 000000000000..290309662bb5
--- /dev/null
+++ b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch
@@ -0,0 +1,84 @@
+--- Makefile.in.orig	2008-11-03 12:05:33.000000000 +0000
++++ Makefile.in	2008-11-03 12:07:48.000000000 +0000
+@@ -28,6 +28,11 @@
+ 
+ prefix =		@prefix@
+ exec_prefix =		@exec_prefix@
++bindir = 		@bindir@
++libdir = 		@libdir@
++datadir = 		@datadir@
++mandir = 		@mandir@
++includedir = 		@includedir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -37,19 +42,19 @@
+ INSTALL_ROOT =
+ 
+ # Directory in which to install the .a or .so binary for the XPA library:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(libdir)
+ 
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(bindir)
+ 
+ # Directory in which to install the include file xpa.h:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
+ 
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
++MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)/xpa
+ 
+ # Platform-specific X compiler flags (include file specifications)
+ X_CFLAGS = 		@X_CFLAGS@
+@@ -175,7 +180,7 @@
+ 		$(RANLIB) $(LIB)
+ 
+ shlib:		$(LIB)
+-		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
++		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
+ 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
+ 		rm -f lib$(PACKAGE).tmp/xt*.o; \
+ 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
+@@ -184,7 +189,7 @@
+ 		rm -rf lib$(PACKAGE).tmp)
+ 
+ tclxpa:		$(LIB)
+-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
++		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
+ 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
+ 		rm -f libtclxpa.tmp/xt*.o; \
+ 		CC='$(CC)' CXX=$(CXX) \
+@@ -259,7 +264,7 @@
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -281,7 +286,7 @@
+ install-man:
+ 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
+-	    mkdir $(MAN_INSTALL_DIR); \
++	    mkdir -p $(MAN_INSTALL_DIR); \
+ 	    chmod 755 $(MAN_INSTALL_DIR); \
+ 	    else true; \
+ 	fi;
+@@ -292,7 +297,7 @@
+ 		M="$(MAN_INSTALL_DIR)/man$$E"; \
+ 		if [ ! -d $$M ] ; then \
+ 		    echo "Making directory $$M"; \
+-		    mkdir $$M; \
++		    mkdir -p $$M; \
+ 		    chmod 755 $$M; \
+ 		    else true; \
+ 		fi; \
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
new file mode 100644
index 000000000000..bb77c4ecb722
--- /dev/null
+++ b/x11-libs/xpa/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The XPA messaging system provides seamless communication between many
+    kinds of Unix programs, including X programs and Tcl/Tk programs. 
+    It also provides an easy way for users to communicate with these 
+    XPA-enabled programs by executing XPA client commands in the shell or
+    by utilizing such commands in scripts. Because XPA works both at the
+    programming level and the shell level, it is a powerful tool for
+    unifying any analysis environment: users and programmers have great
+    flexibility in choosing the best level or levels at which to access
+    XPA services, and client access can be extended or modified easily
+    at any time.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ericmandel/xpa</remote-id>
+  </upstream>    
+</pkgmetadata>
diff --git a/x11-libs/xpa/xpa-2.1.15.ebuild b/x11-libs/xpa/xpa-2.1.15.ebuild
new file mode 100644
index 000000000000..c5f4c09f108e
--- /dev/null
+++ b/x11-libs/xpa/xpa-2.1.15.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Messaging system providing communication between programs"
+HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
+SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	x11-libs/libXt
+	!<sci-astronomy/ds9-5.3"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
+	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-threaded-xpans \
+		--with-x \
+		--with-tcl \
+		--with-threads
+}
+
+src_compile() {
+	emake shlib tclxpa
+}
+
+src_install () {
+	dodir /usr/$(get_libdir)
+	emake INSTALL_ROOT="${D}" install
+	insinto /usr/$(get_libdir)/tclxpa
+	doins pkgIndex.tcl
+	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+	dodoc README
+	use doc && dodoc doc/*.pdf && dohtml doc/*.html
+	# build system so crappy not worth patching to a non respondant upstream
+	# and builds static with PIC
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/x11-libs/xpa/xpa-2.1.17.ebuild b/x11-libs/xpa/xpa-2.1.17.ebuild
new file mode 100644
index 000000000000..926c80687052
--- /dev/null
+++ b/x11-libs/xpa/xpa-2.1.17.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Messaging system providing communication between programs"
+HOMEPAGE="https://github.com/ericmandel/xpa"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	x11-libs/libXt:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
+	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-threaded-xpans \
+		--with-x \
+		--with-tcl \
+		--with-threads
+}
+
+src_compile() {
+	emake shlib tclxpa
+}
+
+src_install () {
+	dodir /usr/$(get_libdir)
+	emake INSTALL_ROOT="${D}" install
+	insinto /usr/$(get_libdir)/tclxpa
+	doins pkgIndex.tcl
+	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+	dodoc README
+	use doc && dodoc doc/*.pdf && dohtml doc/*.html
+	# build system so crappy not worth patching to a non respondant upstream
+	# and builds static with PIC
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
new file mode 100644
index 000000000000..45e6b4b73df2
--- /dev/null
+++ b/x11-libs/xpa/xpa-2.1.18.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Messaging system providing communication between programs"
+HOMEPAGE="https://github.com/ericmandel/xpa"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	x11-libs/libXt:0"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.18-makefile.patch )
+
+src_prepare() {
+	default
+	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
+		-i mklib || die
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-threaded-xpans \
+		--with-x \
+		--with-tcl \
+		--with-threads
+}
+
+src_compile() {
+	emake shlib tclxpa
+}
+
+src_install () {
+	dodir /usr/$(get_libdir)
+	emake INSTALL_ROOT="${D}" install
+	insinto /usr/$(get_libdir)/tclxpa
+	doins pkgIndex.tcl
+	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+	dodoc README
+	use doc && dodoc doc/*.pdf && dodoc doc/*.html
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
new file mode 100644
index 000000000000..e16b06134fd0
--- /dev/null
+++ b/x11-libs/xpyb/Manifest
@@ -0,0 +1,7 @@
+AUX xpyb-1.3.1-xcbproto-1.9.patch 533 SHA256 b6318b1aa072952b841fea0385c7b0bf75c12356309a6c03772a1c0002fd501d SHA512 62fcb656d0990b22e1d375e18b3fca7f8d7a09dec5a1a7d116c4c225ff3fab65e16cd00caba6e179b2b3dbc2d53574af36466d4ac87f7f3516f8660615a00bc4 WHIRLPOOL 276fdcbb5574741ed06f0dd6e2a92f1a6bec3558c5f9e87836be6eeb27a18211799e886e252060e798353e46b20a2fea7a937cc51fb98927969cc44d247f9f7e
+AUX xpyb-python.patch 551 SHA256 43f445e6a428dbbf3579b814f51b2bc9b9b4f522f3b21e9212ac4de89f8dc005 SHA512 1aa769145dac51fe70fcdd043f06e5dfebc9108c71bf6a34f3e3161e88d82883b7a53406e153dd6253d9de516745bb2297fbb8dbf1f8f0a1b3a7d6e1aa873cb7 WHIRLPOOL c14c4f801ca69bb88d211b3269b69b80ba4f449c5f4e493c4cfaf7920f1b0bfe2d66095ba8eb832e79b68d6ba460a6d33935a9cecf4b0deecc54a81f23f3f6c7
+DIST xpyb-1.3.1.tar.bz2 273962 SHA256 fd4c877b05b83893043734a678eca332c6cabf1867d9b6a966c28a97ac987366 SHA512 f3020f9b9d27ae522408d22cbdb14c9eb3d4acbc911e6f8fac425323c3f99233f773c3c4e027aa3812dec11b832cf0df8a38f71d21b0c3a1918eea6efe36c090 WHIRLPOOL 8cb9289125bd6860590c86eeaaddadde32452cdbc64c63f3f82c85ac627378da203f3e1b6331a213e3a17eed3d0d179d1ba5f6279bf613a7cca870a242f81fab
+EBUILD xpyb-1.3.1-r3.ebuild 1124 SHA256 926b17002b5b2a28dcd3bc1bfb5180cbe49874ead57d5c5a1cab84939e8e7ba3 SHA512 d8034aa2de2092ce561c7f16c1ce72370c54ee0a3962777768046a8a773eade0c2349e03efb8972edaa8559b18ab3cf905c393440fa2bde4798cb30782f17297 WHIRLPOOL 7afa1e4cf37683a1dc81d7ea34c462471bd89d9c82e59eeec59c1a7f22208c3a1f32feaa8a7837c288fa3baa07eb1758d0e061b6e14a1bdedd99cc033c9b377b
+MISC ChangeLog 3499 SHA256 d8aefe89c97f991ffa6788db242155dc441d5b3746c99a52abbcf941b683d2d9 SHA512 b3fa4004879c358362dd18622b5d7a962801f3b84c56d847a7f069a5e9c0f59b656ed91728817f40e63da934e958791ef702e0a5402e5fe0c89dc231c936e275 WHIRLPOOL 2beb929d132f2b833a06f14f4aebd030e24c435b8f2200e37c67df12e3d07f806bcdacbbdc4bc6efdd23f5cb3efe670bef5e0c155ec19c0a234a0d2889861118
+MISC ChangeLog-2015 7748 SHA256 9b8617a99ce82c67f5f8244a48e4b471b4fe9e910d45654e888fe9c1ee8b4a2e SHA512 6b669a886ab7795202014981da8093f351de80bc004f1d201fdd9cffd27158fc6978f91594f01149b10b8ce84d562bc1267c593817aff7a3e732c6590ec5d069 WHIRLPOOL 496e4d8358db4074e4d2c71bc799f2a306d545192c277e9dee2facac5190a1ae64ffaccb38e57f0eb55a3798313b509a0fb827f6d965a9928c7b763574ab0a65
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
new file mode 100644
index 000000000000..1196741b3cbe
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
@@ -0,0 +1,11 @@
+diff -ruN xpyb-1.3.1_ORIG/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1_ORIG/src/py_client.py	2013-11-17 12:57:05.157530931 +0100
++++ xpyb-1.3.1/src/py_client.py	2013-11-17 12:57:52.221530100 +0100
+@@ -19,6 +19,7 @@
+                    'INT8':   'b', 'int8_t':  'b',
+                    'INT16':  'h', 'int16_t': 'h',
+                    'INT32':  'i', 'int32_t': 'i',
++                   'INT64':  'i', 'int64_t': 'i',
+                    'BYTE': 'B',
+                    'BOOL': 'B',
+                    'char': 'b',
diff --git a/x11-libs/xpyb/files/xpyb-python.patch b/x11-libs/xpyb/files/xpyb-python.patch
new file mode 100644
index 000000000000..4d5d9ac72956
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-python.patch
@@ -0,0 +1,12 @@
+--- xpyb-1.3.1/configure.ac.orig	2013-05-21 19:01:51.054962821 +0400
++++ xpyb-1.3.1/configure.ac	2013-05-21 19:05:22.342961464 +0400
+@@ -38,7 +38,8 @@
+ 
+ # Find the xcbgen Python package
+ AC_MSG_CHECKING([for xcb-proto python dir])
+-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
++XCBPROTO_XCBPYTHONDIR=`$PYTHON -c 'import xcbgen; from os.path import dirname, abspath, join; \
++                       print abspath(join(dirname(xcbgen.[__file__]), ".."))'`
+ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
+ AC_SUBST(XCBPROTO_XCBPYTHONDIR)
+ 
diff --git a/x11-libs/xpyb/metadata.xml b/x11-libs/xpyb/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xpyb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..64d7a33b7dab
--- /dev/null
+++ b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit flag-o-matic xorg-2 python-r1
+
+#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git"
+SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+DESCRIPTION="XCB-based Python bindings for the X Window System"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+	>=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-python.patch
+	"${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
+)
+DOCS=( NEWS README )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable selinux)
+	)
+}
+
+src_configure() {
+	append-cflags -fno-strict-aliasing
+	python_foreach_impl xorg-2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl xorg-2_src_compile
+}
+
+src_install() {
+	python_foreach_impl xorg-2_src_install
+}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
new file mode 100644
index 000000000000..1caa7be37a7d
--- /dev/null
+++ b/x11-libs/xtrans/Manifest
@@ -0,0 +1,5 @@
+DIST xtrans-1.3.5.tar.bz2 186833 SHA256 adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b WHIRLPOOL 69cbdb9c329a6302c7dcc284d86c7f548f371e90cd1d360e56377fa60e0ce1631f720dc9fa62b457ebab673c99712a2d0f9f54edeb9fa0728a21d4b21b83aba0
+EBUILD xtrans-1.3.5.ebuild 707 SHA256 1b4628013262c6b18806dac9ac39a80718e88d9cf417117bad1e8b0ea603cb9c SHA512 1b870bcfa57605e332c6f41b0d366addb26aae82481de8f406c68fe0fde24878b6a4165c38a4d83d3905401ab90ac804971edda002e61c985b1091ba7e6b5bbb WHIRLPOOL 3748125147b330c8fba819d825d068018fb62ba7a51a1f8ab6b3d3b4ab990aa1d74dde037a893cfb894e5cbe582eb59e0284e8e42f72a1e227f6757186349959
+MISC ChangeLog 2657 SHA256 662eef1f8ef2a9a7ade7eee12cb6c74d748b0f41718b91582a380b2e5c992e67 SHA512 3c97a3fab05e9db46a6fdd935cd7f5e78c875588093b4f2ac51a0710ccccaf2a95d3e5fdaf36ffb6c59a4167dcd9239ad7148a48b0397d517817d52f270c9e8a WHIRLPOOL 2fd3608e650c24f8cf758ad69329bbfbd395d746710f8bd03691f896cab56cd12f88033c6f8d7708e4726cb0466a95a4cf7dc9a978b92c4e1b4cfef8da624eae
+MISC ChangeLog-2015 14666 SHA256 ef41d1c37c348b685c741ab2ccd84cce41aeaedb08be30a5a06643dc4cad7bf6 SHA512 2a34562b7efdc43b9bb93c142275817b05f4396212a71fdcdbd7d0065eaadcfd832d2c168a9f8daada20cf3f8d56d849d6be86ab686ae0b174ad85f87397abd6 WHIRLPOOL 9aba8edce7ec407b76a5c74fba0dd05586fd764ca6f7baf8b209523a760053e52bf7ce9df5fffb51addc40bd764625bf10de4d1a2c71d6274af7e0d474652050
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-libs/xtrans/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
new file mode 100644
index 000000000000..5dad3bccc2d6
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-libs