[gentoo-commits] proj/x11:master commit in: x11-proto/kbproto/, x11-proto/scrnsaverproto/, x11-proto/inputproto/, ...

[Michał Górny]

commit:     95743f39390de4cf45d9a02bb4b86f3d1b94bda3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 22:49:20 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 22:40:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=95743f39

Conver the packages from emul-linux-x86-xlibs to multilib.

---
 x11-libs/libICE/libICE-9999.ebuild                 |    3 ++-
 x11-libs/libSM/libSM-9999.ebuild                   |   12 +++++++++---
 x11-libs/libX11/libX11-9999.ebuild                 |   13 +++++++------
 x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild   |    8 +++++---
 x11-libs/libXau/libXau-9999.ebuild                 |    4 +++-
 x11-libs/libXaw/libXaw-9999.ebuild                 |   15 ++++++++-------
 x11-libs/libXcomposite/libXcomposite-9999.ebuild   |    9 +++++----
 x11-libs/libXcursor/libXcursor-9999.ebuild         |    8 +++++---
 x11-libs/libXdamage/libXdamage-9999.ebuild         |   10 ++++++----
 x11-libs/libXdmcp/libXdmcp-9999.ebuild             |    3 ++-
 x11-libs/libXext/libXext-9999.ebuild               |    5 +++--
 x11-libs/libXfixes/libXfixes-9999.ebuild           |   10 ++++++----
 x11-libs/libXft/libXft-9999.ebuild                 |   14 ++++++++------
 x11-libs/libXi/libXi-9999.ebuild                   |   11 ++++++-----
 x11-libs/libXinerama/libXinerama-9999.ebuild       |   10 ++++++----
 x11-libs/libXmu/libXmu-9999.ebuild                 |    9 +++++----
 x11-libs/libXp/libXp-9999.ebuild                   |   10 ++++++----
 x11-libs/libXpm/libXpm-9999.ebuild                 |   12 +++++++-----
 x11-libs/libXrandr/libXrandr-9999.ebuild           |   14 ++++++++------
 x11-libs/libXrender/libXrender-9999.ebuild         |    8 +++++---
 x11-libs/libXt/libXt-9999.ebuild                   |   12 +++++++-----
 x11-libs/libXtst/libXtst-9999.ebuild               |   14 ++++++++------
 x11-libs/libXv/libXv-9999.ebuild                   |   10 ++++++----
 x11-libs/libXvMC/libXvMC-9999.ebuild               |   12 +++++++-----
 x11-libs/libXxf86dga/libXxf86dga-9999.ebuild       |   12 +++++++-----
 x11-libs/libXxf86vm/libXxf86vm-9999.ebuild         |   12 +++++++-----
 x11-libs/libpciaccess/libpciaccess-9999.ebuild     |   12 +++++++++++-
 x11-libs/libxcb/libxcb-9999.ebuild                 |    7 ++++---
 .../compositeproto/compositeproto-9999.ebuild      |    2 ++
 x11-proto/damageproto/damageproto-9999.ebuild      |    2 ++
 x11-proto/fixesproto/fixesproto-9999.ebuild        |    4 +++-
 x11-proto/inputproto/inputproto-9999.ebuild        |    2 ++
 x11-proto/kbproto/kbproto-9999.ebuild              |    2 ++
 x11-proto/printproto/printproto-9999.ebuild        |    2 ++
 x11-proto/randrproto/randrproto-9999.ebuild        |    2 ++
 x11-proto/recordproto/recordproto-9999.ebuild      |    1 +
 x11-proto/renderproto/renderproto-9999.ebuild      |    2 ++
 .../scrnsaverproto/scrnsaverproto-9999.ebuild      |    1 +
 x11-proto/videoproto/videoproto-9999.ebuild        |    2 ++
 x11-proto/xextproto/xextproto-9999.ebuild          |    1 +
 .../xf86bigfontproto/xf86bigfontproto-9999.ebuild  |    2 ++
 x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild    |    2 ++
 .../xf86vidmodeproto/xf86vidmodeproto-9999.ebuild  |    2 ++
 x11-proto/xineramaproto/xineramaproto-9999.ebuild  |    2 ++
 x11-proto/xproto/xproto-9999.ebuild                |    1 +
 45 files changed, 200 insertions(+), 111 deletions(-)

diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index c9394dd..3b2f06a 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org ICE library"
@@ -13,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
-	x11-proto/xproto"
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index d8fdd3e..80d6ffa 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
@@ -12,11 +13,16 @@ DESCRIPTION="X.Org SM library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~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="ipv6 +uuid"
 
-RDEPEND=">=x11-libs/libICE-1.0.5
+RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	x11-proto/xproto
+	x11-proto/xproto[${MULTILIB_USEDEP}]
 	!elibc_FreeBSD? ( !elibc_SunOS? (
-		uuid? ( >=sys-apps/util-linux-2.16 )
+		uuid? (
+			>=sys-apps/util-linux-2.16
+			abi_x86_32? (
+				app-emulation/emul-linux-x86-baselibs[development]
+			)
+		)
 	) )"
 DEPEND="${RDEPEND}"
 

diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 8dd5b74..58dfc7d 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
@@ -12,13 +13,13 @@ DESCRIPTION="X.Org X11 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 ~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.1.92[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	>=x11-proto/xproto-7.0.17
-	x11-proto/xf86bigfontproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xextproto"
+	>=x11-proto/xproto-7.0.17[${MULTILIB_USEDEP}]
+	x11-proto/xf86bigfontproto[${MULTILIB_USEDEP}]
+	x11-proto/inputproto[${MULTILIB_USEDEP}]
+	x11-proto/kbproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 

diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
index 3ba08ea..73e8983 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
@@ -3,13 +3,15 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
 KEYWORDS="~alpha ~amd64 ~arm ~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
