Enable multilib support.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

18 files changed, 378 insertions, 51 deletions

diff --git a/x11-libs/xcb-util-cursor/ChangeLog b/x11-libs/xcb-util-cursor/ChangeLog
index 89705cda4020..7f049ef583ac 100644
--- a/x11-libs/xcb-util-cursor/ChangeLog
+++ b/x11-libs/xcb-util-cursor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xcb-util-cursor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/ChangeLog,v 1.11 2014/06/08 09:16:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/ChangeLog,v 1.12 2014/06/17 17:35:57 mgorny Exp $
+
+*xcb-util-cursor-0.1.1-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +xcb-util-cursor-0.1.1-r1.ebuild:
+  Enable multilib support.
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> xcb-util-cursor-0.1.1.ebuild:
   Stable for arm, wrt bug #500368
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 4fda8f82f015..03d23cd89f4f 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -4,23 +4,26 @@ Hash: SHA256
 DIST xcb-util-cursor-0.1.0.tar.bz2 289086 SHA256 bb7bc11a977a7eca9c0b79dbe1c47ec813db98fbed6bcaf613118487a60131e5 SHA512 3c00d8130ee18e72da7833e014376f098164dcb0023c3dd8f8c75ae7494c1f9776735dfa4ecd62496cca4224f2e31cc1d54f3bb36d5576f5ace8acf5d71addae WHIRLPOOL 8c7f3b4a120e5abc5791b7042bd7c14456533190a7ebc515c2e3c535c541ef1a8ab6486bfc76bec45b6a06237219e9aa9fd91ed532909540316277ba46d2c94a
 DIST xcb-util-cursor-0.1.1.tar.bz2 280852 SHA256 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652 SHA512 599f9074a9801615a29374a96649c2d9d8de8abd053b7ddb245b7cc50a1c9c94610a8df996a7a79a831ade3d903335fdf7ac299e6b33e735ab087c3fe5923d71 WHIRLPOOL b73856c19e451af35b07de3bc3706ab0374c3c79dcbbc5d19f3cb03324a86d5422a46d51e63a916f53afb5f45d3b689d25d4ea58baa880d42a13fb0dd6693108
 EBUILD xcb-util-cursor-0.1.0.ebuild 1009 SHA256 e65ce026a28c782937372757ecd21cc57c447f789d67e853af2051a92f322824 SHA512 ae4ebca460c1b36ad561dee215c72840b12318c68781d91c98b4e2e4de91b06702b214f7d20d093124e4f43bee5e14b58b60e8c8a0ce3804218909167ecd6316 WHIRLPOOL fc09dd17cf19e89b8c93ffb3bbced5449fd34a30d683595c4b1e55c87ab4778649afba8a923f08a8d4f3edde5c2fa66a8b9fc672a6f89579db701a496669e2ce
+EBUILD xcb-util-cursor-0.1.1-r1.ebuild 1116 SHA256 c2b152073759b72a1ff7cbb438ba12db10a4808053240925832fc9bda1cb32f8 SHA512 876573ac8f250ef2f2bf7609a3ec928aa681fc6b3dcacc5d4afce36bf433e5aaf06280bd500c725c15fc60663512e0c623b28db7b1b9126713d5f19d23f01cc5 WHIRLPOOL 93777ed812cbe62819ae74955cae4a8f2a570b620476aa82be914005b78ba93f36422c1bc954918a78e05b6f8ccfe1a140aa41b1f83343e1de289e32b7884239
 EBUILD xcb-util-cursor-0.1.1.ebuild 996 SHA256 db10f9690faee3b872d2d723136316250ea80e12c85efc485076b6057a657ff8 SHA512 923747ad5bdae871f378c149ebb7bd0e605c568a488215aafc7c9ad38e7539456552dc4fa17b87a4ab13c6202e4d69ee1800537d461e1a01510bba0f1cd7b511 WHIRLPOOL 7c4653806ae48db067d80892fe9424a7f8e1d5506953b94b20bda74511f5d2b6275e11e4f1d46d291af574d224122675efbb49ed268dab9d25d36df6b2fcbc86
