diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 8da994c..3dee7b8 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1 @@
-DIST libX11-1.4.99.901.tar.bz2 2335927 RMD160 8c87b20275dfcfa90a785f9aad80fa98bcbed449 SHA1 af10b064c1c64ee9e7daae0a7f1f9719eb7e965a SHA256 bf238569e07e459651265735e093103322478e4d07265ad9eb55aba4d9db26db
+DIST libX11-1.6.0.tar.bz2 2373718 SHA256 53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa SHA512 d97f96ebbb6d44a002ea69cd71378882cff28e49dcfd2272654e3d1a2db4bf7fd2fd122dbd2e2c36f1fd18c2d012c79339ba6f65915a96e187096afa68f9f20d WHIRLPOOL 85d47d59e661da22c4eacdb9b187901c726af4a9679f4646e643772f20107afa1731525b997dbc1c394c1845860ece55c8b0df9dabcb222d39cc414289e85951
diff --git a/x11-libs/libX11/libX11-1.4.99.901.ebuild b/x11-libs/libX11/libX11-1.6.0.ebuild
similarity index 68%
rename from x11-libs/libX11/libX11-1.4.99.901.ebuild
rename to x11-libs/libX11/libX11-1.6.0.ebuild
index 9fcec30..365013c 100644
--- a/x11-libs/libX11/libX11-1.4.99.901.ebuild
+++ b/x11-libs/libX11/libX11-1.6.0.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.99.901.ebuild,v 1.1 2012/03/16 23:29:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.0.ebuild,v 1.1 2013/06/04 12:50:51 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
+# needs automake-1.13 without eautoreconf
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
 inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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.1.92
+RDEPEND=">=x11-libs/libxcb-1.8.1
 	x11-libs/xtrans
 	>=x11-proto/xproto-7.0.17
 	x11-proto/xf86bigfontproto
@@ -28,17 +31,14 @@
 	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 		$(use_enable doc specs)
 		$(use_enable ipv6)
 		--without-fop
 	)
-}
 