-	x11-libs/libXext
-	>=x11-proto/scrnsaverproto-1.2"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	>=x11-proto/scrnsaverproto-1.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild
index f5b1b2e..c70bd6f 100644
--- a/x11-libs/libXau/libXau-9999.ebuild
+++ b/x11-libs/libXau/libXau-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xau library"
@@ -10,5 +12,5 @@ DESCRIPTION="X.Org Xau 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND="x11-proto/xproto"
+RDEPEND="x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 7e51d54..4223a8f 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
@@ -12,13 +13,13 @@ DESCRIPTION="X.Org Xaw 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-proto/xproto
-	x11-proto/xextproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXmu[${MULTILIB_USEDEP}]
+	x11-libs/libXpm[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index 5e593d5..5d134ec 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xcomposite library"
@@ -12,10 +13,10 @@ DESCRIPTION="X.Org Xcomposite 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	>=x11-proto/compositeproto-0.4
-	x11-proto/xproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	>=x11-proto/compositeproto-0.4[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index e789ae5..7395b01 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
@@ -10,9 +12,9 @@ DESCRIPTION="X.Org Xcursor 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/libXrender-0.8.2
-	x11-libs/libXfixes
-	x11-libs/libX11"
+RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 XORG_CONFIGURE_OPTIONS=(

diff --git a/x11-libs/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild
index 1345d0b..051f23a 100644
--- a/x11-libs/libXdamage/libXdamage-9999.ebuild
+++ b/x11-libs/libXdamage/libXdamage-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xdamage library"
@@ -10,8 +12,8 @@ DESCRIPTION="X.Org Xdamage 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	>=x11-proto/damageproto-1.1
-	x11-proto/xproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	>=x11-proto/damageproto-1.1[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index fb27c49..337c988 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xdmcp library"
@@ -12,7 +13,7 @@ DESCRIPTION="X.Org Xdmcp 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND="x11-proto/xproto"
+RDEPEND="x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 5a639ab..6b1a772 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
@@ -12,8 +13,8 @@ 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 ~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"
+RDEPEND=">=x11-libs/libX11-1.2[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.1.99[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index 3ddcf53..22954e8 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
@@ -10,8 +12,8 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	>=x11-proto/fixesproto-5[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index 169a519..ee8b774 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
@@ -10,11 +12,11 @@ DESCRIPTION="X.Org Xft 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libXrender-0.8.2
-	x11-libs/libX11
-	x11-libs/libXext
-	media-libs/freetype
-	media-libs/fontconfig
-	x11-proto/xproto
+RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
 	virtual/ttf-fonts"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index ea6e5be..242ab90 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -5,17 +5,18 @@
 EAPI=5
 
 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 ~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-proto/inputproto-2.2.99.1
-	>=x11-proto/xproto-7.0.13
-	>=x11-proto/xextproto-7.0.3"
+RDEPEND=">=x11-libs/libX11-1.4.99.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.1[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.2.99.1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.13[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.0.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index 184230a..e83db6c 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
@@ -10,8 +12,8 @@ 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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	>=x11-proto/xineramaproto-1.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index 9d6ce14..b4e535e 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
@@ -12,10 +13,10 @@ DESCRIPTION="X.Org Xmu 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 ~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"
+RDEPEND="x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild
index f222f50..e0202a7 100644
--- a/x11-libs/libXp/libXp-9999.ebuild
+++ b/x11-libs/libXp/libXp-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xp library"
@@ -10,8 +12,8 @@ DESCRIPTION="X.Org Xp library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~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/libXau
-	x11-proto/printproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
+	x11-proto/printproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index 1694063..1d9605a 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xpm library"
@@ -10,11 +12,11 @@ DESCRIPTION="X.Org Xpm 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/xproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 

diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
index 4eca882..8f98e19 100644
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ b/x11-libs/libXrandr/libXrandr-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xrandr library"
@@ -10,10 +12,10 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-proto/randrproto[${MULTILIB_USEDEP}]
+	x11-proto/renderproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild
index f994950..179d075 100644
--- a/x11-libs/libXrender/libXrender-9999.ebuild
+++ b/x11-libs/libXrender/libXrender-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
@@ -10,7 +12,7 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	>=x11-proto/renderproto-0.9.3[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index 80c5796..b4e41d5 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
@@ -10,11 +12,11 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	x11-proto/kbproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {

diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index f1e4340..12a78e9 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xtst library"
@@ -10,10 +12,10 @@ DESCRIPTION="X.Org Xtst library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-1.0.99.4
-	  x11-libs/libXi
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/xextproto-7.0.99.3
-	x11-proto/inputproto"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.0.99.4[${MULTILIB_USEDEP}]
+	  x11-libs/libXi[${MULTILIB_USEDEP}]
+	>=x11-proto/recordproto-1.13.99.1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.0.99.3[${MULTILIB_USEDEP}]
+	x11-proto/inputproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
index af9bfd2..fd28924 100644
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ b/x11-libs/libXv/libXv-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
@@ -10,8 +12,8 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/videoproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild
index 691515a..d41e9f8 100644
--- a/x11-libs/libXvMC/libXvMC-9999.ebuild
+++ b/x11-libs/libXvMC/libXvMC-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XvMC library"
@@ -10,10 +12,10 @@ 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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	x11-proto/videoproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 PDEPEND="app-admin/eselect-xvmc"

diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index 646278f..ca9b307 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86dga library"
@@ -10,9 +12,9 @@ DESCRIPTION="X.Org Xxf86dga library"
 KEYWORDS="~alpha ~amd64 ~arm ~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
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/xproto
-	>=x11-proto/xf86dgaproto-2.0.99.2"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86dgaproto-2.0.99.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index 76a195f..7814bb3 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
@@ -10,9 +12,9 @@ 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 ~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"
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index ba0a404..fd0db99 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
@@ -24,8 +26,16 @@ src_configure() {
 
 src_install() {
 	xorg-2_src_install
+
 	if ! use minimal; then
+		scanpci_install() {
+			${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" \
+				--mode=install "$(type -P install)" -c \
+				"${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" \
+				"${ED}"/usr/bin || die
+		}
+
 		dodir /usr/bin || die
-		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
+		multilib_foreach_impl scanpci_install
 	fi
 }

diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 70888fb..63dbf27 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X C-language Bindings library"
@@ -16,9 +17,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="selinux"
 
-RDEPEND="dev-libs/libpthread-stubs
-	x11-libs/libXau
-	x11-libs/libXdmcp"
+RDEPEND="dev-libs/libpthread-stubs[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
+	x11-libs/libXdmcp[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-lang/python[xml]
 	dev-libs/libxslt

diff --git a/x11-proto/compositeproto/compositeproto-9999.ebuild b/x11-proto/compositeproto/compositeproto-9999.ebuild
index 4a165d7..8dc7079 100644
--- a/x11-proto/compositeproto/compositeproto-9999.ebuild
+++ b/x11-proto/compositeproto/compositeproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Composite protocol headers"

diff --git a/x11-proto/damageproto/damageproto-9999.ebuild b/x11-proto/damageproto/damageproto-9999.ebuild
index ded99cb..6c6160c 100644
--- a/x11-proto/damageproto/damageproto-9999.ebuild
+++ b/x11-proto/damageproto/damageproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Damage protocol headers"

diff --git a/x11-proto/fixesproto/fixesproto-9999.ebuild b/x11-proto/fixesproto/fixesproto-9999.ebuild
index 301416f..3fa35fe 100644
--- a/x11-proto/fixesproto/fixesproto-9999.ebuild
+++ b/x11-proto/fixesproto/fixesproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Fixes protocol headers"
@@ -10,5 +12,5 @@ DESCRIPTION="X.Org Fixes protocol headers"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-proto/xextproto-7.0.99.1"
+RDEPEND=">=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-proto/inputproto/inputproto-9999.ebuild b/x11-proto/inputproto/inputproto-9999.ebuild
index 5cb4acb..ac8c107 100644
--- a/x11-proto/inputproto/inputproto-9999.ebuild
+++ b/x11-proto/inputproto/inputproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Input protocol headers"

diff --git a/x11-proto/kbproto/kbproto-9999.ebuild b/x11-proto/kbproto/kbproto-9999.ebuild
index 0e42d2f..99a593c 100644
--- a/x11-proto/kbproto/kbproto-9999.ebuild
+++ b/x11-proto/kbproto/kbproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org KB protocol headers"

diff --git a/x11-proto/printproto/printproto-9999.ebuild b/x11-proto/printproto/printproto-9999.ebuild
index 7cdd441..8afb9b0 100644
--- a/x11-proto/printproto/printproto-9999.ebuild
+++ b/x11-proto/printproto/printproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Print protocol headers"

diff --git a/x11-proto/randrproto/randrproto-9999.ebuild b/x11-proto/randrproto/randrproto-9999.ebuild
index 1268f2d..8bfe9f9 100644
--- a/x11-proto/randrproto/randrproto-9999.ebuild
+++ b/x11-proto/randrproto/randrproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Randr protocol headers"

diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 53b7e93..05cc82b 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Record protocol headers"

diff --git a/x11-proto/renderproto/renderproto-9999.ebuild b/x11-proto/renderproto/renderproto-9999.ebuild
index 9c5b4a5..57e3895 100644
--- a/x11-proto/renderproto/renderproto-9999.ebuild
+++ b/x11-proto/renderproto/renderproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Render protocol headers"

diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index 614f794..a95e8d0 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org ScrnSaver protocol headers"

diff --git a/x11-proto/videoproto/videoproto-9999.ebuild b/x11-proto/videoproto/videoproto-9999.ebuild
index 8355569..35f257f 100644
--- a/x11-proto/videoproto/videoproto-9999.ebuild
+++ b/x11-proto/videoproto/videoproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Video protocol headers"

diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index 7ba9a1d..0c92126 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XExt protocol headers"

diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
index 28fc6b9..74acd28 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XF86BigFont protocol headers"

diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
index 59dd7e9..75e1f91 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XF86DGA protocol headers"

diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
index 5fabcb7..604db37 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XF86VidMode protocol headers"

diff --git a/x11-proto/xineramaproto/xineramaproto-9999.ebuild b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
index 89642a6..1f02883 100644
--- a/x11-proto/xineramaproto/xineramaproto-9999.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama protocol headers"

diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild
index 68293f0..5b70c35 100644
--- a/x11-proto/xproto/xproto-9999.ebuild
+++ b/x11-proto/xproto/xproto-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"