-MISC ChangeLog 1574 SHA256 85732402e7acecd4dfdc28bf491eff44e9ad3f2f3a3b595b0a8396beb287e82d SHA512 4d59a810c9b7ef25216ef165bbf384e371d24812aaba03b96e125c27734a423471b9570e2a644c7791b6b4d5869c631657aca1d09089fdaf7d495f9b9c622f51 WHIRLPOOL 9bc0732e05cbd9623486b89930c8bc9088bd6c3c00f85c8bfc015441340ade69bcdaad4ac81f63ae08d55bb722e4d16351ff3e85902bd596cf942852ff4fffa8
+MISC ChangeLog 1732 SHA256 4a5d22398401d93477d9cd06456fef166b7a9d7b88d0d37b4887bc92a04c66e9 SHA512 6960e3e992b099d16eef384d9dccfeeb172fd790ad119da0729d2820e7231876da20e931980b74551bde67330ac0a31fd84a6b5ec14d6e259775ccc243c79719 WHIRLPOOL bf9d8bbe117545fe8ca3c9d9779d40893238d8b4f9ae6e06748c71e43d92ada90b168d8aeae744095bbab0e36e3b33fbf10c8a0eea23a78ad1555bac2cd47924
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTlCnTAAoJELp701BxlEWfRVcQAJ2lFv+G03nB0H+rR9srFL03
-oMbfiZH6wkLlvSfHwHPaNtdxlM2vulUWN9450ugJxEQZh7TYVWAF90NrAMp7Ux+a
-MBT7/XOibsUs6zzdNbBNKh34VSi+lKjYfCd15bnSTC6j8CZmsRbmv8TnRFhW1G1u
-TM+nNwjjM9v8oZ366h6/m5XYzRjP97TBNFHtr62xyyqgfkjHez/kvyaCKIioJv/o
-QEB7okApadAsvW3p95wAfjMtxYor9CWEKE3+kOk2tkJ92rY17exWKSHB2TVHbkTh
-BD+uvCo98VIat72YrumJBVDbIPlATHGbTGV3Ux+dOrgPawXpXQDFAulHKkSxtdVA
-Z4dotMrGJm7nUy5kduLssrBcH00d8qcpj3LJSekUdyftxXgzWWoK3en7oY54UrHW
-Dm+11CBiTRv2Wtjn+z1sTTeLCT50h5ckjgCulHVcWrNDVzZF9r+hEBZuV1PQbrFr
-6x/UnrhIPVYsiNEiUnOCkCB5zguvA3NCS5wkc5CYkoPldmHzBh8+d7bbPv65i8Kq
-DIKhac0JjnbRTL3R1+cdn4bbDZxfCm63TiePNq5Mn5ER7Xp6F70SyXKl+pFpqzLa
-tV1jfC6CynN3toHZc2BKaQNRxdGFNjtuvUHCUzpgNoXnSHNyksmzlMQUTkLKLhf9
-7/uo82rMPC/TLAnPBong
-=EBqF
+iQJ8BAEBCABmBQJToHx/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOj8AP/Aw1Y+seIhBByeZKKMH4i5we
+ik4zvgWOfLvHZz3rM1olM1RNtFlCMgL15Ftr02EZ523M0jMbSJE5VQwsgrG2Sa28
+jjnUPgEKJpryXxlaa0d2co+tUMBpofuOyBm7AsXKOW+LRohKqww2qqdU+Fnsy2nz
+qLdesFDylQ9SDErSR4Mn9wW0cQrlwDujVqz/sYSG+ogCgaLQAumLkPsimHmi0f00
+sm00cpHnGsZ0j/ie+0LvqqMlikIUliM5InrwHy7ZNvcMkdwMZ/EQVDCm+F3hzHjw
+fpQ0Ev5giUAGeVJ1FLGoQ7z3kClM0N2z6ai7NmZIhIWujQwueVIvMNwfE8SXRrzu
+HwbcbQOsavPxDqH9/8BYFZ4MAXuvbou2DD3es69utAZDNqU+W7bs/HuC9BEmewwu
+yTeBMpzeAbWRLSXcEik0MX3B9L6n52hcn7Z0U8XiBE+hD2he19P1RX8zWvBxR8Ik
+iIoCiCJ1GfDWxTeOJo0qgmdWbc45MUHqqywl0Zxsoh31gISz4ro7Jg5KlfvLgAVO
+S1dHZhCoLJSiYRqLieD10fIGG+VEbXUX645wQpq49rHOg8TEU9KusyOqvtGVyXtJ
+WUB5qOlPyN1B/9OKPLjeZuiFPw8Hy4c+wrShhxmBGuODbh/zEvEhImjemMSU8j6v
+BE6gCC4WdtQQfgcWWBZq
+=ElDt
 -----END PGP SIGNATURE-----
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..5773315987a2
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild,v 1.1 2014/06/17 17:35:57 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-cursor"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+	x11-proto/xcb-proto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-image/ChangeLog b/x11-libs/xcb-util-image/ChangeLog
index ef9351b0ae98..eb90790cfc03 100644
--- a/x11-libs/xcb-util-image/ChangeLog
+++ b/x11-libs/xcb-util-image/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xcb-util-image
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/ChangeLog,v 1.19 2013/11/04 00:28:33 chithanh Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/ChangeLog,v 1.20 2014/06/17 17:35:52 mgorny Exp $
+
+*xcb-util-image-0.3.9-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +xcb-util-image-0.3.9-r1.ebuild:
+  Enable multilib support.
 
   04 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +files/xcb-util-image-0.3.9-return-type.patch, xcb-util-image-0.3.9.ebuild:
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index e9304cb25ec5..d6ea70e0c5a6 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,7 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xcb-util-image-0.3.9-return-type.patch 1581 SHA256 05a16fb3ae61bd1e02cc3c55f24ab677865ab514c0935151af63e58b647ac515 SHA512 12c9d36375e42c127fd0e50363b5289cfa86ec238f94af9914e1a5375e55180fe37645a7cc473ff19c286c84dfdee74b6bdb7c3aa6ae1f3d0f0608e482d4c76c WHIRLPOOL 9a3bf549ea0ffa5a9ad1592f89f06d5fdf2891e841437f6138517fd16722328eacb138705bcd0a68c7ca631097e671dedc8f9871a650e473f63b2d360119b6f2
 DIST xcb-util-image-0.3.8.tar.bz2 289004 SHA256 40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9 SHA512 265790e7e5dc436a463408ce988ef245abea546aedb37384d6199aadec2dca3ec60f59aa72e676eb1a555f63da89c520fd89430d3613682700a3edd6d046f701 WHIRLPOOL 5ae5ee9c8f3c3457e12fdcea11fffa5ba49473f2b610f26d8b9ea5ab168d2754fae69c70dc651f8781e8fc9516b4634d2258b6676a9134bad7d6c2f08a682960
 DIST xcb-util-image-0.3.9.tar.bz2 310947 SHA256 d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df SHA512 6cf7e191f3814528d977aa2acb2a106aaba0732c5d5f4041ac39039e18b9064f90f96da087300f4061d700e3521648e5540117794fdc41dad36ca5f973370394 WHIRLPOOL 6848c12e1f98a4989c8ae2f6765de99639aef178c28f5d782eca132e0ea7adf32aecbd1da0b2631213898a2315dec71beacb8a4dfc717d3701d6500e70092828
 EBUILD xcb-util-image-0.3.8.ebuild 975 SHA256 6e55959669fe01f882634be846cd748d36215ad3f0c38c7a44bb18e479a5a339 SHA512 b0fe694cfd78f6e6d70cb6fe4fdc94059a3931dd0cd32ef33779e94d057e7cd818fdb45eb558a41f9d82d17c5c0d59fafe8a9fb97ebbbff03c4b8b9e2224d886 WHIRLPOOL 7721486fa0b7a876694559e70fbb969a639410cded3acb107fe351addc9d23f66e0128304f6d5b7bc158052036ba676fb5cb03ac9b4547d6b64128048f849e47
