diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 3bf7ab0..1668bb4 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -27,8 +27,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc static-libs"
 
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 09c3192..a4ad366 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -94,40 +94,40 @@ RDEPEND="
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.7
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-215[${MULTILIB_USEDEP}] )
-	dri3? ( >=virtual/libudev-215[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
 	llvm? (
 		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 			) )
 		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 			) )
 		!video_cards_r600? (
 			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 				) )
 		)
-		>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
 	)
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc
 			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8[${MULTILIB_USEDEP}] )
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
 "
 for card in ${INTEL_CARDS}; do
@@ -149,23 +149,23 @@ DEPEND="${RDEPEND}
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.3:=[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
 	sys-devel/bison
 	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
 	dri3? (
-		>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
 	)
-	>=x11-proto/glproto-1.4.16-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index 1ff2b1b..20ac512 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -14,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-7.0.24[${MULTILIB_USEDEP}]"
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index b07d606..908d1f4 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -13,11 +13,11 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
-RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libICE-1.0.8-r1:=[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
 	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
-		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+		uuid? ( >=sys-apps/util-linux-2.24.1-r3:=[${MULTILIB_USEDEP}] )
 	) ) )"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 8018308..23d3637 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -13,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 ~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.9.1[${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86bigfontproto-1.2.0-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
index 8f119e0..59ce13e 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
@@ -11,7 +11,7 @@ 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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/scrnsaverproto-1.2.2-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/scrnsaverproto-1.2.2-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild
index ca38c26..e050cb9 100644
--- a/x11-libs/libXau/libXau-9999.ebuild
+++ b/x11-libs/libXau/libXau-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 617e660..6b08587 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -13,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXpm-3.5.10-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index 9c6c167..65938f8 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -13,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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-proto/compositeproto-0.4.2-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/compositeproto-0.4.2-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index d402914..b148113 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libXrender-0.9.8:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild
index 7f9ffe8..659997a 100644
--- a/x11-libs/libXdamage/libXdamage-9999.ebuild
+++ b/x11-libs/libXdamage/libXdamage-9999.ebuild
@@ -12,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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/damageproto-1.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index 19a074f..fee926a 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -13,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-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 6732ac3..3dfb2c1 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -13,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index 89f4cb3..7ca7873 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/fixesproto-5.0-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index 2745aa4..4946d3d 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -12,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.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libXrender-0.9.8:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:=[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
 	virtual/ttf-fonts"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index c55ea0a..d74ffae 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -12,12 +12,12 @@ 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.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index c198f2a..10595ad 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xineramaproto-1.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index a0c0f0d..0c2d30a 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -13,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
-RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild
index a90ca79..2e0ce00 100644
--- a/x11-libs/libXp/libXp-9999.ebuild
+++ b/x11-libs/libXp/libXp-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/printproto-1.0.5-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/printproto-1.0.5-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index b846c51..fba214a 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -12,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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
index eddf28a..0f9a87b 100644
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ b/x11-libs/libXrandr/libXrandr-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-proto/randrproto-1.4.0-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8:=[${MULTILIB_USEDEP}]
+	>=x11-proto/randrproto-1.4.0-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/renderproto-0.11.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild
index 4ec5b5f..304db4b 100644
--- a/x11-libs/libXrender/libXrender-9999.ebuild
+++ b/x11-libs/libXrender/libXrender-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/renderproto-0.11.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index 914132f..05ad1f6 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libSM-1.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libICE-1.0.8-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index ed730d2..b1f1610 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -13,10 +13,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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-proto/recordproto-1.14.2-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/recordproto-1.14.2-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
index 6a84d34..5ea8d79 100644
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ b/x11-libs/libXv/libXv-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/videoproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild
index 4e838d0..48fa5ed 100644
--- a/x11-libs/libXvMC/libXvMC-9999.ebuild
+++ b/x11-libs/libXvMC/libXvMC-9999.ebuild
@@ -12,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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXv-1.0.10:=[${MULTILIB_USEDEP}]
+	>=x11-proto/videoproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 PDEPEND="app-admin/eselect-xvmc"
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index 75e6a85..26678fe 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -12,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-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86dgaproto-2.1-r2[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86dgaproto-2.1-r2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index 142a0c3..e558ec4 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -12,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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 99f8876..c04ae74 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -24,8 +24,8 @@ done
 IUSE="${IUSE_VIDEO_CARDS} libkms"
 RESTRICT="test" # see bug #236845
 
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
 	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index b3213ae..11d3338 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
-	zlib? (	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 1e4192b..e2df007 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -20,9 +20,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 ~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-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdmcp-1.1.1-r1:=[${MULTILIB_USEDEP}]"
 # Note: ${PYTHON_USEDEP} needs to go verbatim
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
diff --git a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
index c7891ac..f6a92dd 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
@@ -24,8 +24,8 @@ IUSE="X doc"
 DEPEND="sys-devel/bison
 	sys-devel/flex
 	X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]
 	doc? ( app-doc/doxygen )"
 RDEPEND=""
 
diff --git a/x11-libs/libxshmfence/libxshmfence-9999.ebuild b/x11-libs/libxshmfence/libxshmfence-9999.ebuild
index 9104106..a925d23 100644
--- a/x11-libs/libxshmfence/libxshmfence-9999.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-9999.ebuild
@@ -12,5 +12,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
 	${RDEPEND}"
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild
index 83093e7..90ef9e2 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild
@@ -18,12 +18,12 @@ 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-1.8-r3[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
index d97ec2b..785782d 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
@@ -18,11 +18,11 @@ 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/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
index 383c8c9..c1450e0 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
@@ -18,11 +18,11 @@ 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/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
index 4c4a023..b529f8a 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
@@ -18,11 +18,11 @@ 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/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
index eae3e19..8bcefe4 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
@@ -18,11 +18,11 @@ 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/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index 997bad9..4026a48 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -18,17 +18,17 @@ 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/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
 
 PDEPEND="
-	>=x11-libs/xcb-util-image-${PV}[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-keysyms-${PV}[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-${PV}[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-wm-${PV}[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
 "
 
 src_configure() {
diff --git a/x11-proto/fixesproto/fixesproto-9999.ebuild b/x11-proto/fixesproto/fixesproto-9999.ebuild
index 3901a32..98f291c 100644
--- a/x11-proto/fixesproto/fixesproto-9999.ebuild
+++ b/x11-proto/fixesproto/fixesproto-9999.ebuild
@@ -12,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.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"