-src_configure() {
 	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
 	xorg-2_src_configure
 }
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 4459c48..f031628 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1 +1 @@
-DIST libXcursor-1.1.12.tar.bz2 297332 RMD160 22a7d2735bbb8882243a0a3bde40b1319e0b5e67 SHA1 f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c SHA256 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
+DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec
diff --git a/x11-libs/libXcursor/libXcursor-1.1.12.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
similarity index 64%
rename from x11-libs/libXcursor/libXcursor-1.1.12.ebuild
rename to x11-libs/libXcursor/libXcursor-1.1.14.ebuild
index 3e872e4..29b5c47 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.12.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.12.ebuild,v 1.7 2011/10/03 18:05:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.14.ebuild,v 1.1 2013/06/24 12:32:56 chithanh Exp $
 
 EAPI=4
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 2b4f71c..5405d12 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-DIST libXext-1.2.0.tar.bz2 313332 RMD160 2d84b0f69ef9a84af7114da7bff6bfb559ebb4fc SHA1 090d7109c5fffde8a0063e10f22f3e2ec48cf19e SHA256 4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7
+DIST libXext-1.3.2.tar.bz2 378901 SHA256 f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0 SHA512 5ed612f2c5e902648eb0438bfb8d9d6440a5baa19d95eb1253b51fe9ad8dcf903a7ee68a9455044d17ce0d486e421df0f98a069ab5ad1a49364f157bdf64efe7 WHIRLPOOL dff91d80c9bcddebd0b1eb0356395749bec3511d40bb69ea681ba55c5353827242bf60dae550081fd482678f6ab551c053ece7728a9dded62aab97a2bdf2137c
diff --git a/x11-libs/libXext/libXext-1.2.0.ebuild b/x11-libs/libXext/libXext-1.2.0.ebuild
deleted file mode 100644
index 6ebe8b9..0000000
--- a/x11-libs/libXext/libXext-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.2.0.ebuild,v 1.9 2011/02/14 18:45:28 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/libX11-1.2
-	>=x11-proto/xextproto-7.1
-	>=x11-proto/xproto-7.0.13"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.1.2-xhidden.patch" )
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop"
-}
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 0000000..f379d2f
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.2.ebuild,v 1.1 2013/06/01 12:08:13 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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.2
+	>=x11-proto/xextproto-7.1.99"
+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/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 98b9614..43aaeee 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1 +1 @@
-DIST libXfixes-5.0.tar.bz2 253777 RMD160 31764e2dcc66ef73ad3cf42ad491f2039e0e5602 SHA1 3e4d374e9026111a04cd669d4b3434273fc34fe0 SHA256 537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3
+DIST libXfixes-5.0.1.tar.bz2 291978 SHA256 63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767 SHA512 b47c841db169d1b329eec9deb555799cd087a466326840f1f5349303ba79cff5850b1bb69c1ff38b3f522f24d61db58a0c01021e1ffea2896527167262fc7150 WHIRLPOOL d4ea1f3d83173f811f93adcec0791b850354e249ca384e65c53ea404ced0e47131c7bd531d7cde5007804b3509d962c395028c7ae03c48f31ae35b0c178679a3
diff --git a/x11-libs/libXfixes/libXfixes-5.0.1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
new file mode 100644
index 0000000..ceaf6f5
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-5.0.1.ebuild,v 1.1 2013/06/01 03:17:40 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfixes library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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/fixesproto-5
+	x11-proto/xproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfixes/libXfixes-5.0.ebuild b/x11-libs/libXfixes/libXfixes-5.0.ebuild
deleted file mode 100644
index f1a6909..0000000
--- a/x11-libs/libXfixes/libXfixes-5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-5.0.ebuild,v 1.7 2011/04/16 18:08:25 armin76 Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfixes library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	>=x11-proto/fixesproto-5
-	x11-proto/xproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 09586d4..e329b02 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1 +1 @@
-DIST libXi-1.6.0.tar.bz2 418674 RMD160 a47e51cf70621ec4b8a6573f93670ec0cc5ef91c SHA1 b7edf48f93e8abd13ca688fa7f597452c4b74346 SHA256 b2fc65a24a269405c5bbe27152e97ed4c5987ca728b9d7e7576e4c9543c4a7af
+DIST libXi-1.7.1.901.tar.bz2 441364 SHA256 5248b643fc0b76fff978eefc0acdeee278407983cf7b6e371242e1b53ba32f7c SHA512 24584ec84d7cbc3b121d0723b4321a34f7e77a3ca238172b7a29d14e73c614702cce1e185eb65bb5c858488b2eb47f2a5444b6b16c31a767d433a7edd29b7a1f WHIRLPOOL f120a003ce3aad85ff98dd472bd3977d6553a898a86b7542d3e740178f5eedce0b8e41f0897a17cff0c0224a3435eaabc4124021e61d33f900833ebff47f0424
diff --git a/x11-libs/libXi/libXi-1.6.0.ebuild b/x11-libs/libXi/libXi-1.6.0.ebuild
deleted file mode 100644
index cc85c96..0000000
--- a/x11-libs/libXi/libXi-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.0.ebuild,v 1.1 2012/03/09 00:04:22 chithanh Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.4.99.1
-	>=x11-libs/libXext-1.1
-	>=x11-proto/inputproto-2.1.99.6
-	>=x11-proto/xproto-7.0.13
-	>=x11-proto/xextproto-7.0.3"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	ewarn "Some special keys and keyboard layouts may stop working."
-	ewarn "To fix them, recompile xorg-server."
-}
diff --git a/x11-libs/libXi/libXi-1.7.1.901.ebuild b/x11-libs/libXi/libXi-1.7.1.901.ebuild
new file mode 100644
index 0000000..d02b259
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.1.901.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.7.1.901.ebuild,v 1.1 2013/06/27 13:56:12 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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.4.99.1
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXfixes-5
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xextproto-7.0.3"
+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
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	ewarn "Some special keys and keyboard layouts may stop working."
+	ewarn "To fix them, recompile xorg-server."
+}
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 67e5ee3..05f0135 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1 +1 @@
-DIST libXinerama-1.1.2.tar.bz2 279682 RMD160 4b5858c8c8a2c6992ecb3c400ab3a2107e0a5667 SHA1 06a5b636305725ce09f6c3a4d5a15f2f188b5afd SHA256 a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
+DIST libXinerama-1.1.3.tar.bz2 278026 SHA256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c WHIRLPOOL a97c76b2ad26b5f322cb5990c5b7643f9d283783cbe7e22b9735473f226fa92ddd78085f70f17a6231da087410bf351d533ec53cdfe1663aeacf97421f4dbc7d
diff --git a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild b/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
deleted file mode 100644
index 087fbba..0000000
--- a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.2.ebuild,v 1.8 2012/07/12 17:49:26 ranger Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama library"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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/xineramaproto-1.2"
-DEPEND="${RDEPEND}"
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 0000000..f94382d
--- /dev/null
+++ b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.3.ebuild,v 1.1 2013/06/01 03:19:13 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama library"
+
+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 ~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/xineramaproto-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index bc898b3..ea71a89 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1 +1 @@
-DIST libXrandr-1.3.2.tar.bz2 274401 RMD160 9731fe2a704d79863ea192b33b31e7eeef57eab5 SHA1 0c844a4c5237f96794f0c18a5af16dc5ab7a36ec SHA256 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
+DIST libXrandr-1.4.1.tar.bz2 312857 SHA256 d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905 SHA512 73ceca5a1ff56e886a95fbfa250ccec49e5d847e3a6d1dd6bb38462ee30724e838706caa41caa536a87ed2811fdff8fa7d1120fde656a05699830ff978ebd1ad WHIRLPOOL ff474c27edd9dc43c18cb894741fa224155ce7fa6713e0fedf5cef5743f4e3c18322c0fbe98062d8496393e11e07b9a5fc85214c72a3b4f50ec25fa3abe7ecbc
diff --git a/x11-libs/libXrandr/libXrandr-1.3.2.ebuild b/x11-libs/libXrandr/libXrandr-1.3.2.ebuild
deleted file mode 100644
index d1aaba4..0000000
--- a/x11-libs/libXrandr/libXrandr-1.3.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.3.2.ebuild,v 1.8 2011/10/03 18:06:25 josejx Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-proto/randrproto-1.3.0
-	x11-proto/renderproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/libXrandr-1.4.1.ebuild b/x11-libs/libXrandr/libXrandr-1.4.1.ebuild
new file mode 100644
index 0000000..1db12ab
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.4.1.ebuild,v 1.1 2013/06/01 12:08:50 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrandr library"
+
+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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 6340aa3..6540e80 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1 +1 @@
-DIST libXrender-0.9.6.tar.bz2 258249 RMD160 4eb2ac0762dd533c7254b43361b21812ca12d50f SHA1 65bd96dc17da6b064f95109da02d9c9d14cb06dc SHA256 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
+DIST libXrender-0.9.8.tar.bz2 306121 SHA256 1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62 SHA512 111a0ec4e19932a50da4914d9112b0a16c1d9c800e2b8398ddaf9ed70dae1a4eb75860282ca62d023e78957bbc3f015cb80d91ba76a24595df9f8a2b7e055b58 WHIRLPOOL 1d2173b6c78fe6c19f9c23bc7813137d39913e3dbc410aa784d89324459a0055d3c4d9c62aaeecc508a7ffe5a158e2e0c9511b46aa31c8d59bfc84f426955833
diff --git a/x11-libs/libXrender/libXrender-0.9.6.ebuild b/x11-libs/libXrender/libXrender-0.9.6.ebuild
deleted file mode 100644
index 17febe9..0000000
--- a/x11-libs/libXrender/libXrender-0.9.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.6.ebuild,v 1.10 2010/10/21 01:18:16 ranger Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrender library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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/renderproto-0.9.3
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-0.9.8.ebuild b/x11-libs/libXrender/libXrender-0.9.8.ebuild
new file mode 100644
index 0000000..dbcd86d
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.8.ebuild,v 1.1 2013/06/18 14:17:08 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrender library"
+
+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 ~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/renderproto-0.9.3
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index d7ba48f..9aa4d30 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1 +1 @@
-DIST libXt-1.0.7.tar.bz2 559875 RMD160 eb6553819486cef75d2cbb76e12953c6da5fb997 SHA1 3c285b9c04a393dec1cc3d60cf5582d798eb3272 SHA256 706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
+DIST libXt-1.1.4.tar.bz2 762331 SHA256 843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57 SHA512 57721def16bf29e05deb746566400d71cf0cd5bf9b8b7ebed19abb7c6804e14073060b6cf94409903aa464d27acca2e91f55654b2d4770677b2b4b4dc78fd423 WHIRLPOOL ff97431f0afce438acceb30186b5458e0990fe27194a9457b2fb8865202c45dcdb2e9e24a9c3f3a9427ec136e74389c3b64a69b20d66e9bf04c44f61ffd930eb
diff --git a/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch b/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch
deleted file mode 100644
index fc5ea7d..0000000
--- a/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From da5ba611fbff6f939a7cec9ca41fa7df0f76a197 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Thu, 5 Nov 2009 11:55:22 +0100
-Subject: [PATCH] fix cross-compile again
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-makestrs should always be built for the target arch. When cross-compiling,
-create a native version "xmakestrs" which will always be noinst, and use it
-to generate the other sources.
-
-This avoids installing a makestrs built for the wrong arch.
-
-Based on this patch :
-http://overlays.gentoo.org/proj/embedded/browser/openmoko/trunk/openmoko-target/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- configure.ac     |    2 ++
- src/Makefile.am  |    8 +++++++-
- util/Makefile.am |   15 ++++++++++-----
- 3 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a66d45..73bfbc0 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,8 @@ AC_PROG_LIBTOOL
- AM_PROG_CC_C_O
- XORG_DEFAULT_OPTIONS
- 
-+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
-+
- if test x"$CC_FOR_BUILD" = x; then
- 	if test x"$cross_compiling" = xyes; then
- 		AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a43fb22..6b767a7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -92,12 +92,18 @@ BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
- 
- STRING_LIST = $(top_srcdir)/util/string.list
- 
-+if CROSS_COMPILING
-+MAKESTRS=$(top_builddir)/util/xmakestrs
-+else
-+MAKESTRS=$(top_builddir)/util/makestrs
-+endif
-+
- all-local: $(BUILT_FILES)
- 
- $(BUILT_HEADER): $(BUILT_SOURCE)
- 
- $(BUILT_SOURCE):
--	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
-+	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
- 	mkdir -p $(top_builddir)/src
- 	mkdir -p $(top_builddir)/include/X11
- 	cp StringDefs.h $(top_builddir)/include/X11
-diff --git a/util/Makefile.am b/util/Makefile.am
-index d51365e..6853d89 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -1,13 +1,10 @@
- if INSTALL_MAKESTRS
- bin_PROGRAMS = makestrs
-+noinst_PROGRAMS = $(MAKESTRS_PROG)
- else
--noinst_PROGRAMS = makestrs
-+noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
- endif
- 
--CC = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_FOR_BUILD@
--
- EXTRA_DIST = \
- 	Shell.ht \
- 	StrDefs.ct \
-@@ -45,3 +42,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
- 
- .man.$(APP_MAN_SUFFIX):
- 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-+
-+if CROSS_COMPILING
-+MAKESTRS_PROG=xmakestrs$(EXEEXT)
-+
-+xmakestrs$(EXEEXT): makestrs.c
-+	$(AM_V_GEN)$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
-+endif
--- 
-1.6.5.2
-
diff --git a/x11-libs/libXt/libXt-1.0.7-r1.ebuild b/x11-libs/libXt/libXt-1.0.7-r1.ebuild
deleted file mode 100644
index 446431c..0000000
--- a/x11-libs/libXt/libXt-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.7-r1.ebuild,v 1.10 2010/01/19 20:09:44 armin76 Exp $
-
-SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic toolchain-funcs
-
-DESCRIPTION="X.Org Xt library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-proto/xproto
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cross-compile-again.patch" )
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-
-	if tc-is-cross-compiler; then
-		export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
-	fi
-}
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 0000000..b70a702
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.4.ebuild,v 1.1 2013/06/01 03:21:04 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org Xt library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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-libs/libSM
+	x11-libs/libICE
+	x11-proto/xproto
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-is-cross-compiler && export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libXt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index a44ac25..5cbe247 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1 +1 @@
-DIST libXv-1.0.6.tar.bz2 271504 RMD160 eb7a241a9981c15572209cb1406532db02f81456 SHA1 9ebb6d7936a7b247b9b0f6dc81def39a18e4214c SHA256 e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
+DIST libXv-1.0.9.tar.bz2 309744 SHA256 a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b SHA512 283c96484066fa2b3dcd2c518d3e7262fa7271eabbbca6cf2f935df7fd004047e20c27695241656abf03738ae6446c45feb5017f3fe11f7ed8ff20a4097cd1ae WHIRLPOOL 20ac48b402e86842842522e528286adc3e8c99367cd24f1da863cf3aff68c68a27939ae0dcd464ee68fabc557f002c402c22d7802ec681fc82b713a54e5708ac
diff --git a/x11-libs/libXv/libXv-1.0.6.ebuild b/x11-libs/libXv/libXv-1.0.6.ebuild
deleted file mode 100644
index e50ce6b..0000000
--- a/x11-libs/libXv/libXv-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.6.ebuild,v 1.9 2011/02/14 23:08:48 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xv library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/videoproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/libXv-1.0.9.ebuild b/x11-libs/libXv/libXv-1.0.9.ebuild
new file mode 100644
index 0000000..88b1fe9
--- /dev/null
+++ b/x11-libs/libXv/libXv-1.0.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.9.ebuild,v 1.1 2013/06/23 04:52:22 mattst88 Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xv library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-proto/videoproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index eaf81b6..ab6a04a 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1 +1 @@
-DIST libXvMC-1.0.6.tar.bz2 270013 RMD160 c400661c4b2a401ccfb5efa0c01d0fdc7fdf8168 SHA1 4ace7e7ce6b646b5715b2efa561affc89bc87f91 SHA256 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
+DIST libXvMC-1.0.8.tar.bz2 305234 SHA256 5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204 SHA512 781a53ad1d60a06019ed24150b85a96f2608e6ca0d876de9f06511c0e086cdf837804994e33b51ee8b3714150dc1d6060449e89ab7458476c8535b5b336147bf WHIRLPOOL 67c7d2694310d386b7ad8f6db928fa02af2ba2a9aab3a1e2ff222eca490672474cc3abd767b4fdc2433f90e69f655334eb209747644943a980e6c1ad0f1c3521
diff --git a/x11-libs/libXvMC/libXvMC-1.0.6.ebuild b/x11-libs/libXvMC/libXvMC-1.0.6.ebuild
deleted file mode 100644
index 27890a1..0000000
--- a/x11-libs/libXvMC/libXvMC-1.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.6.ebuild,v 1.8 2011/02/14 23:22:40 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X.Org XvMC library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-proto/videoproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/eselect-xvmc"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.8.ebuild b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
new file mode 100644
index 0000000..81fe882
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.8.ebuild,v 1.1 2013/06/18 14:07:42 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XvMC library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-proto/videoproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+PDEPEND="app-admin/eselect-xvmc"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 03213b3..9b9df86 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1 +1 @@
-DIST libXxf86vm-1.1.1.tar.bz2 252404 RMD160 e4d28d2e4462bd76416eb9c7e0395c242572a313 SHA1 2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af SHA256 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
+DIST libXxf86vm-1.1.3.tar.bz2 284279 SHA256 da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8 SHA512 7cd5491b79920f9c1d134f2815f14d45b0a29cf5f99d866c35418b6f84ce6b48e702db3472bd7c6158804e573f2384ad4ebee78e5ea8f07afec2e34489d99ed4 WHIRLPOOL 9dcec1f837d53f6541cb950cca7f47194e7a99dd7d1ea7187316472940ea04e1ff25a02f66a5c775063b639027684a227dd6a713f78b2f5170af28ee398b9dd6
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
deleted file mode 100644
index c4c0258b..0000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild,v 1.9 2011/02/14 22:57:04 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~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/xf86vidmodeproto-2.3
-	x11-proto/xextproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
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 0000000..65f3dbb
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild,v 1.1 2013/06/01 03:22:17 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-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/xf86vidmodeproto-2.3
+	x11-proto/xextproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
new file mode 100644
index 0000000..29e5b03
--- /dev/null
+++ b/x11-libs/libxcb/Manifest
@@ -0,0 +1 @@
+DIST libxcb-1.9.1.tar.bz2 373312 SHA256 d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f SHA512 541d6e07b1a0da61c3cc1dbdae50ce4e55f1a27e79e277db5af192d02c8360bb3958c597d6692f2c6afcf009ae7b312459f65e8c8d2f1bcc446f7f512bacdd41 WHIRLPOOL cc2af531d5beddec577507d4cf983262069144d7e9667958ce03bba6ceebb907488ddf475253e856b879e81333cfac8bfbc2c8092d60fbfa49a3b447af6e6f68
diff --git a/x11-libs/libxcb/libxcb-1.9.1.ebuild b/x11-libs/libxcb/libxcb-1.9.1.ebuild
new file mode 100644
index 0000000..976b98b
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.9.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9.1.ebuild,v 1.3 2013/06/30 15:16:12 jlec Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+RDEPEND="dev-libs/libpthread-stubs
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+DEPEND="${RDEPEND}
+	dev-lang/python[xml]
+	dev-libs/libxslt
+	>=x11-proto/xcb-proto-1.7-r1"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc build-docs)
+		$(use_enable selinux)
+		$(use_enable xkb)
+		--enable-xinput
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 2dd5e44..6320401 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1 +1 @@
-DIST inputproto-2.2.tar.bz2 178839 RMD160 7b93f798ab953e21e64a21170d6d151c6ffe3171 SHA1 500e0a6dac3523887c0b82753fe5e9d4bb982137 SHA256 de7516ab25c299740da46c0f1af02f1831c5aa93b7283f512c0f35edaac2bcb0
+DIST inputproto-2.3.tar.bz2 195642 SHA256 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f SHA512 4bc3986a49273777850342cfa086641eeba0fd95ad428a2f025bd44e9ea04516cb6e190b3fd2a99fe21c63d9fe4010bebe57aefe3807050d00f8b301289ec43a WHIRLPOOL 6604906b9bf756559a6ba236b4f0b4fb97062e6b09aac57fdd17c3e1ca7c4bec470f725c2e4a1a3252fae4326a27e06486008e8f859cc58c1b0471482066f7fb
diff --git a/x11-proto/inputproto/inputproto-2.2.ebuild b/x11-proto/inputproto/inputproto-2.2.ebuild
deleted file mode 100644
index b74e001..0000000
--- a/x11-proto/inputproto/inputproto-2.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.2.ebuild,v 1.1 2012/03/04 21:04:53 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Input protocol headers"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/inputproto/inputproto-2.3.ebuild b/x11-proto/inputproto/inputproto-2.3.ebuild
new file mode 100644
index 0000000..cfcbabd
--- /dev/null
+++ b/x11-proto/inputproto/inputproto-2.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.3.ebuild,v 1.1 2013/03/08 00:01:57 chithanh Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Input protocol headers"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 2f02acd..9c08d20 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -1 +1 @@
-DIST randrproto-1.3.2.tar.bz2 122915 RMD160 76c70ebfb3e30b833cd9ca92ee0b466e501338ff SHA1 55d4b1a09fc8e645d9674a452ae151988caabad1 SHA256 d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
+DIST randrproto-1.4.0.tar.bz2 133300 SHA256 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf SHA512 7880360e0f63a9bf88bc4ea76160311ba1d64af30414068df90d6b613b5cc24c2cc7986f2e68ee9a2fcde1359108da25017dd32885b09e878406e66aefe06f0d WHIRLPOOL 83eaabaec01650f3573ce064004f5ab2ae15d3c527b0e825fdd91325e12b2c97c15e86b582279346cd53a5246f224b922d01d39a6a21ac2099440b9882ca9e6c
diff --git a/x11-proto/randrproto/randrproto-1.3.2.ebuild b/x11-proto/randrproto/randrproto-1.3.2.ebuild
deleted file mode 100644
index ab82564..0000000
--- a/x11-proto/randrproto/randrproto-1.3.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/randrproto-1.3.2.ebuild,v 1.8 2011/02/14 13:53:18 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Randr protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
new file mode 100644
index 0000000..641be4a
--- /dev/null
+++ b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild,v 1.1 2013/02/25 21:51:06 mgorny Exp $
+
+EAPI=4
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Randr protocol headers"
+
+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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"