+EBUILD xcb-util-image-0.3.9-r1.ebuild 1134 SHA256 0b66700c8dbb2e9b0b2495330a1de79ac085bf2b2cb8ee69287481f6d5c8ec50 SHA512 3f7182a049d13e2f9ed0de5629af4316b955ba0c2fd04f7d3634eb35e3ed363dc440232f323222e25ffe6561b18d1ff2ad7fd6a7e68aaa10b8b97d3fcfa320d4 WHIRLPOOL 3190d5fa8275f07f740bd6ddc6ab5b01de57c695944af8aba763742983a963cdd0d93c8210af9d9f9b3a1e568404410cd3754c5c36d6b65e2448a01b1749112f
 EBUILD xcb-util-image-0.3.9.ebuild 1037 SHA256 7cc26d32376c99de6160dfc426e8fb5d274cc9bde4553c8fdc14781c612f01e1 SHA512 6e72c7f3016002f18d00563ee0bf486ea560629e1acde9f8efaf4cd28e361a8794f2bca627d5d2caa25c31b4e058af279fcbdc330cfac33abf4aa3d852e62ba8 WHIRLPOOL 2f67dc56d30de99454929b584f1ab779a36b4f38df1f503d5721badad8597f10d4b2cba5812af95eed8bd17d66a9c81a4d648028ff55c7088bc932145906d8fe
-MISC ChangeLog 2615 SHA256 05fd78eb65974cd5f7d1d789573b9de7348421c2e3ac9b60a9bc73fc168f2d07 SHA512 d3dba15a62f8c57232a949f3a007ec55063670996f28783bf8b40c4606fe2d4cb4d33bed944eca0380d361aceb8e5fb0be6332bd18494da87b54299ab838a9a2 WHIRLPOOL 31ba1ae6ab9ac669770cc3d62a62de60cae3c93c4d4975e5e70e025a8ba6677c827c7cbca4ee009b3b7c92fae345e9fa8498424fd8d2f327c2c3b00f416d08a6
+MISC ChangeLog 2764 SHA256 67c7fe34178ccf87be80fbf64b38a465827529b151b33ba781b00bde2b9bb64a SHA512 fdbbabdcec056cbbe6810d6bd9dae2769f50bf2bef471cea9bd4593ef16b6021f19233f3a8e3d96e77afc59c89406ae5a2ea0e0987307089f2da58f14f370d4f WHIRLPOOL ececaf7cdd9d89fbef67f3b1dbb0f05ca7d6a677ae55f117a64942ba9db0dc984c0f08e746f1d304894be0230da8fc8eacc694ba950a1854acb7fb979853ff8b
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
+MISC xcb-util-image-0.3.9-r1.ebuild.orig 1048 SHA256 730e258d82dbc86004b18ac00bd21132105dc9ca00c26f18e30f57d8808970c8 SHA512 8116ae0cbdab1932f798e14b0445d6e969f3a582847f4600063dd53a2333de74985e4c9ae2f8e7b75381cba8cdf865b89dd395b555e52757694921bad3db30d1 WHIRLPOOL 97e8d872fe395a0f2d7c66e4e2b1e4385119cf483630987ad7259dc194ee4d09b79247a315a4644a54e01babc1d1750ebb57941b89b2775af51bb53bb2bf1f74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJToHx6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvjwP/3JmHJqgjl2jIe95cfjDW1SB
+JjSSmoLzUfaNMj8b19REreTir9Xr8a9KOCjxkFQqbHZg+cdhqxqPDtPo7hF4GDDI
+GTel61qzQxdx6KZlMDc5B2DQcUhHzr72aVpa4fsBJHChsC0ryS8HlF/GWMlA2Vfp
+OpY26dOIIDxK1IRUK0BRC+LaNz9QlR5/sCVDKMAxFVPixO4C+mebmKI2iz+trnZn
+Ksg93KzpmwpOxrtRjxgyQQ8exQPyXAlg0yD5VXYxPjmiBAuYtiN0z5tcp5JgRUri
+PQbc3xlCDzhRhK8QLLANFjki3NuQI9E2b0s71/vhWYxiqhJxkwu7uX3t4yQ9GBGD
+bHiuzZXZ7LheXlFHs5v0DJiFY+I09uD4VGOK3Mo/AU8Du73G8FZscER/qNKXR6JF
+mtasXfpDIdC9y0/VI/rOr6w9sQClfe39tyDpUiafviSG6cC2pz7EcCs3eKvxbIDl
+U62VF3xAY9pOlTvyGJ7czJNTe6+Hyxo220rLdFA7+8hYw01aTRGgSm7xN3cJEo/J
+HMtmmSx4INUkag5zkj2qQ3hPL74PaAb7vlGALDcQmimjHzcTcHg/fBxWuC31X7VX
+MvzES05wXibThHWWgCgX0wIlsbeEwrqEYf65Qaq9OZbP3JGphrDDER3BbQWq9m7U
+R3wje/bh/l9WUXrXcuOQ
+=EL4X
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..7abe9d859973
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild,v 1.1 2014/06/17 17:35:52 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-return-type.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-keysyms/ChangeLog b/x11-libs/xcb-util-keysyms/ChangeLog
index 52adbffad4b6..337053d3c236 100644
--- a/x11-libs/xcb-util-keysyms/ChangeLog
+++ b/x11-libs/xcb-util-keysyms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xcb-util-keysyms
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/ChangeLog,v 1.18 2013/02/23 02:46:08 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/ChangeLog,v 1.19 2014/06/17 17:36:11 mgorny Exp $
+
+*xcb-util-keysyms-0.3.9-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +xcb-util-keysyms-0.3.9-r1.ebuild:
+  Enable multilib support.
 
   23 Feb 2013; Zac Medico <zmedico@gentoo.org> xcb-util-keysyms-0.3.9.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 94f6541f4682..b537608dbef8 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 DIST xcb-util-keysyms-0.3.8.tar.bz2 252726 SHA256 913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121 SHA512 0c7257079af140adac1ac2cf79ca305906978256b627b164b08202ff4e6dfed3a8bedf49b92b06e44f8268a5002b7071d5fab575ee243be319eb36131d6bb97f WHIRLPOOL 0366120763a17cfafd164ea16c2f830bbce461224493312dd810fff9c7823b3defcb118ef1ab82fcecfb2a26a62eded0e563b53f79099e28be0dc019a658530b
 DIST xcb-util-keysyms-0.3.9.tar.bz2 286075 SHA256 7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e SHA512 0c7f9afea5886145760ff055fa9d38ac886306bca926b00c0c7da770b5e9a941887383922b144441d82fd071784cf94334773eae39b59aee094d570778f8f8f8 WHIRLPOOL fea0109e7e61af17170cf8da8a6c521d61f3354b40e16ea78fe2668df0afad551745caf84059db463fd4b7ee75d4d5795007d3a7268922da9bb7974753e4c33e
 EBUILD xcb-util-keysyms-0.3.8.ebuild 981 SHA256 6f4c98dc716147f180390a6b34b43511e4da3699da9ee6b24f61f7f8af20684b SHA512 789180178cc2745eabee55fc6d580e72d74ccda44b48e6debddd723087e641de95a5e0ec723b873547c2ebe8d3756bf2ac12f2f5a4fba309a7784cd30d380596 WHIRLPOOL ee0dddc49cae6c345cd0d6326ac21b4db1a84894f652ebcd3d55017313bcd1f03b4f9993fcb01d58b921f5af81e7293b655c10a2cf473ad7c8bf7386058f15da
+EBUILD xcb-util-keysyms-0.3.9-r1.ebuild 1089 SHA256 b0ca0489e11241c100cb4f141563b9e21af39a59243704bf6033ee4dcfdb5b62 SHA512 7a3a543f2cb0b1d34bebb78e55c75b01dc7fdbc6af7b158e019a022c4c8aabe1afd850f668ea1b4ab8193f7374ffb49b0eb81f117a9d6b2c586476dd89903f9b WHIRLPOOL b250fd8ba7121324e7b600332f9f7e5a4114461ea119f49ca12e7a963d02497f8dd5763aa947cb042dc1ce20141c035ad250e446d312b9aa441c816f4bcaaed6
 EBUILD xcb-util-keysyms-0.3.9.ebuild 990 SHA256 9849af65b8d25263766e8db5bec587e44c245f08255de7993ade7eab79e66eda SHA512 ab922731ce6892195ea934552c0eacae0e2696015db37ed7724432983e1044e84e872acfa547a2484fea43b3981cfca20be70a3ebef26c0abb1884087cbcbec7 WHIRLPOOL 87316c1367d2831f091814a45180adaedbef0cefb5db45b7b2828a7810355d3f388808eeca44bf2eee9ed7ce9f80661459928853c169e7352f15940382f2c635
-MISC ChangeLog 2474 SHA256 5a117fc772d3cea8c40f16a01e90a3ce0917e13f4d6c425da2cabbd98c68b908 SHA512 63779a2607e14cca48bdfbee0f0e4f00ae82ae1f00c9c7f5b94c5cdc6858017a47e790749526126365a5c392d95b6938205f412e06181e10b5b02e926c4ecc0b WHIRLPOOL 556cd153e8ba4c628828f721e2fc034986ac373fa2169d08fc7e4c6b7cc561e205021349ec44886d7b26f12eb45be3fd4c38d8e34e1b0c2d9b7347666aed5239
+MISC ChangeLog 2630 SHA256 57cb76f68dbf18078863f4fed299197195cb646fe3c392f44cc9a589275be5b6 SHA512 6875abe1ce622c41b80d2c9b6bfb8e0112c70ceef9a51b81f7860da146b4259917c5c5594a90ced47b07f25f6f32d9a543d67a5efdbbc00bd9fd54db063e4af6 WHIRLPOOL 0459763f71c1b97abdd2219776808806c1e1b6f20322d0a98835fbd8dac678dee90858cde8c1657158589f91e7e17bd30bd71879f4ce3b9bd94787baa5f462d8
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlEoLXIACgkQ/ejvha5XGaPC8wCfdPDTITcZnu3Wu5WRr8MpWL15
-CM8AnjJfV2tYBywkBBOus/zaW6sM9VZJ
-=7REs
+iQJ8BAEBCABmBQJToHyNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOShEP/3Uezsl/nQIfwU4MjMYpPVf/
+lmWYXW+d7BBtfT6pIymtBf7v31d4GCPUsYXvFhfG8a0r9pUndJLAqk5jQ7QwjjJs
+kGVl49J3DV2L44pgJqEFPbSPZiq/O0JYXSDL26LwftK4L9IDRS2juiFkNuk91qv/
+vgxQM551BsRCxHn+FcMNnAtc+6vG32MVFqo8AoDKziND/aPGrB/TQam2BP2Im5Hv
+hwMd/5xFdhJyp/r8Hh/0tgCgYrTjVKLlxhOgj4fPqgLE3X2GPD+kUqK8QH1BVcao
+PyesxViXFjQC1oiR4JpLgKPKZYi7c3dk7VzwLIrN2RKKQGmvd69DGDicksnZh6NC
+Iw37XFiUeymKQd0qKYBrSqt0RLJNhbkq07Q9pI7hFnWkvZBFnMkxw/1U42N8aTk5
+/k1VVVvOEEAyeTZP/J8X2mAT4EJXX/Zwy/XkQH+JVYJge4HE3g5uPE8y4VXsthNv
+ohBGiCXpF688BHivnEj0MtLE/eRtM8E+61YoaDJo2XafWweWE5E9p/kihmnbRchz
+D0MIXjR3qk+JmkiUVQa2u9tpctLTAAJGajp9aPb/FjVRT2sUu3x4gi/PTwFpiGgn
+rrN4p9Alq/96t02jqV4LWSioyxz0qUS4jYd1j/5IEmj/jgZlcRAxuqIbJPlJTwKQ
++8a0Wp6ZtC+hTCDxbO2b
+=/UmL
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..93ed38aebf7d
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild,v 1.1 2014/06/17 17:36:11 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-renderutil/ChangeLog b/x11-libs/xcb-util-renderutil/ChangeLog
index 4bcafcd88854..3a9fdd7bc3b9 100644
--- a/x11-libs/xcb-util-renderutil/ChangeLog
+++ b/x11-libs/xcb-util-renderutil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xcb-util-renderutil
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/ChangeLog,v 1.11 2014/06/13 13:31:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/ChangeLog,v 1.12 2014/06/17 17:36:06 mgorny Exp $
+
+*xcb-util-renderutil-0.3.9-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +xcb-util-renderutil-0.3.9-r1.ebuild:
+  Enable multilib support.
 
 *xcb-util-renderutil-0.3.9 (13 Jun 2014)
 
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 4603abd0fa0d..d9840aa85679 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,6 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST xcb-util-renderutil-0.3.8.tar.bz2 257492 SHA256 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452 SHA512 d2f94d23628383a1d2c861e0bfbe6452b89efd1003348dcfacfae9249b49fefb91efdec4cd5f5fc0aadd6f6b72cb2b866089e42b5006f9394fb6b68cb484fa8e WHIRLPOOL 7ef258498c1ca3ebe16e4505f9fe280c4abe72ee04b012842cfb624edb622f611c3843ff5de52a7a455401ec352e02a432d60ab2829654bbe98b2b6450a907b6
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 SHA256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc WHIRLPOOL 4c503898720aff7f81a75424d4d8f8351044aaa5fef446637474987264ee7487ba0f07b1f92f3f6d2c36495bad9086cc190d085fe7bf83281f2ce9b67a13cfb5
 EBUILD xcb-util-renderutil-0.3.8.ebuild 1000 SHA256 12c94f284ec52ba0908a7527fe8e757f8517b41ac132acceb1868c684046dffb SHA512 00760c4bb157353ce782557f7c0b87c7edb61f455ae87176952f61b5de9575cdb496871ac69b1f7e5731916f3c14787c4d4b0308444dc40087a0da71ca52b6c8 WHIRLPOOL 3db4128f4d6965d7418b97c5770602ecf31060f8e3bd627f908e9be81bc36cd480fb732eaa82c06a20c1dff580de571813a65d3956be9be0848cfc6cdbf64ad9
+EBUILD xcb-util-renderutil-0.3.9-r1.ebuild 1098 SHA256 4f9cefb75b13ccf1354fc6a512357db39f392dd30994d4c75a1f9152dccc8269 SHA512 4d50d1e771f51be0bbfa16231c7340b18f4fd9b70046c016386c36f9ce4dd180f61c23efb7a35b18258797980d2efb84b727327bf48e11d86f1b0b3e81260b77 WHIRLPOOL c2734493b4303e15161b52dfd3e7eeb3c970083faa9a9a40c5662e367c16489ba4f2f2f0b9e48469020049322c4926bcd46388da7d27b20f686a79045743a254
 EBUILD xcb-util-renderutil-0.3.9.ebuild 1011 SHA256 9d0a2d7f98841131a798a8263614c3359bc4a25c8e0bcf51d4b5c9f1a36296f0 SHA512 cdc907170de662c283d335e5964cf5df7414637c103752d2bce626428023d95a11f52e86404d307cfcb4a420caade7c19a614a216b50ab15c2a6014eccbd77a9 WHIRLPOOL 805ea6e29558fc424fa9ec8896f8fb649be247bb6d97fcefaf091e18d21290d433fc1db05cd23b666aabdd9937c4aeba15e861c8dc6596a31c9cb6cc839c1001
-MISC ChangeLog 1678 SHA256 f124d98e07c99178245863b62ea5b763f1f0c95f564ed8fb8f88e5aef308a490 SHA512 401ee3a01138d9ae7598d73e92735400427523d303cbf0b8bfe9411733a6b26fe200ab2efabffd89a0e02f62b0dbe8e387a9a4d00113a4fee35ed7e1ffbc4a3b WHIRLPOOL 343c98b0650c718539ecfd9a77a6b335b84bade323d33d6464a8f2c52dcf67be72f26d5e115c12589575af9a1edd25751dbbdddd294a375a1755df27fbe08724
+MISC ChangeLog 1839 SHA256 8255a645e01b4290aa0d8eaa1bc8f0851500b26d699c62e59a2ad38b5defb01f SHA512 88c08453d2e245fbef674047a89ae15c7b41a401c80f218162388ae01aa72317bed469210e9224a6a45cd123e978cdb3c994317d45e7ee1d96d26d2c37960252 WHIRLPOOL 80f82e2e2a398157f8486e80b8eff1cf330edfed0deb3d0247808d2df7fb4d4a5a9ceedba5a4b3d5b98cd6ae30a5bced56911e6dc4b71d62e00da71424183c01
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJToHyIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOExoP/3dEqFzrsWvjaKPIn0WhLbqG
+vPWEcrDpQo0qDBjwiiDismfka0c113iQ+qjEw9Xue477t3mV2+QJOsZqtLUEGQJC
+CnUnxCcYmBkvXT2wO46AYOCxDIZ9a1TUjlqSC/Aty4rUbD8/4es0rr0b4c5bBa7Z
+lp3heYG8/NqUxEdq5vuGw9RmBlkEhlNcYx1MLdjXvNV5yOJN3lXadF/foCEiOwjB
+qGBUarx2iHOb/VCtHcu0Fi2Rm2W8fhF8Kv/c9r1ho4FVaFnG2Yedmp1UQ6YyGJy7
+5BTP+E6kio1hYySczdXSCbRvb01F1JCVE+6lG4ebA0skElFNSjqrKOlw4ZwA1yx4
+NscYCaaojPVUz91jlt6ARH6WOlgt5Y8IBdf3ncjI9Wi/59vzdZ06DEJlbwUIy01F
+cDSy5FeupRrBO5GORhehMlHuLOUMfRH3o6ZbaExe1diNAVQNxi5EmedfjUAcFEd+
+tgbSUP3WYrTEXM2ShiGYgZz6mv6ABnqIv8EuB/K96Cu5sv6Heapb4ayq+wLtTkic
+yzX7ejLnt3Z2r8Nx/llJi2JXtzFs1bjYzQjgCCbh0ysZA2mfR7NMzfRKY2KWQ2XL
+aEnk+RjeDFauS6PgBBB50xMXC9/zr6AGVfD36Myx15FRvQNlNFF7YSJUS/anvSd2
+pTTUDlojnvDqgvIol9ti
+=7yLo
+-----END PGP SIGNATURE-----
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..32ee20ff4b25
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild,v 1.1 2014/06/17 17:36:06 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-renderutil"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-wm/ChangeLog b/x11-libs/xcb-util-wm/ChangeLog
index 7bff665d96dd..44baefb81262 100644
--- a/x11-libs/xcb-util-wm/ChangeLog
+++ b/x11-libs/xcb-util-wm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xcb-util-wm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/ChangeLog,v 1.29 2014/06/08 09:16:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/ChangeLog,v 1.30 2014/06/17 17:35:48 mgorny Exp $
+
+*xcb-util-wm-0.4.1-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +xcb-util-wm-0.4.1-r1.ebuild:
+  Enable multilib support.
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> xcb-util-wm-0.4.1.ebuild:
   Stable for arm, wrt bug #500368
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index b8acb6434fa8..da7b0add65aa 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -8,23 +8,26 @@ DIST xcb-util-wm-0.4.1.tar.bz2 321855 SHA256 28bf8179640eaa89276d2b0f1ce4285103d
 EBUILD xcb-util-wm-0.3.8.ebuild 987 SHA256 cee4f5375db86fcf93d7762fca8a88b352167d6c86a76b63092e8285f5cfe9f9 SHA512 b077fb97ea407843454c83763f857a4c7c6a19e257497eae49219c94a3b3c05d82af510c2c5bbf636509a63bcb25c29d5130b5d9de5f533c7408904a14d43654 WHIRLPOOL 690e958fe786edc5c58bda2786778701d702264b81d7498d8677592971697812c214e9c3a082411bdf2922ab3f3ddb1a9311a6fc92e4e45ac73a13b023025bf9
 EBUILD xcb-util-wm-0.3.9.ebuild 985 SHA256 ed51fdbf999512f38e81517271fadd6c3387eb54812c8067d9da30586f01a898 SHA512 899b480cb247f1c0befff0d20d44f7478b0872de37c7902e1380e5ce715172b59dd2905214bf81fb5ca26c5788331e5b521867755b4c663a83beb713f3cb3cbe WHIRLPOOL 9ed20a90eecd81a4791b3f614305b06ab1791eddc0b619fd202218b24737701ba21b9169590f8f3247ddc88d17c970a119d62e79fd66b36a7f713d4bfc8bc102
 EBUILD xcb-util-wm-0.4.0.ebuild 983 SHA256 a8cc5cb2f694b2df7902e71d8f0b8f6b112a3467abd50dcd0de7c0bd6f58a6c9 SHA512 827168611de22be35e7511d3355e30fcc6c833a4073d2636008dd80b08e1c2a02ea3ded2d1b8fbfbb96b6c0fef7fafd776992444b35968a1d4993b1b2eaf3a06 WHIRLPOOL 49b5b233c1b59949b8286873a2a553f3586e732b8aa713bba6f5a124747ff42e0ad82c0ef39996ed557ee52c1ebb702f525266b81a54a1fc73741483e20f5e65
+EBUILD xcb-util-wm-0.4.1-r1.ebuild 1062 SHA256 f787886c709777f8ba648ec2c17138fa43d613236658c7d75d74eebfea44b2fe SHA512 041d9dd1ef65f5a2bc073f5f84fea1204c0218c8c28f0957a2becabdc4e03e1995de2773133e22738f2e1cd1ae7f638de1a9ca1a2a6215d6e9fb4c1098221409 WHIRLPOOL 2d0b0f9ea55cb7756693ddda4f380c8d8afadc814ef19881e5f4f35bf38d35b24e57014972e0c3bd4f14325e74392517bf9fddd88a494e2dc55d756d77e96433
 EBUILD xcb-util-wm-0.4.1.ebuild 970 SHA256 c01d47f00b206711feeb81c87429a46c7b8c93f96d89532b1a920e58598a7f61 SHA512 03cfd9ff8bf56b15c3e273776e9290c599182b4c20a484b05ecd9af88164975494b66b21a2d77cde76e12d21f3700033a9c0c99a0c2c80c0ae5b5b0a0e38d50b WHIRLPOOL e22cd04710b9116db437a801dac2ba217e9b164945917dbaffdcaa935d3a64309ef1427d59c122fe5fe0c73e7d80960978d2c79813cf25584bcb0f3fdefbd065
-MISC ChangeLog 3682 SHA256 e2089213695c65f14a0b136cc2af79aa27f4e3a81cda40c88b2752840039e700 SHA512 248d88dcda8784cbe212d2a77e8f0bc4489b8e0ffeb28275569ec5ecb5a6de3f0a1b2cc4ffb941f44701ec39ff5dbcf1e40bedd46387c83973d69fda3c780610 WHIRLPOOL 0e8e33047248339c119e75f75c7f58637fbe4c44e79c6f7ea2748b8757109fda37a40daba9abf1f299bf773d775352bba8733e80399de97ec4eddbabc193d1f4
+MISC ChangeLog 3830 SHA256 0ad4131d822304989d96b0ce70e9c52258db9a08e2dec1ad9948a78a68d1e485 SHA512 5be1ce7c340e421fffe9927db1136f372ba408de924d84ee589bebfe5d1ac1ca778277075c895b3cd5ec362a9ef1de897d06001533f87fc322a405c8db9bb4e3 WHIRLPOOL 400318704121502ac5ab756e0f29d48ff03bcbffe5a4db4e2793386549a04700bb1934e9f37300d5b4bde1fdf658e209c9dca18f5a44c3e31e502f0d48d78295
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTlCnVAAoJELp701BxlEWfrrcQAIRC/OaNFLfrPn5s3AWm++oQ
-Jsr8X0iAFIg4nKnheoLuhA7JyRCuxwF787GCaEcwc863WfsoZeyGo+k4LSRv0Woe
-HjrRPOQIusMxfe4TbkmXWmYsy2E5ccjAjLSAB+V5WlprAGS3aIzaJnQHsHv5Ffg5
-NMF0a4n/ctmdNKC+NkrjV7a+IESn6HNYr7ngK8R+6NpiqfrXnY06VNNteahvz9eK
-hUhlFa9kyepdKaowgjfefeR62ExpZ4NtByPSCa2v9Rb6SCNwJbeTgiIpCH9gjMtX
-no5CW1F7jn3VUFFhqVZnkynfjq02Ot6i9uRn5mfE/2xixkHSThyobbYDR1DUBEDA
-ftDAcV3ouAoxLoHT0Rzu2L6ovkRyYUOZKLn3vAqVYtKMZ7XujOckZnjFzQbzu8Lr
-dnbUulKDHL8Kzaqd308d43OCqIyghlom92NcOqYjdSwCP+gROYOgCYxDrHvYXgjC
-dgW8V/Y9fttv+05n8aE08Nzi8kh46GcyCAv40uGDSpWXdrxJUrqQtKbYvzdb1QE+
-sFPhQGVEjKjJk5Q7A178641S76Ur/J+uSet8IH3Mf2XMW0x+SZfUbtV8ste2qwjr
-RfOK+qr7APrsYHFDDLHX0sNfTPCe0KDDzH2jkcbyLfpDEHwRHE+jKBIqYtg1BbKk
-37nWm2DAw0wP6nAu8N4T
-=aXFd
+iQJ8BAEBCABmBQJToHx2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMzMP/2Mz1ZDA2Bi4Xwv4rBy8SQI5
+pfTh198Vzq70Mck7JSsh/idf1dxPdL1yq/adRFhJq05icgFHm2JRvfgff/VX5jep
+sa55YBKOghL4SeSpenQKBgVNwMKJ7/ESHHixPwL4sRQCERpki7jSKYYmcfqqhI6q
+QrL7DNrYTkDhoW+sJEGET9trz54CkHnKU+6CMI9tTTGaTyik9Fx63TIiJNEzkifw
+HLZgZoHZjyQ749rlhHNJkYqrRYjgIQAr2pHdIfWQ53EJQJ/LIL8+UJGxY05xW/q4
+F3J/QOSdKP4NY4hSbPAl9B6Nf82JztjjowPZsrwtt/nI073PKZGde2YKADAE5g1o
+Fe4Wwoe2n5DyP/p9fdIEulanDDE0yU7cSUjsQmhQ5Ex+rzfkMdt7Jwa0VmY72nIe
+iPrZG/CAzLc1Vyr19VT3XO6jmU5D3ACimQwby5fsn+8jyolMS54mlYMFScZMVOwr
+FY4PHQG6D0c6W5+Ob0WLPMnaENsjcdiEsZ+jPCY1jRdLLHllj6jp7iM7hwcyTumf
+Ysvl5MHT1ps2UObQWBNvHuUqvKF9N7yQO2nCA/alWRI8k7dAY0Z9hPrK45IuOrVG
++XgIOSQ+uTeJij+LhnzRBiNlgqkwcJn1lZRp/d23Ra2E57jomJubwW79pzHNQNRi
+8k6VEZ05IdN2yRQiP8EJ
+=sYTM
 -----END PGP SIGNATURE-----
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..534a1eb31f39
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild,v 1.1 2014/06/17 17:35:48 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-0.3.9[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util/ChangeLog b/x11-libs/xcb-util/ChangeLog
index 1ef6c3ecae58..b1c61a987ede 100644
--- a/x11-libs/xcb-util/ChangeLog
+++ b/x11-libs/xcb-util/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xcb-util
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/ChangeLog,v 1.69 2013/02/23 02:45:25 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/ChangeLog,v 1.70 2014/06/17 17:35:43 mgorny Exp $
+
+*xcb-util-0.3.9-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +xcb-util-0.3.9-r1.ebuild:
+  Enable multilib support.
 
   23 Feb 2013; Zac Medico <zmedico@gentoo.org> xcb-util-0.3.9.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 3cc4b997ed02..f282be8e0777 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -6,13 +6,26 @@ DIST xcb-util-0.3.8.tar.bz2 266339 SHA256 c1eed9284750bc09352e60654df77bb585dbbe
 DIST xcb-util-0.3.9.tar.bz2 287855 SHA256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4 SHA512 3cf2e1da2c8099e66e7200e074f31d0c5913533382bceeedb663aab3ef2571533271218a17ad638db26b8ab9be41743e4665e1db8f85c85b1a42890329e1254a WHIRLPOOL 75dbd708103fc775f9bbd21f8e408a205d298389f6232b810e026a87a75580c90529a88a54d6453b79b21b7aa7c17c00473870fd7721d7337af3b262ca83a13c
 EBUILD xcb-util-0.3.6.ebuild 1150 SHA256 50c131db802b64dc5d34d869a4d9d14f44161613afa7d3c82a35ff7c2c75590d SHA512 8f0014012f9cee717ecd4fa4b248f23430b41f31eb358d22fa62666f7d9167bdfd638c23e959c467ce6ce780f4fc0c875da232cd401254502b223a36282061ba WHIRLPOOL 4286b6d5f2549b0747eeff541ffca2cefd31e76836ade8831d6363800fc7899434ddbb8f7cb9b1e0795361ab6feb5bce3e41ba0566f1d5e80b07b1f6712ec8fd
 EBUILD xcb-util-0.3.8.ebuild 1101 SHA256 70a690d8735743a7c035a45f9e4a0b622765ed96177e927dfdcb08d4c3eace7c SHA512 c4614e82e82306c876fc4422cdcacaa07e240631be6c3d602dc181db3bcf980aa2d962993e19c6cfa5aea0a9f36fae6278c05ddba18dddc2826b3409a6d53a92 WHIRLPOOL c5725c695b9c9897241611e4a4f80721d39ea1b9b72b7781f2cc22a4645947257138238ca00e038308fc9c626e4df99f68a1c75e675ce7ae174f8226e3538ca0
+EBUILD xcb-util-0.3.9-r1.ebuild 1290 SHA256 b1ba173aae415325ff216a5e490442cb63408390ad8caa65267637f559b3d3fd SHA512 5b00d93e026b1a407b2b4129c981432e432dabf1c820f44c4631cd138a4d62f2b660895484c4888fe81e0e907cb31c5e599f20106da04962d2d21e38424f2b25 WHIRLPOOL 666a633095050ff2816db44752d541188a68f05afd704f57b74a7f567cde23019a1ada83af6bd76d43a8f1f68b62293fdf8f74ede4733065b5b2a926706997da
 EBUILD xcb-util-0.3.9.ebuild 1111 SHA256 c6cb100dad7eb7cdd21ed8a9709f97ff974136f8283b9c78a0341e23d8799c05 SHA512 a3ece85edaca70df4c282cbc5862e0f881ae8acf2306d8be6e3163a79ef78220cafb51e6febce36c42e7b333f2a312ff1e5157d285f862905b42ebc17340b1dc WHIRLPOOL 6ddc86f0ea108358b535455627cffd752da1f7f5335042f649afda7548f05be69555a261127bd5dc387820fe0d80d59ac26bc916acaa8fca169c04288c97076c
-MISC ChangeLog 8441 SHA256 cd0c3bfe8b5b134d882e15eb876e4f0f9a1b188be65da495dbb72a8f6c6a4373 SHA512 295a718430a5061da8f1824a898aeb65423eebbe9b8d523dc83974bb086eee13c7d945bd1c6e4bda39899d9990575200d90f6b040f6e37bd016bf25d1912f83b WHIRLPOOL 4e0d003a78be3800098f5f08c137ab3bea65dd941847086540874450640bc6b4fb4f264034994f6a4b2b0933f733b69dbcf571905641cdcd07c06cb5f2dd4c5b
+MISC ChangeLog 8579 SHA256 5a29f70fa93c352c59995de511bdb5e7513c49b9999b9ba12ab25ac3e3e93de5 SHA512 1ce070fec2c5564539e27e2599ba41f9a072517a8d6176a751d98d5b1e8333e1ca68ea46d2e61354cd468e502cd59c7dd55549f2f8b94b83633fa620e8afe2e0 WHIRLPOOL f5e5da8cd2d1e84ee4f05d32fc3cf5b81f3dd592dae832cd7d8b26c8df2adf02704f22255ec139a47fb6552dbd3ddbca7ca62ada72dcf7f7a767e4e08f4dabe7
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlEoLUcACgkQ/ejvha5XGaM69ACfRrTn/n5+qgsRhGjpmDggXZAN
-Ha8AnRrm11fwVLC2FAVNfci5rmdSOQce
-=YqXD
+iQJ8BAEBCABmBQJToHxxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgh4QALjPzGpoW7GLoUk9411Az8Gz
+JSl4Mzf/G4+YUOQ+gyhIP/F6aUXLqiY0MmUyHPm5J7IEHwhQnXd/FPE5yKF4KYYe
+iG59si1h39WlFjoNfwfncLXrxqCvKyfjx1zbEm/te2bVcUsJ9E5cLbvIgdogL+Bi
+ZEtT2m6CUrRrBJ3JYJiByaqFyeByJ5sOhG0lEMnORoFiXu797Uyrw1mbkHxwymtk
+ZjRdYn/0cc12GM7OMmoyEh2nOT4HzyC3RhUoDU9Mzes0lR8K+q9EUgQ6wbmLFWii
+gdrJi3nYi38+AoXe566+kzEzC0p+Cgp1RPaIfdr2MFcUhxLxzXRbe9ezXm8YH3pf
+jC+6EIATErqbq+AZ/7jst8oSHYwKpc2iJoNOL4HhMTYLPDlQE5tz/7yG6PnOfbFR
+32YAWrSitgswYAOWQ2oOutwFVEKErpL//LR9K/7SgCUbhnDp8uCEirvNCOga/kPX
+qMTdmbO0D0KqCBje7Q0f5zmGSov6mG711PtHFdQ7kaTWi5DYOHbj0mVrI6JVsR6V
+e3OHNN9qGudtTdDolilfj7+TWfF0pMKQMRhR6/ZqUkf7OjzUghch3BlYDZ114V5e
+1WoxEx1o4kws7ui5J+M7g4AYKiNexaN89AqtPtIuWnWY8EFHOTmcHTSbbN5Y33HQ
+3XANhFpDHRxl40VjD4Sq
+=RoL/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..7e1f143fac29
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild,v 1.1 2014/06/17 17:35:43 mgorny Exp $
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.7[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.4[${MULTILIB_USEDEP}] )"
+
+PDEPEND="
+	>=x11-libs/xcb-util-image-${PV}[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-keysyms-${PV}[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.8[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-wm-${PV}[${MULTILIB_USEDEP}]
+"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+	)
+
+	xorg-2_src_configure
+}