diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index c2c41020dbbe..aa4461469e54 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,5 +1,6 @@
 DIST monit-5.12.2.tar.gz 1192066 SHA256 8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c SHA512 086f9af2c6d155c5375e7de5641025707f34577d4f2a4a76d1a104361b5d5793a4f04313cafb5d6884a01aba59f1bbb405b37294ba133d9a93c05e484e5933ff WHIRLPOOL 3d25ab0dc3cfe0e2c881f35e48b64355fe12ce1d3357450d2b1d2aba7344acbe55c031e4fd6b49f7c523b674ff650cbad5bbc91853ec15dd10e64f164504ea70
 DIST monit-5.13.tar.gz 1193463 SHA256 9abae036f3be93a19c6b476ecd106b29d4da755bbc05f0a323e882eab6b2c5a9 SHA512 257fc9d5ece7b39973107adef51b437941c944909efa03949f53067a0811ab8929ea57e98cbf06a22dd6d69aaa0aadd65a22788165819ede8316dcd1894ad546 WHIRLPOOL 7556bd2299b4f930525877543c74c9a30f4a719e7abfb7e5b596ba070dc5c9a6aefaf129891e7ba1f5d1643bc8edbbfd9b35513b38c1bfec143f33e34b667420
+DIST monit-5.14.tar.gz 1200131 SHA256 d0424c3ee8ed43d670ba039184a972ac9f3ad6f45b0806ec17c23820996256c6 SHA512 6491434e15fab6f92e29b9f490418332a7700d110c0bd825d65e1aadd68ea082a1d9a7e2b570075b35d6cdb64ae207567bdeb2580e6e5407ba277cc6d1693c78 WHIRLPOOL 8e7ba198f6048d8de06082a269a9f7fa8fbbcd95e14174010bdf54935db53f840d00744e35f4260e9de5d8d9a6ea47aa7c4b037998b035775bbbe212057d75e7
 DIST monit-5.8.1.tar.gz 1212491 SHA256 a25e4b79257ac29ebaf46605dccb7ed693c8e001669c0ccc8feb22e7d4c870e5 SHA512 0cf8b46ea5a5ab42beac4aab649d4fa324b03e02aaceee6a86968849db46b129cd8f20e314c855653620a0bd4b4aa105e2c812a386ddd2be3196ff956f1e7e11 WHIRLPOOL 8134017da3c1f0dc2675df9cb2d7ecd0905765a92a248701a4de2b9ba449a548ae28cf661019e882a1992c027095360f14d1b2378c924623937c85b691c6056c
 DIST monit-5.8.tar.gz 1237958 SHA256 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5 SHA512 61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda WHIRLPOOL 0eb1f5b778264d7881281f7139037fa07c225a5c7ece7cae2149460036a58c008e16a3d883e1876a2dc08f092900e05d164e37714ec5fc19960d4127e13c6eeb
 DIST monit-5.9.tar.gz 1161683 SHA256 274044485170b7498de29e7876cd86488378f50d69df4303a14930ba1f5e4a11 SHA512 915d548d5a4e043b346ec32d9fd3131d7eafd8ed1167e4fca3d4918df9ff87a166dbb2b3398d59a8510c7190c43fe26043568742a27828257140683bea349c83 WHIRLPOOL d5bde04202b066665feeef7bca5e0ec23c18c0bf5a6940ac30b8bfc8cc01056a802b3beae8e0caac861770e167b7b48254fe08fbb9294554e25102bec620f508
diff --git a/app-admin/monit/monit-5.14.ebuild b/app-admin/monit/monit-5.14.ebuild
new file mode 100644
index 000000000000..a8b1a0af65f5
--- /dev/null
+++ b/app-admin/monit/monit-5.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.14.ebuild,v 1.1 2015/06/14 12:24:42 patrick Exp $
+
+EAPI="5"
+inherit pam systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="pam ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-doc/root-docs/root-docs-5.34.26.ebuild b/app-doc/root-docs/root-docs-5.34.26.ebuild
index 399f559f07a7..d0d9a4aa56ab 100644
--- a/app-doc/root-docs/root-docs-5.34.26.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.26.ebuild,v 1.3 2015/04/11 11:29:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.26.ebuild,v 1.4 2015/06/14 19:25:46 bircoph Exp $
 
 EAPI=5
 
@@ -41,8 +41,8 @@ VIRTUALX_REQUIRED="api"
 
 DEPEND="
 	app-text/pandoc
-	app-text/texlive
 	dev-haskell/pandoc-citeproc[bibutils]
+	dev-texlive/texlive-latex
 	virtual/pkgconfig
 	api? (
 		media-fonts/dejavu
diff --git a/app-doc/root-docs/root-docs-5.34.28.ebuild b/app-doc/root-docs/root-docs-5.34.28.ebuild
index 4346ba280e76..57f0db5f9aca 100644
--- a/app-doc/root-docs/root-docs-5.34.28.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.28.ebuild,v 1.2 2015/04/11 11:29:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.28.ebuild,v 1.3 2015/06/14 19:25:46 bircoph Exp $
 
 EAPI=5
 
@@ -41,8 +41,8 @@ VIRTUALX_REQUIRED="api"
 
 DEPEND="
 	app-text/pandoc
-	app-text/texlive
 	dev-haskell/pandoc-citeproc[bibutils]
+	dev-texlive/texlive-latex
 	virtual/pkgconfig
 	api? (
 		media-fonts/dejavu
diff --git a/app-doc/root-docs/root-docs-6.02.05.ebuild b/app-doc/root-docs/root-docs-6.02.05.ebuild
index 6f07876a4675..1c98c124966b 100644
--- a/app-doc/root-docs/root-docs-6.02.05.ebuild
+++ b/app-doc/root-docs/root-docs-6.02.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-6.02.05.ebuild,v 1.1 2015/04/12 19:13:45 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-6.02.05.ebuild,v 1.2 2015/06/14 19:25:46 bircoph Exp $
 
 EAPI=5
 
@@ -40,8 +40,8 @@ VIRTUALX_REQUIRED="api"
 
 DEPEND="
 	app-text/pandoc
-	app-text/texlive
 	dev-haskell/pandoc-citeproc[bibutils]
+	dev-texlive/texlive-latex
 	virtual/pkgconfig
 	api? (
 		media-fonts/dejavu
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 0029e98ba94c..a2c5ab5e04d3 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index b879c29f53bb..65439b0e3d06 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index 02d924e1db78..31f8c05f8314 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index eaf9332ec881..5565bcd55fb8 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index a6f8ded34ad8..75e2d8febe96 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index 9bbcbea7f294..6b533b260562 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index f9525cb76d1a..7521b9f1cd61 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index 55af535cd528..f51deb5e6196 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
index 464d1754ca53..8ecb96ee06f8 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild,v 1.2 2015/04/08 07:30:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,17 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	"
 S="${WORKDIR}"
 
-REGULAR_DEPS="
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
 	capi? ( net-dialup/capi4k-utils )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
@@ -63,32 +73,7 @@ REGULAR_DEPS="
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-EMUL_DEPS="
-	app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-	v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
-
-DEPEND="dev-lang/perl
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	|| ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) )
-	"
+	x11-libs/libxcb[abi_x86_32(-)]"
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
index dcb84394782b..ece1f618740a 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.8 2015/06/14 16:49:39 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
index c30deaff84c6..85b1943ac307 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.8 2015/06/14 16:49:39 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
index f4b2fdf5cc1c..f4b590ae8552 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.6 2014/10/15 12:15:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.7 2015/06/14 16:49:39 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
index 22b5bd028cf8..bf5bd28eb975 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.8 2015/06/14 16:49:39 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
index d4542cc6baee..c201610ac14c 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.12 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.13 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
index 9c327f1dcfb6..bff7c8f5c584 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.10 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.11 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
index 6a40ef00a288..673788dc1457 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.8 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.9 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
index 7947948ea05b..40d424f9f25b 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.8 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.9 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
index 2da3579782fa..12b9d069c831 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.5 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.6 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
index 7f842b000e59..198147ac83c3 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.5 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.6 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
index 4eb10c60047f..ebf92843f8c3 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.4 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.5 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
index f453bc1ecaaf..4b40cd398395 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.4 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.5 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
index 972f1d2691d0..c9c023e43910 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.4 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.5 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
index 64793a2e12e7..bcf2a0bc84c6 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.4 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.5 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
index 6727312ab0db..eda2210197ba 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.4 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.5 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,19 +19,12 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
index 5e28f6547594..9370f8d16fff 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.7 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.8 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,22 +19,14 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			|| ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] )
-			media-libs/libpng:1.2[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	|| ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] )
+	media-libs/libpng:1.2[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
index 438f74043df9..1c422e079ab7 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.6 2014/10/15 12:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.7 2015/06/14 15:16:14 ulm Exp $
 
 EAPI=5
 
@@ -19,22 +19,14 @@ RESTRICT="fetch strip"
 RDEPEND="
 	dev-util/desktop-file-utils
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXrandr[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXxf86dga[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			|| ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] )
-			media-libs/libpng:1.2[abi_x86_32(-)]
-			nas? ( media-libs/nas[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	|| ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] )
+	media-libs/libpng:1.2[abi_x86_32(-)]
+	nas? ( media-libs/nas[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 92b6ef0529d2..1f8497d8e301 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,3 +6,4 @@ DIST libvirt-1.2.12.tar.gz 30710487 SHA256 eff5227f774560d97f0b44402a444e821c51e
 DIST libvirt-1.2.14-20150524.tar.xz 2404 SHA256 5f2bafd9643c1aca78390400ecd88222ae88882ac11f43bbf0e5e8a25f380738 SHA512 4656d8e215514d3afd35ab06f5a2d653591d38cfd09f164cabfa078b86b13a48d5333654fc53ad62b32d04e0339b742a9aeeecbf007c3df8f5fbb35d739ecde3 WHIRLPOOL 2df415ab668e37a6cfe797780bba896f398fa1cdd79257b26e6670e080c36d99b248a1033a33677eeab164d0ca16bca3b2f62085fd4edb171ba410599819dbee
 DIST libvirt-1.2.14.tar.gz 28947850 SHA256 b8e8e6f1fc91eb8694fa21f9c57a736fa4a5af10562e14e4aa2c7e23510c4c07 SHA512 ea5a68211ce3940f73444777ae5e2c8de7405df3e1a78d2871a9e18591bc8bf036288a6733da5ab23180b6ed88e03347e898554a46c0ad440da48590b32340ad WHIRLPOOL 8a9791a780c3daa416abeff711a9204093b4f979a2bb1ee8d2adb93f033b48ff3c576811b1f8d943a3f93a95cab9592293d9b4309f11eb2b16515b32cf5cc033
 DIST libvirt-1.2.15.tar.gz 29094868 SHA256 5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 SHA512 c5dd3af86e89e3804d6c3b527c6dbd98c79d87d2591725a13af33530e0e9a9a2e9aeb9491844469d44ec4f4d17adb036c76391f964158ada23ec042a75556fbc WHIRLPOOL a43aad4caeff707c8d7a6872ff3c46911c96fd90ece02a7f6ceabb4ccd00e467b5341ab9d922912cc2968a2bb8826e970b253b257c5a8981b37364550f9b3616
+DIST libvirt-1.2.16.tar.gz 29157627 SHA256 419bee553442024b9ee8a1fa94023b1189bb52b7c3021fa37d8e4c108490060d SHA512 ad2892d143b28784146191ec0c4e3fc1f3d246b51c39c8bcdfc6ecff59a4021b94277fc14cef04436046d3614baeb4edff753d0158c5da35cbb718ab8692950b WHIRLPOOL c48cb4f4e4be0994600f924d616112e112bd3a9a695cede70512995b4d563c92f82918298313472c440751213c893cbdc54d54b2e175b969df157bd486ef7207
diff --git a/app-emulation/libvirt/libvirt-1.2.16.ebuild b/app-emulation/libvirt/libvirt-1.2.16.ebuild
new file mode 100644
index 000000000000..c9d1257e8cb5
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.16.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.16.ebuild,v 1.1 2015/06/14 15:39:58 tamiko Exp $
+
+EAPI=5
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
+	else
+		SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+	fi
+	SRC_URI+=" ${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+		http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+# TODO: Reenable IUSE wireshark-plugins
+IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
+	+macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
+	elibc_glibc systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline:=
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt:0
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources:* )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq[script]
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-perl/XML-XPath
+	dev-libs/libxslt"
+
+DOC_CONTENTS="For the basic networking support (bridged and routed networks)
+you don't need any extra software. For more complex network modes
+including but not limited to NATed network, you can enable the
+'virt-network' USE flag.\n\n
+If you are using dnsmasq on your system, you will have
+to configure /etc/dnsmasq.conf to enable the following settings:\n\n
+	bind-interfaces\n
+	interface or except-interface\n\n
+Otherwise you might have issues with your existing DNS server."
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~CGROUP_NET_PRIO
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~USER_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~SECURITYFS
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+BWLMT_CONFIG_CHECK="
+	~BRIDGE_EBT_T_NAT
+	~NET_SCH_HTB
+	~NET_SCH_SFQ
+	~NET_SCH_INGRESS
+	~NET_CLS_FW
+	~NET_CLS_U32
+	~NET_ACT_POLICE
+"
+
+MACVTAP_CONFIG_CHECK=" ~MACVTAP"
+
+LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
+
+ERROR_USER_NS="Optional depending on LXC configuration."
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_init=
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
+	use avahi && avahi_init='avahi-daemon'
+	use iscsi && iscsi_init='iscsid'
+	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
+
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf+=" $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf+=" $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
+	myconf+=" $(use_with openvz)"
+	myconf+=" $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf+=" $(use_with virtualbox vbox)"
+	fi
+	myconf+=" $(use_with uml)"
+	myconf+=" $(use_with qemu)"
+	myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
+	myconf+=" $(use_with phyp)"
+	myconf+=" --with-esx"
+	myconf+=" --with-vmware"
+
+	## additional host drivers
+	myconf+=" $(use_with virt-network network)"
+	myconf+=" --with-storage-fs"
+	myconf+=" $(use_with lvm storage-lvm)"
+	myconf+=" $(use_with iscsi storage-iscsi)"
+	myconf+=" $(use_with parted storage-disk)"
+	mycond+=" $(use_with glusterfs)"
+	mycond+=" $(use_with glusterfs storage-gluster)"
+	myconf+=" $(use_with lvm storage-mpath)"
+	myconf+=" $(use_with rbd storage-rbd)"
+	myconf+=" $(use_with numa numactl)"
+	myconf+=" $(use_with numa numad)"
+	myconf+=" $(use_with selinux)"
+	myconf+=" $(use_with fuse)"
+
+	# udev for device support details
+	myconf+=" $(use_with udev)"
+	myconf+=" --without-hal"
+
+	# linux capability support so we don't need privileged accounts
+	myconf+=" $(use_with caps capng)"
+
+	## auth stuff
+	myconf+=" $(use_with policykit polkit)"
+	myconf+=" $(use_with sasl)"
+
+	# network bits
+	myconf+=" $(use_with macvtap)"
+	myconf+=" $(use_with pcap libpcap)"
+	myconf+=" $(use_with vepa virtualport)"
+	myconf+=" $(use_with firewalld)"
+
+	## other
+	myconf+=" $(use_enable nls)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf+=" --with-qemu-user=qemu"
+		myconf+=" --with-qemu-group=qemu"
+	else
+		myconf+=" --with-qemu-user=root"
+		myconf+=" --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf+=" $(use_with audit)"
+
+	# wireshark dissector
+	myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
+
+	## stuff we don't yet support
+	myconf+=" --without-netcf"
+
+	# locking support
+	myconf+=" --without-sanlock"
+
+	# systemd unit files
+	myconf+=" $(use_with systemd systemd-daemon)"
+	use systemd && myconf+=" --with-init-script=systemd"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--disable-werror \
+		--with-remote \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconf
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	dodir /etc/sysctl.d
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "The systemd service-file configuration under /etc/sysconfig has"
+		elog "been removed. Please use"
+		elog "    /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
+		elog "to control the '--listen' parameter for libvirtd. The configuration"
+		elog "for the libvirt-guests.service is now found under"
+		elog "    /etc/libvirt/libvirt-guests.conf"
+		elog "The openrc configuration has not been changed. Thus no action is"
+		elog "required for the openrc service manager."
+		elog ""
+	fi
+}
diff --git a/app-emulation/lxc/lxc-1.0.7.ebuild b/app-emulation/lxc/lxc-1.0.7.ebuild
index 0f16ca8b1560..e36947f8a512 100644
--- a/app-emulation/lxc/lxc-1.0.7.ebuild
+++ b/app-emulation/lxc/lxc-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.7.ebuild,v 1.6 2015/04/08 07:30:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.7.ebuild,v 1.7 2015/06/14 20:07:42 zlogene Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
index 114f1a8a2f26..4ca16c11052a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild,v 1.3 2015/06/14 11:53:19 zlogene Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
index 5d84550dbe60..6418b1a1281b 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild,v 1.3 2015/06/14 11:53:19 zlogene Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
index 343a97e426cd..d8f831444cbe 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild,v 1.3 2015/06/14 11:53:19 zlogene Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
index 9d3594656879..6f8114061b46 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild,v 1.3 2015/06/14 11:53:19 zlogene Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild
index 32fa20db22e4..70007430b5e7 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild,v 1.2 2014/12/22 13:09:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.18.ebuild,v 1.3 2015/06/14 18:10:40 mgorny Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}"
 	enewgroup vboxusers
 }
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild
index 0eda37f563e6..8ee5d8f7151a 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild,v 1.1 2015/03/17 07:59:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.26.ebuild,v 1.2 2015/06/14 18:10:40 mgorny Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}"
 	enewgroup vboxusers
 }
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
index 29693eee1016..8dbb1816ae06 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild,v 1.4 2015/06/14 18:10:40 mgorny Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
@@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}"
 	enewgroup vboxusers
 }
 
diff --git a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
index 0aefcd210825..635c82cf33b1 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.28.ebuild,v 1.2 2015/06/12 16:37:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.28.ebuild,v 1.3 2015/06/14 11:53:19 zlogene Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild
index 0d9d0a93e759..a863727fcdeb 100644
--- a/app-emulation/wine/wine-1.6.2.ebuild
+++ b/app-emulation/wine/wine-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.8 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.9 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -95,130 +95,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild
index 4062567a2437..78d90b16e238 100644
--- a/app-emulation/wine/wine-1.7.0.ebuild
+++ b/app-emulation/wine/wine-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.12 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.13 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -97,132 +97,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+				>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild
index febffdac02d0..087beaa1a589 100644
--- a/app-emulation/wine/wine-1.7.10.ebuild
+++ b/app-emulation/wine/wine-1.7.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.7 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.11.ebuild b/app-emulation/wine/wine-1.7.11.ebuild
index 280a80abf941..bd488f73e459 100644
--- a/app-emulation/wine/wine-1.7.11.ebuild
+++ b/app-emulation/wine/wine-1.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.7 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild
index 78ad218b6a75..d309e026a6b2 100644
--- a/app-emulation/wine/wine-1.7.12.ebuild
+++ b/app-emulation/wine/wine-1.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.7 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild
index 76b6c6e9466e..812264c287b6 100644
--- a/app-emulation/wine/wine-1.7.13.ebuild
+++ b/app-emulation/wine/wine-1.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.7 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.14.ebuild b/app-emulation/wine/wine-1.7.14.ebuild
index 62dc0f974c7c..5bc62c11739a 100644
--- a/app-emulation/wine/wine-1.7.14.ebuild
+++ b/app-emulation/wine/wine-1.7.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.6 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.15.ebuild b/app-emulation/wine/wine-1.7.15.ebuild
index adb11106ce92..948e1ff74068 100644
--- a/app-emulation/wine/wine-1.7.15.ebuild
+++ b/app-emulation/wine/wine-1.7.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.6 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.16.ebuild b/app-emulation/wine/wine-1.7.16.ebuild
index 1b7b2feb60f5..54fee563bab7 100644
--- a/app-emulation/wine/wine-1.7.16.ebuild
+++ b/app-emulation/wine/wine-1.7.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.6 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.17.ebuild b/app-emulation/wine/wine-1.7.17.ebuild
index 2cd41e0c6f36..aef4ba441196 100644
--- a/app-emulation/wine/wine-1.7.17.ebuild
+++ b/app-emulation/wine/wine-1.7.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.6 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild
index 798c909f1c4d..daea09e253ec 100644
--- a/app-emulation/wine/wine-1.7.18.ebuild
+++ b/app-emulation/wine/wine-1.7.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.6 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild
index e3e8f53c203b..0076953f34dd 100644
--- a/app-emulation/wine/wine-1.7.19-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.7 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.8 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -100,134 +100,50 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.20.ebuild b/app-emulation/wine/wine-1.7.20.ebuild
index afee4c3940a0..b35875167b13 100644
--- a/app-emulation/wine/wine-1.7.20.ebuild
+++ b/app-emulation/wine/wine-1.7.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.3 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.4 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -102,135 +102,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.21.ebuild b/app-emulation/wine/wine-1.7.21.ebuild
index c8c534afb7d9..03bb426febf1 100644
--- a/app-emulation/wine/wine-1.7.21.ebuild
+++ b/app-emulation/wine/wine-1.7.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.3 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -102,135 +102,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.22.ebuild b/app-emulation/wine/wine-1.7.22.ebuild
index 70f69404e88c..88bb44e75850 100644
--- a/app-emulation/wine/wine-1.7.22.ebuild
+++ b/app-emulation/wine/wine-1.7.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.22.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.22.ebuild,v 1.3 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -102,135 +102,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.28.ebuild b/app-emulation/wine/wine-1.7.28.ebuild
index 75bcf3d87a1a..3d02da9bbe65 100644
--- a/app-emulation/wine/wine-1.7.28.ebuild
+++ b/app-emulation/wine/wine-1.7.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.3 2015/03/08 07:00:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.4 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -101,135 +101,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.29.ebuild b/app-emulation/wine/wine-1.7.29.ebuild
index 6594da7ef5bd..8503529b6534 100644
--- a/app-emulation/wine/wine-1.7.29.ebuild
+++ b/app-emulation/wine/wine-1.7.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.3 2015/03/08 07:00:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.4 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -100,135 +100,51 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild
index e20bbab29aa6..a99c4d3daf89 100644
--- a/app-emulation/wine/wine-1.7.3.ebuild
+++ b/app-emulation/wine/wine-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.9 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.10 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -95,130 +95,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.33.ebuild b/app-emulation/wine/wine-1.7.33.ebuild
index 6dda5b5031eb..31d0dde1f057 100644
--- a/app-emulation/wine/wine-1.7.33.ebuild
+++ b/app-emulation/wine/wine-1.7.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.33.ebuild,v 1.2 2015/03/08 07:00:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.33.ebuild,v 1.3 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -101,136 +101,52 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.38.ebuild b/app-emulation/wine/wine-1.7.38.ebuild
index 78210970cd41..31cab53e4bad 100644
--- a/app-emulation/wine/wine-1.7.38.ebuild
+++ b/app-emulation/wine/wine-1.7.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.38.ebuild,v 1.1 2015/03/08 07:00:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.38.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.39.ebuild b/app-emulation/wine/wine-1.7.39.ebuild
index 0ab061a596ef..33699dafdeb1 100644
--- a/app-emulation/wine/wine-1.7.39.ebuild
+++ b/app-emulation/wine/wine-1.7.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.39.ebuild,v 1.1 2015/03/22 19:58:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.39.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild
index 75ef4e79e358..783ca37c9206 100644
--- a/app-emulation/wine/wine-1.7.4.ebuild
+++ b/app-emulation/wine/wine-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.10 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.11 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -95,130 +95,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.40.ebuild b/app-emulation/wine/wine-1.7.40.ebuild
index e5ed5e0e7810..a3f11fa96c3e 100644
--- a/app-emulation/wine/wine-1.7.40.ebuild
+++ b/app-emulation/wine/wine-1.7.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.40.ebuild,v 1.1 2015/04/10 06:24:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.40.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.41.ebuild b/app-emulation/wine/wine-1.7.41.ebuild
index 0f06491b3106..5a294a00b41e 100644
--- a/app-emulation/wine/wine-1.7.41.ebuild
+++ b/app-emulation/wine/wine-1.7.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.41.ebuild,v 1.1 2015/04/19 03:45:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.41.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.42.ebuild b/app-emulation/wine/wine-1.7.42.ebuild
index b1ac505a6a37..ad7b49e8d123 100644
--- a/app-emulation/wine/wine-1.7.42.ebuild
+++ b/app-emulation/wine/wine-1.7.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.42.ebuild,v 1.1 2015/05/17 23:25:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.42.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.43.ebuild b/app-emulation/wine/wine-1.7.43.ebuild
index ccb52fddc1d1..c032c45cb4b2 100644
--- a/app-emulation/wine/wine-1.7.43.ebuild
+++ b/app-emulation/wine/wine-1.7.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.1 2015/05/18 04:59:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.2 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -113,137 +113,53 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			staging? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
 			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 7bfbb537cd91..a046f5b4b054 100644
--- a/app-emulation/wine/wine-1.7.8.ebuild
+++ b/app-emulation/wine/wine-1.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.8 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.9 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.9.ebuild b/app-emulation/wine/wine-1.7.9.ebuild
index d7b3cbb19633..04100be83f23 100644
--- a/app-emulation/wine/wine-1.7.9.ebuild
+++ b/app-emulation/wine/wine-1.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.7 2015/06/14 16:18:11 ulm Exp $
 
 EAPI="5"
 
@@ -96,130 +96,49 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
-				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
-					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
-					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] )
+			ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+			udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] )
+			fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] )
+			gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] )
+			openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )
+			gstreamer? (
+				>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+				>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+			)
+			X? (
+				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+			)
+			xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] )
+			alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+			cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] )
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
-					>=virtual/glu-9.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
-				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
-				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			opengl? (
+				>=virtual/glu-9.0-r1[abi_x86_32(-)]
+				>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			)
+			gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] )
+			jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] )
+			ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] )
+			lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] )
+			mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] )
+			nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] )
+			odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] )
+			osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] )
+			pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] )
+			xml? (
+				>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+				>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+			)
+			scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] )
+			ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] )
+			png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] )
+			v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] )
+			xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] )
 		)
 	)"
 
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
index 8f70f1f07a95..07c2ca6d7857 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild,v 1.1 2014/11/12 17:59:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild,v 1.2 2015/06/14 16:24:39 ulm Exp $
 
 EAPI=5
 
@@ -54,47 +54,29 @@ RDEPEND="!app-i18n/atokx2
 	x11-libs/libdrm
 	x11-libs/pangox-compat
 	multilib? (
-		|| (
-			(
-				>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-				>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
-				>=media-libs/libpng-1.2.51[abi_x86_32(-)]
-				>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-				>=virtual/pam-0-r1[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		)
-		|| (
-			(
-				>=dev-libs/atk-2.10.0[abi_x86_32]
-				>=x11-libs/cairo-1.12.14-r4[abi_x86_32]
-				>=x11-libs/gtk+-2.24.23:2[abi_x86_32]
-				>=x11-libs/pangox-compat-0.0.2[abi_x86_32]
-			)
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-		|| (
-			>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-		|| (
-			(
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-				>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-				>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-				>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
-				>=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
-				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-				>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-				>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
+		>=dev-libs/atk-2.10.0[abi_x86_32]
+		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+		>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
+		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+		>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
+		>=virtual/pam-0-r1[abi_x86_32(-)]
+		>=x11-libs/cairo-1.12.14-r4[abi_x86_32]
+		>=x11-libs/gtk+-2.24.23:2[abi_x86_32]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+		>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+		>=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+		>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32]
 	)"
 
 QA_PREBUILT="opt/atokx3/lib/server/*
diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild
index a5450bf71156..c75d9e0b18be 100644
--- a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild,v 1.1 2015/05/12 07:01:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild,v 1.2 2015/06/14 17:45:23 grobian Exp $
 
 # The Debian ca-certificates package merely takes the CA database as it exists
 # in the nss package and repackages it for use by openssl.
@@ -171,7 +171,7 @@ pkg_postinst() {
 		# to include their stuff in the db.
 		# However it's too overzealous when the user has custom certs in place.
 		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
 	fi
 
 	local c badcerts=0
diff --git a/app-misc/dvtm/dvtm-0.11.ebuild b/app-misc/dvtm/dvtm-0.11.ebuild
index f86f34fa36a3..7625d1c4b3dd 100644
--- a/app-misc/dvtm/dvtm-0.11.ebuild
+++ b/app-misc/dvtm/dvtm-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.11.ebuild,v 1.3 2015/05/13 07:55:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.11.ebuild,v 1.4 2015/06/14 19:44:19 maekke Exp $
 
 EAPI=5
 
@@ -12,10 +12,10 @@ HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-	KEYWORDS=""
+	KEYWORDS="arm"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/acroread/acroread-9.5.5-r3.ebuild b/app-text/acroread/acroread-9.5.5-r3.ebuild
index b4e849e73042..aad81fbf9019 100644
--- a/app-text/acroread/acroread-9.5.5-r3.ebuild
+++ b/app-text/acroread/acroread-9.5.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5-r3.ebuild,v 1.2 2015/06/08 17:41:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5-r3.ebuild,v 1.3 2015/06/14 16:28:20 ulm Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ IUSE+=" linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 RESTRICT="strip mirror"
 
 DEPEND=""
-RDEPEND="|| ( (
+RDEPEND="
 	dev-libs/atk[abi_x86_32(-)]
 	dev-libs/glib:2[abi_x86_32(-)]
 	dev-libs/libxml2[abi_x86_32(-)]
@@ -38,20 +38,8 @@ RDEPEND="|| ( (
 		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
 		<x11-libs/pango-1.31[X]
 	)
-	) (
-		app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	) )
-	nsplugin? ( || (
-		x11-libs/libXt[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	) )
-	ldap? ( || (
-		>=net-nds/openldap-2.4.38-r1[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	) )
+	nsplugin? ( x11-libs/libXt[abi_x86_32(-)] )
+	ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] )
 	x86? ( html? (
 		|| (
 			www-client/firefox-bin
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 8ccfb5dd4d3e..51ed2eb88725 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,5 +1 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 SHA256 09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 WHIRLPOOL db0edafb63a6c37b001b071693278c2c0054ab20ae0744147fe8b1a828f1e575b7751d5aabca05a640fc7c099ce9402df835c6e81a0c3b21b7aa700110c426de
-DIST JabRef-2.10b2-src.tar.bz2 16796962 SHA256 296a55bd480c252facfae25b6ee36b4d490ec6e1852d79609b01d6ad6d12d941 SHA512 611456d0fcc310987876b0210537ed5cc648bed43de543b465b93613bf6f2449ba4514e3086dc633005e630216ac776f716671b9085623940e380b5133cb4323 WHIRLPOOL 220548bf28ffef14e488838fbe7b2e130043518369de9bc95fc7ee7207f49a6995dd59f3e2857e2afabe3762739e6b0ecfc36ead5a46114bcf1932dfe08e25eb
-DIST JabRef-2.10b3-src.tar.bz2 16799104 SHA256 0ff6084d55273644210a6caaa1a2c465c7ccda772a82cf5b16405fd773addfb3 SHA512 02698b390b319ff31d8ff979ad63df4ca5ec324466b3470056fac47e2f34549ef046fb763c5890a729b598512d46fcb08f59dd8caac365365bbfb6caf566b114 WHIRLPOOL f4afa892485ae5bd84635e04d9ee5f077ccfb2d5817cc6b557d43f1193a51f26eec53d033fba3191645c2c1858fdd0ac1600326dc5e97f7ab414f3fecf2c080c
-DIST JabRef-2.6-src.tar.bz2 7028591 SHA256 fd7551b796cdeca8db0b3cb8f089fcb673b03d797b6ff0e68216b1201792d02c SHA512 63302871ed8724451d76fed451b585f13b776f2ab5b765ba4d95b55652ea5c8ffccbdecbe3cd4d4e9f43bd03268da4e24896a0ac6f61e54c985c7f11cab411ec WHIRLPOOL 01a3681644b2782ebd5ed3f0413a79f50ed9a514ef53421e90907263add8a80da675d6f27004ac5231b73eef24a3ecf022bfb7da48c89c4a764c58da3aa858ad
-DIST JabRef-2.9.2-src.tar.bz2 16664284 SHA256 12bc7e489709bc6f57327bf8e15c6bc9ceaa600369dca6452b7c13d792215e83 SHA512 40eb5d3f3528e92c4d5c62abce12d87ea63b84a58778a32151cd1af2a0198c49aa354ee295f8b3c9449d5b078f7119163babd3c29f358b0d56b3776980292463 WHIRLPOOL d2115e497066f31a3772085510f6820e46a55fbe36778471e6c81a4973f45607761cca80655cfefffb1308f65315ef72fb17791fe964d004826f345322ca0dcf
diff --git a/app-text/jabref/jabref-2.10-r1.ebuild b/app-text/jabref/jabref-2.10-r1.ebuild
deleted file mode 100644
index 5a9af72b2dee..000000000000
--- a/app-text/jabref/jabref-2.10-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r1.ebuild,v 1.1 2014/03/15 13:24:48 nicolasbock Exp $
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	dev-java/microba:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-	rm lib/microba.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
index 46e60a10f695..74efffe7b4a7 100644
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.1 2014/03/21 14:22:19 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.2 2015/06/14 18:00:13 monsieurp Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 COMMON_DEP="
diff --git a/app-text/jabref/jabref-2.10.ebuild b/app-text/jabref/jabref-2.10.ebuild
deleted file mode 100644
index 2639f70185ec..000000000000
--- a/app-text/jabref/jabref-2.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10.ebuild,v 1.1 2014/03/12 13:21:44 nicolasbock Exp $
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,spin"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10_beta2.ebuild b/app-text/jabref/jabref-2.10_beta2.ebuild
deleted file mode 100644
index da58b1736196..000000000000
--- a/app-text/jabref/jabref-2.10_beta2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10_beta2.ebuild,v 1.1 2014/01/28 16:51:03 nicolasbock Exp $
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,spin"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10_beta3.ebuild b/app-text/jabref/jabref-2.10_beta3.ebuild
deleted file mode 100644
index b32289848faa..000000000000
--- a/app-text/jabref/jabref-2.10_beta3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10_beta3.ebuild,v 1.1 2014/02/19 04:10:12 nicolasbock Exp $
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix incorrect version information.
-	sed -i -e 's:2.10b2:2.10b3:' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,spin"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.6.ebuild b/app-text/jabref/jabref-2.6.ebuild
deleted file mode 100644
index 721bd3e6f316..000000000000
--- a/app-text/jabref/jabref-2.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.6.ebuild,v 1.7 2014/02/19 17:26:28 nicolasbock Exp $
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="GUI frontend for BibTeX, written in Java"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mysql"
-
-CDEPEND="dev-java/spin:0
-	|| ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] )
-	>=dev-java/antlr-2.7.3:0[java]
-	>=dev-java/jgoodies-forms-1.1.0:0
-	dev-java/jgoodies-looks:2.0
-	>=dev-java/microba-0.4.3:0
-	dev-java/jempbox:0
-	dev-java/pdfbox:0
-	dev-java/commons-logging:0
-	dev-java/jpf:1.5
-	dev-java/jpfcodegen:0
-	mysql? ( dev-java/jdbc-mysql:0 )"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# moves jarbundler definition to where it's needed (not by us)
-	# don't call unjarlib, don't want to absorb deps
-	# failonerror in jpfcodegen
-	epatch "${FILESDIR}/${PN}-2.4-build.xml.patch"
-
-	# bug #268252
-	java-ant_xml-rewrite -f build.xml -d -e javac -a encoding -v UTF-8
-
-	mkdir libs || die
-	mv lib/antlr-3.0b5.jar libs/ || die
-
-	rm -v lib/*.jar lib/plugin/*.jar \
-		src/java/net/sf/jabref/plugin/core/generated/*.java || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	local gcp=$(java-pkg_getjars --with-dependencies antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox,commons-logging,jpf-1.5,jpfcodegen)
-	gcp="${gcp}:libs/antlr-3.0b5.jar"
-	eant -Dgentoo.classpath="${gcp}" jars \
-		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-	java-pkg_dojar libs/antlr-3.0b5.jar
-
-	use doc && java-pkg_dojavadoc build/docs/api
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} \
-		--main net.sf.jabref.JabRef
-
-	dodir /usr/share/${PN}/lib/plugins
-	keepdir /usr/share/${PN}/lib/plugins
-
-	java-pkg_register-optional-dependency jdbc-mysql
-
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-	echo "MimeType=text/x-bibtex" >> "${D}/usr/share/applications/${PN}-${PN}.desktop"
-}
-
-pkg_postinst() {
-	elog "Users need to set their user java vm to one of the 1.6 slot for the search"
-	elog "feature to work."
-}
diff --git a/app-text/jabref/jabref-2.9.2.ebuild b/app-text/jabref/jabref-2.9.2.ebuild
deleted file mode 100644
index 1c430adde9b4..000000000000
--- a/app-text/jabref/jabref-2.9.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.9.2.ebuild,v 1.3 2014/01/28 16:47:27 nicolasbock Exp $
-
-EAPI=5
-
-#EANT_DOC_TARGET=javadocs
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Removed doc USE flag, since the API documentation build system in this
-# version is broken (see bug #497030). Reported the problem to upstream [1].
-#
-# [1] http://sourceforge.net/p/jabref/bugs/1203/
-
-EANT_BUILD_TARGET="jars"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${PV}.jar
-	#use doc && java-pkg_dojavadoc build/docs/API
-	#dodoc src/txt/README
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index b6e01eb14068..9425b0cea5b2 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1 +1,2 @@
+DIST pgxnclient-1.2.1.tar.gz 87275 SHA256 8e3022bc960aa5d5fc7d4c564786087693a1a99f15e025ad920fc0aa378e1d67 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf WHIRLPOOL f0e5df1e841a8da59a0fed16643e30120c188813c69307e2db6055c25d4298368a56c89f08dd54edbb6c6dbc1a8676a462fc9fe1b7982c8334d2c6af040d0d99
 DIST pgxnclient-1.2.tar.gz 86436 SHA256 ad3768d1ed83ea3af8a3ad9abf11fd164dbdeb355371819bce072dc581f43c42 SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb WHIRLPOOL fcb76ce45b4898a56f2ee99317874b1cbecafc67d37d1edabc55c9f6bea644d757ac1ab396fc5f3d0a8d98040e2f70211d3a712a8219c1ba2da23c4fa22b41fa
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
new file mode 100644
index 000000000000..850799805f9a
--- /dev/null
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild,v 1.1 2015/06/14 15:30:05 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL Extension Network Client"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ http://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-db/postgresql-9.1[server]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	# suite written onlt for py2
+	pushd ${PN} > /dev/null
+	if ! python_is_python3; then
+		PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
+	fi
+	popd > dev/null
+}
diff --git a/dev-java/bcmail/bcmail-1.50.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild
index 0c90ebae76a4..859ef91d20b9 100644
--- a/dev-java/bcmail/bcmail-1.50.ebuild
+++ b/dev-java/bcmail/bcmail-1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.4 2015/05/19 09:27:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.5 2015/06/14 17:52:47 monsieurp Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
 		~dev-java/bcpkix-${PV}:0[test?]
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index d081c41753aa..fa4a7fb9dd4d 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,6 +1,2 @@
-DIST cglib-src-2.0.2.jar 445834 SHA256 91644a03487a9a0161a54e0c3644c34c44e507557dcf4b8b97a60dd91e67cd1c SHA512 6cfaf0b03043a2ae36a83eb4b4c23026d02943ee56bd89d9556a9670385844a181d220291efe5eb1c248854a2f2adf46ca9de041d4670f80672b3cc7d5ee8b42 WHIRLPOOL 8afcd44f17bdf7e52c00d9e5b21f390f8ae8316a6c40db063c2f4dd7e503059d6b985fe259871801c51a8847b0280f8fc78bb982ea02833065c57abddd172712
-DIST cglib-src-2.1_3.jar 1610524 SHA256 652c7533f5c6d4bf66ba13871f70133e9ffdca648e49354cff7f39824282739e SHA512 9bd34c3448870f9ba8e0e985b679bf077d9f0c66d815a93cede35b743958e0f0fe03382933d2a696a55f41ad8669ca392daef4ad0e12c17dd5744262984f4e14 WHIRLPOOL 44e999b8de2e3ba37e6667ee46e68fa463e6609ad08fd69b744e36719a9b4ff4d9e95fc626487b7a788dae128d514c70ee3900da6f217d4208d534b776305a24
-DIST cglib-src-2.2.jar 1520971 SHA256 762e0214f0d31f224e712a7a5b4768c16ad24741ba98fc2e94715ae390d07fcb SHA512 ef0694684345c08f6e107c5a32177b63f53e4779a729f3f28d98f6cde1d8edaa9cf9c8e1fc9325f5c22f4214f5795d34fb3a13bfe298705f424d569b3e7b7baa WHIRLPOOL a7072eab907cb08c2b44d2cacf837abac70fbcaf7af4c30483479c4994c27dfdad02c916dced3f75e45de73bc111ee3efc133ae30766cd7ed26695cfa63f7773
 DIST cglib-src-3.0.jar 1537863 SHA256 40f8cc721f80b820207f0061b10ad51151f577b2d7d94d93f19a85aa2551e674 SHA512 7791c36ed1908ddbc35a0bf1f4f54c3554b0fe4f707b318d7d24189fb513d8712335f2e41f90065e8eb102657d53699cc709a1b9f7a12a8f924c6a755969a829 WHIRLPOOL d9e4f80e7cbe1bc39aad654e437347551e13c66bcc3139f8991e870c123bdd83603a26b9d5a07a902c2fa668ba7cb42285417578b836e195f5660b691c6ddc79
 DIST cglib-src-3.1.jar 1541525 SHA256 386f9a55ae8fed3cf8014f2c20344ce9ce05cd2e4fa467e5e4d8027abb3d62eb SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f WHIRLPOOL e3a865296790e1de31889e7624797418392466f7756567382fa9c0b1108d386ee848be2e6b4e96db206101cde8d0320293e58d0b83e0a5a7633afc46b3a37e22
-DIST cglib.2.2.3.zip 2417681 SHA256 23e605c9b8972d4944c90391aaecf7b00ed59096a0a8936bb16e5b30cdbaa1b2 SHA512 c7bcdc8035c1edcff45a2325d52dba464df0737d1e3941f59174a7e3e3896002a7de7d7fa47271b3575704aeed96e82a1041fb1a7f189bf37575323f02dcdd7b WHIRLPOOL b002b2c6d55a004bf5e3e3804942d2bb2a276382dfcab65304a3eb998aa80324386b3c7e0984969da0c41c75ad6be62543f7f83a6940d0c75c90bc05dcce7192
diff --git a/dev-java/cglib/cglib-2.0.2-r2.ebuild b/dev-java/cglib/cglib-2.0.2-r2.ebuild
deleted file mode 100644
index 669630ce99b0..000000000000
--- a/dev-java/cglib/cglib-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r2.ebuild,v 1.20 2014/08/10 20:09:21 slyfox Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A powerful, high performance and quality Code Generation Library"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-HOMEPAGE="http://cglib.sourceforge.net"
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-COMMON_DEP="=dev-java/asm-1.4.3*
-	=dev-java/aspectwerkz-2*
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-#	test? ( dev-java/junit:0 )
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-IUSE=""
-
-S=${WORKDIR}
-
-java_prepare() {
-	# needed for ecj-3.5
-	java-ant_rewrite-bootclasspath auto
-
-	epatch "${FILESDIR}/${P}-asm-1.4.3.patch"
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from asm-1.4
-	java-pkg_jar-from aspectwerkz-2
-	java-pkg_jar-from ant-core ant.jar
-}
-
-#Investigate why this fails
-EANT_FILTER_COMPILER="ecj-3.3"
-EANT_TEST_JUNIT_INTO="lib"
-
-# Fail and would need aspectwekrz-1.0
-RESTRICT="test"
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar
-	java-pkg_newjar dist/${PN}-full-${PV}.jar ${PN}-full.jar
-
-	dodoc NOTICE README || die
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/proxy/net
-}
diff --git a/dev-java/cglib/cglib-2.1.3.ebuild b/dev-java/cglib/cglib-2.1.3.ebuild
deleted file mode 100644
index 1f530633181b..000000000000
--- a/dev-java/cglib/cglib-2.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.20 2014/08/10 20:09:21 slyfox Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV=${PV/1./1_}
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${MY_PV}.jar"
-HOMEPAGE="http://cglib.sourceforge.net"
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-COMMON_DEP="dev-java/asm:1.5
-	dev-java/aspectwerkz:2
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/jarjar
-	${COMMON_DEP}"
-IUSE=""
-
-S=${WORKDIR}
-
-java_prepare() {
-	# needed for ecj-3.5
-	java-ant_rewrite-bootclasspath auto
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from asm-1.5
-	java-pkg_jar-from aspectwerkz-2
-	java-pkg_jar-from ant-core ant.jar
-}
-
-EANT_FILTER_COMPILER="ecj-3.3"
-EANT_ANT_TASKS="jarjar-1"
-
-# Does not work against our current version of aspectwerkz
-# https://bugs.gentoo.org/show_bug.cgi?id=183997
-RESTRICT="test"
-
-src_install() {
-	java-pkg_newjar dist/${PN}-${MY_PV}.jar
-	java-pkg_newjar dist/${PN}-nodep-${MY_PV}.jar ${PN}-nodep.jar
-
-	dodoc NOTICE README || die
-	use doc && java-pkg_dojavadoc docs/
-	use source && java-pkg_dosrc src/proxy/net
-}
diff --git a/dev-java/cglib/cglib-2.2.3.ebuild b/dev-java/cglib/cglib-2.2.3.ebuild
deleted file mode 100644
index f550ec78486c..000000000000
--- a/dev-java/cglib/cglib-2.2.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2.3.ebuild,v 1.3 2014/08/10 20:09:21 slyfox Exp $
-
-EAPI=5
-JAVA_PKG_IUSE="test doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="http://cglib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}.${PV}.zip"
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEP="dev-java/asm:3
-	>=dev-java/ant-core-1.7.0:0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/junit:0 )
-	${COMMON_DEP}"
-
-S=${WORKDIR}
-
-EANT_GENTOO_CLASSPATH="asm-3,ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_JUNIT_INTO="lib"
-EANT_TEST_EXTRA_ARGS="-DdebugLocation=${T}/debug"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip -q ${PN}-src-${PV}.jar || die
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-
-	# fix line endings otherwise patch fails
-	edos2unix src/test/net/sf/cglib/CodeGenTestCase.java
-	# mem leak tests fail on ppc #284316
-	# assuming gc() guarantees to free all memory is wrong, so don't make them fail
-	epatch "${FILESDIR}/${PN}-2.2-no-leak-test.patch"
-
-	cp "${FILESDIR}"/words.txt src/test/net/sf/cglib/util/ || die
-
-	find . -name '*.jar' -delete
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar
-	dodoc NOTICE README
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/proxy/net
-	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
-}
diff --git a/dev-java/cglib/cglib-2.2.ebuild b/dev-java/cglib/cglib-2.2.ebuild
deleted file mode 100644
index 025d8c025314..000000000000
--- a/dev-java/cglib/cglib-2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2.ebuild,v 1.7 2014/08/10 20:09:21 slyfox Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="test doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-HOMEPAGE="http://cglib.sourceforge.net"
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-COMMON_DEP="dev-java/asm:3
-	>=dev-java/ant-core-1.7.0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/junit )
-	${COMMON_DEP}"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	# mem leak tests fail on ppc #284316
-	# assuming gc() guarantees to free all memory is wrong, so don't make them fail
-	epatch "${FILESDIR}/${P}-no-leak-test.patch"
-
-	cp "${FILESDIR}/words.txt" "${S}/src/test/net/sf/cglib/util/"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from asm-3 asm-util.jar
-	java-pkg_jar-from asm-3 asm-commons.jar
-	java-pkg_jar-from ant-core ant.jar
-}
-
-EANT_TEST_JUNIT_INTO="lib"
-EANT_TEST_EXTRA_ARGS="-DdebugLocation=${T}/debug"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	dodoc NOTICE README || die
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/proxy/net
-	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
-}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild b/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
index 110b6c027560..07555457c7ba 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r1.ebuild,v 1.2 2015/06/08 23:28:16 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r1.ebuild,v 1.3 2015/06/14 15:08:20 monsieurp Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ~ppc64"
 
 CDEPEND="dev-java/cglib:3
 	dev-java/commons-beanutils:1.7
diff --git a/dev-java/commons-digester/commons-digester-3.2.ebuild b/dev-java/commons-digester/commons-digester-3.2.ebuild
deleted file mode 100644
index 69968fc445f0..000000000000
--- a/dev-java/commons-digester/commons-digester-3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2.ebuild,v 1.4 2015/04/11 21:05:13 monsieurp Exp $
-
-EAPI="5"
-
-# See bug #480758.
-RESTRICT="test"
-JAVA_PKG_IUSE="doc examples source" # test
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}-src"
-
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system"
-HOMEPAGE="http://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-logging-1.0.2:0
-	dev-java/cglib:2.2"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-#	test? (
-#		dev-java/junit:4
-#		dev-java/ant-junit
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-logging,cglib-2.2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}-2.1-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg_jar-from --build-only junit-4
-
-	ANT_TASKS="ant-junit" eant \
-		-Djunit.jar="$(java-pkg_getjar --build-only junit-4 junit.jar)" test
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}.jar
-
-	dodoc RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/jackson-databind/jackson-databind-2.5.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
similarity index 95%
rename from dev-java/jackson-databind/jackson-databind-2.5.1.ebuild
rename to dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
index ac02f3cd8ab2..b70a31ff5018 100644
--- a/dev-java/jackson-databind/jackson-databind-2.5.1.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/jackson-databind-2.5.1.ebuild,v 1.2 2015/03/05 21:47:19 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild,v 1.1 2015/06/14 15:30:26 monsieurp Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ RDEPEND=">=virtual/jre-1.5
 DEPEND=">=virtual/jdk-1.5
 	${CDEPEND}
 	test? (
-		dev-java/cglib:2.2
+		dev-java/cglib:3
 		dev-java/groovy:0
 		dev-java/junit:4
 	)"
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index e4306b006381..bb769723f1c5 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,4 +1,3 @@
-DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
 DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
 DIST jdk-8u45-docs-all.zip 92214205 SHA256 bc83053e6730779a97077cf1246e7c57e46600294357ab37675555c1c6a11cbc SHA512 b4f15bab3b7d28f78e19c72bf8266d3f53b43b8b413903a03bcd141af5adcbd3031053d532c886288048e5b887f7d712d4dc422eb5e9395d7c8fc85adcda119f WHIRLPOOL 879de168fe76531345059f5e2be9efa99105181ef928823f6b6448c60094afbab44c920034aa26c0cc81edefc4bfc01985ec68ba29403feba30cd58ec4beb18c
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
deleted file mode 100644
index 69e19bb10e20..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.12 2010/05/13 20:28:33 nelchael Exp $
-
-SRC_URI="jdk-1_5_0-doc-${PR}.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-LICENSE="sun-j2sl"
-SLOT="1.5.0"
-KEYWORDS="amd64 ia64 ppc ppc64 x86"
-IUSE=""
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-1.5.0-doc-oth-JPR@CDS-CDS_Developer"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download jdk-1_5_0-doc.zip from"
-	einfo "${DOWNLOAD_URL}"
-	einfo "(select English and agree to the license) and place it in ${DISTDIR} named as"
-	einfo "${SRC_URI}. Notice the ${PR}. Because Sun changes the doc zip file"
-	einfo "without changing the filename, we have to resort to renaming to keep"
-	einfo "the md5sum verification working existing and new downloads."
-	einfo ""
-	einfo "If emerge fails because of a md5sum error it is possible that Sun"
-	einfo "has again changed the upstream release, try downloading the file"
-	einfo "again or a newer revision if available. Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	local dirs="api guide images relnotes tooldocs"
-	for i in $dirs ; do
-		doins -r $i
-	done
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index b953b48e010b..fa4794378863 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.8 2015/05/27 11:28:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.10 2015/06/14 19:29:57 monsieurp Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 sparc ~ia64 ~arm ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 python_prepare_all() {
diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
index e200d15c0f57..bfb9f84f234b 100644
--- a/dev-java/jcs/Manifest
+++ b/dev-java/jcs/Manifest
@@ -1,2 +1,3 @@
+DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 SHA256 2ff60facc31b52625f1f2d8907380947508790bd864e2fea03625dee0c36ffa5 SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f WHIRLPOOL e5e67465a7c318ec73de3ffacc566cce48304a3379885dd814f0c32f362c1d2e24abf2935e090056df0bd8db0fa85cb36553203e5eb6e837e23e888ca6cd137f
 DIST jcs-1.2.7.9.tar.bz2 570289 SHA256 9963cfb34fd813167b52907f21c2c5123f8a78b2d4fe2d21802967fb097735cf SHA512 3ea9a753d95815fcd81266e4ce83046b2eac22d52ab166929cbc082d2b5aa7e184a74adf87dcd77a2f19c4658d15deb364a439f515d4a1ba5d20c021f230abbc WHIRLPOOL 43e0a7853843e7c32799213043270b86e36e34756c3ce991a12d919a03f3bd806405b2734a938b236fa27d0e8e2b3bf2a2bd159235c6b9a70a5ce8f83fb1acb6
 DIST jcs-1.3-src.tar.gz 608600 SHA256 cb5534698e77e04715e634ed748941e3c24ecc0be6b8db1731a131848a51f611 SHA512 edaf63c83393c9e48711aa3b76545cafb2297909a4f7470a1396f3a1d3f7a5c78321ce29a8d0097be8b0600e587757fd1d45b5e5feb31e658ec6b4f3af950be6 WHIRLPOOL 34e698826ffd14b2b0fe488b5dcbac02fc43abb969eca207e98bef45b448c767e567f489682419a4e8566439026bef721bf57fc564cb6570ba692a36a4358da3
diff --git a/dev-java/jcs/files/jcs-2.0-build.xml b/dev-java/jcs/files/jcs-2.0-build.xml
new file mode 100644
index 000000000000..04c4dae81729
--- /dev/null
+++ b/dev-java/jcs/files/jcs-2.0-build.xml
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/14/15 12:02 AM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-jcs-core-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="commons-jcs-core-2.0-beta-1"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/test-conf"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
+    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
+    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
+    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
+    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
+    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
+    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
+    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes"/>
+    <copy todir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}">
+        <include name="**/*.properties"/>
+        <include name="**/*.ccf"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/*UnitTest.java"/>
+          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
+          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
+          <exclude name="**/TestTCPLateralUnitTest.java"/>
+          <exclude name="**/UDPDiscoveryUnitTest.java"/>
+          <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
+          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
+          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
+          <exclude name="**/TestTCPLateralUnitTest.java"/>
+          <exclude name="**/UDPDiscoveryUnitTest.java"/>
+          <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             encoding="UTF-8" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             docencoding="UTF-8" 
+             source="1.6" 
+             linksource="true" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://docs.oracle.com/javaee/6/api/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+</project>
diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
new file mode 100644
index 000000000000..e8986727a001
--- /dev/null
+++ b/dev-java/jcs/jcs-2.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-2.0.ebuild,v 1.1 2015/06/14 14:38:41 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="test doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="commons-${PN}-dist-${PV}-beta-1-src"
+JCS_CORE="commons-${PN}-core"
+
+DESCRIPTION="JCS is a distributed caching system written in Java for server-side Java applications"
+HOMEPAGE="http://commons.apache.org/jcs/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/commons-${PN}-dist-${PV}-beta-1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="admin"
+
+CDEPEND="dev-java/jisp:2.5
+	dev-db/hsqldb:0
+	dev-java/xmlrpc:0
+	dev-java/commons-lang:0
+	dev-java/commons-dbcp:0
+	dev-java/commons-pool:0
+	dev-java/commons-logging:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	xmlrpc
+	hsqldb
+	jisp-2.5
+	commons-lang
+	commons-pool
+	commons-dbcp
+	commons-logging
+	commons-httpclient-3
+	servlet-api-3.0
+"
+
+EANT_BUILD_XML="${JCS_CORE}/build.xml"
+EANT_BUILD_TARGET="package"
+
+java_prepare() {
+	cp "${FILESDIR}/${P}-build.xml" ${JCS_CORE}/build.xml
+
+	# Disable the velocity-tools dep.
+	rm -v \
+		${JCS_CORE}/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
+
+	if use test; then
+		# Make use of commons-collections4 not yet packaged in Gentoo
+		rm -v \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
+
+		# Fails for some reason.
+		rm -v \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java \
+			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
+	fi
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local target="${JCS_CORE}"/target
+	java-pkg_newjar "${target}"/"${JCS_CORE}-${PV}"-beta-1.jar "${JCS_CORE}".jar
+
+	if use doc; then
+		java-pkg_dojavadoc "${target}"/site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${JCS_CORE}"/src
+	fi
+}
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index badaec7456f5..a2bec409f5e7 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,4 +1,3 @@
-DIST jmock-1.1.0-src.zip 579355 SHA256 3f9fbfe322e2e09878a9418c86c9f440bf135ea09487e117d151f12cfc93050e SHA512 7728f23bdfb78b2989400e48d90c42aa72d8c95f678597cf8e234109d9df2c4abc36ebbf4edbe16167b38891ef624d14cc6aae9b7be33a31b41b4caaae157dd8 WHIRLPOOL 875d4988bd0a2d3dadf98c2e95d33f08eb37c35ae647d93d8a426a0d88c27983b039168b10e8bdb1d7f0dda7424d97b3fb5448a76490eca7d8d464036bfc9e7b
 DIST jmock-1.2.0-jars.zip 153318 SHA256 c98e8dd0e5ebb590578baf4eb095b0c69084cd448269cac6c7dd52075ced5b36 SHA512 7b854c462e04642444f8994875d496655986a094b113f888c8dd5f07149c41c4e97e23f8f0cf75822b4e8281ffb90054ac44024cacd3f6e55ef0659e463f0cc5 WHIRLPOOL b2563df867f481706a9a7ebf4b5535321bcb295c42233575fb657908c232cda8416d3e1a5c78b67d41a311efdb0760ad5984278ae9cc02ea81868184767cc88a
 DIST jmock-2.5.1-jars.zip 758019 SHA256 e5f8d704d732a4e0d2a7788d966e6c8cfc722707bf278b6c0618f9d46eae6e7a SHA512 97032dd3f7f2b8e4e310e04722af0f444a60b0908ca45111b0ad1578f92ddac411c9d66f6eb696f45134c8baced86c10194b5ebbd8974090a585e95583dd2a9c WHIRLPOOL 1e50a9da3f8a16f4f706f2631f2a9aee89a89067c1a365284c116e6bdd7a4e5c4ac9a828317e13e49d097ad59bb7cd4f7d49cf99ed47055a17b2faa418300f94
 DIST jmock-2.6.1-jars.zip 1249841 SHA256 e49a0f7628c6368e46de1c48dfd8aed084f03661d87cf3a78025fdec367021fb SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e WHIRLPOOL e67be30e6718b998a34a52cdaa59ba7afc19969b5fe08529ea056867c0b8b3fad2628eb04b8b0b778bd215d29fe4aa962b0021afbb64835eac845f76c4b5987d
diff --git a/dev-java/jmock/jmock-1.1.0-r2.ebuild b/dev-java/jmock/jmock-1.1.0-r2.ebuild
deleted file mode 100644
index d464a269ff2d..000000000000
--- a/dev-java/jmock/jmock-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.1.0-r2.ebuild,v 1.12 2014/08/10 20:18:36 slyfox Exp $
-
-JAVA_PKG_IUSE="doc examples source test"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://${PN}.codehaus.org/${P}-src.zip"
-HOMEPAGE="http://jmock.codehaus.org"
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-	=dev-java/cglib-2.0*
-	=dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}
-	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/1.1.0-build.xml.patch"
-	epatch "${FILESDIR}/1.1.0-junit-3.8.2.patch"
-
-	cd ${S}/lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from cglib-2,junit
-}
-
-EANT_BUILD_TARGET="core.jar cglib.jar"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant core.test.unit cglib.test.unit
-}
-
-src_install() {
-	java-pkg_newjar build/dist/jars/${PN}-SNAPSHOT.jar
-	java-pkg_newjar build/dist/jars/${PN}-cglib-SNAPSHOT.jar ${PN}-cglib.jar
-	dodoc CHANGELOG || die
-	dohtml overview.html || die
-
-	use doc && java-pkg_dojavadoc build/javadoc-*
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc core/src/org
-}
diff --git a/dev-java/jmock/jmock-1.2.0.ebuild b/dev-java/jmock/jmock-1.2.0.ebuild
index 64253aae11fa..e446a13ef433 100644
--- a/dev-java/jmock/jmock-1.2.0.ebuild
+++ b/dev-java/jmock/jmock-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.2.0.ebuild,v 1.3 2015/06/06 22:51:50 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.2.0.ebuild,v 1.4 2015/06/14 14:57:18 monsieurp Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://jmock.codehaus.org"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="dev-java/junit:0"
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 0bdc009c9b66..eda16549fffb 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,3 +1 @@
-DIST scala-2.11.4.tgz 26509669 SHA256 000f5a19de78049bc06e33ee98063c7ad3cfd51212df92a8a164af89aeef8084 SHA512 f963279cba5d2f4d41d195f80dad32bf529bc5f2c3d306ce6c1b9fbb6d4977a481796d98c3d1758f3987824880ab0925ac72e3a70e4165faf7c7985e64cece28 WHIRLPOOL a76a97854e0d4ac9f2f555ab3b5196d473e8723c88926163f88c891ac31cacb7d97acadf437aee101b2d9db0fc0295f4b3fc95c5db6bc16de8e6ff54b1a2ecda
-DIST scala-2.11.5.tgz 27135212 SHA256 6d593ce6df0e4f2e90ae423f2d40b915cd9be2bd41708b7fc1df56ebbdf0893c SHA512 c906cb1e42a62fc271674cb95b3eacd968dd579dfd43a1adaae8a102b4069096907af4798a6a002dfec796905e3cff05d58116013c8e45a7277879935c39d3d3 WHIRLPOOL d05fd600bf5c24a856f75ca245338d97da642dd7d68033bf21364aa9ba82aa79c00b37a1a8721cd761126e011556ef52ad06a370d680b04aa5391488e695f739
 DIST scala-2.11.6.tgz 27130723 SHA256 41ba45e4600404634217a66d6b2c960459d3a67e0344a7c3d9642d0eaa446583 SHA512 aeb6dd1b586d4e66e01f268aa8a647a303f2f960cbe255e9c79ced978dad92b6cef3cba143945affa3427548daed6e5e1d607b9ecb4d7567adc886d64546da61 WHIRLPOOL 20c1bd8b905ad4f7d155d366637a2aeaeb50569025ba585a0e6e3bb2268068e7b74bed26769a9b3a1d1d662833b6d5f57781c7165ec84d1c63142cdd6edae294
diff --git a/dev-lang/scala-bin/scala-bin-2.11.4.ebuild b/dev-lang/scala-bin/scala-bin-2.11.4.ebuild
deleted file mode 100644
index d9b5cb6b1ad5..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.11.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.4.ebuild,v 1.2 2015/05/18 21:11:24 monsieurp Exp $
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.6
-	!dev-lang/scala"
-
-JAVA_PKG_IUSE='doc'
-
-S=${WORKDIR}/scala-${PV}
-
-java_prepare() {
-	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat || die
-	eend $?
-
-	ebegin 'Patching SCALA_HOME variable in bin/ scripts'
-	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
-	done
-	eend $?
-}
-
-src_install() {
-	ebegin 'Installing bin scripts'
-	dobin bin/*
-	eend $?
-
-	ebegin 'Installing jar files'
-	cd lib/ || die
-
-	# Unversion those libs
-	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
-	java-pkg_newjar akka-actor_*.jar akka-actor.jar
-	java-pkg_newjar config-*.jar config.jar
-	java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-	java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-	java-pkg_newjar scala-swing_*.jar scala-swing.jar
-	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
-	java-pkg_newjar scala-xml_*.jar scala-xml.jar
-	java-pkg_newjar jline-*.jar jline.jar
-	java-pkg_newjar scala-continuations-plugin_*.jar scala-continuations-plugin.jar
-	java-pkg_newjar scalap-*.jar scalap.jar
-
-	# Install these the usual way
-	java-pkg_dojar scala-compiler.jar
-	java-pkg_dojar scala-library.jar
-	java-pkg_dojar scala-reflect.jar
-
-	eend $?
-
-	cd ../ || die
-
-	ebegin 'Installing man pages'
-	doman man/man1/*.1
-	eend $?
-
-	if use doc; then
-		ebegin 'Installing documentation'
-		java-pkg_dohtml -r doc/tools
-		eend $?
-	fi
-}
diff --git a/dev-lang/scala-bin/scala-bin-2.11.5.ebuild b/dev-lang/scala-bin/scala-bin-2.11.5.ebuild
deleted file mode 100644
index f2dfc237f675..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.11.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.5.ebuild,v 1.1 2015/05/18 21:07:03 monsieurp Exp $
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.6
-	!dev-lang/scala"
-
-JAVA_PKG_IUSE='doc'
-
-S=${WORKDIR}/scala-${PV}
-
-java_prepare() {
-	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat || die
-	eend $?
-
-	ebegin 'Patching SCALA_HOME variable in bin/ scripts'
-	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
-	done
-	eend $?
-}
-
-src_install() {
-	ebegin 'Installing bin scripts'
-	dobin bin/*
-	eend $?
-
-	ebegin 'Installing jar files'
-	cd lib/ || die
-
-	# Unversion those libs
-	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
-	java-pkg_newjar akka-actor_*.jar akka-actor.jar
-	java-pkg_newjar config-*.jar config.jar
-	java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-	java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-	java-pkg_newjar scala-swing_*.jar scala-swing.jar
-	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
-	java-pkg_newjar scala-xml_*.jar scala-xml.jar
-	java-pkg_newjar jline-*.jar jline.jar
-	java-pkg_newjar scala-continuations-plugin_*.jar scala-continuations-plugin.jar
-	java-pkg_newjar scalap-*.jar scalap.jar
-
-	# Install these the usual way
-	java-pkg_dojar scala-compiler.jar
-	java-pkg_dojar scala-library.jar
-	java-pkg_dojar scala-reflect.jar
-
-	eend $?
-
-	cd ../ || die
-
-	ebegin 'Installing man pages'
-	doman man/man1/*.1
-	eend $?
-
-	if use doc; then
-		ebegin 'Installing documentation'
-		java-pkg_dohtml -r doc/tools
-		eend $?
-	fi
-}
diff --git a/dev-lang/scala-bin/scala-bin-2.11.6.ebuild b/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
index dc36312eaa9a..dbf0f8402035 100644
--- a/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.6.ebuild,v 1.1 2015/05/18 21:07:03 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.6.ebuild,v 1.3 2015/06/14 18:46:48 monsieurp Exp $
 
 EAPI=5
 
@@ -12,15 +12,14 @@ SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="doc"
 
 DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.6
 	!dev-lang/scala"
 
-JAVA_PKG_IUSE='doc'
+JAVA_PKG_IUSE="doc"
 
 S=${WORKDIR}/scala-${PV}
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild
index eb57fbc3a898..a5f6d0af1939 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild,v 1.1 2015/06/13 14:59:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild,v 1.2 2015/06/14 18:00:36 mgorny Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -64,10 +64,10 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	emake
-	use doc && emake -C doc gcrypt.pdf
+	multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
 }
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	use doc && dodoc doc/gcrypt.pdf
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
 }
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild
index 2677cd2ade04..7abc2c36e83e 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild,v 1.3 2015/05/21 07:27:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild,v 1.4 2015/06/14 12:43:15 patrick Exp $
 
 EAPI=5
 
@@ -12,14 +12,15 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
 
 RDEPEND="
 	>=dev-lang/ocaml-4:=[ocamlopt]
 	virtual/libffi
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
 
 src_compile() {
 	emake -j1
diff --git a/dev-perl/CGI/CGI-4.200.0.ebuild b/dev-perl/CGI/CGI-4.200.0.ebuild
index 083c55cf75a9..008f7db99dce 100644
--- a/dev-perl/CGI/CGI-4.200.0.ebuild
+++ b/dev-perl/CGI/CGI-4.200.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI/CGI-4.200.0.ebuild,v 1.1 2015/06/13 17:32:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI/CGI-4.200.0.ebuild,v 1.2 2015/06/14 14:35:34 dilfridge Exp $
 
 EAPI=5
 
@@ -26,7 +26,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.980.0 )
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Warn
+	)
 "
 
 SRC_TEST="do"
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 0ea78707a4c0..6536a894f940 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,3 +1,4 @@
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
 DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
 DIST PyQt-x11-gpl-4.11.3.tar.gz 11120237 SHA256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 SHA512 48264bed71a0c9662c2903a7cf1ed0263f18b3b69e5b9639b6a006f3cf72bc9766e786788c46046546d1676b221ed2ab29d2ec7fe57057ea9b84cede5ee7622c WHIRLPOOL 1c0f7ecd9f845ec1887ebd0c5b4473bc9be19c074aa8d0c3203c7ccdc0fbd16c4f247f80ba81ab491ef06cefaae704adb1da5da99d658826e941db398c920570
+DIST PyQt-x11-gpl-4.11.4.tar.gz 11317088 SHA256 fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407 SHA512 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170 WHIRLPOOL cf635d6399bd04def2648eee65e038d720f06dddfac70f3df6f87deb7483e023ee1a4aa07285a5075adc19dc91bca4500b82f65b342e07a8845023cf98bb6233
diff --git a/dev-python/PyQt4/PyQt4-4.11.4.ebuild b/dev-python/PyQt4/PyQt4-4.11.4.ebuild
new file mode 100644
index 000000000000..01bfb70c8b88
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.11.4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.4.ebuild,v 1.3 2015/06/14 14:07:15 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multibuild multilib python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"
+
+MY_PN="PyQt-x11-gpl"
+if [[ ${PV} == *_pre* ]]; then
+	MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION}
+	SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X dbus debug declarative designer doc examples help kde multimedia
+	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sql? ( X )
+	testlib? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.5:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.16.6:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? ( >=dev-qt/qtgui-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	phonon? (
+		kde? ( >=media-libs/phonon-4.7[qt4] )
+		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
+	)
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Support qreal on arm architecture (bug 322349).
+	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+	# Allow building against KDE's phonon (bug 525354).
+	epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch"
+}
+
+pyqt_use_enable() {
+	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure-ng.py
+			$(use debug && echo --debug --trace)
+			--verbose
+			--confirm-license
+			--qmake="$(qt4_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtXml
+			$(pyqt_use_enable X QtGui)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable multimedia)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable phonon phonon)
+			$(pyqt_use_enable script)
+			$(pyqt_use_enable scripttools QtScriptTools)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webkit QtWebKit)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake4 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
+		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc ChangeLog NEWS THANKS
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index 02596874b927..58a13f76fc2c 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -1 +1,2 @@
 DIST Flask-Admin-1.0.6.tar.gz 235842 SHA256 c16d1bb1b6c2b6ac8db8486b9a5e1919d1a073252e3fb0c0c226406470113a54 SHA512 a30e2678a063d45d55ccf41cfec07fd16973cc8c770b1e7f16d11b9aba693049b1d9d4cff81d8ae8f2548d019f977f0906728e98d23d229d76bf135a079abc8f WHIRLPOOL 9851b8f7e59c5b7bf99e2e58a0ad72076578f12564146a282b9e3e0e79bd31bec7a1fd394dc807b8152165fce617c6a7b025cfaa987680a649412a3d1c3f8e8c
+DIST Flask-Admin-1.1.0.tar.gz 735408 SHA256 28380393143a9b209e22c256494ba3ab1b6aea86f183962451896e26e75a8609 SHA512 35e21cda38ba8658940356240df7b3feec7619a5ab7c31c70c8a962b385d391d78d6440716c7dfce00fb48bf1243799de2a3d53b3cd0b7eee45137e2ebd3273d WHIRLPOOL d2790169dd3711864ee190c328bc5502622706af6a3c306b7d8c00459a0859af4b527b0dec449a824459361f4602fd1c1f7a96212e2585c3d46df3beb48197ec
diff --git a/dev-python/flask-admin/flask-admin-1.1.0.ebuild b/dev-python/flask-admin/flask-admin-1.1.0.ebuild
new file mode 100644
index 000000000000..07e948159f47
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/flask-admin-1.1.0.ebuild,v 1.1 2015/06/14 15:41:52 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
+		dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-evolution/Manifest b/dev-python/flask-evolution/Manifest
index d6f25e93a4c2..724832d83d11 100644
--- a/dev-python/flask-evolution/Manifest
+++ b/dev-python/flask-evolution/Manifest
@@ -1 +1,2 @@
 DIST Flask-Evolution-0.5.tar.gz 3582 SHA256 f1a177eebd7908bc2390956754cf9b7c6d29f915d760db867d4b094843020dbb SHA512 94c7861a218563e6e72b831728bd199d2eb4850a14fab5e144cde9d44fe2545ea739019250073a27bed588b2bbfc88da7067ce3495dab355398bc0aba5a5960d WHIRLPOOL b7874931624b0a88954bb8bcd980b614cd672a52d88c6870f254268f79a1a071279d8a7262f79d79bf3f60ca87d85cd34e468856e3a86b6262e389230429079c
+DIST Flask-Evolution-0.6.tar.gz 3480 SHA256 54be57ccc4cac5a5fe54fa4635e792e69bd1959a6d60318fe8c0a414f3963591 SHA512 04fd348b7ed0dc93d864bf012dd9708a8c4c0fac81cd31ddffe91159a7631f42095bb9d6bcacc08cc5498d836e3497b4ea9896f1df039a12eb78d5e2c236c7ba WHIRLPOOL 4a17cc623bc68caa3c50368bcddfc556722047110fcd435fdd62af9769e81717192943863bd0c34d76f4b1c41c270571983e0cfbf5c5b6215738e290a2f2b6de
diff --git a/dev-python/flask-evolution/flask-evolution-0.6.ebuild b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
new file mode 100644
index 000000000000..b8b148ef4ced
--- /dev/null
+++ b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-evolution/flask-evolution-0.6.ebuild,v 1.1 2015/06/14 15:58:18 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Evolution"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
+HOMEPAGE="http://pypi.python.org/pypi/Flask-Evolution"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index eba29a8ac47c..6cf7d424d288 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1 +1,2 @@
 DIST flask-mongoengine-0.7.0.tar.gz 103676 SHA256 e5031d1f812181699b10fec76d7c9c6633f19f8b686dcee48371e9216884f2b4 SHA512 3a9ce923b5d391e4fbdacc87d32e6cd8e0ada592c9fce585cf6dc38b8c116966cd70c83c2f2b77f580348722351c129ef38d7788f9ae2bd27d043de0d5487493 WHIRLPOOL 20583285ec18871b750c045a1dc911d6c836b152a27816b81805f12808dd68450236139245fd6ea07c9239544a7a62dafd358feaf13304910b6c6301f5f32567
+DIST flask-mongoengine-0.7.1.tar.gz 103947 SHA256 8ab895611a92b1e16f8467ddda0d4e8addee0ccf478f61d161ff58417caa06f2 SHA512 5da5c0a9794a108c2ff3adc3a6a415216841f060db54483b96421769879e7961c1137b787ad2ebd0ceb80a2187e4c7eaaecca4cb57c517e43aaf4845ac618c99 WHIRLPOOL afb4cf0a02678d1f4cfaa9c6d35d6086cf2e1f49a4b739348463173175f5928c7bacb2eecd3257bb0782021a5276761c187377ca3f2ec80560cdd086a86aa5c9
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.7.1.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.7.1.ebuild
new file mode 100644
index 000000000000..0c840c541dfb
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-mongoengine/flask-mongoengine-0.7.1.ebuild,v 1.1 2015/06/15 01:35:57 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+		>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 55c515b2c398..dd7151f2646b 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -2,3 +2,4 @@ DIST libvirt-python-1.2.10.tar.gz 162075 SHA256 fd38d589da34de523756e2b39980453b
 DIST libvirt-python-1.2.12.tar.gz 164708 SHA256 432f438f9759e216424490f51a8804398b70fb1b2f2211f45fb05f72f5ad849f SHA512 f9196734fd91f135671b75e2e967bdcdcbf9daec7d898a57080251bf306c29b7367f99361098924ffd7eb321809b61ef28147f395465d3d84b99389d505ea1f2 WHIRLPOOL 191d4ae091ac7903a0927a72e63c1bb075aac23341dcd000b8ab2bb423a12e62d324d667ffc213da1748b995218b1fcb90a4e6d819d17e75af7157c4a863f603
 DIST libvirt-python-1.2.14.tar.gz 165276 SHA256 0dc3c2bd8eeb570921e7c5cc7cfc202795e5ffd63b0f356ae89dbe0575ee0581 SHA512 38b7af055f92ac1e7473174368db75aa4c3b2ec090ab73bf8728c622e6576b3da04789ffda4388168f5b051701f021a6b8eecd8e83f6f36ecb46565c53a04714 WHIRLPOOL 029c8dfad830f8c7647d209ab117ea6a68baca3b78629530fa8e55550de7da72282ec90b68501218e9ecb5510a9e4e3eb78f6d87b9b54fd1ed6623f86ac7b2cf
 DIST libvirt-python-1.2.15.tar.gz 166128 SHA256 9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba SHA512 5687308c2f16199ecc4ec935719da1e2d34d0fb3752437a4c662d7c83d972f49ee5e852daf7233fa9aa29f25bbaed1c26d17740faf56c1771bbc2134bcb8958b WHIRLPOOL d2173060d5d3763ba367fbf3140800d6534c27f36b91d7a944ff2f5ce36f9ac54bd86fb6df1399cfa8610ef62c0b0b87427fc68dc1e0be77b0c7b3f94f7d9e30
+DIST libvirt-python-1.2.16.tar.gz 167711 SHA256 44eddd353d66f24380d90503bf16f3155c08f3d84d9cc4375d3529f312a7d8fe SHA512 97eaad16cd4561bf1319ff047ab73ed4794ad40ebf962eedd964015d9c83859f897514eaa60273e8f82393d0afc6fd1131909b277ac4e8eaf11ee9f96d542a28 WHIRLPOOL 4cf9381dc664bc7593ada8b0bc1a92742514907661eb59e0ffc29438d131f093d4d0b5e2c925a1d251c771d7e7b2017c27644be6da19ab3efc551bf537b25e4e
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.16.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.16.ebuild
new file mode 100644
index 000000000000..18dfb5ff2500
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.2.16.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libvirt-python/libvirt-python-1.2.16.ebuild,v 1.1 2015/06/14 15:41:08 tamiko Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 220f284b04c9..682d80e12cea 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,2 @@
-DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
deleted file mode 100644
index add77db9da67..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild,v 1.11 2015/04/08 08:05:26 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils multilib python-r1 toolchain-funcs
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.12:=[${PYTHON_USEDEP}]
-	=dev-python/PyQt4-4.10*[X,${PYTHON_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}" configure-old.py
-			--apidir="${EPREFIX}"/usr/share/qt4/qsci
-			--destdir="$(python_get_sitedir)"/PyQt4
-			--sipdir="${EPREFIX}"/usr/share/sip
-			-n "${EPREFIX}"/usr/include/qt4
-			-o "${EPREFIX}"/usr/$(get_libdir)/qt4
-			-p 4
-			--no-timestamp
-			$(use debug && echo --debug)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_parallel_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	compilation() {
-		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)"
-	}
-	python_foreach_impl run_in_build_dir compilation
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild
deleted file mode 100644
index 66643f73f74e..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild,v 1.3 2015/04/30 13:50:25 pesa Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}" configure.py
-			--qmake="$(qt4_get_bindir)"/qmake
-			--destdir="$(python_get_sitedir)"/PyQt4
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt4
-			--no-timestamp
-			$(use debug && echo --debug)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
-		eqmake4
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 889e248eadc9..2c1f15d0457d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,4 @@
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
-DIST sip-4.16.6.tar.gz 861708 SHA256 8c7db2baf52935ee7d8573c98d6ede0d90e4308b8b9e7739e59acf1650714552 SHA512 18646c5ccefe45a01e6bb649acc062781da03942e1c12f79f3e1ee01cec81e834ead36321ec073e75d42328071171111ba3e4a067e1f67d576f443a96854d51a WHIRLPOOL f15225f95fa682a23d3cacc71049ca51692cc194318d4aea38ed87fffbbcfb2e856b73ecc79907b09818ca1469ab19decc3a5865890b7ed3de83f5c536451954
 DIST sip-4.16.7.tar.gz 954799 SHA256 4caa8d52e4403bae5c4c64f44de03a2cfd0bb10b6d96c5fb771133516df9abbd SHA512 0e15b837c3f109f8665f057218c81ed4cb3d7c1eb9be78e454d54020cd748e5d1034d04345897f5f63a38c4ec33c39b9500486167a507895597d4e3c1623be56 WHIRLPOOL 3671344235e7fcb032936e3bf509170d2728b04b17402db484c5d73500378a161a6ecce8e592d38381ccd1d6a8daa01e098cb6680dd2546b0b34984e77032b3a
+DIST sip-4.16.8.tar.gz 957083 SHA256 d3141b65e48a30c9ce36612f8bcd1730ebf02d044757e4d6c5234927e2063e18 SHA512 aa63ab9925d581e929613cfd9c5804489a0702b8380958874cc1bd364030e21b30816493c7f38ceccdffc9da310d2c793ea438ce458ed06511ede7fbb913ef8d WHIRLPOOL 3c84a4de2be0458ec90dc2b266c0435808f0e92db09bae92e7ce1a24b2dd1bdf6037cdcec322a7c92266cf591e95bd36e812434aaf3dbfe8c71cf882dcba72f5
diff --git a/dev-python/sip/sip-4.16.6.ebuild b/dev-python/sip/sip-4.16.8.ebuild
similarity index 96%
rename from dev-python/sip/sip-4.16.6.ebuild
rename to dev-python/sip/sip-4.16.8.ebuild
index c6975849857b..716bd74839cf 100644
--- a/dev-python/sip/sip-4.16.6.ebuild
+++ b/dev-python/sip/sip-4.16.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.6.ebuild,v 1.1 2015/03/02 03:14:52 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.8.ebuild,v 1.1 2015/06/14 13:39:58 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
diff --git a/dev-qt/qt-mobility/metadata.xml b/dev-qt/qt-mobility/metadata.xml
index 688f13b00aae..557271548b9f 100644
--- a/dev-qt/qt-mobility/metadata.xml
+++ b/dev-qt/qt-mobility/metadata.xml
@@ -24,6 +24,6 @@
 </use>
 <upstream>
 	<bugs-to>https://bugreports.qt.io/</bugs-to>
-	<doc>http://doc.qt.digia.com/qtmobility/</doc>
+	<doc>http://doc-snapshots.qt.io/qt-mobility/index.html</doc>
 </upstream>
 </pkgmetadata>
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild
index 6f91de5e399f..52efb52c4c45 100644
--- a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild
+++ b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild,v 1.5 2015/04/01 20:50:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild,v 1.6 2015/06/14 23:15:19 pesa Exp $
 
 EAPI=5
 
 inherit multilib qt4-r2
 
 DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
-HOMEPAGE="http://doc.qt.digia.com/qtmobility/"
+HOMEPAGE="http://doc-snapshots.qt.io/qt-mobility/index.html"
 SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -144,7 +144,7 @@ src_install() {
 	qt4-r2_src_install
 
 	if use doc; then
-		dohtml -r doc/html/*
+		dodoc -r doc/html
 		dodoc doc/qch/qtmobility.qch
 		docompress -x /usr/share/doc/${PF}/qtmobility.qch
 	fi
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
index 0ae077fcbc7d..256b2c5c4830 100644
--- a/dev-ruby/pygments_rb/Manifest
+++ b/dev-ruby/pygments_rb/Manifest
@@ -1 +1,2 @@
 DIST pygments.rb-0.6.2.gem 1892352 SHA256 f4a1743be41a14f1f7ce63e03acefb9c6fabf7261c296b001191e0800f56e032 SHA512 8fd2da56d669882fa6b73073f02371ed7f9523ae115dd66bd77f2ed1d2e0abe5336e52d94fd92e85a55d813d163b0a6615233c2b27d16b5d089e0f97a2647d9c WHIRLPOOL 4caecb6182dcc712f2cdeded83bb734db7c5f988b70c0e87dd63c09ab0e75877cd780f4c5d1d64f751ca0fe3f0d8794e6f27d16a72fdfe4f1724312a705f6f12
+DIST pygments.rb-0.6.3.gem 1892352 SHA256 d19824fe964cf10388e2852ce3ee888f3e1446c9c2cdc89a55137d8183391198 SHA512 faa9d04b0571e34d5b01cf8ac8b70a68aa3e2555d222199c0090c0b71ae4046e74fc6e64fe8fd0c327fbe9c4a4efb34a91a02dec962086e8d9f8d881bff1eff0 WHIRLPOOL 6663226ee996827dd480a326a5c55c8603d5ab159c78969a2c774a45ff302c7d0b2eb4ee12601de59fb43bac207faf9b4222f1eb017ded313721906c02709db9
diff --git a/dev-ruby/pygments_rb/pygments_rb-0.6.3.ebuild b/dev-ruby/pygments_rb/pygments_rb-0.6.3.ebuild
new file mode 100644
index 000000000000..00ef5c895bb2
--- /dev/null
+++ b/dev-ruby/pygments_rb/pygments_rb-0.6.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/pygments_rb-0.6.3.ebuild,v 1.1 2015/06/14 15:39:46 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+PYTHON_COMPAT=( python2_7 )
+
+RUBY_FAKEGEM_NAME="pygments.rb"
+MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
+
+inherit ruby-fakegem python-single-r1
+
+DESCRIPTION="Pygments syntax highlighting in ruby"
+HOMEPAGE="https://github.com/tmm1/pygments.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
+
+RUBY_S="${MY_P}"
+
+RDEPEND+=" dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND+=" test? ( ${RDEPEND} )"
+
+ruby_add_rdepend ">=dev-ruby/yajl-ruby-1.2
+	dev-ruby/posix-spawn"
+ruby_add_bdepend "dev-ruby/rake-compiler"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/s.files/d' pygments.rb.gemspec || die
+	python_fix_shebang lib/pygments/mentos.py
+	# we are loosing a "custom github lexer here", no idea what it is,
+	# but if we need it, it should go into dev-python/pygments
+	rm -r vendor lexers || die "removing bundled libs failed"
+}
+
+each_ruby_compile() {
+	# regenerate the lexer cache, based on the system pygments pkg
+	${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_doins lexers
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
index 231f621f4948..d639db48198d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI=5
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
index 4a59ae42876f..5d845d8fe072 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild,v 1.4 2015/06/14 16:34:38 ulm Exp $
 
 EAPI=5
 
@@ -24,14 +24,7 @@ RDEPEND="
 	>=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index 21ed6f3156f9..70c3f25a8d24 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild,v 1.5 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild,v 1.6 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
index e48026629252..3e69a51c7e0b 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI=5
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index 2b4436f1d784..e20587f1ddc4 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index b56b959cf7da..81c55bf3428d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index 52b57ce74e6d..2573c19c8687 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 90a7a9c3f36c..9594f889e653 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index d7bdc37660e6..04e76c37c63d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild,v 1.4 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index 5e2dd0ae9727..94cb7ba0c4dc 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.4 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index 50143f538539..9e7eff22ac0d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.3 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
index f897c03d1b35..e70c63a1cce2 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild,v 1.4 2015/06/14 16:34:38 ulm Exp $
 
 EAPI=5
 
@@ -23,14 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	|| (
-		(
-			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 027800312562..115cf351de7c 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.3 2015/04/01 20:08:34 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.4 2015/06/14 16:34:38 ulm Exp $
 
 EAPI="5"
 
@@ -23,10 +23,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	|| (
-		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		sys-libs/zlib[abi_x86_32(-)]
-	)
+	sys-libs/zlib[abi_x86_32(-)]
 "
 
 ANDROID_SDK_DIR="/opt/${PN}"
diff --git a/dev-vcs/tig/tig-2.0.3.ebuild b/dev-vcs/tig/tig-2.0.3.ebuild
index 0d04904b5aa6..83faf70b8bec 100644
--- a/dev-vcs/tig/tig-2.0.3.ebuild
+++ b/dev-vcs/tig/tig-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tig/tig-2.0.3.ebuild,v 1.2 2014/11/08 04:55:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tig/tig-2.0.3.ebuild,v 1.3 2015/06/14 19:48:15 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://jonas.nitro.dk/tig/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+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"
 IUSE="unicode"
 
 DEPEND="sys-libs/ncurses[unicode?]
diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
index 64ac10ff7f15..2d08a2506c6e 100644
--- a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
+++ b/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild,v 1.2 2014/07/08 20:47:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild,v 1.3 2015/06/14 19:38:13 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -23,17 +23,9 @@ QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/*"
 RDEPEND="sys-libs/glibc
 	sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/doom3/doom3-1.3.1304-r1.ebuild b/games-fps/doom3/doom3-1.3.1304-r1.ebuild
index d3932121ba03..2ab87b774ab2 100644
--- a/games-fps/doom3/doom3-1.3.1304-r1.ebuild
+++ b/games-fps/doom3/doom3-1.3.1304-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.3 2014/07/08 21:05:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.4 2015/06/14 17:27:57 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -22,19 +22,12 @@ DEPEND="app-arch/bzip2
 	app-arch/tar"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	!dedicated? ( || (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		)
-	) )
+	!dedicated? (
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	)
 	cdinstall? (
 		>=games-fps/doom3-data-1.1.1282-r1
 		roe? ( games-fps/doom3-roe ) )"
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 23f35a2ece7d..7210d7428350 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,3 +1,3 @@
 DIST ET-2.60b.zip 4143401 SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8 SHA512 f86d0d172a170cd894f1c60a817d2159768bf7d03cb0146f3470edd54828096a62e890c24bac80a5851adc9356cb2716d5f0c756fab063a9c0eb561b72825b84 WHIRLPOOL 6e4718051b77201b5bdb87efebd492db46ca83cca380b7f4bac2833d3f95700a39801cfcd5b025ed2b4c51d6b3140b7a2021ba8e1056bf4d100e67204768170b
-DIST enemy-territory-all-0.1.tar.bz2 876 SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64
+DIST enemy-territory-all-0.1.tar.bz2 876 SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64 SHA512 7e00ac4a30ebbbc5db646e0edf6683d8e4d99756c1010922ccfd16a3dc27c0a5b23a91c9f3adb3e120bfcd5f9a3302a466a86888ff1496dda29a3b09e87eacb2 WHIRLPOOL 1dec8052196a04a3cf834636bab54a15a0eceee2eb52df888a533fe4f78a3f774eb122d6b14d65738b9084b7d543d26ab3d9ef14cafd63a1ba68e50e60d63307
 DIST et-linux-2.60.x86.run 270965248 SHA256 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36 SHA512 7321a3d831dd375c49aff81f30098c5201880e9fc783a25dd7dee3bd2211372e0e07a482e6c78982bc1f27d62bceb769dffc30f820c3144b4a64268fd9ef5cfe WHIRLPOOL 43e4cdced441add2524e07412d06a5530627922b14549f847567b9e558eb7652f7a7c8b6dac26b5ed6c18f55597a8cf898c950026dcd0577731d86257ae59162
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
index 7d68e3805d88..9358a6896b73 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild,v 1.5 2015/02/01 11:50:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild,v 1.6 2015/06/14 20:05:27 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -26,17 +26,11 @@ DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	dedicated? ( app-misc/screen )
-	!dedicated? ( || (
-		(
-			virtual/opengl[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	) )"
+	!dedicated? (
+		virtual/opengl[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+	)"
 
 S=${WORKDIR}
 
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
index 85e38a539a08..afd75d06e455 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild,v 1.2 2015/02/01 13:38:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild,v 1.3 2015/06/14 19:42:08 ulm Exp $
 
 EAPI=5
 inherit eutils games
@@ -18,21 +18,12 @@ RESTRICT="strip"
 DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
-		(
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=virtual/jpeg-62:62[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-			>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=virtual/jpeg-62:62[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 	cdinstall? ( games-fps/etqw-data )"
 
 S=${WORKDIR}/data
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
index 678f0fa14461..e5a5a86d00c4 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild,v 1.2 2014/07/07 17:55:00 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild,v 1.3 2015/06/14 16:59:55 ulm Exp $
 
 EAPI=5
 inherit unpacker eutils versionator games
@@ -21,20 +21,11 @@ IUSE=""
 RESTRICT="strip mirror"
 
 DEPEND="app-arch/unzip"
-RDEPEND="|| (
-	(
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=virtual/jpeg-62:62[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-sdl-20071114[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-)"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=virtual/jpeg-62:62[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
 
 S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/${PN}
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
index a89f266c1d86..648b9cc18266 100644
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild,v 1.3 2015/02/01 11:31:22 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild,v 1.4 2015/06/14 19:43:34 ulm Exp $
 
 EAPI=5
 inherit games
@@ -17,18 +17,11 @@ IUSE=""
 
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
-	(
-		virtual/opengl[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libXxf86vm[abi_x86_32(-)]
-		x11-libs/libXxf86dga[abi_x86_32(-)]
-	)
-	(
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-	) )"
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libXxf86dga[abi_x86_32(-)]"
 
 S=${WORKDIR}/glxquake
 
diff --git a/games-fps/legends/legends-0.4.1.43-r1.ebuild b/games-fps/legends/legends-0.4.1.43-r1.ebuild
index a041e913a4c2..4da350524cc6 100644
--- a/games-fps/legends/legends-0.4.1.43-r1.ebuild
+++ b/games-fps/legends/legends-0.4.1.43-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/legends-0.4.1.43-r1.ebuild,v 1.4 2015/04/21 17:39:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/legends-0.4.1.43-r1.ebuild,v 1.5 2015/06/14 19:44:55 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -26,22 +26,12 @@ DEPEND=""
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	media-fonts/font-adobe-75dpi
-	|| (
-	(
-		media-libs/libsdl[video,sound,opengl,abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		media-libs/libogg[abi_x86_32(-)]
-		media-libs/libvorbis[abi_x86_32(-)]
-		media-libs/openal[abi_x86_32(-)]
-	)
-	(
-		>=app-emulation/emul-linux-x86-sdl-2.1[-abi_x86_32(-)]
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-	) )
-"
+	media-libs/libsdl[video,sound,opengl,abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	media-libs/libogg[abi_x86_32(-)]
+	media-libs/libvorbis[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/postal2/postal2-1409.2-r2.ebuild b/games-fps/postal2/postal2-1409.2-r2.ebuild
index e74c6de33e98..f412b36d8e73 100644
--- a/games-fps/postal2/postal2-1409.2-r2.ebuild
+++ b/games-fps/postal2/postal2-1409.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/postal2-1409.2-r2.ebuild,v 1.3 2015/02/01 13:35:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/postal2-1409.2-r2.ebuild,v 1.4 2015/06/14 19:46:00 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker cdrom multilib games
@@ -20,17 +20,9 @@ DEPEND="games-util/loki_patch"
 RDEPEND="sys-libs/glibc
 	sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
-			>=media-libs/openal-1.15.1[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
+	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
index 6429902592b0..c97581643cbf 100644
--- a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild,v 1.4 2015/02/01 11:42:22 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild,v 1.5 2015/06/14 19:47:06 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker multilib games
@@ -20,16 +20,8 @@ RESTRICT="mirror strip"
 RDEPEND="sys-libs/glibc
 	sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		(
-			>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
-			>=media-libs/openal-1.15.1[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
+	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
 DEPEND=""
 
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/System/*"
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
index 952a7d26099e..a59a8b650b6c 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild,v 1.3 2015/02/01 11:37:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild,v 1.4 2015/06/14 19:48:25 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -24,17 +24,11 @@ RDEPEND="sys-libs/glibc
 		teamarena? ( games-fps/quake3-teamarena )
 	)
 	dedicated? ( app-misc/screen )
-	!dedicated? ( || (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	) )"
+	!dedicated? (
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	)"
 
 S=${WORKDIR}
 
diff --git a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
index 74c00a7e1bdc..5e1143be8743 100644
--- a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild,v 1.3 2015/02/01 11:33:06 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild,v 1.4 2015/06/14 19:49:39 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -19,17 +19,11 @@ RESTRICT="strip"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	dedicated? ( app-misc/screen )
-	!dedicated? ( || (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	) )"
+	!dedicated? (
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	)"
 
 S=${WORKDIR}
 
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
index 86325d33bf0b..ed77d44e3d03 100644
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild,v 1.2 2015/04/02 16:12:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild,v 1.3 2015/06/14 17:01:51 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -22,10 +22,7 @@ RESTRICT="strip"
 
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
-		sys-libs/zlib[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
+	sys-libs/zlib[abi_x86_32(-)]
 	dedicated? ( app-misc/screen )
 	!dedicated? (
 		|| (
@@ -33,18 +30,9 @@ RDEPEND="sys-libs/glibc
 			x11-drivers/nvidia-drivers
 			>=x11-drivers/ati-drivers-8.8.25-r1
 		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
-			)
-			(
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			)
-		)
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
 	)
 	cdinstall? ( games-fps/quake4-data )"
 
diff --git a/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild b/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
index a50bf7338e29..004aaa7aae06 100644
--- a/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
+++ b/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild,v 1.4 2014/07/10 05:44:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild,v 1.5 2015/06/14 17:05:33 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -36,18 +36,9 @@ RDEPEND="sys-libs/glibc
 			x11-drivers/nvidia-drivers
 			>=x11-drivers/ati-drivers-8.8.25-r1
 		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
-			)
-			(
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			)
-		)
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
 	)"
 
 S=${WORKDIR}
diff --git a/games-fps/rtcw/rtcw-1.41b.ebuild b/games-fps/rtcw/rtcw-1.41b.ebuild
index de0ab2b2fdfb..58faf683921f 100644
--- a/games-fps/rtcw/rtcw-1.41b.ebuild
+++ b/games-fps/rtcw/rtcw-1.41b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41b.ebuild,v 1.20 2014/10/13 16:44:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41b.ebuild,v 1.21 2015/06/14 19:51:56 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -17,20 +17,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="opengl dedicated"
 RESTRICT="strip mirror"
 
-UIDEPEND="
-	|| (
-		(
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)"
+UIDEPEND="x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
 RDEPEND="sys-libs/glibc
 	sys-libs/lib-compat
 	dedicated? ( app-misc/screen )
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
index e2e7ff2c20e2..07723dd70f68 100644
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild,v 1.3 2015/02/01 11:29:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild,v 1.4 2015/06/14 19:53:04 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -21,17 +21,11 @@ RESTRICT="strip mirror"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	dedicated? ( app-misc/screen )
-	!dedicated? ( || (
-		(
-			virtual/opengl
-			x11-libs/libX11
-			x11-libs/libXext
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	) )"
+	!dedicated? (
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
 
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/{PN}/*
 	${GAMES_PREFIX_OPT:1}/{PN}/demomain/*"
diff --git a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
index cd5519b85e6d..e80e5b4caeba 100644
--- a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
+++ b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild,v 1.3 2014/10/30 09:54:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild,v 1.4 2015/06/14 19:54:21 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -20,17 +20,9 @@ RESTRICT="strip mirror"
 
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
-		(
-			virtual/opengl[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild b/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild
index 9bbcb2546d73..2df1a9310dbc 100644
--- a/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild
+++ b/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild,v 1.3 2014/10/15 12:04:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild,v 1.4 2015/06/14 17:21:19 ulm Exp $
 
 EAPI="5"
 
@@ -23,21 +23,12 @@ RESTRICT="strip"
 IUSE="alsa"
 
 RDEPEND="
-	|| (
-		(
-			>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-			alsa? (
-				>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-				>=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)]
-				>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-			)
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-		)
+	>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	alsa? (
+		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
+		>=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)]
+		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
 	)
 "
 
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
index dbc8c5c442d2..3b872d1c411b 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild,v 1.1 2014/07/10 22:14:04 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild,v 1.2 2015/06/14 19:56:51 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -18,21 +18,12 @@ IUSE=""
 RESTRICT="strip"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="|| (
-	(
-		virtual/opengl[abi_x86_32(-)]
-		media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
-		x11-libs/libXrender[abi_x86_32(-)]
-		x11-libs/libXrandr[abi_x86_32(-)]
-		x11-libs/libXcursor[abi_x86_32(-)]
-		media-libs/smpeg[abi_x86_32(-)]
-	)
-	(
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)
-)"
+RDEPEND="virtual/opengl[abi_x86_32(-)]
+	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
+	x11-libs/libXrender[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	media-libs/smpeg[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
index 8964b30f25e9..55c1d7805086 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.5 2015/02/08 07:41:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.6 2015/06/14 19:55:37 ulm Exp $
 
 EAPI=5
 inherit check-reqs eutils unpacker cdrom games
@@ -18,20 +18,11 @@ IUSE=""
 DEPEND="games-util/loki_patch"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
-		(
-			virtual/opengl[abi_x86_32(-)]
-			media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
-			x11-libs/libXrender[abi_x86_32(-)]
-			x11-libs/libXrandr[abi_x86_32(-)]
-			media-libs/smpeg[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		)
-	)"
+	virtual/opengl[abi_x86_32(-)]
+	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
+	x11-libs/libXrender[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	media-libs/smpeg[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index 42131767ffef..7ea7d9402ec4 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.17 2014/10/15 11:42:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.18 2015/06/14 17:25:09 ulm Exp $
 
 EAPI=5
 
@@ -21,19 +21,11 @@ DEPEND="!games-fps/unreal-tournament
 	app-arch/unzip
 "
 RDEPEND="
-	|| (
-		(
-			opengl? ( virtual/opengl[abi_x86_32(-)] )
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-		)
-		amd64? (
-			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	opengl? ( virtual/opengl[abi_x86_32(-)] )
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
 "
 
 S=${WORKDIR}
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index 00cf615c7b5b..854902591d5b 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.20 2014/10/15 11:42:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.21 2015/06/14 17:25:09 ulm Exp $
 
 EAPI=5
 
@@ -18,21 +18,12 @@ IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
 RDEPEND="
-	|| (
-		(
-			opengl? ( virtual/opengl[abi_x86_32(-)] )
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-		)
-		amd64? (
-			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	opengl? ( virtual/opengl[abi_x86_32(-)] )
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
 "
 DEPEND=""
 
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index 96df13fd0c7c..c31594954e5c 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.32 2015/05/16 07:09:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.33 2015/06/14 17:23:12 ulm Exp $
 
 EAPI=5
 
@@ -18,21 +18,12 @@ IUSE="3dfx opengl"
 RESTRICT="mirror bindist"
 
 RDEPEND="
-	|| (
-		(
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			opengl? ( virtual/opengl[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-		)
-	)
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	opengl? ( virtual/opengl[abi_x86_32(-)] )
 "
 DEPEND="${RDEPEND}
 	!games-fps/unreal-tournament-goty
diff --git a/games-fps/unreal/unreal-226.ebuild b/games-fps/unreal/unreal-226.ebuild
index 5b8dc9010ccb..081155af27fc 100644
--- a/games-fps/unreal/unreal-226.ebuild
+++ b/games-fps/unreal/unreal-226.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/unreal-226.ebuild,v 1.22 2014/10/15 11:53:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/unreal-226.ebuild,v 1.23 2015/06/14 17:22:16 ulm Exp $
 
 EAPI=5
 
@@ -22,21 +22,12 @@ DEPEND="sys-libs/lib-compat
 	app-arch/unzip
 "
 RDEPEND="
-	|| (
-		(
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			opengl? ( virtual/opengl[abi_x86_32(-)] )
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			opengl? ( app-emulation/emul-linux-x86-opengl[abi_x86_32(-)] )
-		)
-	)
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	opengl? ( virtual/opengl[abi_x86_32(-)] )
 "
 
 S=${WORKDIR}
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index cd2615ca3b44..e221c05156a9 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.27 2014/10/15 11:29:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.28 2015/06/14 18:16:56 ulm Exp $
 
 EAPI=5
 
@@ -22,17 +22,9 @@ DEPEND="app-arch/unzip"
 RDEPEND="
 	sys-devel/bc
 	virtual/libstdc++:3.3
-	|| (
-		(
-			virtual/opengl[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
 "
 
 S=${WORKDIR}
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index 33a0ce6b9b02..27d41b533f1f 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.17 2014/10/15 11:34:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.18 2015/06/14 18:15:46 ulm Exp $
 
 EAPI=5
 
@@ -19,16 +19,7 @@ RESTRICT="strip"
 RDEPEND="
 	games-fps/ut2003-data
 	dedicated? ( games-server/ut2003-ded )
-	!dedicated? (
-		|| (
-			(
-				 virtual/opengl[abi_x86_32(-)]
-			)
-			amd64? (
-				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			)
-		)
-	)
+	!dedicated? ( virtual/opengl[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
index 2bdc18c72d8b..1094df525fc7 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.24 2015/03/26 23:09:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.25 2015/06/14 18:17:51 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -19,17 +19,9 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	virtual/libstdc++:3.3
-	|| (
-		(
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 
 S=${WORKDIR}
diff --git a/games-rpg/nwn/nwn-1.68-r5.ebuild b/games-rpg/nwn/nwn-1.68-r5.ebuild
index 432587f0248c..a357eb1310c3 100644
--- a/games-rpg/nwn/nwn-1.68-r5.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.7 2014/10/15 20:34:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.8 2015/06/14 17:08:19 ulm Exp $
 
 EAPI=5
 
@@ -56,20 +56,10 @@ RESTRICT="mirror strip"
 RDEPEND="
 	>=games-rpg/nwn-data-1.29-r3
 	!<games-rpg/nwmouse-0.1-r1
-	|| (
-		(
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 DEPEND="app-arch/unzip"
 
diff --git a/games-rpg/nwn/nwn-1.68-r6.ebuild b/games-rpg/nwn/nwn-1.68-r6.ebuild
index 2199ae1b077c..ef2ee1360cd2 100644
--- a/games-rpg/nwn/nwn-1.68-r6.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r6.ebuild,v 1.3 2014/10/15 20:34:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r6.ebuild,v 1.4 2015/06/14 17:08:19 ulm Exp $
 
 EAPI=5
 inherit eutils games
@@ -54,20 +54,10 @@ RESTRICT="mirror strip"
 RDEPEND="
 	>=games-rpg/nwn-data-1.29-r3
 	!<games-rpg/nwmouse-0.1-r1
-	|| (
-		(
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 DEPEND="app-arch/unzip"
 
diff --git a/games-rpg/nwn/nwn-1.69-r1.ebuild b/games-rpg/nwn/nwn-1.69-r1.ebuild
index 75986f997d0d..c251f6af8b64 100644
--- a/games-rpg/nwn/nwn-1.69-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.69-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.8 2014/10/15 20:34:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.9 2015/06/14 17:08:19 ulm Exp $
 
 EAPI=5
 inherit eutils games
@@ -32,20 +32,10 @@ RDEPEND="
 		${NWN_DATA},-linguas_fr,-linguas_de,-linguas_es,-linguas_it]
 	)
 	!<games-rpg/nwmouse-0.1-r1
-	|| (
-		(
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 DEPEND=""
 
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
index a2f2165bd204..322f3af97ff9 100644
--- a/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
+++ b/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild,v 1.5 2014/10/15 08:28:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild,v 1.6 2015/06/14 18:14:03 ulm Exp $
 
 EAPI=5
 
@@ -20,18 +20,10 @@ IUSE=""
 RESTRICT="mirror bindist strip"
 
 RDEPEND="
-	|| (
-		(
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 DEPEND=""
 
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
index 09820c586c29..83c0a024dba2 100644
--- a/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
+++ b/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.ebuild,v 1.4 2014/10/15 08:28:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.ebuild,v 1.5 2015/06/14 18:14:03 ulm Exp $
 
 EAPI=5
 
@@ -17,18 +17,10 @@ IUSE=""
 RESTRICT="bindist strip"
 
 RDEPEND="
-	|| (
-		(
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libXi[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 DEPEND=""
 
diff --git a/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild b/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild
index deac8509d821..6a5a5d2f079a 100644
--- a/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild
+++ b/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild,v 1.1 2014/10/16 21:40:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild,v 1.2 2015/06/14 17:12:48 ulm Exp $
 
 EAPI=5
 
@@ -20,56 +20,19 @@ QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/*"
 
 RDEPEND="
 	virtual/opengl
-	amd64? (
-		|| (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			(
-				>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
-			)
-		)
-		|| (
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-			(
-				>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
-				>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
-				>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
-				>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
-				>=x11-libs/pango-1.36.5[abi_x86_32(-)]
-			)
-		)
-		|| (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			(
-				>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
-				>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			)
-		)
-		|| (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			(
-				>=virtual/glu-9.0-r1[abi_x86_32(-)]
-			)
-		)
-	)
-	x86? (
-		dev-libs/atk
-		dev-libs/glib:2
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/pango
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		virtual/glu
-	)
+	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
+	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
+	>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
+	>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
+	>=x11-libs/pango-1.36.5[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=virtual/glu-9.0-r1[abi_x86_32(-)]
 "
 
 S="${WORKDIR}/Wasteland 2"
diff --git a/games-strategy/spaz/spaz-1.605.ebuild b/games-strategy/spaz/spaz-1.605.ebuild
index dd4826d57180..1c4767f61a2d 100644
--- a/games-strategy/spaz/spaz-1.605.ebuild
+++ b/games-strategy/spaz/spaz-1.605.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/spaz/spaz-1.605.ebuild,v 1.4 2014/06/25 17:28:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/spaz/spaz-1.605.ebuild,v 1.5 2015/06/14 17:19:45 ulm Exp $
 
 EAPI=4
 
@@ -16,16 +16,8 @@ IUSE="alsa pulseaudio"
 RESTRICT="fetch strip"
 
 DEPEND="app-arch/unzip"
-RDEPEND="
-	|| (
-		(
-			>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
-			>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		)
-	)"
+RDEPEND=">=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
 
 S="${WORKDIR}"/data
 
diff --git a/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild
index 2b35c37c311c..e36086550add 100644
--- a/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild,v 1.5 2015/05/17 20:06:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild,v 1.6 2015/06/14 19:47:27 maekke Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+autoconf-archive"
 
 RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 )
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..9fc07a916aef
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.1 2015/06/14 13:59:58 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps debug pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.38:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+
+	app-crypt/pinentry[gnome-keyring]
+	>=app-crypt/gnupg-2.0.28
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --disable-gpg-agent, bug #547456
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc \
+		--disable-gpg-agent
+}
+
+src_test() {
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}
diff --git a/gnome-base/orbit/orbit-2.14.19-r3.ebuild b/gnome-base/orbit/orbit-2.14.19-r3.ebuild
deleted file mode 100644
index b65393214f20..000000000000
--- a/gnome-base/orbit/orbit-2.14.19-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r3.ebuild,v 1.9 2013/09/10 20:24:47 maekke Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="ORBit2"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 toolchain-funcs autotools
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="http://projects.gnome.org/ORBit2/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pic static-libs test"
-REQUIRED_USE="test? ( debug )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	>=dev-libs/libIDL-0.8.2
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix wrong process kill, bug #268142
-	sed "s:killall lt-timeout-server:killall timeout-server:" \
-		-i test/timeout.sh || die "sed 1 failed"
-
-	# Do not mess with CFLAGS
-	sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
-
-	if ! use test; then
-		sed -i -e 's/test //' Makefile.am || die
-	fi
-
-	# Drop failing test, bug #331709
-	sed -i -e 's/test-mem //' test/Makefile.am || die
-
-	# Fix link_protocol_is_local() for ipv4 on machines with ipv6
-	# https://bugzilla.gnome.org/show_bug.cgi?id=693636
-	epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch"
-
-	# Build libname-server-2.a with -fPIC on hardened, bug #312161
-	epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch"
-
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
-	# files to be not found by autotools when compiling ORBit.  See bug #58540
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	# We need to use the hosts IDL compiler if cross-compiling, bug #262741
-	if tc-is-cross-compiler; then
-		# check that host version is present and executable
-		[ -x /usr/bin/orbit-idl-2 ] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
-		G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2"
-	fi
-	gnome2_src_configure \
-		$(use_enable pic libname-server-pic) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# Parallel build fails from time to time, bug #273031
-	MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
-}
-
-src_test() {
-	# can fail in parallel, see bug #235994
-	emake -j1 check
-}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0d5e08aa1796..3ebfae19328d 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,4 @@
 DIST cinnamon-2.4.6.tar.gz 2813177 SHA256 f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 SHA512 c7553b3af4a46dc25e7b39ce8b66036d6975b9487ecaba023df3d5b4176fc9f2cea90f1e6a8daadcf482f5cfc0c495c011b2734b60af1bf3577c033c587de43d WHIRLPOOL 2060d1784e285b084e576e33e0dfcf3721779a8ce92be0cd7187db792b8ac631d931cdd327203b694904552657133e1a418ce8e23e1d2b1ef165cc97f1b8477b
 DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
 DIST cinnamon-2.6.7.tar.gz 2967804 SHA256 839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004 SHA512 f76aa7401e44b0529ec5041b613df2ad95393701949fe8a25de75332984d102b441da32d08b06618cdf132d5026a92cd21ebaf8cac1707798dae667c468d57f0 WHIRLPOOL 0b1acc4e4e03c374cfcf12abe1e9cfb2593d0b72c2ace10db113665e517b1d9204ac54bdb9237ae2dc544b50b10b94d581fa7163ea2a0b07669bfbd0f8a3e30b
+DIST cinnamon-2.6.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
index 12a93504ec84..291576f5e102 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.1 2015/06/14 01:59:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.2 2015/06/14 17:39:40 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -83,7 +83,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-extra/cinnamon-session-2.4
 	>=gnome-extra/cinnamon-settings-daemon-2.4
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
new file mode 100644
index 000000000000..19f89ba68aed
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild,v 1.1 2015/06/14 22:02:06 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 )
+	"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.29.10:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.4
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-sound/pulseaudio:0=[glib]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-2.4[introspection]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	virtual/python-imaging[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+		-i files/usr/lib/*/*.py \
+		-i files/usr/lib/*/*/*.py \
+		-i files/usr/bin/* || die "sed failed"
+	if [[ "$(get_libdir)" != lib ]]; then
+		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]" ||
+	   has_version "media-libs/mesa[video_cards_r300]" ||
+	   has_version "media-libs/mesa[video_cards_r600]"; then
+		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+}
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2.ebuild
deleted file mode 100644
index c3bb88cb8a59..000000000000
--- a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2.ebuild,v 1.4 2015/04/08 17:56:31 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Monitor and inspect Zeitgeist's log at a low level - developer tool"
-HOMEPAGE="https://launchpad.net/zeitgeist-explorer/"
-SRC_URI="https://launchpad.net/${PN}/0.x/${MY_PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	gnome-extra/zeitgeist
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra"
-
-DISTUTILS_NO_PARALLEL_BUILD=true
diff --git a/java-virtuals/interceptor-api/interceptor-api-0.ebuild b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
index 3bc443b501b9..bcd57ac6156c 100644
--- a/java-virtuals/interceptor-api/interceptor-api-0.ebuild
+++ b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/interceptor-api/interceptor-api-0.ebuild,v 1.3 2015/05/19 09:30:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/interceptor-api/interceptor-api-0.ebuild,v 1.4 2015/06/14 17:56:07 monsieurp Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=""
 RDEPEND="dev-java/glassfish-interceptor-api:0"
diff --git a/mail-client/thunderbird/thunderbird-38.0.1.ebuild b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
index 764acb7d1911..b14374076627 100644
--- a/mail-client/thunderbird/thunderbird-38.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-38.0.1.ebuild,v 1.1 2015/06/14 00:34:15 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-38.0.1.ebuild,v 1.2 2015/06/14 14:15:57 anarchy Exp $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
@@ -57,8 +57,8 @@ SRC_URI="${SRC_URI}
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 CDEPEND="
-	>=dev-libs/nss-3.17.1
-	>=dev-libs/nspr-4.10.6
+	>=dev-libs/nss-3.19.1
+	>=dev-libs/nspr-4.10.8
 	!x11-plugins/enigmail
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
@@ -290,6 +290,7 @@ src_install() {
 		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
 	fi
 
+
 	# Required in order for jit to work on hardened, for mozilla-31
 	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
 
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
index 91ab56499bc8..9fb82626c7d9 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild,v 1.4 2015/02/19 21:44:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild,v 1.5 2015/06/14 16:53:05 ulm Exp $
 
 EAPI=5
 
@@ -40,26 +40,16 @@ RDEPEND="
 	media-libs/mesa
 	media-libs/freeglut
 	amd64? ( abi_x86_32? (
-		|| (
-			(
-				>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
-				>=media-libs/mesa-9.1.6[abi_x86_32(-)]
-				>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-		|| (
-			(
-				>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-				>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-				>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
-				>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
+		>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+		>=media-libs/mesa-9.1.6[abi_x86_32(-)]
+		>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
 	) )
 	x86? ( virtual/libstdc++:3.3 )"
 DEPEND=""
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
index aca11367407b..d7132828fbf4 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild,v 1.1 2015/02/19 21:44:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild,v 1.2 2015/06/14 16:53:05 ulm Exp $
 
 EAPI=5
 
@@ -42,26 +42,16 @@ RDEPEND="
 	virtual/opengl
 	amd64? (
 		abi_x86_32? (
-			|| (
-				(
-					>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
-					>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
-					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-					>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
-					>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			)
+			>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+			>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+			>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
 		)
 	)"
 DEPEND=""
diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
index fc94998e5a61..84293f6ae5de 100644
--- a/media-libs/cogl/cogl-1.20.0.ebuild
+++ b/media-libs/cogl/cogl-1.20.0.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.20.0.ebuild,v 1.1 2015/06/08 22:21:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.20.0.ebuild,v 1.2 2015/06/14 13:32:27 pacho Exp $
 
 EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="yes"
 
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
+inherit gnome2 multilib virtualx
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="http://www.cogl3d.org/"
 
 LICENSE="MIT BSD"
 SLOT="1.0/20" # subslot = .so version
+
 # doc and profile disable for now due bugs #484750 and #483332
 IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
 REQUIRED_USE="wayland? ( gles2 )"
+
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
@@ -34,7 +35,7 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0 )
 
-	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
 	kms? (
 		media-libs/mesa[gbm]
 		x11-libs/libdrm:= )
@@ -45,7 +46,8 @@ COMMON_DEPEND="
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
+	!<media-libs/clutter-1.7
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
@@ -118,10 +120,12 @@ src_test() {
 }
 
 src_install() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
 
-	clutter_src_install
+	gnome2_src_install
 
 	# Remove silly examples-data directory
 	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index e3cc8551b059..465b183131a8 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-  <flag name="gles2">Enable OpenGL ES 2.0 support</flag>
-  <flag name="kms">Enable KMS support.</flag>
-  <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
-    integration</flag>
+	<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+	<flag name="kms">Enable KMS support.</flag>
+	<flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg> integration</flag>
 </use>
 </pkgmetadata>
diff --git a/media-sound/apulse/apulse-0.1.4.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild
index c877413aa6d7..89eb68e3b15a 100644
--- a/media-sound/apulse/apulse-0.1.4.ebuild
+++ b/media-sound/apulse/apulse-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.4 2014/12/05 14:34:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.5 2015/06/14 16:38:48 ulm Exp $
 
 EAPI=5
 
@@ -12,23 +12,10 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 
-# Tricky stuff, we want to support both gx86-multilib and emul-linux-x86.
-DEPEND="
-	|| (
-		(
-			dev-libs/glib:2[${MULTILIB_USEDEP}]
-			media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		)
-		amd64? ( abi_x86_32? ( !abi_x86_x32? (
-			dev-libs/glib:2
-			media-libs/alsa-lib
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		) ) )
-	)"
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!!media-plugins/alsa-plugins[pulseaudio]"
 
diff --git a/media-sound/mpd/mpd-0.19.9-r1.ebuild b/media-sound/mpd/mpd-0.19.9-r1.ebuild
index d87c7c3310ad..64986f70f2ad 100644
--- a/media-sound/mpd/mpd-0.19.9-r1.ebuild
+++ b/media-sound/mpd/mpd-0.19.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.9-r1.ebuild,v 1.4 2015/06/12 05:11:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.9-r1.ebuild,v 1.5 2015/06/14 19:37:19 maekke Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
 	flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
 	libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
diff --git a/media-sound/ncmpc/files/ax_require_defined.m4 b/media-sound/ncmpc/files/ax_require_defined.m4
new file mode 100644
index 000000000000..cae11112d901
--- /dev/null
+++ b/media-sound/ncmpc/files/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
index 2fd65da57da2..17bd901b8e0d 100644
--- a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.24-r1.ebuild,v 1.1 2015/06/13 06:23:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.24-r1.ebuild,v 1.2 2015/06/15 05:22:58 jer Exp $
 
 EAPI=5
 inherit autotools eutils multilib
@@ -27,6 +27,9 @@ DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+
+	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
+
 	eautoreconf
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index feb8351a937f..243fad0fca6c 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.3 2015/06/05 16:33:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.4 2015/06/14 19:42:22 maekke Exp $
 
 EAPI="5"
 
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
index caa1f99fe476..d80b449a580e 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.5 2015/05/29 04:44:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.6 2015/06/14 19:38:54 maekke Exp $
 
 EAPI=5
 
@@ -159,9 +159,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="hppa"
+	KEYWORDS="arm hppa"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
index 991d4c75aa38..3bfebf1ce446 100644
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.13 2014/06/25 06:32:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.14 2015/06/14 17:37:18 ulm Exp $
 
 EAPI=5
 
@@ -38,37 +38,19 @@ RDEPEND="
 		)
 	)
 	amd64? (
-		|| (
-			>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
+		>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
 		qt4? (
-			|| (
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-				(
-					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-					>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-				)
-			)
-			|| (
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-				(
-					>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-					>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-					>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-				)
-			)
-			|| (
-				(
-					>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
-					>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
-			)
+			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+			>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
+			>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
 		)
 	)"
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ec4df4b26f2b..670f17be95b4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jun 2015 11:36:54 +0000
+Mon, 15 Jun 2015 05:36:58 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ec4df4b26f2b..670f17be95b4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jun 2015 11:36:54 +0000
+Mon, 15 Jun 2015 05:36:58 +0000
diff --git a/metadata/md5-cache/app-admin/monit-5.14 b/metadata/md5-cache/app-admin/monit-5.14
new file mode 100644
index 000000000000..d0f02cab0841
--- /dev/null
+++ b/metadata/md5-cache/app-admin/monit-5.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=ssl? ( dev-libs/openssl ) sys-devel/flex sys-devel/bison pam? ( virtual/pam ) virtual/pkgconfig
+DESCRIPTION=a utility for monitoring and managing daemons or similar programs running on a Unix system
+EAPI=5
+HOMEPAGE=http://mmonit.com/monit/
+IUSE=pam ssl
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://mmonit.com/monit/dist/monit-5.14.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7325df0be3768746aeb8cc0440498d1a
diff --git a/metadata/md5-cache/app-doc/root-docs-5.34.26 b/metadata/md5-cache/app-doc/root-docs-5.34.26
index 955cce4ff9bd..0de066c4474b 100644
--- a/metadata/md5-cache/app-doc/root-docs-5.34.26
+++ b/metadata/md5-cache/app-doc/root-docs-5.34.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc app-text/texlive dev-haskell/pandoc-citeproc[bibutils] virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.26[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.26[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Documentation for ROOT Data Analysis Framework
 EAPI=5
 HOMEPAGE=http://root.cern.ch/drupal
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=ftp://root.cern.ch/root/root_v5.34.26.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf http://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3d7d1765fa4bab76f107d34b1ce5071e
+_md5_=e6d2a48be87f4534daf652ba3a909179
diff --git a/metadata/md5-cache/app-doc/root-docs-5.34.28 b/metadata/md5-cache/app-doc/root-docs-5.34.28
index dd6a68cb1b73..20551c8ba593 100644
--- a/metadata/md5-cache/app-doc/root-docs-5.34.28
+++ b/metadata/md5-cache/app-doc/root-docs-5.34.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc app-text/texlive dev-haskell/pandoc-citeproc[bibutils] virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.28[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.28[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Documentation for ROOT Data Analysis Framework
 EAPI=5
 HOMEPAGE=http://root.cern.ch/drupal
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=ftp://root.cern.ch/root/root_v5.34.28.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf http://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=28b659b2a4380d6160b8a6e759b4c540
+_md5_=f8bea3fd4a8de7c7051b49deb32d44de
diff --git a/metadata/md5-cache/app-doc/root-docs-6.02.05 b/metadata/md5-cache/app-doc/root-docs-6.02.05
index 23933884930f..bd68cf459385 100644
--- a/metadata/md5-cache/app-doc/root-docs-6.02.05
+++ b/metadata/md5-cache/app-doc/root-docs-6.02.05
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc app-text/texlive dev-haskell/pandoc-citeproc[bibutils] virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-6.02.05[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-6.02.05[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Documentation for ROOT Data Analysis Framework
 EAPI=5
 HOMEPAGE=http://root.cern.ch/drupal
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=ftp://root.cern.ch/root/root_v6.02.05.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf http://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( http://root.cern.ch/drupal/sites/default/files/images/root6-banner.jpg http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9476ddeabe015d55e21a0575729ea88e
+_md5_=9cf540b069498a2e1cd697501db7c2b5
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
index 3be8fbf10497..4603823a3893 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.0.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9675ea8fef4f6bff3a22dc188bfe0af3
+_md5_=d43b8d96204a19417927bce88a03a1cd
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
index d8a94df6de8c..b3740a6b183e 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.1.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=dd30b61102914872c3d52106fdbf8d60
+_md5_=d1a6c4365c6efd2b8efc5bc39ca73f0d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
index 2731840ec044..fbf7a7e8b04c 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.0.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=b67fd66a9c810c1e0feaf98ded99896d
+_md5_=e18bed92c64841dda2084f85526b8f93
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
index e92905fef605..21dcc320dff1 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.1.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=822ba553c47aa275c22ddb25d6e780bb
+_md5_=158bc576690488dd622563860411151c
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
index 358aa07d8489..85b875814163 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.0.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=8fcd08233c78843f81edf844246afa4d
+_md5_=a8942ea7fed93e40420c44f9c16f7fa4
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
index 4901e03035c0..e2076d336c1d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.2.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=1ecec83409d51cdecf13e328f6503461
+_md5_=dae3966e9499f01934d85d2e3a5e2644
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
index 9519d00e72d0..b13ed92ce2bb 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.3.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=0da78989b491873bac3c392fb745fc47
+_md5_=5d39c1bc443541e3cbf75b3b62a5bbf7
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
index 0805ae598c12..924444754099 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-13.2.0.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c9b7343eff7957aee42633f3fd27ceca
+_md5_=160d49dda3b344542c460181a8ef9567
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3 b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3
index c66308e2521e..0b359fb9f886 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.codeweavers.com/products/crossover/
 IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin || ( ( capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) ) )
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=install-crossover-14.0.3.bin
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=d9b9aef9f91454d4ff08fe3d6596d1d1
+_md5_=e2a5539cd252814dee6f4e25973fe12d
diff --git a/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.0 b/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.0
index 68f0ae8674e5..5ea786fde989 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-standard-6.0.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5b6966cb22403d0a461cf8fd03e7316c
+_md5_=084da257bf7f174249a6badeaec3d1f4
diff --git a/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.1 b/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.1
index e04dcd21d274..804fc8637888 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-office-bin-6.0.1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-standard-6.0.1.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=4e16cd8c3aec0193b1ae559e589410b9
+_md5_=7967ff886289d8e3218dd6ecda1d302f
diff --git a/metadata/md5-cache/app-emulation/crossover-office-bin-6.1.0 b/metadata/md5-cache/app-emulation/crossover-office-bin-6.1.0
index b68ba54204fd..28b423767fc4 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-bin-6.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-bin-6.1.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-standard-6.1.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2798a861b552d63141aef1c746be83ed
+_md5_=93c8cd94837c78b77d327afedec72bfa
diff --git a/metadata/md5-cache/app-emulation/crossover-office-bin-6.2.0 b/metadata/md5-cache/app-emulation/crossover-office-bin-6.2.0
index deca22987bb2..35f8338cdb66 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-bin-6.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-bin-6.2.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-standard-6.2.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=e5ceb3a7100102e936678dd8eb7f8a4e
+_md5_=0588dd96b2de893f39afac0379418ad5
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.0
index 387735e191fc..020c5c36b6b6 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-5.0.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5193e72cd76ac48ce6aa2392c44126e9
+_md5_=f970711b940f2c3c1e620e657d98d54b
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.1 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.1
index 728e0f56c95e..bc3df8fd493a 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-5.0.1.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=dfcdeef787c24fa95ceafb62e08a9ed8
+_md5_=e9be76373fd43ab1ba72ceb4f43f0126
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.3 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.3
index e1f258371af4..053e99cda754 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.3
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.3
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-5.0.3.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2786b98ab047967d633a91f938f8dc94
+_md5_=924cdc01a8fdc3d1d6c4b17d0aeb3ea6
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.0.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.0.0
index 7317fc2774f2..01f325eb42c5 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.0.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-6.0.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=785c61c3c6d22555f84d865635a0799b
+_md5_=54f5652c09dfde56085d3f6602a19f8a
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.1.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.1.0
index ec1f4c99a31d..333886ac333c 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.1.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-6.1.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=fbc7af63a522be608f9b762e3425d5c2
+_md5_=0297d020c75c42b9dab1360e62e38d93
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.2.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.2.0
index 8d70f81ecb32..94273770144f 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.2.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-6.2.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=44a225dc8c5237fca979a9097f28300e
+_md5_=484b31ab8b63a0631ded17d6bf402116
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.0.2 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.0.2
index 315da437d092..b0280fb4677d 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.0.2
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.0.2
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-7.0.2.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=8a24a2d5660049b57682b784f6c21642
+_md5_=6bb37e3dfe4f5da1641327bc9cb2e451
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0
index 79054c0388c2..fe8a23b7a83a 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-7.1.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=a05c7e6eb3de682c5f605829a510fb24
+_md5_=2d8aa569538dc503ad46e1b1484481e3
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-8.0.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-8.0.0
index 37101153cb15..ef38d3340e1f 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-8.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-8.0.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-8.0.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9e29ac0f670f037381fb628b03d1a071
+_md5_=36f3004541b8f8eacffb173a1cdd13da
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.0
index aa317110b482..d4440ffcaf27 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-9.0.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5c35f34937b6a8eda3fc2a7dcaa7e8cc
+_md5_=17395f7106cd8772d4582efbb5cac0e0
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.1 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.1
index a14516ddfe2b..7c5c9d91d01d 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-9.0.1.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=a85ad511e213e34a1fb610c97376dd75
+_md5_=8620e1e69b416f83ea28fc90015c600a
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.1.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.1.0
index b0a966fa7a1b..e8c78c936da5 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.1.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) media-libs/libpng:1.2[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) media-libs/libpng:1.2[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-9.1.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c7ec53a7c0c4b7c8996c152f2073efaa
+_md5_=a09eaf4269cf58fabdf85726529628fa
diff --git a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.2.0 b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.2.0
index 4824f4401e22..93edfb67f134 100644
--- a/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.2.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.codeweavers.com/products/cxoffice/
 IUSE=nas
 KEYWORDS=-* amd64 x86
 LICENSE=CROSSOVER
-RDEPEND=dev-util/desktop-file-utils sys-libs/glibc || ( ( x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) media-libs/libpng:1.2[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=dev-util/desktop-file-utils sys-libs/glibc x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) media-libs/libpng:1.2[abi_x86_32(-)] nas? ( media-libs/nas[abi_x86_32(-)] )
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=install-crossover-pro-9.2.0.sh
 _eclasses_=unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=be0f0fad4ec4a894ed3ce04df4411271
+_md5_=97280a2ef03656cf4706fa115a77d805
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.2.16 b/metadata/md5-cache/app-emulation/libvirt-1.2.16
new file mode 100644
index 000000000000..3638ce80b974
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=sys-libs/readline:= sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-lang/perl dev-perl/XML-XPath dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=5
+HOMEPAGE=http://www.libvirt.org/
+IUSE=audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen elibc_glibc systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/readline:= sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
+SLOT=0/1.2.16
+SRC_URI=http://libvirt.org/sources/libvirt-1.2.16.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d630c5a190a303c112c67499abf1c1a9
diff --git a/metadata/md5-cache/app-emulation/lxc-1.0.7 b/metadata/md5-cache/app-emulation/lxc-1.0.7
index adae750ccbf0..e5eadd851f67 100644
--- a/metadata/md5-cache/app-emulation/lxc-1.0.7
+++ b/metadata/md5-cache/app-emulation/lxc-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=LinuX Containers userspace utilities
 EAPI=5
 HOMEPAGE=https://linuxcontainers.org/
 IUSE=doc examples lua python seccomp python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) seccomp? ( sys-libs/libseccomp ) sys-apps/util-linux app-misc/pax-utils virtual/awk
 REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
 SRC_URI=https://github.com/lxc/lxc/archive/lxc-1.0.7.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=289d6dd756433e63d54a4db1e97ff8cc
+_md5_=184e04c3ed720946662fc48efadeb063
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.28 b/metadata/md5-cache/app-emulation/virtualbox-4.3.28
index 242a56828352..6e25645d3ebf 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.28
@@ -4,7 +4,7 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise as wel
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.3.28 ) extensions? ( =app-emulation/virtualbox-extpack-oracle-4.3.28* )
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.28 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl:0= dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx sys-libs/zlib !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0 )
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targe
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4a7c80c1feba48616b58c79d977e084c	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2fd9670aeef511f74914199dbdaf5da3
+_md5_=00fd81f47c42fd4f8217fdb740eda4cb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.28 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.28
index efec5595bb31..429a6115eb12 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.28
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/VBoxGuestAdditions_4.3.28.iso
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ac9f8f818a7a910a760d412b01191894
+_md5_=d5570ea55dd60ed130ffaee08a55dda8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.28.100309 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.28.100309
index 8decdcd7c98f..028aacf55a22 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.28.100309
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.28.100309
@@ -4,7 +4,7 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise as wel
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 PUEL
 RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.3.28 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28-100309-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28-100309-Linux_x86.run ) http://download.virtualbox.org/virtualbox/4.3.28/Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/4.3.28/VirtualBoxSDK-4.3.28-100309.zip )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4513ff1ad72eb185b751d5c292157a25
+_md5_=6dcd47c9597e4a0d2337947653020ae9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.28.100309 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.28.100309
index 9e9f7fd31abe..4c1bb77818b8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.28.100309
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.28.100309
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PUEL
 RDEPEND=~app-emulation/virtualbox-4.3.28
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=31097a799781cddc74c6c7c855e9a1a0
+_md5_=8e0dc7d894b5c23e2f5cfe93c23abd96
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.28 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.28
index 8bbcb7a18e59..8cd633cb2fd4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.28
@@ -4,10 +4,10 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.3.28 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f34bffc4963c9926335f745cb3eb9bbc
+_md5_=167883bd8ca4ac1a6cd0cb8e4b18b838
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.18 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.18
index 421aaf48d516..719914f9c023 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.18
@@ -10,4 +10,4 @@ RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.3.18.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5bae712c67ac605ad3d5091de367257b
+_md5_=cff8bf26f74d35e7770a86f691a6cb86
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.26 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.26
index 50c228666285..c45a9fc70f92 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.26
@@ -10,4 +10,4 @@ RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.3.26.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c17ae34448bfe395fb2383b6caf982e2
+_md5_=2448d0404a4342113a2f4328302e946e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.28 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.28
index 941940e25370..35de51e6681f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.28
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.3.28.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2c261c9afe857857c239425044837d22
+_md5_=13941832ba6ac7b55a1d17e1b9bd0a85
diff --git a/metadata/md5-cache/app-emulation/wine-1.6.2 b/metadata/md5-cache/app-emulation/wine-1.6.2
index f1a5779ac285..937a093b7990 100644
--- a/metadata/md5-cache/app-emulation/wine-1.6.2
+++ b/metadata/md5-cache/app-emulation/wine-1.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.6.2.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=901da9f461570925ee1b395623445a48
+_md5_=08dd764fa8afcf0292a2f118e4074c7a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.0 b/metadata/md5-cache/app-emulation/wine-1.7.0
index 134e234b60cc..130bc208f8d9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.0
+++ b/metadata/md5-cache/app-emulation/wine-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( sys-auth/rtkit )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( sys-auth/rtkit )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.0.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.0.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=134d1fef93200ffe842abbd33e612fd1
+_md5_=9bedd114ce68349b26b1ae7aa982c082
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.10 b/metadata/md5-cache/app-emulation/wine-1.7.10
index 4a71f5ab7fe8..9a57605470fa 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.10
+++ b/metadata/md5-cache/app-emulation/wine-1.7.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.10.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.10.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9e3d4a06a53fc91e3ddff52b91cd26f1
+_md5_=8c8c3b50a6abf26e000eac7caf80619d
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.11 b/metadata/md5-cache/app-emulation/wine-1.7.11
index 6c39e909dc9a..a1d685b64c19 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.11
+++ b/metadata/md5-cache/app-emulation/wine-1.7.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.11.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.10.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c0c3e756c225244f9c050466fd7b4d21
+_md5_=4220c7ab14712d05b618b027dde080e5
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.12 b/metadata/md5-cache/app-emulation/wine-1.7.12
index f1aa674a485e..1c5619cc8a76 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.12
+++ b/metadata/md5-cache/app-emulation/wine-1.7.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.12.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a597421e24997b34fbb61a6a9ddcfd6c
+_md5_=e5a188cfa8366cea38617f1c286dd397
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.13 b/metadata/md5-cache/app-emulation/wine-1.7.13
index 3c08931ca31e..2c1c9f20b789 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.13
+++ b/metadata/md5-cache/app-emulation/wine-1.7.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.13.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=97853f7da7902dd56265e2db373fe6f3
+_md5_=1056537e38c43eec788aaa5093450f50
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.14 b/metadata/md5-cache/app-emulation/wine-1.7.14
index cfec26f90fb4..65e18deeb815 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.14
+++ b/metadata/md5-cache/app-emulation/wine-1.7.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.14.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b5205d5194c3352498da294ab23525d7
+_md5_=a21490036c97eb5d3302053d7d33fbf6
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.15 b/metadata/md5-cache/app-emulation/wine-1.7.15
index 5adf3ab89bc4..81c71b3dc6cb 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.15
+++ b/metadata/md5-cache/app-emulation/wine-1.7.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.15.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=23c1d4a7383f2f2533e8d0097e032deb
+_md5_=fdcb8c3bbc3aedafa7f7df2952b448b0
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.16 b/metadata/md5-cache/app-emulation/wine-1.7.16
index 211ecf795e61..95a4ccebed0b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.16
+++ b/metadata/md5-cache/app-emulation/wine-1.7.16
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.16.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=de8b3c13956e3f573d952875ce6dde44
+_md5_=f0e66e109c66d18c8716f6cf61905fdf
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.17 b/metadata/md5-cache/app-emulation/wine-1.7.17
index 320785383d81..6687bd11f55b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.17
+++ b/metadata/md5-cache/app-emulation/wine-1.7.17
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.17.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b8148880540559d749124aad14e98b8a
+_md5_=9b4b00cf35b4bcb5b5f5a2c3b3ad9c7f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.18 b/metadata/md5-cache/app-emulation/wine-1.7.18
index f497b97f6649..22b886f161df 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.18
+++ b/metadata/md5-cache/app-emulation/wine-1.7.18
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.18.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78a6d76fda22ada5a42b0bacfa9b23e3
+_md5_=dd9b222eacc641f51b6c311dd5e7c551
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.19-r1 b/metadata/md5-cache/app-emulation/wine-1.7.19-r1
index fb43af782eba..43c4d563a7f9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.19-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.7.19-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.19.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.18-1.tar.gz -> wine-compholio-daily-1.7.18-1.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2dfe133b5b556ec9a212dfb064920368
+_md5_=bee01b4747c3a92503c832b15c21890a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.20 b/metadata/md5-cache/app-emulation/wine-1.7.20
index 91950faaa764..4a7c890a7194 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.20
+++ b/metadata/md5-cache/app-emulation/wine-1.7.20
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) gstreamer? ( pulseaudio ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.20.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.20.tar.gz -> wine-compholio-daily-1.7.20.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.20.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=87e1c81959a1ba74a76bc26190f4b49a
+_md5_=6b6545968870172dafa284b044b8d77f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.21 b/metadata/md5-cache/app-emulation/wine-1.7.21
index 6f8523dc765a..3966a8a1ae4d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.21
+++ b/metadata/md5-cache/app-emulation/wine-1.7.21
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) gstreamer? ( pulseaudio ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.21.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.21.tar.gz -> wine-compholio-daily-1.7.21.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.21.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fc2a940b531240e61158a7f64b673d19
+_md5_=3c2fa7d442f480cb960aadfb3d2fc9f3
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.22 b/metadata/md5-cache/app-emulation/wine-1.7.22
index 50e522405e0d..e209c3d95371 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.22
+++ b/metadata/md5-cache/app-emulation/wine-1.7.22
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) gstreamer? ( pulseaudio ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.22.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.22.tar.gz -> wine-compholio-1.7.22.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.21.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b9df965fefeeb65b1566df8fcfbb06a1
+_md5_=7199f52cd137dc1c9db6a236ce947f5a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.28 b/metadata/md5-cache/app-emulation/wine-1.7.28
index 5abdc912375d..0350745b2e25 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.28
+++ b/metadata/md5-cache/app-emulation/wine-1.7.28
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.28.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.28.tar.gz -> wine-compholio-1.7.28.tar.gz ) pulseaudio? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.28.tar.gz -> wine-compholio-1.7.28.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4c0d1415daf2196f855f72797b341951
+_md5_=499ef9c1dab6fce73facf25ad7a7a74f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.29 b/metadata/md5-cache/app-emulation/wine-1.7.29
index 45bac1c282ee..2400f344cd72 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.29
+++ b/metadata/md5-cache/app-emulation/wine-1.7.29
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.29.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.29.tar.gz -> wine-staging-1.7.29.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.29.tar.gz -> wine-staging-1.7.29.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a301cb07c84d4fc83a7d9cbc560e9e76
+_md5_=ae74c62262b172fd821dbaef34c0e251
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.3 b/metadata/md5-cache/app-emulation/wine-1.7.3
index e7b91b1f70c0..808dfd94b799 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.3
+++ b/metadata/md5-cache/app-emulation/wine-1.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.3.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.3.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8ede1d263819fab2a6493a579d980c8c
+_md5_=d43a5dd688b440f0e7afcca5741db12f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.33 b/metadata/md5-cache/app-emulation/wine-1.7.33
index 3c69ac447bda..ff451f73fe14 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.33
+++ b/metadata/md5-cache/app-emulation/wine-1.7.33
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pipelight? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.33.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.34/wine_gecko-2.34-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.34/wine_gecko-2.34-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.4/wine-mono-4.5.4.msi ) pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.33.tar.gz -> wine-staging-1.7.33.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.33.tar.gz -> wine-staging-1.7.33.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8447ca45dce08cbc97aa2ae1f05f7acf
+_md5_=b5edf420c87f1232fa09c371c4b7a445
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.38 b/metadata/md5-cache/app-emulation/wine-1.7.38
index ee3313429e9d..8b5add0249fe 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.38
+++ b/metadata/md5-cache/app-emulation/wine-1.7.38
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.38.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.38.tar.gz -> wine-staging-1.7.38.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.38.tar.gz -> wine-staging-1.7.38.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=053a39624ef40679bf1078f6b43418fb
+_md5_=8d8b6563b033f9af767621d3a08b1917
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.39 b/metadata/md5-cache/app-emulation/wine-1.7.39
index 8a2f9874b939..88a9fe1577b7 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.39
+++ b/metadata/md5-cache/app-emulation/wine-1.7.39
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.39.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.39.tar.gz -> wine-staging-1.7.39.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.39.tar.gz -> wine-staging-1.7.39.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f5e95b585a116cc248cbfca4aa89e8ba
+_md5_=2f43a5313a7877ed46f0d5121a134be5
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.4 b/metadata/md5-cache/app-emulation/wine-1.7.4
index e9ac62348ec0..157529fc14f9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.4
+++ b/metadata/md5-cache/app-emulation/wine-1.7.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.4.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.4.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4ca9c8720d96ce4cfd4b3077aa16fe05
+_md5_=5bf3cac8821221121062bd54ed7faffc
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.40 b/metadata/md5-cache/app-emulation/wine-1.7.40
index 3603f02a13a9..b2270f6f2273 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.40
+++ b/metadata/md5-cache/app-emulation/wine-1.7.40
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.40.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=61d4aea6a50d78c78b57633749c4340a
+_md5_=192948b262c7d26b1057230a250253d6
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.41 b/metadata/md5-cache/app-emulation/wine-1.7.41
index fab9942aa223..b00e2fd2892e 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.41
+++ b/metadata/md5-cache/app-emulation/wine-1.7.41
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.41.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.41.tar.gz -> wine-staging-1.7.41.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.41.tar.gz -> wine-staging-1.7.41.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7fe4abebc5022192413edaa0c503c4a9
+_md5_=1cf2d13afc61c5b7a88479305b1e6df3
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.42 b/metadata/md5-cache/app-emulation/wine-1.7.42
index 5a5e7d574386..10266bffe3b4 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.42
+++ b/metadata/md5-cache/app-emulation/wine-1.7.42
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.42.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.42.tar.gz -> wine-staging-1.7.42.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.42.tar.gz -> wine-staging-1.7.42.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3616a292b612e27a489da237db6aaf3e
+_md5_=e6120befc81d88c855526930bb45916c
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.43 b/metadata/md5-cache/app-emulation/wine-1.7.43
index e6d08e58984a..509d58f6e46b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.43
+++ b/metadata/md5-cache/app-emulation/wine-1.7.43
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) staging? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.43.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.43.tar.gz -> wine-staging-1.7.43.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.43.tar.gz -> wine-staging-1.7.43.tar.gz )
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6050d343e2dcca88eaca3209ec0dcad2
+_md5_=db43b8e37e47742020608fbcafa78b29
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.8 b/metadata/md5-cache/app-emulation/wine-1.7.8
index 408c317c5cfa..722e7e94ac89 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.8
+++ b/metadata/md5-cache/app-emulation/wine-1.7.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.8.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c92a6a606078112cbabd115bb091584a
+_md5_=403c188fec3519cf882eec323ef139db
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.9 b/metadata/md5-cache/app-emulation/wine-1.7.9
index a222b0659139..969e93bcfe6c 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.9
+++ b/metadata/md5-cache/app-emulation/wine-1.7.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) udisks? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) gstreamer? ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) X? ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) nls? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) odbc? ( >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) osmesa? ( >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) scanner? ( >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) xcomposite? ( >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.9.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=093bd051d4ea1bbaadfdf856782d5371
+_md5_=39ad45244e805ad8fd13cc22f07e5b09
diff --git a/metadata/md5-cache/app-i18n/atokx3-3.0.0-r11 b/metadata/md5-cache/app-i18n/atokx3-3.0.0-r11
index 36496d9e7440..383dedf28648 100644
--- a/metadata/md5-cache/app-i18n/atokx3-3.0.0-r11
+++ b/metadata/md5-cache/app-i18n/atokx3-3.0.0-r11
@@ -7,9 +7,9 @@ IUSE=multilib
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=ATOK MIT
 PROPERTIES=interactive
-RDEPEND=!app-i18n/atokx2 !dev-libs/libiiimcf !dev-libs/csconv !app-i18n/iiimgcf !dev-libs/libiiimp !app-i18n/iiimsf !app-i18n/iiimxcf dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 media-libs/fontconfig media-libs/libpng sys-apps/tcp-wrappers virtual/pam x11-libs/cairo >=x11-libs/gtk+-2.4.13:2 x11-libs/libICE x11-libs/libSM x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm x11-libs/libdrm x11-libs/pangox-compat multilib? ( || ( ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=virtual/pam-0-r1[abi_x86_32(-)] ) app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) || ( ( >=dev-libs/atk-2.10.0[abi_x86_32] >=x11-libs/cairo-1.12.14-r4[abi_x86_32] >=x11-libs/gtk+-2.24.23:2[abi_x86_32] >=x11-libs/pangox-compat-0.0.2[abi_x86_32] ) app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) || ( >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) || ( ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=!app-i18n/atokx2 !dev-libs/libiiimcf !dev-libs/csconv !app-i18n/iiimgcf !dev-libs/libiiimp !app-i18n/iiimsf !app-i18n/iiimxcf dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 media-libs/fontconfig media-libs/libpng sys-apps/tcp-wrappers virtual/pam x11-libs/cairo >=x11-libs/gtk+-2.4.13:2 x11-libs/libICE x11-libs/libSM x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm x11-libs/libdrm x11-libs/pangox-compat multilib? ( >=dev-libs/atk-2.10.0[abi_x86_32] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=virtual/pam-0-r1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32] >=x11-libs/gtk+-2.24.23:2[abi_x86_32] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/pangox-compat-0.0.2[abi_x86_32] )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://www3.justsystem.co.jp/download/atok/up/lin/atokx3up2.tar.gz http://www3.justsystem.co.jp/download/atok/up/lin/atokx3gtk216.tar.gz http://www3.justsystem.co.jp/download/zipcode/up/lin/a20y1311lx.tgz
 _eclasses_=cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=869bd1b534bdc66048d0608e21d51e43
+_md5_=939b8f9b1ac8f5b7a080e1c218e3aaf1
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20141019.3.19 b/metadata/md5-cache/app-misc/ca-certificates-20141019.3.19
index 7b36f92b91b6..bcab436ef173 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20141019.3.19
+++ b/metadata/md5-cache/app-misc/ca-certificates-20141019.3.19
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20141019.tar.xz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/nss-3.19.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ae61b1247d93b6589eeb35bfc00688dd
+_md5_=85fd4cb67ff3f6e43e8b0cea199641c9
diff --git a/metadata/md5-cache/app-misc/dvtm-0.11 b/metadata/md5-cache/app-misc/dvtm-0.11
index b98ea9917000..b0917e0e8e66 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.11
+++ b/metadata/md5-cache/app-misc/dvtm-0.11
@@ -4,10 +4,10 @@ DESCRIPTION=Dynamic virtual terminal manager
 EAPI=5
 HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
 IUSE=unicode savedconfig
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.11.tar.gz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=059dbe598b7bdf475605d75d62272560
+_md5_=e58aeb5e943ef7c5f2124b84bf6635d6
diff --git a/metadata/md5-cache/app-text/acroread-9.5.5-r3 b/metadata/md5-cache/app-text/acroread-9.5.5-r3
index d30828178012..0e603311e7c7 100644
--- a/metadata/md5-cache/app-text/acroread-9.5.5-r3
+++ b/metadata/md5-cache/app-text/acroread-9.5.5-r3
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.adobe.com/products/reader/
 IUSE=html ldap nsplugin linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko
 KEYWORDS=-* amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Adobe
-RDEPEND=|| ( ( dev-libs/atk[abi_x86_32(-)] dev-libs/glib:2[abi_x86_32(-)] dev-libs/libxml2[abi_x86_32(-)] dev-libs/openssl:0.9.8[abi_x86_32(-)] media-libs/fontconfig[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] >=net-dns/libidn-1.28[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/pango[abi_x86_32(-)] || ( >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] <x11-libs/pango-1.31[X] ) ) ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) nsplugin? ( || ( x11-libs/libXt[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ldap? ( || ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) x86? ( html? ( || ( www-client/firefox-bin www-client/firefox www-client/seamonkey-bin www-client/seamonkey ) ) ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )
+RDEPEND=dev-libs/atk[abi_x86_32(-)] dev-libs/glib:2[abi_x86_32(-)] dev-libs/libxml2[abi_x86_32(-)] dev-libs/openssl:0.9.8[abi_x86_32(-)] media-libs/fontconfig[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] >=net-dns/libidn-1.28[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/pango[abi_x86_32(-)] || ( >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] <x11-libs/pango-1.31[X] ) nsplugin? ( x11-libs/libXt[abi_x86_32(-)] ) ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] ) x86? ( html? ( || ( www-client/firefox-bin www-client/firefox www-client/seamonkey-bin www-client/seamonkey ) ) ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.5/enu/AdbeRdr9.5.5-1_i486linux_enu.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	62927b3db3a589b0806255f3a002d5d3	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eb8b262a28e69d1b69ba71082d57256c
+_md5_=598614d77c5943359e699f4d10a4bf9a
diff --git a/metadata/md5-cache/app-text/jabref-2.10 b/metadata/md5-cache/app-text/jabref-2.10
deleted file mode 100644
index a3665482ee8b..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3d99f33444563ca65982e10caf94c3fd
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r1 b/metadata/md5-cache/app-text/jabref-2.10-r1
deleted file mode 100644
index 23e006dc9295..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=64366369dc4dc820cd27f86d1ab545ef
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
index 7ba5b1efee8b..dfd98aae0fbf 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ b/metadata/md5-cache/app-text/jabref-2.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=5
 HOMEPAGE=http://jabref.sourceforge.net/
 IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7553463da5b6b9208e13c2c7ea90746
+_md5_=d05200b3f34f3105d3346ca649e10cb8
diff --git a/metadata/md5-cache/app-text/jabref-2.10_beta2 b/metadata/md5-cache/app-text/jabref-2.10_beta2
deleted file mode 100644
index acfb7d0762ce..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10_beta2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10b2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=15afa9be0940f4625986517c3741a9d4
diff --git a/metadata/md5-cache/app-text/jabref-2.10_beta3 b/metadata/md5-cache/app-text/jabref-2.10_beta3
deleted file mode 100644
index db80da74f5c4..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10b3-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b16ff23ac7e054e35f779491f19a6cd
diff --git a/metadata/md5-cache/app-text/jabref-2.6 b/metadata/md5-cache/app-text/jabref-2.6
deleted file mode 100644
index a7ae1f003906..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/spin:0 || ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] ) >=dev-java/antlr-2.7.3:0[java] >=dev-java/jgoodies-forms-1.1.0:0 dev-java/jgoodies-looks:2.0 >=dev-java/microba-0.4.3:0 dev-java/jempbox:0 dev-java/pdfbox:0 dev-java/commons-logging:0 dev-java/jpf:1.5 dev-java/jpfcodegen:0 mysql? ( dev-java/jdbc-mysql:0 ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GUI frontend for BibTeX, written in Java
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=mysql elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/spin:0 || ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] ) >=dev-java/antlr-2.7.3:0[java] >=dev-java/jgoodies-forms-1.1.0:0 dev-java/jgoodies-looks:2.0 >=dev-java/microba-0.4.3:0 dev-java/jempbox:0 dev-java/pdfbox:0 dev-java/commons-logging:0 dev-java/jpf:1.5 dev-java/jpfcodegen:0 mysql? ( dev-java/jdbc-mysql:0 ) >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.6-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=63d6140eb30d9ead9f1633b66a25346b
diff --git a/metadata/md5-cache/app-text/jabref-2.9.2 b/metadata/md5-cache/app-text/jabref-2.9.2
deleted file mode 100644
index 190e62bb5ffe..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.9.2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4e4b1c7ab92e1eb6757419472f08780e
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2.1 b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
new file mode 100644
index 000000000000..db04f46c4280
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=PostgreSQL Extension Network Client
+EAPI=5
+HOMEPAGE=http://pgxnclient.projects.postgresql.org/ http://pypi.python.org/pypi/pgxnclient
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=93af12d266909f14c88c0a2172275d7e
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50 b/metadata/md5-cache/dev-java/bcmail-1.50
index 8004d9835e49..692f3928f0ca 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.50
+++ b/metadata/md5-cache/dev-java/bcmail-1.50
@@ -4,11 +4,11 @@ DESCRIPTION=Java cryptography APIs
 EAPI=5
 HOMEPAGE=http://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] ~dev-java/bcpkix-1.50:0[test?] dev-java/sun-jaf:0 java-virtuals/javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ae8c5db4c1b48310229fa43e15c4d47f
+_md5_=0d9810c2f4c3af551d485909a1b3f107
diff --git a/metadata/md5-cache/dev-java/cglib-2.0.2-r2 b/metadata/md5-cache/dev-java/cglib-2.0.2-r2
deleted file mode 100644
index c7761ac1113b..000000000000
--- a/metadata/md5-cache/dev-java/cglib-2.0.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip =dev-java/asm-1.4.3* =dev-java/aspectwerkz-2* dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A powerful, high performance and quality Code Generation Library
-EAPI=2
-HOMEPAGE=http://cglib.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 =dev-java/asm-1.4.3* =dev-java/aspectwerkz-2* dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://sourceforge/cglib/cglib-src-2.0.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c5eeda52cd5fdc6c9de0bf78eda53c5f
diff --git a/metadata/md5-cache/dev-java/cglib-2.1.3 b/metadata/md5-cache/dev-java/cglib-2.1.3
deleted file mode 100644
index cdf37e451c48..000000000000
--- a/metadata/md5-cache/dev-java/cglib-2.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/jarjar dev-java/asm:1.5 dev-java/aspectwerkz:2 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
-EAPI=2
-HOMEPAGE=http://cglib.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/asm:1.5 dev-java/aspectwerkz:2 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.1
-SRC_URI=mirror://sourceforge/cglib/cglib-src-2.1_3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37e4f9b798541b95f645afa8e71c331b
diff --git a/metadata/md5-cache/dev-java/cglib-2.2 b/metadata/md5-cache/dev-java/cglib-2.2
deleted file mode 100644
index 918c3da02f12..000000000000
--- a/metadata/md5-cache/dev-java/cglib-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/junit ) dev-java/asm:3 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
-EAPI=2
-HOMEPAGE=http://cglib.sourceforge.net
-IUSE=elibc_FreeBSD test doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/asm:3 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=mirror://sourceforge/cglib/cglib-src-2.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d2206f923afe3a6b6cd5792c37a8cbde
diff --git a/metadata/md5-cache/dev-java/cglib-2.2.3 b/metadata/md5-cache/dev-java/cglib-2.2.3
deleted file mode 100644
index cad904474019..000000000000
--- a/metadata/md5-cache/dev-java/cglib-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/junit:0 ) dev-java/asm:3 >=dev-java/ant-core-1.7.0:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
-EAPI=5
-HOMEPAGE=http://cglib.sourceforge.net
-IUSE=elibc_FreeBSD test doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/asm:3 >=dev-java/ant-core-1.7.0:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.2
-SRC_URI=mirror://sourceforge/cglib/cglib.2.2.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6938db511774c340032e88d6068b8d85
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2 b/metadata/md5-cache/dev-java/commons-digester-3.2
deleted file mode 100644
index d327364b12a6..000000000000
--- a/metadata/md5-cache/dev-java/commons-digester-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 dev-java/cglib:2.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects within the system
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 dev-java/cglib:2.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.2
-SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7ddd0d28d0ca2958d8f653a9cb1ca286
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r1 b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
index 781c9621d494..28461f142d45 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Reads XML configuration files to provide initialization of various J
 EAPI=5
 HOMEPAGE=http://commons.apache.org/digester/
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~ppc ~ppc64
+KEYWORDS=amd64 x86 ppc ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=85760803ab2550a4257762b1522d50f4
+_md5_=a6134898c40be3bc4e62b31cddf4b884
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.5.1 b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
similarity index 83%
rename from metadata/md5-cache/dev-java/jackson-databind-2.5.1
rename to metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
index 96e253909ace..96975e1ba240 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotations-2.5.1:2 test? ( dev-java/cglib:2.2 dev-java/groovy:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotations-2.5.1:2 test? ( dev-java/cglib:3 dev-java/groovy:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=High-performance JSON processor
 EAPI=5
 HOMEPAGE=https://github.com/FasterXML/jackson-databind
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.5.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=08ea0703715bd05809a8f5dc5ee185d3
+_md5_=69e1d3121743fb08afc2da2d80a17838
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.5.0-r1 b/metadata/md5-cache/dev-java/java-sdk-docs-1.5.0-r1
deleted file mode 100644
index 0765c4c1e6c3..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.5.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=>=app-arch/unzip-5.50-r1
-DESCRIPTION=Sun's documentation bundle (including API) for Java SE
-HOMEPAGE=http://java.sun.com/j2se/1.5.0/
-KEYWORDS=amd64 ia64 ppc ppc64 x86
-LICENSE=sun-j2sl
-RESTRICT=fetch
-SLOT=1.5.0
-SRC_URI=jdk-1_5_0-doc-r1.zip
-_md5_=c59118d41f90490446ba6814d9e99392
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index 8145e6007079..2de68b6e2787 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/java/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86 sparc ~ia64 ~arm ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=270077a8e87db3c4dbb9a6dd926e02ae
+_md5_=89bb55992440f9efb46cd643bde72a17
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
new file mode 100644
index 000000000000..d0f42030b430
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/xmlrpc:0 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=JCS is a distributed caching system written in Java for server-side Java applications
+EAPI=5
+HOMEPAGE=http://commons.apache.org/jcs/
+IUSE=admin elibc_FreeBSD test doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/xmlrpc:0 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=2.0
+SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fefe5e0c3b77bca58a7d74c0429ff173
diff --git a/metadata/md5-cache/dev-java/jmock-1.1.0-r2 b/metadata/md5-cache/dev-java/jmock-1.1.0-r2
deleted file mode 100644
index fda6fd8f0576..000000000000
--- a/metadata/md5-cache/dev-java/jmock-1.1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 =dev-java/cglib-2.0* =dev-java/junit-3* app-arch/unzip test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Library for testing Java code using mock objects
-HOMEPAGE=http://jmock.codehaus.org
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 =dev-java/cglib-2.0* =dev-java/junit-3* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=http://jmock.codehaus.org/jmock-1.1.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1035038fd407301408023fe0cbe29391
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0 b/metadata/md5-cache/dev-java/jmock-1.2.0
index 2d1da8ed34db..992abce8fb78 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for testing Java code using mock objects
 EAPI=5
 HOMEPAGE=http://jmock.codehaus.org
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.codehaus.org/dist/jmock-1.2.0-jars.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fcd50a09b4ba9c5e120e10b9a8621eed
+_md5_=ffd02ccf6220de5055392d4fd9613f9b
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.4 b/metadata/md5-cache/dev-lang/scala-bin-2.11.4
deleted file mode 100644
index 019be955a4d0..000000000000
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0
-DESCRIPTION=The Scala Programming Language
-EAPI=5
-HOMEPAGE=http://scala.epfl.ch/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://downloads.typesafe.com/scala/2.11.4/scala-2.11.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=50201115811d6f1b1ed7173b3259d65b
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.5 b/metadata/md5-cache/dev-lang/scala-bin-2.11.5
deleted file mode 100644
index 0dc4313679af..000000000000
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0
-DESCRIPTION=The Scala Programming Language
-EAPI=5
-HOMEPAGE=http://scala.epfl.ch/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://downloads.typesafe.com/scala/2.11.5/scala-2.11.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ef27e39358c44063f2605e5809303e78
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.6 b/metadata/md5-cache/dev-lang/scala-bin-2.11.6
index 0dc177055494..301b6eaa18d0 100644
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.6
+++ b/metadata/md5-cache/dev-lang/scala-bin-2.11.6
@@ -4,10 +4,10 @@ DESCRIPTION=The Scala Programming Language
 EAPI=5
 HOMEPAGE=http://scala.epfl.ch/
 IUSE=doc elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=x86 amd64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.6/scala-2.11.6.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=085dfcda0f9b5cb1aeaff26ed4070b52
+_md5_=2ccb933593b3611e06af331fb4d7ee21
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
index c5d07237e787..7b251eabf463 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.3.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=3904d22453ed06f443bd05a30373d2ad
+_md5_=8d22bca587c1b28dcbd05154de45d882
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.1
index 331572a8d5a0..d0147758d593 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt] virtual/libffi >=dev-ml/findlib-1.0.4-r1
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-KEYWORDS=~amd64 ~arm
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt] virtual/libffi
 SLOT=0/0.4.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.4.1.tar.gz -> ocaml-ctypes-0.4.1.tar.gz
 _eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868
-_md5_=3d38cd32c589c914292f5ff87da180cd
+_md5_=fa97c6874dfed2e900e0f592361686a3
diff --git a/metadata/md5-cache/dev-perl/CGI-4.200.0 b/metadata/md5-cache/dev-perl/CGI-4.200.0
index c0fa8640b063..d9990fca98f0 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.200.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.200.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 virtual/perl-File-Temp >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=[-build(-)]
+DEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 virtual/perl-File-Temp >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Warn ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Simple Common Gateway Interface Class
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CGI/
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/pe
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.20.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=231856994d0be551e88846b5b8a9cb1f
+_md5_=769a9cc3a576f44593ba9d7d2f032754
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.11.4 b/metadata/md5-cache/dev-python/PyQt4-4.11.4
new file mode 100644
index 000000000000..434e5a71d7a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt4-4.11.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16.6:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( kde? ( >=media-libs/phonon-4.7[qt4] ) !kde? ( || ( >=dev-qt/qtphonon-4.8.5:4 >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 ) dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=5
+HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4
+IUSE=X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16.6:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( kde? ( >=media-libs/phonon-4.7[qt4] ) !kde? ( || ( >=dev-qt/qtphonon-4.8.5:4 >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) sql? ( X ) testlib? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.11.4.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=acd3c00848a7af55eb036e7c783a6357
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.1.0 b/metadata/md5-cache/dev-python/flask-admin-1.1.0
new file mode 100644
index 000000000000..8c25e93f88b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-admin-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-peewee[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Simple and extensible admin interface framework for Flask
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
+IUSE=examples test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.1.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=8763b2b7b48726f4565d7eb8db8ef262
diff --git a/metadata/md5-cache/dev-python/flask-evolution-0.6 b/metadata/md5-cache/dev-python/flask-evolution-0.6
new file mode 100644
index 000000000000..689fcd2e9d54
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-evolution-0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-script[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Simple migrations for Flask/SQLAlchemy projects
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/Flask-Evolution
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-script[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Evolution/Flask-Evolution-0.6.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=86d6494fc7803ac66eee1f8558829638
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-0.7.1 b/metadata/md5-cache/dev-python/flask-mongoengine-0.7.1
new file mode 100644
index 000000000000..9fdd680ab3e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-0.7.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Flask support for MongoDB and with WTF model forms
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/flask-mongoengine/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mongoengine-0.7.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/flask-mongoengine/flask-mongoengine-0.7.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=d89dcead1b7e603df0df6b3a441b315c
diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.2.16 b/metadata/md5-cache/dev-python/libvirt-python-1.2.16
new file mode 100644
index 000000000000..da2a57d6e11f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.2.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/libvirt:0/1.2.16 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=libvirt Python bindings
+EAPI=5
+HOMEPAGE=http://www.libvirt.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/1.2.16 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.2.16.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=5b9d94e3cd11a2a9f6987dddf780c463
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.7.2 b/metadata/md5-cache/dev-python/qscintilla-python-2.7.2
deleted file mode 100644
index d07359da3574..000000000000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.12:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] =dev-python/PyQt4-4.10*[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.7.2:=
-DESCRIPTION=Python bindings for Qscintilla
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_3
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.12:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] =dev-python/PyQt4-4.10*[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.7.2:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.7.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=d3535864bf8970dcd71348305aebbc91
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.8.4-r1 b/metadata/md5-cache/dev-python/qscintilla-python-2.8.4-r1
deleted file mode 100644
index 604fbddb3fb6..000000000000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.8.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8.4:=
-DESCRIPTION=Python bindings for Qscintilla
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8.4:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.8.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=3288383e9d68b27893cb9ea71c72063f
diff --git a/metadata/md5-cache/dev-python/sip-4.16.6 b/metadata/md5-cache/dev-python/sip-4.16.8
similarity index 94%
rename from metadata/md5-cache/dev-python/sip-4.16.6
rename to metadata/md5-cache/dev-python/sip-4.16.8
index 515423996a37..6730429eb1dc 100644
--- a/metadata/md5-cache/dev-python/sip-4.16.6
+++ b/metadata/md5-cache/dev-python/sip-4.16.8
@@ -9,6 +9,6 @@ LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0/11
-SRC_URI=mirror://sourceforge/pyqt/sip-4.16.6.tar.gz
+SRC_URI=mirror://sourceforge/pyqt/sip-4.16.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7dca4bf7a8588bb4a4306f97d6078b1d
+_md5_=65279cb30af2439ad91df21e6df25a30
diff --git a/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703-r1 b/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703-r1
index 3f4f0279d83b..333cfd3ce003 100644
--- a/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703-r1
+++ b/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=>=dev-qt/qtcore-4.8.0:4 connectivity? ( >=dev-qt/qtdbus-4.8.0:4 bluetooth? ( net-wireless/bluez ) ) contacts? ( >=dev-qt/qtgui-4.8.0:4 ) gallery? ( >=dev-qt/qtdbus-4.8.0:4 ) location? ( >=dev-qt/qtdeclarative-4.8.0:4 >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[sqlite] ) messaging? ( >=net-libs/qmf-4.0 ) multimedia? ( >=dev-qt/qtgui-4.8.0-r4:4[xv] >=dev-qt/qtopengl-4.8.0:4 media-libs/alsa-lib media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 x11-libs/libX11 x11-libs/libXext x11-libs/libXv pulseaudio? ( media-sound/pulseaudio[alsa] ) ) publishsubscribe? ( tools? ( >=dev-qt/qtgui-4.8.0:4 ) ) qml? ( >=dev-qt/qtdeclarative-4.8.0:4 ) serviceframework? ( >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[sqlite] tools? ( >=dev-qt/qtgui-4.8.0:4 ) ) systeminfo? ( >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4 sys-apps/util-linux virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr bluetooth? ( net-wireless/bluez ) networkmanager? ( net-misc/networkmanager ) ) versit? ( >=dev-qt/qtgui-4.8.0:4 ) virtual/pkgconfig doc? ( >=dev-qt/qthelp-4.8.0:4 ) multimedia? ( sys-kernel/linux-headers x11-proto/videoproto ) systeminfo? ( sys-kernel/linux-headers )
 DESCRIPTION=Additional Qt APIs for mobile devices and desktop platforms
 EAPI=5
-HOMEPAGE=http://doc.qt.digia.com/qtmobility/
+HOMEPAGE=http://doc-snapshots.qt.io/qt-mobility/index.html
 IUSE=bluetooth debug doc networkmanager pulseaudio qml +tools connectivity +contacts feedback gallery location messaging multimedia organizer publishsubscribe sensors serviceframework systeminfo versit
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( connectivity contacts feedback gallery location messaging mult
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pesa/distfiles/qt-mobility-1.2.2_p20130703.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=211f95a5a3624051514c52e2e62a3d84
+_md5_=337b1e78a33e87c43056946bb80c77f1
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
new file mode 100644
index 000000000000..5ed2023bfcf5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby19] dev-ruby/posix-spawn[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby20] dev-ruby/posix-spawn[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Pygments syntax highlighting in ruby
+EAPI=5
+HOMEPAGE=https://github.com/tmm1/pygments.rb
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ruby_targets_ruby19? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby19] dev-ruby/posix-spawn[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby20] dev-ruby/posix-spawn[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/pygments.rb-0.6.3.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=92e61ce217826f9fd7b5feba919907ea
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-21 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21
index dc5bd663d8b6..9143a2311892 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-21
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r21-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e052b305fc5cd115478c4cac0347b8a6
+_md5_=f4d79a4da4ccd968008ea55c732c6d3c
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
index 1fd0407b77ef..c17fc39025a6 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r21.1-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=affd30212d7764e04be9aef8f43bbdd4
+_md5_=35a01dc61adf24431a248cfe8e11b9d9
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22
index d8f85a7f6193..7719adc0b995 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0df4429e2167977954becb22ebe37d23
+_md5_=624901b20cafad3913521f2e43969f80
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
index 8d428de4f0f4..46921cb6bb01 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9388023cfd96648d8f998ae2defa7be5
+_md5_=7b4e2d6d2ba0c695b1bf2ffde9fdf6e4
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
index 41de39519995..5263e6ebbbd7 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c84cf994486d6a9bc286fdb08fd1c59a
+_md5_=508c9ec64e2f33af0cd9b807fcf200b8
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
index d8afe70c1342..f6a0e7e18338 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=bb705ae41435b38c7cac80ddcd2e25cf
+_md5_=d7cac14066621fc8607fbf9866b266a6
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
index 8b6dc6b80315..34d3cf7caca9 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=312d49ed7c9bebd38469cfe6789ca111
+_md5_=25dc7f8f6e2610ce53be72a4bf709818
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
index ff43cbed08be..b0bf4b2fd3d9 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=8c659102619819baed2d6932c6183376
+_md5_=645189ef7eeab3b06aaa43aef6e73e5a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
index 97bc214318a2..79c60a87139d 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.2.1-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2a232cafe26f2b516757046d92930205
+_md5_=f1e68b0e0bdbe9bcd5ca70c93591695c
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
index 5e987ad45ab5..fb8011b0e724 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.3-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5dc78199bb3a6956b61f4938745200df
+_md5_=a31dc8fbdf007116bf2e7e07f0b502ee
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
index 5734c4fc823f..9983ea516b70 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.6-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d65ba94bdd51f21fdad5a8b076df262a
+_md5_=0b67fefdede63b7c43252d438f7326be
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
index 2fddf0b396f3..0945de31cfcb 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( ( >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=982d680489770d88416122246a245a81
+_md5_=0968c09a38eeec9e1183740de4f40cfa
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
index 7dcec5a48cf7..5059257c2d3a 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://developer.android.com
 KEYWORDS=~amd64 ~x86
 LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] )
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) sys-libs/zlib[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dl.google.com/android/android-sdk_r23-linux.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=af5cd4aa8a7e2aa2a4bbd6170cb48661
+_md5_=8a05e5a2dd2af0653ba7e9019631c4fd
diff --git a/metadata/md5-cache/dev-vcs/tig-2.0.3 b/metadata/md5-cache/dev-vcs/tig-2.0.3
index d3b74e0c58f3..eed1f6152665 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.0.3
+++ b/metadata/md5-cache/dev-vcs/tig-2.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Tig: text mode interface for git
 EAPI=5
 HOMEPAGE=http://jonas.nitro.dk/tig/
 IUSE=unicode
-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
+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
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses[unicode?] sys-libs/readline:0 dev-vcs/git
 SLOT=0
 SRC_URI=http://jonas.nitro.dk/tig/releases/tig-2.0.3.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=09f1349ace0ea5afd5de1df0c352298b
+_md5_=311d35ab7a6e2c15e18d028a730f1d99
diff --git a/metadata/md5-cache/games-fps/doom3-1.3.1304-r1 b/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
index b13896fce189..45922d490ae4 100644
--- a/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
+++ b/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.doom3.com/
 IUSE=cdinstall dedicated roe
 KEYWORDS=~amd64 ~x86
 LICENSE=DOOM3
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) !dedicated? ( || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) ) cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 roe? ( games-fps/doom3-roe ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) !dedicated? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 roe? ( games-fps/doom3-roe ) ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/doom3/linux/doom3-linux-1.3.1.1304.x86.run http://zerowing.idsoftware.com/linux/doom3.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=09b8a6dbf89daeeda3da8e8f34fdcbed
+_md5_=c91e8c26a33439f8df69df8eede254da
diff --git a/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1 b/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
index 6fe8a80fc450..569ee755cdfe 100644
--- a/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
+++ b/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://www.doom3.com/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=DOOM3
-RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://3dgamers/doom3/doom3-linux-1.1.1286-demo.x86.run mirror://idsoftware/doom3/linux/doom3-linux-1.1.1286-demo.x86.run mirror://gentoo/doom3.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b2e7629825e298436fb39ea4ae2132de
+_md5_=cab7c0acbd5cb51a994bee3c3c43d097
diff --git a/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1 b/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
index b38d940b4778..c8068fa68095 100644
--- a/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
+++ b/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.idsoftware.com/
 IUSE=dedicated
 KEYWORDS=-* amd64 x86
 LICENSE=RTCW-ETEULA
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run mirror://idsoftware/et/linux/et-linux-2.60.x86.run ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run mirror://idsoftware/et/ET-2.60b.zip dedicated? ( http://dev.gentoo.org/~wolf31o2/sources/dump/enemy-territory-all-0.1.tar.bz2 mirror://gentoo/enemy-territory-all-0.1.tar.bz2 )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=60b2d56ba2740095af6b2c28b393441b
+_md5_=67b59ebd1e5827ce9e73afac2ac81ea2
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r1 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r1
index 3f0032a53fe7..ed5d6aceca6a 100644
--- a/metadata/md5-cache/games-fps/etqw-bin-1.5-r1
+++ b/metadata/md5-cache/games-fps/etqw-bin-1.5-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
 IUSE=cdinstall
 KEYWORDS=-* amd64 x86
 LICENSE=ETQW
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-1.5-full.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=aa9dace31f8bc10cb7c2db9ccc5edf5d
+_md5_=318f48d806bb0f147703a9ac1ec81825
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
index dee950db95d9..1693937853b6 100644
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
 KEYWORDS=~amd64 ~x86
 LICENSE=ETQW
-RDEPEND=|| ( ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] ) amd64? ( >=app-emulation/emul-linux-x86-sdl-20071114[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e0d345995e5c664353fc2123f7ce0a41
+_md5_=324c00db8ac36a85878785875e208ef4
diff --git a/metadata/md5-cache/games-fps/glxquake-bin-0-r2 b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
index 02d66097b692..48126cd30d8a 100644
--- a/metadata/md5-cache/games-fps/glxquake-bin-0-r2
+++ b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://mfcn.ilo.de/glxquake/
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2523e6b7e4e60a4a46f63da52ecc43f5
+_md5_=495184eb35e00ec2b701f581a78618f0
diff --git a/metadata/md5-cache/games-fps/legends-0.4.1.43-r1 b/metadata/md5-cache/games-fps/legends-0.4.1.43-r1
index d852fa264ba8..431b321bfbb1 100644
--- a/metadata/md5-cache/games-fps/legends-0.4.1.43-r1
+++ b/metadata/md5-cache/games-fps/legends-0.4.1.43-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://legendsthegame.net/
 IUSE=+dedicated
 KEYWORDS=-* amd64 x86
 LICENSE=Legends LGPL-2.1+
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adobe-75dpi || ( ( media-libs/libsdl[video,sound,opengl,abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] media-libs/libogg[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] ) ( >=app-emulation/emul-linux-x86-sdl-2.1[-abi_x86_32(-)] >=app-emulation/emul-linux-x86-soundlibs-2.1[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adobe-75dpi media-libs/libsdl[video,sound,opengl,abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] media-libs/libogg[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://legendsthegame.net/files/legends_linux-0.4.1.43.run mirror://gentoo/legends.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=cfa34e6d727e266834eb665d2a597a2b
+_md5_=3729b57b9ce2821812f0784f233aa0da
diff --git a/metadata/md5-cache/games-fps/postal2-1409.2-r2 b/metadata/md5-cache/games-fps/postal2-1409.2-r2
index 10c89d16fc11..148d72a0ea6f 100644
--- a/metadata/md5-cache/games-fps/postal2-1409.2-r2
+++ b/metadata/md5-cache/games-fps/postal2-1409.2-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=postal2
 KEYWORDS=amd64 x86
 LICENSE=postal2
 PROPERTIES=interactive
-RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.1.run http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.2.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9121f12cab14a921f63677636ced0491
+_md5_=7747c1f7f15042bab86ce1888ef422ad
diff --git a/metadata/md5-cache/games-fps/postal2mp-demo-1409 b/metadata/md5-cache/games-fps/postal2mp-demo-1409
index 9ccc5d04e3fe..3c98b351cea7 100644
--- a/metadata/md5-cache/games-fps/postal2mp-demo-1409
+++ b/metadata/md5-cache/games-fps/postal2mp-demo-1409
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://icculus.org/news/news.php?id=4419
 KEYWORDS=amd64 x86
 LICENSE=postal2
-RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) || ( ( >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2 http://0day.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2 http://cyberstalker.dk/sponsored-by-dkchan.org/Postal2STP-FreeMP-linux.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=96149603dd9299eb7de5937430a0ed6a
+_md5_=916f442d6028176cbe84452a2f309f43
diff --git a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2 b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
index 2ed2bf019495..396ad4d9f29d 100644
--- a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
+++ b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.idsoftware.com/
 IUSE=cdinstall dedicated teamarena
 KEYWORDS=-* amd64 x86
 LICENSE=Q3AEULA GPL-2
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/quake3-data[cdinstall] teamarena? ( games-fps/quake3-teamarena ) ) dedicated? ( app-misc/screen ) !dedicated? ( || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/quake3-data[cdinstall] teamarena? ( games-fps/quake3-teamarena ) ) dedicated? ( app-misc/screen ) !dedicated? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=47939cc8e63e3aa4f1d6f77a9ce9af5d
+_md5_=a1afc00b1e3fe8487e00099beca0ddcf
diff --git a/metadata/md5-cache/games-fps/quake3-demo-1.11-r1 b/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
index 6c9e4c6d6eca..ba1103a5ea70 100644
--- a/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
+++ b/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.idsoftware.com/games/quake/quake3-arena/
 IUSE=dedicated
 KEYWORDS=-* amd64 x86
 LICENSE=Q3AEULA
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh mirror://3dgamers/quake3arena/linuxq3ademo-1.11-6.x86.gz.sh
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=54a519bdea48a345d0741d927a8aa83c
+_md5_=6daf9d5fc973fd945d57b2f20d2b884c
diff --git a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1 b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
index 9b281a6114d1..12797958b2a8 100644
--- a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
+++ b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.quake4game.com/
 IUSE=cdinstall dedicated linguas_cs linguas_fr linguas_it linguas_pl linguas_ru
 KEYWORDS=-* amd64 x86
 LICENSE=QUAKE4
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( sys-libs/zlib[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) cdinstall? ( games-fps/quake4-data ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) sys-libs/zlib[abi_x86_32(-)] dedicated? ( app-misc/screen ) !dedicated? ( || ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) cdinstall? ( games-fps/quake4-data ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/linux/quake4-linux-1.4.2.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=adce3efd40b0b2fc41c6fb1737bb828c
+_md5_=e66abef0c4d8e02954364e683c90e460
diff --git a/metadata/md5-cache/games-fps/quake4-demo-1.0-r1 b/metadata/md5-cache/games-fps/quake4-demo-1.0-r1
index 207bba507a65..3ff805db635e 100644
--- a/metadata/md5-cache/games-fps/quake4-demo-1.0-r1
+++ b/metadata/md5-cache/games-fps/quake4-demo-1.0-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.quake4game.com/
 IUSE=dedicated
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=QUAKE4
-RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/demo/quake4-linux-1.0-demo.x86.run http://www.3ddownloads.com/Action/Quake%204/Demos/quake4-linux-1.0-demo.x86.run mirror://3dgamers/quake4/quake4-linux-1.0-demo.x86.run http://filebase.gmpf.de/quake4/quake4-linux-1.0-demo.x86.run http://www.holarse.de/mirror/quake4-linux-1.0-demo.x86.run http://sonic-lux.net/data/mirror/quake4/quake4-linux-1.0-demo.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=600f72e5a7e98bf6d6fa8107084ddcc6
+_md5_=d41646f606680f853e752c449b2bad3b
diff --git a/metadata/md5-cache/games-fps/rtcw-1.41b b/metadata/md5-cache/games-fps/rtcw-1.41b
index 3d46dcc39a8b..4b866e40155a 100644
--- a/metadata/md5-cache/games-fps/rtcw-1.41b
+++ b/metadata/md5-cache/games-fps/rtcw-1.41b
@@ -5,9 +5,9 @@ HOMEPAGE=http://games.activision.com/games/wolfenstein/
 IUSE=opengl dedicated
 KEYWORDS=~amd64 ~x86
 LICENSE=RTCW GPL-2
-RDEPEND=sys-libs/glibc sys-libs/lib-compat dedicated? ( app-misc/screen ) !dedicated? ( || ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) opengl? ( || ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc sys-libs/lib-compat dedicated? ( app-misc/screen ) !dedicated? ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) opengl? ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run mirror://idsoftware/wolf/linux/wolf-linux-1.41b.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f29236a469bbaa806bed8b453a10b0f0
+_md5_=2de9225b751ec25fb3cc430560240a2d
diff --git a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r1 b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r1
index 939c9ebbbbea..338e192b9b14 100644
--- a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r1
+++ b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://games.activision.com/games/wolfenstein/
 IUSE=dedicated
 KEYWORDS=-* amd64 x86
 LICENSE=RTCW GPL-2
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( ( virtual/opengl x11-libs/libX11 x11-libs/libXext ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x11-libs/libX11 x11-libs/libXext ) games-misc/games-envd
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0f60bcb9fc97f56ec9486c68c65a9fbf
+_md5_=b92c1b261f172f7995fb2c2f1f4055a1
diff --git a/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r1 b/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r1
index dc6feeb2cdb1..56ebb99b9a29 100644
--- a/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r1
+++ b/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r1
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://games.activision.com/games/wolfenstein/
 KEYWORDS=-* amd64 x86
 LICENSE=RTCW
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/old/wolfspdemo-linux-1.1b.x86.run mirror://3dgamers/returnwolfenstein/wolfspdemo-linux-1.1b.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4fb2515c061763a91da23854826422af
+_md5_=10f73b73185d4714a9dc4e01ba55cc10
diff --git a/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3 b/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
index 27c5e99df710..7ab29dfc7d16 100644
--- a/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
+++ b/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
@@ -7,9 +7,9 @@ IUSE=alsa
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
-RDEPEND=|| ( ( >=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] alsa? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] alsa? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://icculus.org/betas/ssam/ssam-tfe-lnx-beta1a.run http://icculus.org/updates/ssam/ssamtfe-beta1b.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta2.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta3.sh.bin
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c3efaa1b6d1b25a2a1d77fc9098afa5a
+_md5_=798001d55269be6e90b141cab2774ca6
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index edc99bcdb80d..75217cd8483a 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.lokigames.com/products/sof/
 KEYWORDS=amd64 x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( ( virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=fb4e2815daa01073e3980fcc20072436
+_md5_=f64d64e238572894917aee934d6532c4
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1 b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
index 0d38f9f8f238..a7ceda01d21a 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://www.lokigames.com/products/sof/
 KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
-RDEPEND=|| ( ( virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/sof-demo.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=47586d1da63d9c6691d1e4e1beb3bd2f
+_md5_=f3ca8c583d316c982d936155a96f4ab7
diff --git a/metadata/md5-cache/games-fps/unreal-226 b/metadata/md5-cache/games-fps/unreal-226
index 7c720d679382..1d624859e204 100644
--- a/metadata/md5-cache/games-fps/unreal-226
+++ b/metadata/md5-cache/games-fps/unreal-226
@@ -7,9 +7,9 @@ IUSE=X opengl
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 PROPERTIES=interactive
-RDEPEND=|| ( ( >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] opengl? ( app-emulation/emul-linux-x86-opengl[abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.icculus.org/%7Echunky/ut/unreal/unreali-install.run ftp://ftp.lokigames.com/pub/patches/ut/ut-install-436.run ftp://ftp.lokigames.com/pub/patches/ut/IpDrv-436-Linux-08-20-02.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=cc63de837c8f44ea799968feec12d383
+_md5_=0b8348817c62f7ba1082833b0304e258
diff --git a/metadata/md5-cache/games-fps/unreal-tournament-451 b/metadata/md5-cache/games-fps/unreal-tournament-451
index 57b4c414f829..8cce596732ee 100644
--- a/metadata/md5-cache/games-fps/unreal-tournament-451
+++ b/metadata/md5-cache/games-fps/unreal-tournament-451
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=|| ( ( >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) !games-fps/unreal-tournament-goty
+DEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) !games-fps/unreal-tournament-goty
 DESCRIPTION=Futuristic FPS
 EAPI=5
 HOMEPAGE=http://www.unrealtournament.com/ http://utpg.org/
@@ -7,9 +7,9 @@ IUSE=3dfx opengl
 KEYWORDS=-* amd64 x86
 LICENSE=all-rights-reserved
 PROPERTIES=interactive
-RDEPEND=|| ( ( >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) ) amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.ibiblio.org/osg/Downloads/Linux/Installers/ut-install-436.run http://utpg.org/patches/UTPGPatch451.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=223974a73ff7a6b37df162a20f6d66f0
+_md5_=f9aa6a5a9793e183fc5f57264f3605db
diff --git a/metadata/md5-cache/games-fps/unreal-tournament-goty-436 b/metadata/md5-cache/games-fps/unreal-tournament-goty-436
index c5716be8350e..678a95efd3a4 100644
--- a/metadata/md5-cache/games-fps/unreal-tournament-goty-436
+++ b/metadata/md5-cache/games-fps/unreal-tournament-goty-436
@@ -7,9 +7,9 @@ IUSE=3dfx S3TC nls opengl
 KEYWORDS=x86
 LICENSE=all-rights-reserved
 PROPERTIES=interactive
-RDEPEND=|| ( ( opengl? ( virtual/opengl[abi_x86_32(-)] ) x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] ) amd64? ( opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=opengl? ( virtual/opengl[abi_x86_32(-)] ) x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=ftp://ftp.lokigames.com/pub/beta/ut/ut-install-436-GOTY.run ftp://ftp.lokigames.com/pub/patches/ut/IpDrv-436-Linux-08-20-02.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6c3f8b29cae4941bd372def61b3e943f
+_md5_=7d7fe7256dece3868bf3d67150096013
diff --git a/metadata/md5-cache/games-fps/unreal-tournament-goty-451 b/metadata/md5-cache/games-fps/unreal-tournament-goty-451
index 3958160d99ce..556377faa497 100644
--- a/metadata/md5-cache/games-fps/unreal-tournament-goty-451
+++ b/metadata/md5-cache/games-fps/unreal-tournament-goty-451
@@ -6,9 +6,9 @@ IUSE=3dfx S3TC nls opengl
 KEYWORDS=~amd64 x86
 LICENSE=all-rights-reserved
 PROPERTIES=interactive
-RDEPEND=|| ( ( opengl? ( virtual/opengl[abi_x86_32(-)] ) >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] ) amd64? ( opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=opengl? ( virtual/opengl[abi_x86_32(-)] ) >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=ftp://ftp.lokigames.com/pub/beta/ut/ut-install-436-GOTY.run http://utpg.org/patches/UTPGPatch451.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=549e17bbad13bee7b09be33366b288bb
+_md5_=029a705e5da0301d5006b595a86e8bee
diff --git a/metadata/md5-cache/games-fps/ut2003-2225-r4 b/metadata/md5-cache/games-fps/ut2003-2225-r4
index ec945ae12c66..9d513505523c 100644
--- a/metadata/md5-cache/games-fps/ut2003-2225-r4
+++ b/metadata/md5-cache/games-fps/ut2003-2225-r4
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.unrealtournament2003.com/
 IUSE=dedicated
 KEYWORDS=amd64 x86
 LICENSE=ut2003
-RDEPEND=games-fps/ut2003-data dedicated? ( games-server/ut2003-ded ) !dedicated? ( || ( ( virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) games-misc/games-envd
+RDEPEND=games-fps/ut2003-data dedicated? ( games-server/ut2003-ded ) !dedicated? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b283f8aeac90c94e3846412eb323907e
+_md5_=d66d98218559134a2ee123a7914d70dc
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
index 42f1cf549d54..6ee905daf695 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://www.ut2003.com/
 KEYWORDS=-* amd64 x86
 LICENSE=ut2003-demo
-RDEPEND=sys-devel/bc virtual/libstdc++:3.3 || ( ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=sys-devel/bc virtual/libstdc++:3.3 virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip http://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4e51aa826d5fb83d989c3ca6d4413539
+_md5_=4b4fba4db9bcf93ccee454779365e27d
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334 b/metadata/md5-cache/games-fps/ut2004-demo-3334
index 50c21abfdd28..0645fcbcb8e6 100644
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://www.unrealtournament.com/
 KEYWORDS=-* amd64 x86
 LICENSE=ut2003-demo
-RDEPEND=virtual/libstdc++:3.3 || ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=virtual/libstdc++:3.3 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d10f6c54187a1a903ef7a7c11b10a45f
+_md5_=8a2c3af356d08448fd89d5ef1debe70a
diff --git a/metadata/md5-cache/games-rpg/nwn-1.68-r5 b/metadata/md5-cache/games-rpg/nwn-1.68-r5
index fc3a0aefc3d7..d99d61f00217 100644
--- a/metadata/md5-cache/games-rpg/nwn-1.68-r5
+++ b/metadata/md5-cache/games-rpg/nwn-1.68-r5
@@ -6,9 +6,9 @@ HOMEPAGE=http://nwn.bioware.com/downloads/linuxclient.html
 IUSE=sou hou linguas_fr linguas_it linguas_es linguas_de linguas_en
 KEYWORDS=-* amd64 x86
 LICENSE=NWN-EULA
-RDEPEND=>=games-rpg/nwn-data-1.29-r3 !<games-rpg/nwmouse-0.1-r1 || ( ( x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=>=games-rpg/nwn-data-1.29-r3 !<games-rpg/nwmouse-0.1-r1 x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~calchan/distfiles/nwn-libs-1.tar.bz2 linguas_fr? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_xp2.tar.gz ) ) linguas_it? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_xp2.tar.gz ) ) linguas_en? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp2.tar.gz ) ) linguas_es? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_xp2.tar.gz ) ) linguas_de? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_xp2.tar.gz ) ) !linguas_en? ( !linguas_es? ( !linguas_de? ( !linguas_fr? ( !linguas_it? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp2.tar.gz ) ) ) ) ) )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=7afe74335b7f65554e911ed8c62c4dd9
+_md5_=03a4211923ef175bee391110445ca7a6
diff --git a/metadata/md5-cache/games-rpg/nwn-1.68-r6 b/metadata/md5-cache/games-rpg/nwn-1.68-r6
index ac61a5ca4def..3bb0014746fa 100644
--- a/metadata/md5-cache/games-rpg/nwn-1.68-r6
+++ b/metadata/md5-cache/games-rpg/nwn-1.68-r6
@@ -6,9 +6,9 @@ HOMEPAGE=http://nwn.bioware.com/downloads/linuxclient.html
 IUSE=sou hou linguas_fr linguas_it linguas_es linguas_de linguas_en
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=NWN-EULA
-RDEPEND=>=games-rpg/nwn-data-1.29-r3 !<games-rpg/nwmouse-0.1-r1 || ( ( x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=>=games-rpg/nwn-data-1.29-r3 !<games-rpg/nwmouse-0.1-r1 x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~calchan/distfiles/nwn-libs-1.tar.bz2 linguas_fr? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/French_linuxclient168_xp2.tar.gz ) ) linguas_it? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Italian_linuxclient168_xp2.tar.gz ) ) linguas_en? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp2.tar.gz ) ) linguas_es? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/Spanish_linuxclient168_xp2.tar.gz ) ) linguas_de? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/German_linuxclient168_xp2.tar.gz ) ) !linguas_en? ( !linguas_es? ( !linguas_de? ( !linguas_fr? ( !linguas_it? ( !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_orig.tar.gz ) ) sou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp1.tar.gz ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/168/English_linuxclient168_xp2.tar.gz ) ) ) ) ) )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e7155e2a2ad38fd6a36c59009e0e993c
+_md5_=9b45a1f60c4f1bb1f7f12234fbce3eca
diff --git a/metadata/md5-cache/games-rpg/nwn-1.69-r1 b/metadata/md5-cache/games-rpg/nwn-1.69-r1
index 42121b99293d..7699ec89caca 100644
--- a/metadata/md5-cache/games-rpg/nwn-1.69-r1
+++ b/metadata/md5-cache/games-rpg/nwn-1.69-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://nwn.bioware.com/downloads/linuxclient.html
 IUSE=sou hou
 KEYWORDS=-* amd64 x86
 LICENSE=NWN-EULA
-RDEPEND=|| ( >=games-rpg/nwn-data-1.29-r3[sou?,hou?,linguas_en] >=games-rpg/nwn-data-1.29-r3[sou?,hou?,-linguas_fr,-linguas_de,-linguas_es,-linguas_it] ) !<games-rpg/nwmouse-0.1-r1 || ( ( x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=|| ( >=games-rpg/nwn-data-1.29-r3[sou?,hou?,linguas_en] >=games-rpg/nwn-data-1.29-r3[sou?,hou?,-linguas_fr,-linguas_de,-linguas_es,-linguas_it] ) !<games-rpg/nwmouse-0.1-r1 x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~calchan/distfiles/nwn-libs-1.tar.bz2 !sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_orig.tar.gz ) ) sou? ( !hou? ( http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp1.tar.gz ) ) hou? ( http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp2.tar.gz )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=421c3746aa5492adc97bd5a14c34acf4
+_md5_=8a7a16cf9f078a889e0c6d1eb43d8ba2
diff --git a/metadata/md5-cache/games-rpg/sacred-gold-1.0 b/metadata/md5-cache/games-rpg/sacred-gold-1.0
index 50d886c254ff..c211a2881a8a 100644
--- a/metadata/md5-cache/games-rpg/sacred-gold-1.0
+++ b/metadata/md5-cache/games-rpg/sacred-gold-1.0
@@ -5,8 +5,8 @@ HOMEPAGE=http://linuxgamepublishing.com/info.php?id=sacred
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved GPL-2 LGPL-2
 PROPERTIES=interactive
-RDEPEND=|| ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=bindist strip
 SLOT=0
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d06b3dce815e6a21760e0156cad7b9a5
+_md5_=4ac685bbfb9ad9a2ce5c91b3f406f0ac
diff --git a/metadata/md5-cache/games-rpg/sacred-gold-1.0.01 b/metadata/md5-cache/games-rpg/sacred-gold-1.0.01
index 00b6be8c5497..ad9886be3290 100644
--- a/metadata/md5-cache/games-rpg/sacred-gold-1.0.01
+++ b/metadata/md5-cache/games-rpg/sacred-gold-1.0.01
@@ -5,9 +5,9 @@ HOMEPAGE=http://linuxgamepublishing.com/info.php?id=sacred
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved GPL-2 LGPL-2
 PROPERTIES=interactive
-RDEPEND=|| ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://updatefiles.linuxgamepublishing.com/sacred/sacred-1.0-1.0.01-x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=69cc780e844a95200d75f25aad5b0fcf
+_md5_=4dbd1e439fb175c9cd9a3a291dc15d41
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7 b/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7
index 65e169e93cc2..61c9f77eef80 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=https://wasteland.inxile-entertainment.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ( >=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] ) ) ) x86? ( dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr virtual/glu ) games-misc/games-envd
+RDEPEND=virtual/opengl >=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=gog_wasteland_2_1.3.0.7.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9cf80df7e39a01adf0d6bd45ee1bae19
+_md5_=462b789e2050fa003ea9b667bb9f575d
diff --git a/metadata/md5-cache/games-strategy/spaz-1.605 b/metadata/md5-cache/games-strategy/spaz-1.605
index 9964d802efb6..8acaa45d218f 100644
--- a/metadata/md5-cache/games-strategy/spaz-1.605
+++ b/metadata/md5-cache/games-strategy/spaz-1.605
@@ -6,9 +6,9 @@ HOMEPAGE=http://spacepiratesandzombies.com
 IUSE=alsa pulseaudio
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LOKI-EULA
-RDEPEND=|| ( ( >=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) ) games-misc/games-envd
+RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=spaz-linux-humblebundle-09182012-bin
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ba97758745745315d1de906acb42c1ad
+_md5_=954f023493eaf5d55df520c7db624f3b
diff --git a/metadata/md5-cache/gnome-base/gnome-common-3.14.0-r1 b/metadata/md5-cache/gnome-base/gnome-common-3.14.0-r1
index 50fd5df6292f..658df7370a51 100644
--- a/metadata/md5-cache/gnome-base/gnome-common-3.14.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-common-3.14.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Common files for development of Gnome packages
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/gnome-common
 IUSE=+autoconf-archive
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 ) !autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-common/3.14/gnome-common-3.14.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7edb09702355203dd22aa7362920dc17
+_md5_=2e1e16cc2905738f627cefa5a5a3b2e4
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1
new file mode 100644
index 000000000000..36982c8f21cb
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) app-crypt/pinentry[gnome-keyring] >=app-crypt/gnupg-2.0.28 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) filecaps? ( sys-libs/libcap ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Password and keyring managing daemon
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
+IUSE=+caps debug pam selinux +ssh-agent test +filecaps debug test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) app-crypt/pinentry[gnome-keyring] >=app-crypt/gnupg-2.0.28
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-keyring/3.16/gnome-keyring-3.16.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fcaps	eeefea88d5fef2853d4c1e3770340302	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=98b05ea4cd109deec27dc9e41608a3c8
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r3 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r3
deleted file mode 100644
index eb9b6151dc08..000000000000
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 dev-util/gtk-doc-am virtual/pkgconfig >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=ORBit2 is a high-performance CORBA ORB
-EAPI=5
-HOMEPAGE=http://projects.gnome.org/ORBit2/
-IUSE=pic static-libs test debug
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2
-REQUIRED_USE=test? ( debug )
-SLOT=2
-SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2761edbb2b390e71ab5a71089eb94831
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.6.7 b/metadata/md5-cache/gnome-extra/cinnamon-2.6.7
index 41f03a5899fa..2a515384a1a4 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-2.6.7
+++ b/metadata/md5-cache/gnome-extra/cinnamon-2.6.7
@@ -6,9 +6,9 @@ HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2[dbus] >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.4 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.4[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] virtual/python-imaging[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+RDEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2[dbus] >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.4 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.4[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] virtual/python-imaging[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) python_targets_python2_7 || ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.6.7.tar.gz -> cinnamon-2.6.7.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b28ff52d075e2c53a72eb2c4f44d9029
+_md5_=fb4ee7a87d5cb9d16583ea86f2d6d35f
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.6.8 b/metadata/md5-cache/gnome-extra/cinnamon-2.6.8
new file mode 100644
index 000000000000..8fd66c65bd81
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-2.6.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2[dbus] >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.4 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.4[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) dev-python/polib[python_targets_python2_7] >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=5
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2[dbus] >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.4 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.4[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] virtual/python-imaging[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) python_targets_python2_7 || ( python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.6.8.tar.gz -> cinnamon-2.6.8.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=621a5b246ba41e212b4946e2b8219096
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2 b/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2
deleted file mode 100644
index 9e892e2f5ab8..000000000000
--- a/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gnome-extra/zeitgeist x11-libs/gtk+:3[introspection] dev-python/python-distutils-extra python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Monitor and inspect Zeitgeist's log at a low level - developer tool
-EAPI=5
-HOMEPAGE=https://launchpad.net/zeitgeist-explorer/
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=gnome-extra/zeitgeist x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=https://launchpad.net/zeitgeist-explorer/0.x/0.2/+download/zeitgeist-explorer-0.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=851e9e87da355a7e46aa63edfecae83a
diff --git a/metadata/md5-cache/java-virtuals/interceptor-api-0 b/metadata/md5-cache/java-virtuals/interceptor-api-0
index e0ecf6e7e6bd..44810f6f722b 100644
--- a/metadata/md5-cache/java-virtuals/interceptor-api-0
+++ b/metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for Interceptor API (javax.interceptor)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4a7c80c1feba48616b58c79d977e084c	java-virtuals-2	3f6b3450d42c285ae53f6b9da9fb5ba3	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f25230f40e4af815c595362a303a0a0f
+_md5_=01a931b1716f1871ad6855918cd7462c
diff --git a/metadata/md5-cache/mail-client/thunderbird-38.0.1 b/metadata/md5-cache/mail-client/thunderbird-38.0.1
index 03cf7d6208e4..e2ece8236db9 100644
--- a/metadata/md5-cache/mail-client/thunderbird-38.0.1
+++ b/metadata/md5-cache/mail-client/thunderbird-38.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.17.1 >=dev-libs/nspr-4.10.6 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2 dev-libs/atk dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.16:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-good-1.2.3:1.0 >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) =sys-devel/autoconf-2.1* >=sys-devel/libtool-2.4 app-arch/unzip app-arch/unzip
+DEPEND=>=dev-libs/nss-3.19.1 >=dev-libs/nspr-4.10.8 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2 dev-libs/atk dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.16:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-good-1.2.3:1.0 >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) =sys-devel/autoconf-2.1* >=sys-devel/libtool-2.4 app-arch/unzip app-arch/unzip
 DESCRIPTION=Thunderbird Mail Client
 EAPI=5
 HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
 IUSE=bindist crypt hardened ldap +minimal mozdom selinux custom-cflags custom-optimization dbus debug gstreamer +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx +jit linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.17.1 >=dev-libs/nspr-4.10.6 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2 dev-libs/atk dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.16:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-good-1.2.3:1.0 >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] ) selinux? ( sec-policy/selinux-mozilla )
+RDEPEND=>=dev-libs/nss-3.19.1 >=dev-libs/nspr-4.10.8 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2 dev-libs/atk dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.16:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-good-1.2.3:1.0 >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ar.xpi -> thunderbird-38.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ast.xpi -> thunderbird-38.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/be.xpi -> thunderbird-38.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/bg.xpi -> thunderbird-38.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-38.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/br.xpi -> thunderbird-38.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ca.xpi -> thunderbird-38.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/cs.xpi -> thunderbird-38.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/da.xpi -> thunderbird-38.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/de.xpi -> thunderbird-38.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/el.xpi -> thunderbird-38.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-38.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-38.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-38.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/et.xpi -> thunderbird-38.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/eu.xpi -> thunderbird-38.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/fi.xpi -> thunderbird-38.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/fr.xpi -> thunderbird-38.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-38.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-38.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/gd.xpi -> thunderbird-38.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/gl.xpi -> thunderbird-38.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/he.xpi -> thunderbird-38.0.1-he.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/hr.xpi -> thunderbird-38.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/hu.xpi -> thunderbird-38.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-38.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/id.xpi -> thunderbird-38.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/is.xpi -> thunderbird-38.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/it.xpi -> thunderbird-38.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ja.xpi -> thunderbird-38.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ko.xpi -> thunderbird-38.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/lt.xpi -> thunderbird-38.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-38.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/nl.xpi -> thunderbird-38.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-38.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-38.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/pl.xpi -> thunderbird-38.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-38.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-38.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/rm.xpi -> thunderbird-38.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ro.xpi -> thunderbird-38.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ru.xpi -> thunderbird-38.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/si.xpi -> thunderbird-38.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/sk.xpi -> thunderbird-38.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/sl.xpi -> thunderbird-38.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/sq.xpi -> thunderbird-38.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/sr.xpi -> thunderbird-38.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-38.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-38.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/tr.xpi -> thunderbird-38.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/uk.xpi -> thunderbird-38.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/vi.xpi -> thunderbird-38.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-38.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//38.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-38.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/38.0.1/source/thunderbird-38.0.1.source.tar.bz2 http://ftp.mozilla.org/pub/thunderbird/releases/38.0.1/source/thunderbird-38.0.1.source.tar.bz2 crypt? ( http://www.enigmail.net/download/source/enigmail-1.8.2.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-38.0-patches-0.3.tar.xz http://dev.gentoo.org/~axs/distfiles/thunderbird-38.0-patches-0.1.tar.xz http://dev.gentoo.org/~axs/distfiles/firefox-38.0-patches-0.3.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-v5.38	232ae5037d45d713132a4a58cead787e	mozcoreconf-v3	30c3473da4c183894e9c355b1bc0a3d6	mozextension	ba6829881080a663d68531424a3dfbc6	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	62927b3db3a589b0806255f3a002d5d3	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a20bab7845712ee4b5d89af9e80a25e0
+_md5_=1239656068d4c033fbdc705b09c7ccea
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
index 2632f3553109..2c7c45bde416 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
@@ -5,10 +5,10 @@ HOMEPAGE=http://developer.nvidia.com/cg_toolkit
 IUSE=doc examples multilib abi_x86_32 abi_x86_64
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=NVIDIA-r1
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/glu media-libs/mesa media-libs/freeglut amd64? ( abi_x86_32? ( || ( ( >=media-libs/glu-9.0.0-r1[abi_x86_32(-)] >=media-libs/mesa-9.1.6[abi_x86_32(-)] >=media-libs/freeglut-2.8.1[abi_x86_32(-)] ) app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) || ( ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) x86? ( virtual/libstdc++:3.3 )
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/glu media-libs/mesa media-libs/freeglut amd64? ( abi_x86_32? ( >=media-libs/glu-9.0.0-r1[abi_x86_32(-)] >=media-libs/mesa-9.1.6[abi_x86_32(-)] >=media-libs/freeglut-2.8.1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) ) x86? ( virtual/libstdc++:3.3 )
 REQUIRED_USE=amd64? ( multilib? ( abi_x86_32 ) ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=091c8a6f262c2f996d3fa628802a5a89
+_md5_=331d47b7598f4996ec55a566690d6211
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
index 17a15e7e2fea..7f329595f60d 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
@@ -5,10 +5,10 @@ HOMEPAGE=http://developer.nvidia.com/cg_toolkit
 IUSE=doc examples multilib abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=NVIDIA-r1
-RDEPEND=media-libs/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt virtual/opengl amd64? ( abi_x86_32? ( || ( ( >=media-libs/freeglut-2.8.1[abi_x86_32(-)] >=media-libs/glu-9.0.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) || ( ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) )
+RDEPEND=media-libs/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt virtual/opengl amd64? ( abi_x86_32? ( >=media-libs/freeglut-2.8.1[abi_x86_32(-)] >=media-libs/glu-9.0.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) )
 REQUIRED_USE=amd64? ( multilib? ( abi_x86_32 ) ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f1697f95d20babf053af0277a9f876b
+_md5_=eed665d81e2d970b357219ceaf1f1d59
diff --git a/metadata/md5-cache/media-libs/cogl-1.20.0 b/metadata/md5-cache/media-libs/cogl-1.20.0
index ab36fdc219a7..4df70a6cbb9f 100644
--- a/metadata/md5-cache/media-libs/cogl-1.20.0
+++ b/metadata/md5-cache/media-libs/cogl-1.20.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) >=dev-util/gtk-doc-am-1.13 sys-devel/gettext virtual/pkgconfig test? ( app-eselect/eselect-opengl media-libs/mesa[classic] ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) >=dev-util/gtk-doc-am-1.13 sys-devel/gettext virtual/pkgconfig test? ( app-eselect/eselect-opengl media-libs/mesa[classic] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
 EAPI=5
 HOMEPAGE=http://www.cogl3d.org/
 IUSE=examples gles2 gstreamer +introspection +kms +opengl +pango test wayland debug test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT BSD
-RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) !<media-libs/clutter-1.7
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) !<media-libs/clutter-1.7
 REQUIRED_USE=wayland? ( gles2 )
 RESTRICT=test
 SLOT=1.0/20
 SRC_URI=mirror://gnome/sources/cogl/1.20/cogl-1.20.0.tar.xz
-_eclasses_=clutter	9f94a7b65d03649427777e9cd447f950	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e5e555155633ef86d10d2867897ef550
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=cbcac07b6182201ff4d3531f42ac9a9f
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.4 b/metadata/md5-cache/media-sound/apulse-0.1.4
index 291d1cde9427..cc87e9b72b3d 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.4
+++ b/metadata/md5-cache/media-sound/apulse-0.1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amd64? ( abi_x86_32? ( !abi_x86_x32? ( dev-libs/glib:2 media-libs/alsa-lib app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=PulseAudio emulation for ALSA
 EAPI=5
 HOMEPAGE=https://github.com/i-rinat/apulse
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT LGPL-2.1
-RDEPEND=|| ( ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amd64? ( abi_x86_32? ( !abi_x86_x32? ( dev-libs/glib:2 media-libs/alsa-lib app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) ) ) !!media-plugins/alsa-plugins[pulseaudio]
+RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!media-plugins/alsa-plugins[pulseaudio]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.4.tar.gz -> apulse-0.1.4.tar.gz
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=d32ca06fb8968b45ce94c2a0d7828a02
+_md5_=9fb2257c789960c2056256ed9d9b0a83
diff --git a/metadata/md5-cache/media-sound/mpd-0.19.9-r1 b/metadata/md5-cache/media-sound/mpd-0.19.9-r1
index 1478866b2ccf..65740743caa4 100644
--- a/metadata/md5-cache/media-sound/mpd-0.19.9-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.19.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=5
 HOMEPAGE=http://www.musicpd.org
 IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos
+KEYWORDS=amd64 arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=!<sys-cluster/mpich2-1.4_rc2 adplug? ( media-libs/adplug ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) glib? ( dev-libs/glib:2 ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) selinux? ( sec-policy/selinux-mpd )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) ao? ( glib ) gme? ( glib ) jack? ( glib ) network? ( || ( audiofile flac lame twolame vorbis ) glib ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) sid? ( glib ) soundcloud? ( glib ) sqlite? ( glib ) opus? ( ogg ) upnp? ( expat ) vorbis? ( glib ) wavpack? ( glib )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/mpd/0.19/mpd-0.19.9.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=769fdee8e36fe9e171e111f8bac1181b
+_md5_=78977ee58359bab61ffc7f6ba33e1c10
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.24-r1 b/metadata/md5-cache/media-sound/ncmpc-0.24-r1
index c9cf6a16f0c1..4d0cc2a8d94a 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.24-r1
+++ b/metadata/md5-cache/media-sound/ncmpc-0.24-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 sys-libs/ncurses li
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/ncmpc/0/ncmpc-0.24.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=202b8cbdc82ddadb8892c69070230345
+_md5_=55f3d5023221fc277810a532e9d85087
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.6.3 b/metadata/md5-cache/media-video/ffmpeg-2.6.3
index ec9392d8a043..c8790e9b7f2b 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.6.3
+++ b/metadata/md5-cache/media-video/ffmpeg-2.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=5
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( aac? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bi
 SLOT=0/54.56.56
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=27283003f9cfc1d944233058b1f22b8e
+_md5_=78799885335785e8deff0930aa21d6a6
diff --git a/metadata/md5-cache/media-video/mplayer-1.2_pre20150214 b/metadata/md5-cache/media-video/mplayer-1.2_pre20150214
index 07f576e5abda..22f1bffb2fef 100644
--- a/metadata/md5-cache/media-video/mplayer-1.2_pre20150214
+++ b/metadata/md5-cache/media-video/mplayer-1.2_pre20150214
@@ -4,7 +4,7 @@ DESCRIPTION=Media Player for Linux
 EAPI=5
 HOMEPAGE=http://www.mplayerhq.hu/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-2.0:0 a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xanim? ( media-video/xanim ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://gentoo/mplayer-1.2_pre20150214.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=538df1d547da3b900c32add8a2eca705
+_md5_=30e3aee52dca2084756c70789a26763d
diff --git a/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1 b/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
index 9e994f55e8ef..c16e49a16f6d 100644
--- a/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
+++ b/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.smlabs.net/en/products/tsmuxer/
 IUSE=qt4 linguas_ru
 KEYWORDS=~amd64 ~x86
 LICENSE=SmartLabs
-RDEPEND=x86? ( media-libs/freetype:2 qt4? ( dev-libs/glib:2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender ) ) amd64? ( || ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) qt4? ( || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] ) ) || ( ( >=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)] >=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) ) )
+RDEPEND=x86? ( media-libs/freetype:2 qt4? ( dev-libs/glib:2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender ) ) amd64? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)] qt4? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)] >=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] ) )
 SLOT=0
 SRC_URI=http://www.smlabs.net/tsMuxer/tsMuxeR_shared_1.10.6.tar.gz http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=381039d7c6d1a319e4b0373e490499b2
+_md5_=aaf6dc05e4f8ebce2898612c69ea02f6
diff --git a/metadata/md5-cache/net-fs/libnfs-1.9.5 b/metadata/md5-cache/net-fs/libnfs-1.9.5
index 7cbe2d9899c3..5bbdd7e4b83f 100644
--- a/metadata/md5-cache/net-fs/libnfs-1.9.5
+++ b/metadata/md5-cache/net-fs/libnfs-1.9.5
@@ -4,9 +4,9 @@ DESCRIPTION=Client library for accessing NFS shares over a network
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=examples static-libs
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 x86
+KEYWORDS=amd64 arm hppa ~ppc ppc64 x86
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.9.5.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7850deeec06ba736b5c9d15537fb09e0
+_md5_=cc1284cd1ddda5d4edde756fa2074bca
diff --git a/metadata/md5-cache/net-im/prosody-0.9.8 b/metadata/md5-cache/net-im/prosody-0.9.8
index ec1596d21568..2518d1ef7fb5 100644
--- a/metadata/md5-cache/net-im/prosody-0.9.8
+++ b/metadata/md5-cache/net-im/prosody-0.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written
 EAPI=5
 HOMEPAGE=http://prosody.im/
 IUSE=ipv6 libevent mysql postgres sqlite ssl zlib jit
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base !jit? ( >=dev-lang/lua-5.1:0 ) jit? ( dev-lang/luajit:2 ) >=net-dns/libidn-1.1 dev-libs/openssl:0 >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 ) !ipv6? ( dev-lua/luasocket ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib )
 SLOT=0
 SRC_URI=http://prosody.im/tmp/0.9.8/prosody-0.9.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17c3f5ba8783633da1460fd35e849f06
+_md5_=f83420388c6575700f15460b61f3ef6e
diff --git a/metadata/md5-cache/net-im/skype-4.3.0.37-r5 b/metadata/md5-cache/net-im/skype-4.3.0.37-r5
index e09943213ab7..d8a48a000b63 100644
--- a/metadata/md5-cache/net-im/skype-4.3.0.37-r5
+++ b/metadata/md5-cache/net-im/skype-4.3.0.37-r5
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.skype.com/
 IUSE=apulse pax_kernel +pulseaudio selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code
-RDEPEND=virtual/ttf-fonts amd64? ( || ( ( dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtdbus:4[abi_x86_32(-)] dev-qt/qtgui:4[accessibility,abi_x86_32(-)] dev-qt/qtwebkit:4[abi_x86_32(-)] ) >=app-emulation/emul-linux-x86-qtlibs-20120520[-abi_x86_32(-)] ) || ( media-libs/alsa-lib[abi_x86_32(-)] >=app-emulation/emul-linux-x86-soundlibs-20120520[-abi_x86_32(-)] ) || ( ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] ) >=app-emulation/emul-linux-x86-xlibs-20120520[-abi_x86_32(-)] ) pulseaudio? ( || ( media-sound/pulseaudio[abi_x86_32(-)] >=app-emulation/emul-linux-x86-soundlibs-20120520[-abi_x86_32(-)] ) ) apulse? ( media-sound/apulse[abi_x86_32(-)] ) ) x86? ( media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXv dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4[accessibility] dev-qt/qtwebkit:4 apulse? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-skype )
+RDEPEND=virtual/ttf-fonts dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtdbus:4[abi_x86_32(-)] dev-qt/qtgui:4[accessibility,abi_x86_32(-)] dev-qt/qtwebkit:4[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] apulse? ( media-sound/apulse[abi_x86_32(-)] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) selinux? ( sec-policy/selinux-skype )
 REQUIRED_USE=apulse? ( !pulseaudio )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://download.skype.com/linux/skype-4.3.0.37.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b8d74ab7ae533684f6bda3499fe00dce
+_md5_=4d8cb588acefb601cc45187d5218a7c5
diff --git a/metadata/md5-cache/net-im/skypetab-ng-0.5.2 b/metadata/md5-cache/net-im/skypetab-ng-0.5.2
index 18ee846e1f5d..24c213d34f46 100644
--- a/metadata/md5-cache/net-im/skypetab-ng-0.5.2
+++ b/metadata/md5-cache/net-im/skypetab-ng-0.5.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=|| ( ( dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) )
+DEPEND=dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)]
 DESCRIPTION=An LD_PRELOAD wrapper that adds tabs to Skype for Linux
 EAPI=4
 HOMEPAGE=http://github.com/kekekeks/skypetab-ng
 KEYWORDS=-* ~x86 ~amd64
 LICENSE=LGPL-3
-RDEPEND=|| ( ( dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) ) || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+RDEPEND=dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 SLOT=0
 SRC_URI=http://github.com/kekekeks/skypetab-ng/tarball/v0.5.2 -> skypetab-ng-0.5.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=7ad38585154eac0925c50f2cc9bbb4fc
+_md5_=4934d5cbefb10217e19c9c21360f12ac
diff --git a/metadata/md5-cache/net-im/skypetab-ng-9999 b/metadata/md5-cache/net-im/skypetab-ng-9999
index f3a2bfe07cb5..9bf254729ddd 100644
--- a/metadata/md5-cache/net-im/skypetab-ng-9999
+++ b/metadata/md5-cache/net-im/skypetab-ng-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=|| ( ( dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) ) dev-vcs/git
+DEPEND=dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] dev-vcs/git
 DESCRIPTION=An LD_PRELOAD wrapper that adds tabs to Skype for Linux
 EAPI=4
 HOMEPAGE=http://github.com/kekekeks/skypetab-ng
 LICENSE=LGPL-3
-RDEPEND=|| ( ( dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) ) || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+RDEPEND=dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 SLOT=0
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=2f2d225541e7fc54bcd1eb6f7f2dab1e
+_md5_=7930255e182c37fe38db663b706746cb
diff --git a/metadata/md5-cache/net-libs/qmf-4.0.3 b/metadata/md5-cache/net-libs/qmf-4.0.3
index 765ad8e327f7..846048e17519 100644
--- a/metadata/md5-cache/net-libs/qmf-4.0.3
+++ b/metadata/md5-cache/net-libs/qmf-4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-qt/qtcore-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtsql-4.8:4 examples? ( >=dev-qt/qtwebkit-4.8:4 ) icu? ( dev-libs/icu:= ) zlib? ( sys-libs/zlib ) virtual/pkgconfig test? ( >=dev-qt/qttest-4.8:4 ) !!<net-libs/qmf-2.0_p201209
+DEPEND=>=dev-qt/qtcore-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtsql-4.8:4 examples? ( >=dev-qt/qtwebkit-4.8:4 ) icu? ( dev-libs/icu:= ) zlib? ( sys-libs/zlib ) virtual/pkgconfig test? ( >=dev-qt/qttest-4.8:4 )
 DESCRIPTION=The Qt Messaging Framework
 EAPI=5
 HOMEPAGE=https://code.qt.io/cgit/qt-labs/messagingframework.git/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtcore-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtsql-4.8:4 examples
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pesa/distfiles/qmf-4.0.3.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=590fbb498714d0de70805d9b97373257
+_md5_=607629a7b4200dcaf79bd90eb3cfd4e8
diff --git a/metadata/md5-cache/net-misc/connman-1.29 b/metadata/md5-cache/net-misc/connman-1.29
index 4ed244aacbf2..2268ec5cf4b0 100644
--- a/metadata/md5-cache/net-misc/connman-1.29
+++ b/metadata/md5-cache/net-misc/connman-1.29
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=5
 HOMEPAGE=https://01.org/connman
 IUSE=bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr
-KEYWORDS=~amd64 ~arm ~ppc ppc64 ~x86
+KEYWORDS=~amd64 arm ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.29.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a1f51bcc60cff8efef50664a3f639269
+_md5_=281437daba02a7cef4a849ad94d928fb
diff --git a/metadata/md5-cache/net-misc/radvd-2.10 b/metadata/md5-cache/net-misc/radvd-2.10
index f72f2e72fcc8..6089bfd5fca9 100644
--- a/metadata/md5-cache/net-misc/radvd-2.10
+++ b/metadata/md5-cache/net-misc/radvd-2.10
@@ -4,10 +4,10 @@ DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=4
 HOMEPAGE=http://v6web.litech.org/radvd/
 IUSE=kernel_FreeBSD selinux
-KEYWORDS=amd64 ~arm hppa ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm hppa ppc ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.10.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b53277eac29e1fada84dd73223662edd
+_md5_=e7e068becd5a2c6a65e25404adc55d48
diff --git a/metadata/md5-cache/net-misc/radvd-2.8 b/metadata/md5-cache/net-misc/radvd-2.11-r1
similarity index 62%
rename from metadata/md5-cache/net-misc/radvd-2.8
rename to metadata/md5-cache/net-misc/radvd-2.11-r1
index 309db00bc94f..61b022e0f0b3 100644
--- a/metadata/md5-cache/net-misc/radvd-2.8
+++ b/metadata/md5-cache/net-misc/radvd-2.11-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libdaemon dev-libs/check sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-libs/check ) virtual/pkgconfig
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=4
 HOMEPAGE=http://v6web.litech.org/radvd/
-IUSE=kernel_FreeBSD selinux
+IUSE=kernel_FreeBSD selinux test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
-SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.8.tar.gz
+SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.11.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f3385995c5e3863d0ca2c071dc95d9e9
+_md5_=4c8786c54d7d1df5bd0dc6a0574db49a
diff --git a/metadata/md5-cache/net-misc/radvd-2.5 b/metadata/md5-cache/net-misc/radvd-2.5
deleted file mode 100644
index d23662b4a746..000000000000
--- a/metadata/md5-cache/net-misc/radvd-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libdaemon dev-libs/check sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Linux IPv6 Router Advertisement Daemon
-EAPI=4
-HOMEPAGE=http://v6web.litech.org/radvd/
-IUSE=kernel_FreeBSD selinux
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
-SLOT=0
-SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f39180feaf8d3e74893f7dcdcf40746a
diff --git a/metadata/md5-cache/net-misc/teamviewer-9.0.32150 b/metadata/md5-cache/net-misc/teamviewer-9.0.32150
index 1df59435e90c..68251e5912c1 100644
--- a/metadata/md5-cache/net-misc/teamviewer-9.0.32150
+++ b/metadata/md5-cache/net-misc/teamviewer-9.0.32150
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.teamviewer.com
 IUSE=system-wine
 KEYWORDS=~amd64 ~x86
 LICENSE=TeamViewer !system-wine? ( LGPL-2.1 )
-RDEPEND=app-shells/bash x11-misc/xdg-utils !system-wine? ( || ( ( media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdamage[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libXtst[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) system-wine? ( app-emulation/wine )
+RDEPEND=app-shells/bash x11-misc/xdg-utils !system-wine? ( media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdamage[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libXtst[abi_x86_32(-)] ) system-wine? ( app-emulation/wine )
 RESTRICT=mirror
 SLOT=9
 SRC_URI=http://www.teamviewer.com/download/version_9x/teamviewer_linux.deb -> teamviewer-9.0.32150.deb
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=1489b54c47c5b799cb06709d1814bd35
+_md5_=4afcf0497f648302dfd3f345eb6b9bb5
diff --git a/metadata/md5-cache/net-misc/vpnc-0.5.3_p550 b/metadata/md5-cache/net-misc/vpnc-0.5.3_p550
index fc9fce69fe24..2645a9eb429a 100644
--- a/metadata/md5-cache/net-misc/vpnc-0.5.3_p550
+++ b/metadata/md5-cache/net-misc/vpnc-0.5.3_p550
@@ -4,11 +4,11 @@ DESCRIPTION=Free client for Cisco VPN routing software
 EAPI=5
 HOMEPAGE=http://www.unix-ag.uni-kl.de/~massar/vpnc/
 IUSE=resolvconf +gnutls selinux
-KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86
+KEYWORDS=amd64 arm ppc ~ppc64 sparc x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) resolvconf? ( net-dns/openresolv ) selinux? ( sec-policy/selinux-vpn )
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/vpnc-0.5.3_p550.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8992f5907fb95bdd571c800ebb80b3c3
+_md5_=249b399956f252f346ad9139aef7fcc0
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.05.29 b/metadata/md5-cache/net-misc/youtube-dl-2015.06.15
similarity index 95%
rename from metadata/md5-cache/net-misc/youtube-dl-2015.05.29
rename to metadata/md5-cache/net-misc/youtube-dl-2015.06.15
index d024eff48295..9d46b5fd8b4a 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.05.29
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.06.15
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2015.05.29/youtube-dl-2015.05.29.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2015.06.15/youtube-dl-2015.06.15.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c4b45f22deed63b11e0fcb93856c2bbb
+_md5_=bc6ed0467f15d806e2b7da1f1c17cf33
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.0_pre20150415 b/metadata/md5-cache/net-p2p/retroshare-0.6.0_pre20150415
index 9802eec306ae..4c0ddd151dd2 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.0_pre20150415
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.0_pre20150415
@@ -3,12 +3,12 @@ DEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-ke
 DESCRIPTION=P2P private sharing application
 EAPI=5
 HOMEPAGE=http://retroshare.sourceforge.net
-IUSE=cli feedreader links-cloud qt5 voip
+IUSE=cli feedreader qt5 voip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-3 Apache-2.0 LGPL-2.1
 RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libupnp sys-libs/zlib cli? ( dev-libs/protobuf net-libs/libssh[server] ) feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt5? ( x11-libs/libX11 x11-libs/libXScrnSaver dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) voip? ( media-libs/speex )
-REQUIRED_USE=|| ( cli qt5 ) feedreader? ( qt5 ) links-cloud? ( qt5 ) voip? ( qt5 )
+REQUIRED_USE=|| ( cli qt5 ) feedreader? ( qt5 ) voip? ( qt5 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/retroshare-0.6.0_pre20150415.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e1c7345e60a8d55051b3a392e38c346a
+_md5_=c08839ea600db64d8bf92f06868a7da3
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.0_rc1 b/metadata/md5-cache/net-p2p/retroshare-0.6.0_rc1
new file mode 100644
index 000000000000..33b963906df3
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp sys-libs/zlib cli? ( dev-libs/protobuf net-libs/libssh[server] ) feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt5? ( x11-libs/libX11 x11-libs/libXScrnSaver dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) voip? ( media-libs/opencv media-libs/speex ) dev-qt/qtcore:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=P2P private sharing application
+EAPI=5
+HOMEPAGE=http://retroshare.sourceforge.net
+IUSE=cli feedreader +qt5 voip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 Apache-2.0 LGPL-2.1
+RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp sys-libs/zlib cli? ( dev-libs/protobuf net-libs/libssh[server] ) feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt5? ( x11-libs/libX11 x11-libs/libXScrnSaver dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) voip? ( media-libs/opencv media-libs/speex )
+REQUIRED_USE=|| ( cli qt5 ) feedreader? ( qt5 ) voip? ( qt5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/retroshare/RetroShare-0.6.0-rc1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=432b783d995254f75c436337b6ff4c2b
diff --git a/metadata/md5-cache/net-print/cndrvcups-lb-2.90 b/metadata/md5-cache/net-print/cndrvcups-lb-2.90
index 5ca05bfe8dd1..e6001a139918 100644
--- a/metadata/md5-cache/net-print/cndrvcups-lb-2.90
+++ b/metadata/md5-cache/net-print/cndrvcups-lb-2.90
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://support-au.canon.com.au/contents/AU/EN/0100270808.html
 KEYWORDS=-* amd64 x86
 LICENSE=Canon-UFR-II
-RDEPEND=gnome-base/libglade net-print/cups ~net-print/cndrvcups-common-lb-2.90 x11-libs/gtk+:2 || ( ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) )
+RDEPEND=gnome-base/libglade net-print/cups ~net-print/cndrvcups-common-lb-2.90 x11-libs/gtk+:2 >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx&cmp=ABS&lang=EN -> Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c54a91e5d99f3a3fc96eac8c57dd514b
+_md5_=a73a5ad3a446883d7f60623c920c4619
diff --git a/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4 b/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4
index 6b72f075f514..0d6dc89e9984 100644
--- a/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4
+++ b/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.nmr.ch
 IUSE=lua
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CARA
-RDEPEND=|| ( ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) virtual/libstdc++ lua? ( dev-lang/lua )
+RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] virtual/libstdc++ lua? ( dev-lang/lua )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cara.nmr-software.org/downloads/cara_1.8.4_linux.gz http://dev.gentoo.org/~jlec/distfiles//Start1.2.cara.xz
-_md5_=a18411f5947518fa9f26f5231ae731fe
+_md5_=84011f4a50029ed9aacc7f5f80a520ae
diff --git a/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r1 b/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r1
index e944f0405080..c9173f70f9a5 100644
--- a/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r1
+++ b/metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r1
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.nmr.ch
 IUSE=lua
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CARA
-RDEPEND=|| ( ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) virtual/libstdc++ lua? ( dev-lang/lua )
+RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] virtual/libstdc++ lua? ( dev-lang/lua )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cara.nmr-software.org/downloads/cara_1.8.4_linux.gz http://dev.gentoo.org/~jlec/distfiles//Start1.2.cara.xz
-_md5_=105a5673ff58fb2acc1b51c6ee8d09c3
+_md5_=61a3d7be820251cb12d9303b5b919fd0
diff --git a/metadata/md5-cache/sci-chemistry/icm-3.7.2e b/metadata/md5-cache/sci-chemistry/icm-3.7.2e
index a738992961e3..ca7de046dcea 100644
--- a/metadata/md5-cache/sci-chemistry/icm-3.7.2e
+++ b/metadata/md5-cache/sci-chemistry/icm-3.7.2e
@@ -1,15 +1,15 @@
 DEFINED_PHASES=install nofetch postinst unpack
-DEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 || ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
+DEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
 DESCRIPTION=MolSoft LCC ICM Pro
 EAPI=5
 HOMEPAGE=http://www.molsoft.com/icm_pro.html
 IUSE=32bit 64bit vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=MolSoft
-RDEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 || ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
+RDEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
 REQUIRED_USE=^^ ( ( !32bit 64bit ) ( 32bit !64bit ) ( 32bit 64bit ) )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=icm-3.7-2e-linux.sh
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=16c825f34020644424ef02e0a946a5a2
+_md5_=5796cc7f6d93added554c8b701029804
diff --git a/metadata/md5-cache/sci-chemistry/icm-3.7.3b b/metadata/md5-cache/sci-chemistry/icm-3.7.3b
index c211d8e0d895..f00cab2a1ae6 100644
--- a/metadata/md5-cache/sci-chemistry/icm-3.7.3b
+++ b/metadata/md5-cache/sci-chemistry/icm-3.7.3b
@@ -1,15 +1,15 @@
 DEFINED_PHASES=install nofetch postinst unpack
-DEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 || ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
+DEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
 DESCRIPTION=MolSoft LCC ICM Pro
 EAPI=5
 HOMEPAGE=http://www.molsoft.com/icm_pro.html
 IUSE=32bit 64bit vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=MolSoft
-RDEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 || ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
+RDEPEND=!sci-chemistry/icm-browser app-arch/unzip vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) amd64? ( 64bit? ( =media-libs/tiff-3* media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 media-libs/libpng:1.2 || ( virtual/jpeg:62 media-libs/jpeg:62 ) x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils ) 32bit? ( virtual/libstdc++:3.3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ) x86? ( =media-libs/tiff-3* media-libs/libpng:1.2 media-libs/libmng app-crypt/mit-krb5 app-arch/bzip2 x11-libs/libdrm x11-libs/libX11 sys-apps/keyutils )
 REQUIRED_USE=^^ ( ( !32bit 64bit ) ( 32bit !64bit ) ( 32bit 64bit ) )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=icm-3.7-3b-linux.sh
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3ba62c3975bf0148abb2a0929f072a88
+_md5_=3aee8def7af9ada856e40f243960be73
diff --git a/metadata/md5-cache/sci-chemistry/icm-browser-3.6.1i b/metadata/md5-cache/sci-chemistry/icm-browser-3.6.1i
index 329313c089df..834d96432c61 100644
--- a/metadata/md5-cache/sci-chemistry/icm-browser-3.6.1i
+++ b/metadata/md5-cache/sci-chemistry/icm-browser-3.6.1i
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://www.molsoft.com/icm_browser.html
 KEYWORDS=~amd64 ~x86
 LICENSE=MolSoft
-RDEPEND=!sci-chemistry/icm virtual/libstdc++:3.3 || ( ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] media-libs/libmng[abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] >=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/krb5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdamage[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXt[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libdrm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=!sci-chemistry/icm virtual/libstdc++:3.3 >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] media-libs/libmng[abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] >=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/krb5[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdamage[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXt[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libdrm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
 RESTRICT=fetch
 SLOT=0
 SRC_URI=icm-browser-3.6-1i.i386.rpm
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b1ea18a6508fb4981e129ed348ea5184
+_md5_=b72cc86e4586c701ef3a84a5460c6602
diff --git a/metadata/md5-cache/sci-electronics/eagle-4.16_p2-r2 b/metadata/md5-cache/sci-electronics/eagle-4.16_p2-r2
index d2a71938eac3..a8b463613e32 100644
--- a/metadata/md5-cache/sci-electronics/eagle-4.16_p2-r2
+++ b/metadata/md5-cache/sci-electronics/eagle-4.16_p2-r2
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=linguas_de doc
 KEYWORDS=amd64 x86
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)]
 RESTRICT=strip
 SLOT=0
 SRC_URI=linguas_de? ( ftp://ftp.cadsoft.de/pub/program/4.16r2/eagle-lin-ger-4.16r2.tgz doc? ( mirror://gentoo/cadsoft_eagle_manual-ger-2006.12.13.pdf ) ) !linguas_de? ( ftp://ftp.cadsoft.de/pub/program/4.16r2/eagle-lin-eng-4.16r2.tgz doc? ( mirror://gentoo/cadsoft_eagle_manual-eng-2006.12.13.pdf ) )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c25fd50719048e6d23c896e46bcee1ba
+_md5_=51f6e7369330a62f58dcac052c7dea0d
diff --git a/metadata/md5-cache/sci-electronics/eagle-5.11.0 b/metadata/md5-cache/sci-electronics/eagle-5.11.0
index 2d3199b71c90..59f108e7f17a 100644
--- a/metadata/md5-cache/sci-electronics/eagle-5.11.0
+++ b/metadata/md5-cache/sci-electronics/eagle-5.11.0
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=doc linguas_de linguas_zh
 KEYWORDS=amd64 x86
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)]
 RESTRICT=strip test
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/eagle/program/5.11/eagle-lin-5.11.0.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=055148588acbe6b388b76282a8ccb3f0
+_md5_=04f3379c29ce70929c70407cae7c1d04
diff --git a/metadata/md5-cache/sci-electronics/eagle-5.12.0 b/metadata/md5-cache/sci-electronics/eagle-5.12.0
index 919ca471f656..3062aaed4c12 100644
--- a/metadata/md5-cache/sci-electronics/eagle-5.12.0
+++ b/metadata/md5-cache/sci-electronics/eagle-5.12.0
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=doc linguas_de linguas_zh
 KEYWORDS=~amd64 ~x86
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/eagle/program/5.12/eagle-lin-5.12.0.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4d5a2d728f6604dc07e9468a238fcf33
+_md5_=5aad39c5072887319a4e9be0531cc001
diff --git a/metadata/md5-cache/sci-electronics/eagle-6.6.0 b/metadata/md5-cache/sci-electronics/eagle-6.6.0
index 98a4470563c4..316905989ef9 100644
--- a/metadata/md5-cache/sci-electronics/eagle-6.6.0
+++ b/metadata/md5-cache/sci-electronics/eagle-6.6.0
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=doc linguas_de linguas_zh
 KEYWORDS=~amd64 ~x86 -*
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-6.6.0.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1185187deb8d20646c6072dabfa53c43
+_md5_=d631e1d31ff9070936b37dd7f5fb6c49
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.1.0 b/metadata/md5-cache/sci-electronics/eagle-7.1.0
index 18f0ce2474da..7aa06224cfbd 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.1.0
+++ b/metadata/md5-cache/sci-electronics/eagle-7.1.0
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=doc linguas_de linguas_zh
 KEYWORDS=~amd64 ~x86 -*
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/eagle/program/7.1/eagle-lin-7.1.0.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ee4ca78a28ba4bb52e02e9754309572f
+_md5_=89957f517dcae5afbe0e8c1639a6dd04
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.2.0 b/metadata/md5-cache/sci-electronics/eagle-7.2.0
index acf72b92aa9f..b5e7a31aa611 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.2.0
+++ b/metadata/md5-cache/sci-electronics/eagle-7.2.0
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.cadsoft.de
 IUSE=doc linguas_de linguas_zh
 KEYWORDS=~amd64 ~x86 -*
 LICENSE=cadsoft
-RDEPEND=sys-libs/glibc || ( ( dev-libs/openssl:0[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
+RDEPEND=sys-libs/glibc dev-libs/openssl:0[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/eagle/program/7.2/eagle-lin-7.2.0.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=eb1556aaa8cd0153a2d13447eba4fdfb
+_md5_=1da3ea86d76259fb49d565734c8370a6
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r14 b/metadata/md5-cache/sys-boot/grub-0.97-r14
index 2b0822848981..f6df5e762c81 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r14
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3 amd64? ( || ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3[static-libs(+)] amd64? ( || ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3 amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3[static-libs(+)] amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU GRUB Legacy boot loader
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3 amd64? ( || ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) ) )
+RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3 amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=14712384d6068f34b4ad62d7b3a3f969
+_md5_=10af227d48b206568a9dc59263747f2d
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04 b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
index b342e45b29ec..6cba85e692a5 100644
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=GNU Autoconf Macro Archive
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/autoconf-archive/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
 SLOT=0
 SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2015.02.04.tar.xz
-_md5_=c0540a6ca54324b06b26a69043349692
+_md5_=c32d63810d12118306ae20fec976a558
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.2 b/metadata/md5-cache/sys-devel/gcc-4.9.2
index 32f1cd69f7dc..c1e8e4daa408 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla altivec debug nopie nossp doc gcj awt hardened multilib objc objc-gc libssp objc++ fixed-point go graphite cilk +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2 mirror://gentoo/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	79b0a1d1153c017995d50b2a739e9164	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4e73d1f5853ad3283984f59bea95306
+_md5_=0f45762c44cdd3bcd8bfa35d42903b57
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.1 b/metadata/md5-cache/sys-devel/llvm-3.6.1
index 59718bb05dbe..3b2f625ced94 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( py
 SLOT=0/3.6
 SRC_URI=http://llvm.org/releases/3.6.1/llvm-3.6.1.src.tar.xz clang? ( http://llvm.org/releases/3.6.1/compiler-rt-3.6.1.src.tar.xz http://llvm.org/releases/3.6.1/cfe-3.6.1.src.tar.xz http://llvm.org/releases/3.6.1/clang-tools-extra-3.6.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.1-manpages.tar.bz2 )
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f786ef5016e7ab147b44458077ea2a76
+_md5_=0d2c47593e92b3e90d28d408d3937fc3
diff --git a/metadata/md5-cache/sys-freebsd/boot0-10.1 b/metadata/md5-cache/sys-freebsd/boot0-10.1
index 549f7a4f8711..b8642f718ce2 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-10.1
+++ b/metadata/md5-cache/sys-freebsd/boot0-10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND==sys-freebsd/freebsd-mk-defs-10.1* =sys-freebsd/freebsd-lib-10.1* !sparc-fbsd? ( sys-devel/clang ) virtual/pmake virtual/pmake
+DEPEND==sys-freebsd/freebsd-mk-defs-10.1* =sys-freebsd/freebsd-lib-10.1* virtual/pmake virtual/pmake
 DESCRIPTION=FreeBSD's bootloader
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz
 _eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a55a9871a8e8258e7086952d64880116
+_md5_=2dd74363e48a09ba862a3ced20b75c41
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
index e28b5e6ad079..fac6cdf85776 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( app-cry
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz https://security.freebsd.org/patches/SA-14:27/stdio.patch -> freebsd-lib-SA-1427-stdio.patch
 _eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a0dede43b597370584cce9f3021cd2a9
+_md5_=cd5edd8debbe0b52039ffecb102c773b
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
index 42170a2be20a..5d97a82367d7 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( app-cry
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-crypto-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 )
 _eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7e355981b2be2c1fa4b62de1fa245ed
+_md5_=382749d85f1ed6d0c816d75d75e88aa2
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-10.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-10.1-r3
index 382ea1b75e06..bd8dc4a625f6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-10.1-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-10.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=build-kernel? ( dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) !sparc-fbsd? ( sys-devel/clang ) >=sys-freebsd/freebsd-usbin-9.1 =sys-freebsd/freebsd-mk-defs-10.1* ) virtual/pmake virtual/pmake
+DEPEND=build-kernel? ( dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) >=sys-freebsd/freebsd-usbin-9.1 =sys-freebsd/freebsd-mk-defs-10.1* ) virtual/pmake virtual/pmake
 DESCRIPTION=FreeBSD kernel sources
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
@@ -11,4 +11,4 @@ RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz https://security.freebsd.org/patches/SA-15:02/sctp.patch -> freebsd-sources-SA-1502-sctp.patch https://security.freebsd.org/patches/SA-15:03/sctp.patch -> freebsd-sources-SA-1503-sctp.patch https://security.freebsd.org/patches/SA-15:04/igmp.patch -> freebsd-sources-SA-1504-igmp.patch https://security.freebsd.org/patches/SA-15:04/igmp-errata.patch -> freebsd-sources-SA-1504-igmp-errata.patch https://security.freebsd.org/patches/SA-15:09/ipv6.patch -> freebsd-sources-SA-1509-ipv6.patch https://security.freebsd.org/patches/EN-15:01/vt.patch -> freebsd-sources-EN-1501-vt.patch https://security.freebsd.org/patches/EN-15:05/ufs.patch -> freebsd-sources-EN-1505-ufs.patch
 _eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multilib	62927b3db3a589b0806255f3a002d5d3	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e4f7e02ba83668e7583c67b0cb829957
+_md5_=80bd0220abe7bef81b06a0492ab118ef
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2014.2.15-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2014.2.15-r1
index d15b0d3d4c3e..e67fe1eee7fe 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2014.2.15-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2014.2.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=5
 HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/
 IUSE=acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr
-KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
 SLOT=0
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2014.2.15.tgz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4f9bdf05a586001302a4ac3758237cd
+_md5_=16dcf0601ce95b246bedd109b22e6901
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-30 b/metadata/md5-cache/sys-fs/udev-init-scripts-30
new file mode 100644
index 000000000000..313883e31afa
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-30
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst prepare
+DESCRIPTION=udev startup scripts for openrc
+EAPI=5
+HOMEPAGE=http://www.gentoo.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~williamh/dist/udev-init-scripts-30.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=87f7d10575daea2398c7f3664c257dc6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
similarity index 90%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.18.14
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
index 11815706c155..1b3e92256137 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.14
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.14
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.14.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 )
+SLOT=3.18.16
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.16.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d144a1dda34dbfe1a5653444b5cbb09
+_md5_=0965b42daa8e06f93884dde99eb84e14
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.10-r1 b/metadata/md5-cache/sys-libs/musl-1.1.10-r1
index 4c912b240f5f..cd4d9b93167a 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.10-r1
+++ b/metadata/md5-cache/sys-libs/musl-1.1.10-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Lightweight, fast and simple C library focused on standards-conforma
 EAPI=5
 HOMEPAGE=http://www.musl-libc.org/
 IUSE=crosscompile_opts_headers-only
-KEYWORDS=-* amd64 arm ~mips ~ppc x86
+KEYWORDS=-* amd64 arm ~mips ppc x86
 LICENSE=MIT LGPL-2 GPL-2
 RDEPEND=!sys-apps/getent
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.1.10.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b65234ca558f15e09f54dfd44b178770
+_md5_=7feadf87a2b85f16938e70b1c1e62410
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466
index ebfec2ca5bf3..0d054cfd718c 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466
+++ b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/fla
 IUSE=debug kde selinux cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=-* amd64 x86
 LICENSE=AdobeFlash-11.x
-RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( || ( ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) || ( ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) || ( ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash )
+RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash )
 REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.466/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.466.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.466-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.466/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.466.x86_64.tar.gz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eaf60ea057907b38b65e951636f36d6a
+_md5_=e092fe91ae83ee0b7e2963cacf9f80ac
diff --git a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3 b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
index f3680b560df2..8bbc3b680da1 100644
--- a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
+++ b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm
-DEPEND=>=x11-libs/gtk+-2:2 net-misc/curl >=sys-apps/util-linux-2.13 || ( ( >=dev-libs/glib-2.34.3[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) ) virtual/pkgconfig app-arch/unzip
+DEPEND=>=x11-libs/gtk+-2:2 net-misc/curl >=sys-apps/util-linux-2.13 >=dev-libs/glib-2.34.3[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] virtual/pkgconfig app-arch/unzip
 DESCRIPTION=Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser
 EAPI=5
 HOMEPAGE=http://nspluginwrapper.org/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl >=sys-apps/util-linux-2.13 || ( ( >=dev-libs/glib-2.34.3[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) )
+RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl >=sys-apps/util-linux-2.13 >=dev-libs/glib-2.34.3[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
 SLOT=0
 SRC_URI=http://web.mit.edu/davidben/Public/nspluginwrapper/nspluginwrapper-1.4.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	62927b3db3a589b0806255f3a002d5d3	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2ec3128caa7e0b9b3d491e220825340a
+_md5_=6f7ef5d706f8deb2201c62309711f820
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5 b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
index eb83d6c9b26a..188f0fa4169b 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
 RDEPEND=>=app-eselect/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.12.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://gentoo/xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=4dd985185455f3272fbf927da8951174
+_md5_=1c3d777b2b9a0cf2e4c863240532c924
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2 b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
index 434ddb475cf0..3eb3a55677b6 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules qt4 static-libs pax_kernel abi_x86_32 abi_x86_64 kernel_linux
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=782ff14ad62c68353181d3db73a142c6
+_md5_=951a6f23edc3a12da799ea407432ec89
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3 b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
index f426672901cb..b2b0786f8b55 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu !x11-libs/xvba-video abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu !x11-libs/xvba-video abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules qt4 static-libs pax_kernel abi_x86_32 abi_x86_64 kernel_linux
 KEYWORDS=-* amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu !x11-libs/xvba-video abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu !x11-libs/xvba-video abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=54d0c6eb3aca0c9a8c3e67b879d6cd78
+_md5_=baa6b81ca561e0c0ada31c3ac829eafd
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.4_p1 b/metadata/md5-cache/x11-drivers/ati-drivers-14.4_p1
index fa2bd6fe04e7..3139e5b1bfc6 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.4_p1
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.4_p1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( || ( >=virtual/glu-9.0-r1[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXinerama-1.1.3[abi_x86_32] >=x11-libs/libXrandr-1.4.2[abi_x86_32] >=x11-libs/libXrender-0.9.8[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( >=virtual/glu-9.0-r1[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXinerama-1.1.3[abi_x86_32] >=x11-libs/libXrandr-1.4.2[abi_x86_32] >=x11-libs/libXrender-0.9.8[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules multilib qt4 static-libs pax_kernel kernel_linux
 KEYWORDS=-* amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( || ( >=virtual/glu-9.0-r1[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXinerama-1.1.3[abi_x86_32] >=x11-libs/libXrandr-1.4.2[abi_x86_32] >=x11-libs/libXrender-0.9.8[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( >=virtual/glu-9.0-r1[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXinerama-1.1.3[abi_x86_32] >=x11-libs/libXrandr-1.4.2[abi_x86_32] >=x11-libs/libXrender-0.9.8[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c82998551e6c64d556ec05e2b971379
+_md5_=bf476ce756f1438b41d91b086fc1aa89
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.6_beta2 b/metadata/md5-cache/x11-drivers/ati-drivers-14.6_beta2
index efc3109634f4..c3ed02aa922d 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.6_beta2
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.6_beta2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules multilib qt4 static-libs pax_kernel kernel_linux
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu multilib? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/linux-amd-catalyst-14.6-beta-v1.0-jul11.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=005d5af40873f5cbcdc1db32e4514dab
+_md5_=41b79ee9763b7a74e51e6c680f7f4e5e
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2 b/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
index 8d83477dd715..d21979e796e3 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules qt4 static-libs pax_kernel abi_x86_32 abi_x86_64 kernel_linux
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.15.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu abi_x86_32? ( virtual/glu[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test fetch
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-14-9-linux-x86-x86-64.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=44c14a0fb03dd60763aec00a07160cd2
+_md5_=d91d58e543585f6ab7373c4815650083
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-346.72 b/metadata/md5-cache/x11-drivers/nvidia-drivers-346.72
index 034cb07d4fa6..a2927cc1179e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-346.72
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-346.72
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm kernel_linux
 KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf gtk2? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.17.99:= >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf gtk2? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.17.99:= >=x11-libs/libvdpau-0.3-r1 multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X || ( gtk2 gtk3 ) )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/346.72/NVIDIA-FreeBSD-x86_64-346.72.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/346.72/NVIDIA-Linux-x86_64-346.72.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/346.72/NVIDIA-FreeBSD-x86-346.72.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/346.72/NVIDIA-Linux-x86-346.72.run )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	nvidia-driver	800f567ff607d5d5171a8149456e294e	portability	a45c088f246ef5091e029f6285d7ce42	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1bb8a0d219a7b9281e8d48a15546ae02
+_md5_=e9d954054b6d70caf385c98b9b172866
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.28 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.28
index 0b5c6bc6c6e5..2a181d892aee 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.28
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.28
@@ -4,11 +4,11 @@ DESCRIPTION=VirtualBox video driver
 EAPI=5
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=dri kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a9d12e94d44e22e8b56d779a7a27b223
+_md5_=02c0e21fabae04c73db5a17fb360abab
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.7.2 b/metadata/md5-cache/x11-libs/qscintilla-2.7.2
deleted file mode 100644
index 1796ca0fae84..000000000000
--- a/metadata/md5-cache/x11-libs/qscintilla-2.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-IUSE=doc python
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=|| ( GPL-2 GPL-3 )
-PDEPEND=python? ( ~dev-python/qscintilla-python-2.7.2 )
-RDEPEND=dev-qt/qtcore:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-SLOT=0/9
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.7.2.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	1c0e4f885b876595f09a9bb6c78a687d	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=384bb943b5845d3da52b31993892174e
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.3 b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
index c1f48eb30227..9dbae811b6df 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( || ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32] ) || ( ( >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) app-emulation/emul-linux-x86-opengl[-abi_x86_32] ) ) ) virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DEPEND=ssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
 DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
 EAPI=5
 HOMEPAGE=http://www.virtualgl.org/
 IUSE=ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( || ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32] ) || ( ( >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) app-emulation/emul-linux-x86-opengl[-abi_x86_32] ) ) ) virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=ssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.3/VirtualGL-2.3.3.tar.gz
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=5beff4d2003668ebf6a6223a56f3826d
+_md5_=f59b62a63ba61a63edbf0ad0bf69e39d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.1 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.1
index 6c45df654e59..78cbe2d20de6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfcegui4-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
+DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-dict
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfcegui4-4.10:= >=xfce-base/xfce4-panel-4.10:=
+RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-dict/0.7/xfce4-dict-0.7.1.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
-_md5_=8ce369ba7d7f0d2868b0626b959148a1
+_md5_=0fb7a9cc64a81b87a6d31f69d56e689b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b9bd396cca6c..b6661454fb65 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jun 2015 11:36:58 +0000
+Mon, 15 Jun 2015 05:37:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 057a20c175a3..a445cb6d923b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jun 14 11:36:54 UTC 2015
+Mon Jun 15 05:36:58 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9d6332bf5376..eb98018a1d11 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jun 2015 12:00:01 +0000
+Mon, 15 Jun 2015 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2ea4cd293864..43c482b83200 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1434281701 Sun 14 Jun 2015 11:35:01 AM UTC
+1434346502 Mon 15 Jun 2015 05:35:02 AM UTC
diff --git a/net-fs/libnfs/libnfs-1.9.5.ebuild b/net-fs/libnfs/libnfs-1.9.5.ebuild
index 3be721f26241..697549dfb893 100644
--- a/net-fs/libnfs/libnfs-1.9.5.ebuild
+++ b/net-fs/libnfs/libnfs-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.9.5.ebuild,v 1.6 2015/06/12 05:11:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.9.5.ebuild,v 1.7 2015/06/14 19:36:41 maekke Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools-utils
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
 	inherit autotools-utils
 fi
 
diff --git a/net-im/prosody/prosody-0.9.8.ebuild b/net-im/prosody/prosody-0.9.8.ebuild
index 2bc53a19c4cd..497001e3afb0 100644
--- a/net-im/prosody/prosody-0.9.8.ebuild
+++ b/net-im/prosody/prosody-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.8.ebuild,v 1.7 2015/05/13 09:33:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.8.ebuild,v 1.8 2015/06/14 19:46:05 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
 
 DEPEND="net-im/jabber-base
diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild
index cc27d8228661..18972f4e1171 100644
--- a/net-im/skype/skype-4.3.0.37-r5.ebuild
+++ b/net-im/skype/skype-4.3.0.37-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.3 2015/06/14 11:22:59 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.4 2015/06/14 18:42:25 ulm Exp $
 
 EAPI=5
 
@@ -23,32 +23,17 @@ EMUL_X86_VER=20120520
 
 RDEPEND="
 	virtual/ttf-fonts
-	amd64? (
-		dev-qt/qtcore:4[abi_x86_32(-)]
-		dev-qt/qtdbus:4[abi_x86_32(-)]
-		dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
-		dev-qt/qtwebkit:4[abi_x86_32(-)]
-		media-libs/alsa-lib[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libXScrnSaver[abi_x86_32(-)]
-		x11-libs/libXv[abi_x86_32(-)]
-		pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-		apulse? ( media-sound/apulse[abi_x86_32(-)] )
-	)
-	x86? (
-		media-libs/alsa-lib
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXScrnSaver
-		x11-libs/libXv
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[accessibility]
-		dev-qt/qtwebkit:4
-		apulse? ( media-sound/apulse )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtdbus:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXScrnSaver[abi_x86_32(-)]
+	x11-libs/libXv[abi_x86_32(-)]
+	apulse? ( media-sound/apulse[abi_x86_32(-)] )
+	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
 	selinux? ( sec-policy/selinux-skype )"
 
 src_prepare() {
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
index 8adaf2ce4a8f..80bf2c3c6b76 100644
--- a/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild,v 1.5 2015/04/07 20:12:21 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild,v 1.6 2015/06/14 17:29:40 ulm Exp $
 
 EAPI=4
 
@@ -26,15 +26,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	|| (
-		(
-			dev-qt/qtcore:4[abi_x86_32(-)]
-			dev-qt/qtgui:4[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
-		)
-	)
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
 "
 RDEPEND="${DEPEND}
 	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
index 6506ca6f6932..eccd4fb4f211 100644
--- a/net-im/skypetab-ng/skypetab-ng-9999.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.9 2015/04/07 20:12:21 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.10 2015/06/14 17:29:40 ulm Exp $
 
 EAPI=4
 
@@ -26,15 +26,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	|| (
-		(
-			dev-qt/qtcore:4[abi_x86_32(-)]
-			dev-qt/qtgui:4[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
-		)
-	)
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
 "
 RDEPEND="${DEPEND}
 	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
diff --git a/net-libs/qmf/qmf-4.0.3.ebuild b/net-libs/qmf/qmf-4.0.3.ebuild
index 283ec7c735ff..ca581686ea12 100644
--- a/net-libs/qmf/qmf-4.0.3.ebuild
+++ b/net-libs/qmf/qmf-4.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-4.0.3.ebuild,v 1.6 2015/03/30 15:34:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-4.0.3.ebuild,v 1.7 2015/06/14 23:29:01 pesa Exp $
 
 EAPI=5
 
@@ -36,10 +36,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( >=dev-qt/qttest-4.8:4 )
-	!!<net-libs/qmf-2.0_p201209
 "
 
-DOCS=(CHANGES)
+DOCS=( CHANGES )
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-tests.patch"
 )
@@ -78,7 +77,6 @@ src_configure() {
 }
 
 src_test() {
-	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
 	cd "${S}"/tests
 
 	export QMF_DATA=${T}
@@ -103,7 +101,7 @@ src_install() {
 	if use doc; then
 		emake docs
 
-		dohtml -r doc/html/*
+		dodoc -r doc/html
 		dodoc doc/html/qmf.qch
 		docompress -x /usr/share/doc/${PF}/qmf.qch
 	fi
diff --git a/net-misc/connman/connman-1.29.ebuild b/net-misc/connman/connman-1.29.ebuild
index 4ee6238d57ba..d16a07ca0ac4 100644
--- a/net-misc/connman/connman-1.29.ebuild
+++ b/net-misc/connman/connman-1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.29.ebuild,v 1.3 2015/06/09 04:29:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.29.ebuild,v 1.4 2015/06/14 19:43:35 maekke Exp $
 
 EAPI="5"
 inherit base systemd
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~x86"
 IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
 
 RDEPEND=">=dev-libs/glib-2.16
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 4accdd1d013c..55d6795be93d 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -2,5 +2,3 @@ DIST radvd-1.15.tar.gz 185528 SHA256 ba2e16bf0b2ac0030aacb0927304603f7ebbd317fdf
 DIST radvd-1.9.8.tar.gz 176288 SHA256 645ccf1c9b16e769ff4179813712e580e2c8786d64a888d8afa1e296c057c1c1 SHA512 25ffa2fe1289ee826432ade3846aa5008e34ff9f0cbe954bf44ebae22198de59b40b7b4a70d19c74117b3280a7ca6a4bf740536f4a08e0bf169e760748548971 WHIRLPOOL 228182cb6fdc6065a728f679ee6d93286c48f186b209b6ff8d553f06317d0e799687c5abf0179cda5c42d2ca72ca32bdacbc31e0a14a06d18316a6538eb09017
 DIST radvd-2.10.tar.gz 202426 SHA256 b41867c5b0375f786bebbd3fc88776d41927aa392eeba954e4b88f8ec7e8f13e SHA512 cfc34ad414bd07e22519982f8c3fa75cb27eab54131d0af09d6dd5fbb69da3de26fda776593e1a4e2735b63fc7cc2224663665854895d8be459f43ba4012fa26 WHIRLPOOL 5689d137313e75e30f370637bc92f4e242f2a4e2675b0ee34f1824a66e7efcf4ad683e121375623b62f015dd59a664511f2dbcff229c70a9d55c083dc7fef98f
 DIST radvd-2.11.tar.gz 202596 SHA256 80ad60b15689e9591a5af393a57a1d93304deeff2e46482f0fd98046c00622f8 SHA512 35fc641b81cc76de677c8e55a61c8b28d9167d8f40a3fa7adf2a254293ca2d7856ca2c8f6d3bdba391bf873345d3019c0f572ee166eaba011ae874b176c85d4b WHIRLPOOL 058ecf265881963e44267945349e56f1b5bb402b8e4605bd852a8e3ced00419e0028eee70028819433bbc7d596f938d94fef1145ea615c66a975feb9fe4aa56c
-DIST radvd-2.5.tar.gz 201436 SHA256 942fb19342390045019f168535eadda268010df4dc9534fd46adc1a858418e1e SHA512 f1ff5bb3ae37dad76fce5937d2101cb88fa12938b8ceb950f22f7f5c5b7d1565a52ca0527892fe279ac7c0540d26652c2634f6aa674396efe6d7836dbbf4574f WHIRLPOOL cba6f12c2df48b32d21cc664e5e06a7a3958e29f141700f3b0774664746583639eecb50eb56440e64ab9ece5cf8b8d167032a277c7b03d2a7acabde26dfdef85
-DIST radvd-2.8.tar.gz 202261 SHA256 f668e190369132de8b425013e204f947cb02db3798fd2ba193f28d7fb237e050 SHA512 72f0c2e042bc9219af2776e2e307181bab526d3284917da469ce4481ba93433513889ccc48b77bc6b74c680252f984c319d032fdfdb5aabe40510b1eefb9f691 WHIRLPOOL bb056c5938cc2732035089a19ef6f567927962bf2f97e689edc5bded45cb1aa36f3ca9ed56b85c11593e06100e8fdd00d6e3da564c9e8514103d07203bf9677d
diff --git a/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch b/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
new file mode 100644
index 000000000000..c44f28437be4
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
@@ -0,0 +1,87 @@
+From 1d8973e13d89802eee0b648451e2b97ac65cf9e0 Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reubenhwk@gmail.com>
+Date: Sat, 16 May 2015 09:27:38 -0700
+Subject: [PATCH] device-linux.c: IEEE 802.15.4 musl libc fix
+
+The ARPHRD_IEEE802154 macro's definition and name have been recently
+moved around from kernel header to glibc headers.  Include linux/if_arp.h
+if available and then use either ARPHRD_IEEE802154_MONITOR or ARPHRD_IEEE802154_PHY,
+whichever comes first.
+---
+ configure.ac   | 1 +
+ device-linux.c | 8 ++++++++
+ includes.h     | 6 ++++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0c1efd6..4bd4c9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -156,6 +156,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS( \
+ 	getopt.h \
+ 	ifaddrs.h \
++	linux/if_arp.h \
+ 	machine/limits.h \
+ 	machine/param.h \
+ 	net/if_arp.h \
+diff --git a/device-linux.c b/device-linux.c
+index fa7d978..de83f2e 100644
+--- a/device-linux.c
++++ b/device-linux.c
+@@ -79,10 +79,12 @@ int update_device_info(int sock, struct Interface *iface)
+ 		iface->sllao.if_maxmtu = -1;
+ 		break;
+ #endif				/* ARPHDR_ARCNET */
++#ifdef ARPHRD_IEEE802154
+ 	case ARPHRD_IEEE802154:
+ 		iface->sllao.if_hwaddr_len = 64;
+ 		iface->sllao.if_prefix_len = 64;
+ 		break;
++#endif
+ 	default:
+ 		iface->sllao.if_hwaddr_len = -1;
+ 		iface->sllao.if_prefix_len = -1;
+@@ -371,9 +373,15 @@ static char const *hwstr(unsigned short sa_family)
+ 	case ARPHRD_IEEE802154:
+ 		rc = "ARPHRD_IEEE802154";
+ 		break;
++#if ARPHRD_IEEE802154_MONITOR
++	case ARPHRD_IEEE802154_MONITOR:
++		rc = "ARPHRD_IEEE802154_MONITOR";
++		break;
++#elif ARPHRD_IEEE802154_PHY
+ 	case ARPHRD_IEEE802154_PHY:
+ 		rc = "ARPHRD_IEEE802154_PHY";
+ 		break;
++#endif
+ 	case ARPHRD_VOID:
+ 		rc = "ARPHRD_VOID";
+ 		break;
+diff --git a/includes.h b/includes.h
+index 39a36d2..d2449c4 100644
+--- a/includes.h
++++ b/includes.h
+@@ -81,9 +81,11 @@
+ #ifdef HAVE_NET_IF_DL_H
+ #include <net/if_dl.h>
+ #endif
++
+ #ifdef HAVE_NET_IF_TYPES_H
+ #include <net/if_types.h>
+ #endif
++
+ #if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
+ #include <net/if_arp.h>
+ #endif				/* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */
+@@ -100,3 +102,7 @@
+ #include <ifaddrs.h>
+ #endif
+ 
++#ifdef HAVE_LINUX_IF_ARP_H
++#include <linux/if_arp.h>
++#endif
++
+-- 
+2.3.6
+
diff --git a/net-misc/radvd/radvd-2.10.ebuild b/net-misc/radvd/radvd-2.10.ebuild
index 1ae053b9a394..72fb437054cb 100644
--- a/net-misc/radvd/radvd-2.10.ebuild
+++ b/net-misc/radvd/radvd-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.10.ebuild,v 1.5 2015/05/21 13:29:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.10.ebuild,v 1.6 2015/06/14 19:39:41 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ~sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/radvd/radvd-2.8.ebuild b/net-misc/radvd/radvd-2.11-r1.ebuild
similarity index 81%
rename from net-misc/radvd/radvd-2.8.ebuild
rename to net-misc/radvd/radvd-2.11-r1.ebuild
index 75b7411b8758..624b372ec8cb 100644
--- a/net-misc/radvd/radvd-2.8.ebuild
+++ b/net-misc/radvd/radvd-2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.8.ebuild,v 1.2 2014/11/02 09:16:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.11-r1.ebuild,v 1.1 2015/06/14 12:09:14 xmw Exp $
 
 EAPI=4
 
@@ -13,14 +13,14 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux"
+IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
-	dev-libs/check
 	sys-devel/bison
 	sys-devel/flex
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-radvd )
 "
@@ -34,9 +34,14 @@ pkg_setup() {
 	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.10-musl-libc-fix.patch
+}
+
 src_configure() {
 	econf --with-pidfile=/var/run/radvd/radvd.pid \
-		--disable-silent-rules
+		--disable-silent-rules \
+		$(use_with test check)
 }
 
 src_install() {
diff --git a/net-misc/radvd/radvd-2.5.ebuild b/net-misc/radvd/radvd-2.5.ebuild
deleted file mode 100644
index 97a8e228e8ac..000000000000
--- a/net-misc/radvd/radvd-2.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.5.ebuild,v 1.2 2014/11/02 09:16:28 swift Exp $
-
-EAPI=4
-
-inherit systemd user eutils
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
-	dev-libs/check
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-
-	# force ownership of radvd user and group (bug #19647)
-	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
-}
-
-src_configure() {
-	econf --with-pidfile=/var/run/radvd/radvd.pid \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dohtml INTRO.html
-
-	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	if use kernel_FreeBSD ; then
-		sed -i -e \
-			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
-			"${D}"/etc/init.d/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please create a configuratoion ${ROOT}etc/radvd.conf."
-	elog "See ${ROOT}usr/share/doc/${PF} for an example."
-	einfo
-	elog "grsecurity users should allow a specific group to read /proc"
-	elog "and add the radvd user to that group, otherwise radvd may"
-	elog "segfault on startup."
-}
diff --git a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
index e4d1f306e40e..0b9d76956fa8 100644
--- a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
+++ b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-9.0.32150.ebuild,v 1.1 2014/11/12 23:18:50 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-9.0.32150.ebuild,v 1.2 2015/06/14 18:36:29 ulm Exp $
 
 EAPI=5
 
@@ -24,28 +24,18 @@ RDEPEND="
 	app-shells/bash
 	x11-misc/xdg-utils
 	!system-wine? (
-		|| (
-			(
-				media-libs/alsa-lib[abi_x86_32(-)]
-				media-libs/freetype[abi_x86_32(-)]
-				sys-libs/zlib[abi_x86_32(-)]
-				x11-libs/libX11[abi_x86_32(-)]
-				x11-libs/libXau[abi_x86_32(-)]
-				x11-libs/libXdamage[abi_x86_32(-)]
-				x11-libs/libXext[abi_x86_32(-)]
-				x11-libs/libXfixes[abi_x86_32(-)]
-				x11-libs/libXrandr[abi_x86_32(-)]
-				x11-libs/libXrender[abi_x86_32(-)]
-				x11-libs/libSM[abi_x86_32(-)]
-				x11-libs/libXtst[abi_x86_32(-)]
-			)
-			(
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			)
-
-		)
+		media-libs/alsa-lib[abi_x86_32(-)]
+		media-libs/freetype[abi_x86_32(-)]
+		sys-libs/zlib[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXau[abi_x86_32(-)]
+		x11-libs/libXdamage[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+		x11-libs/libXfixes[abi_x86_32(-)]
+		x11-libs/libXrandr[abi_x86_32(-)]
+		x11-libs/libXrender[abi_x86_32(-)]
+		x11-libs/libSM[abi_x86_32(-)]
+		x11-libs/libXtst[abi_x86_32(-)]
 	)
 	system-wine? ( app-emulation/wine )"
 
diff --git a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
index 3a749c68fbf7..2bd39eabaa44 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v 1.6 2015/06/11 14:21:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v 1.7 2015/06/14 19:51:21 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ~ppc64 sparc x86"
 IUSE="resolvconf +gnutls selinux"
 
 DEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 6245d8fdac84..fd733661e3fb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.05.29.tar.gz 1547163 SHA256 32ba46eaca000e7752ee2b2c6ff1d767e6a6d7b20f4d7ecaa3f7c612458efd51 SHA512 1a82b3055d5e8cc1da379910945a4f9f376c439c67b9ef6970e97ffc83bd20c5d1a06dcf769719369f0cc67bd77ab71602dfafa0f852aaf99319ca04cc570b37 WHIRLPOOL cec4c65398cff5aff1bb498b47754e3ae8ec127198a29b19eb2050fdd424ffdb475433f705207d9316c6b11b321678c82cf76fa70bbbedd4ab7e54f261abbdc6
 DIST youtube-dl-2015.06.04.1.tar.gz 1562426 SHA256 cffb1edb9637962e6a2ea1d26284f52aa53c7f5cd2a3e1e94a21f414aa606566 SHA512 b0003c6d91c132fd5dcc7fb1b4c3870dc644cb20beb9e541bf90ab897828b31b4aa15582c984d9963e071b4160e0e334dbbb2cadc3a24aded52a78fbe8cc2959 WHIRLPOOL e027bb8b07be6f11ebb878719e3dcfd479255197cfa242b287a5a45118574e286e8d74a3cadb2856f6331aeae61a962be285230c7f4208e99367ebd8b74aa02a
+DIST youtube-dl-2015.06.15.tar.gz 1582537 SHA256 5a30bb0e62bbdf7797b61d29678e672d67dddc0d3fa502d133d3017061b67c9a SHA512 8215aec52c96adf5c91bafb4235aa063c253389f310fc853b3bc66255fb79a6b30432c8a61390913b61156a3893228cfa245b4f34f42f5ab285fcdd16e7b8bfe WHIRLPOOL bc24d41f6b60a9fdf7d71f0321b27a3e6b5c3f0141634b7912acc5d8911ce00e6cee078f4df9b23e2af9e306051c7d760b1afa296618ab21a652756ee9784fe5
diff --git a/net-misc/youtube-dl/youtube-dl-2015.05.29.ebuild b/net-misc/youtube-dl/youtube-dl-2015.06.15.ebuild
similarity index 94%
rename from net-misc/youtube-dl/youtube-dl-2015.05.29.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.06.15.ebuild
index 77a58ba390ed..a948aa732622 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.05.29.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.06.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.05.29.ebuild,v 1.1 2015/05/30 09:50:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.06.15.ebuild,v 1.1 2015/06/15 04:18:04 jer Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ src_prepare() {
 		local xxx=(
 			alphaporno anysex behindkink drtuber empflix eporner eroprofile
 			extremetube fourtube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies mofosex motherless pornhd pornotube
+			hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
 			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
 			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef
 			xhamster xnxx xtube xvideos xxxymovies youjizz youporn
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index bd17810eb557..06537fa5c617 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1,3 @@
+DIST RetroShare-0.6.0-rc1.tar.gz 14023555 SHA256 987d74877b654eec945e0f8d400c49dd62279ed25f9eb6e7fd8c123f2289d0cf SHA512 79046349b9bf58b77e4ce42069a7ec201f3e5eab862ea2b56291318da887297ff960b1153f6ed87d3416052d9ce58e432ada11f91c0648066c300847a5b85aea WHIRLPOOL 9d73cced5530f0d4c7ae051f829b0d5954f8132ad15dc8545685cde5a4ece34c9b24b29fcd99056b92ba2e5299e08b6d765116b08e8473707881c3a7dba3065e
 DIST retroshare-0.6.0_pre20150415.tar.bz2 10838852 SHA256 c63301c000b0ead612220e05c05f900c23cb2fa5e56ae6f9359888b63e0a347d SHA512 d435994b79c1518b531ead54d149ed4ca015c936748d0498fc7b95993e197c4d9afb71f926cc618044682dcb947203f70903dd0cc0116263b7c85f3495d52f6f WHIRLPOOL 7844c8dd4dcbf3c716b21d2086a7028edec01fc2ccb6a83924e2123319951d53584f7a38479e16c99e60b025061d9c5057ed8615e105ae50d7cd5c51f28b3c33
 DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88
diff --git a/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild b/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
index 33293ebaed57..07cf6fa483da 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild,v 1.1 2015/04/27 09:51:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild,v 1.2 2015/06/14 23:14:34 pinkbyte Exp $
 
 EAPI=5
 
@@ -15,10 +15,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="cli feedreader links-cloud qt5 voip"
+IUSE="cli feedreader qt5 voip"
 REQUIRED_USE="|| ( cli qt5 )
 	feedreader? ( qt5 )
-	links-cloud? ( qt5 )
 	voip? ( qt5 )"
 
 RDEPEND="
@@ -69,7 +68,6 @@ src_prepare() {
 	rs_src_dirs="libbitdht/src openpgpsdk/src libretroshare/src supportlibs/pegmarkdown"
 	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
 	use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
-	use links-cloud && rs_src_dirs="${rs_src_dirs} plugins/LinksCloud"
 	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
 
 	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
@@ -106,7 +104,6 @@ src_install() {
 
 	exeinto "${extension_dir}"
 	use feedreader && doexe plugins/FeedReader/*.so*
-	use links-cloud && doexe plugins/LinksCloud/*.so*
 	use voip && doexe plugins/VOIP/*.so*
 
 	insinto /usr/share/RetroShare06
diff --git a/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild
new file mode 100644
index 000000000000..0f59a4bfaf65
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild,v 1.1 2015/06/15 00:14:17 pinkbyte Exp $
+
+EAPI=5
+
+MY_PN="RetroShare"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+inherit eutils gnome2-utils multilib qmake-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="http://retroshare.sourceforge.net"
+SRC_URI="mirror://sourceforge/retroshare/${MY_P}.tar.gz"
+
+# pegmarkdown can also be used with MIT
+LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cli feedreader +qt5 voip"
+REQUIRED_USE="|| ( cli qt5 )
+	feedreader? ( qt5 )
+	voip? ( qt5 )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlcipher
+	dev-libs/openssl:0
+	gnome-base/libgnome-keyring
+	net-libs/libmicrohttpd
+	net-libs/libupnp
+	sys-libs/zlib
+	cli? (
+		dev-libs/protobuf
+		net-libs/libssh[server]
+	)
+	feedreader? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		net-misc/curl
+	)
+	qt5? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+	)
+	voip? (
+		media-libs/opencv
+		media-libs/speex
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local dir
+
+	sed -i \
+		-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
+		libretroshare/src/rsserver/rsinit.cc \
+		|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
+
+	rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
+	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
+	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
+	use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
+
+	# Force linking to sqlcipher ONLY
+	sed -i \
+		-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
+		retroshare-gui/src/retroshare-gui.pro \
+		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
+
+	epatch_user
+}
+
+src_configure() {
+	for dir in ${rs_src_dirs} ; do
+		pushd "${S}/${dir}" 2>/dev/null || die
+		eqmake5
+		popd 2>/dev/null || die
+	done
+}
+
+src_compile() {
+	local dir
+
+	for dir in ${rs_src_dirs} ; do
+		emake -C "${dir}"
+	done
+
+	unset rs_src_dirs
+}
+
+src_install() {
+	local i
+	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
+
+	use cli && dobin retroshare-nogui/src/retroshare-nogui
+	use qt5 && dobin retroshare-gui/src/RetroShare
+
+	exeinto "${extension_dir}"
+	use feedreader && doexe plugins/FeedReader/*.so*
+	use voip && doexe plugins/VOIP/*.so*
+
+	insinto /usr/share/RetroShare06
+	doins libbitdht/src/bitdht/bdboot.txt
+
+	insinto /usr/share/RetroShare06/webui
+	doins libresapi/src/webfiles/*
+
+	dodoc README.txt
+	make_desktop_entry RetroShare
+	for i in 24 48 64 ; do
+		doicon -s ${i} "build_scripts/Debian+Ubuntu/data/${i}x${i}/${PN}.png"
+	done
+	doicon -s 128 "build_scripts/Debian+Ubuntu/data/${PN}.png"
+}
+
+pkg_preinst() {
+	if [[ "${REPLACING_VERSIONS}" = "0.5*"  ]]; then
+		elog "You are upgrading from Retroshare 0.5.* to ${PV}"
+		elog "Version 0.6.* is backward-incompatible with 0.5 branch"
+		elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
+		elog "It's recommended to drop all your configuration and either"
+		elog "generate a new certificate or import existing from a backup"
+	fi
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
index 7c3faf6e44f2..9d4331f56517 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.3 2015/04/08 21:32:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.4 2015/06/14 16:58:01 ulm Exp $
 
 EAPI=5
 inherit eutils autotools multilib versionator
@@ -25,15 +25,8 @@ RDEPEND="
 	net-print/cups
 	~net-print/cndrvcups-common-lb-${PV}
 	x11-libs/gtk+:2
-	|| (
-		(
-			>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-			virtual/jpeg:62[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		)
-	)
+	>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+	virtual/jpeg:62[abi_x86_32(-)]
 "
 DEPEND="${DEPEND}"
 
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0de48598512d..213f3585fe6e 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.134 2015/05/11 17:07:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.135 2015/06/14 14:12:55 zlogene Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mikle Kolyada <zlogene@gentoo.org> (14 Jun 2015)
+# app-emulation/lxc has no stable versions
+app-emulation/docker lxc
+
 # Yixun Lan <dlan@gentoo.org> (02 Apr 2015)
 # sys-fs/zfs is not stable.
 sys-cluster/ceph zfs
diff --git a/profiles/hardened/linux/musl/mips/package.use.force b/profiles/hardened/linux/musl/mips/package.use.force
new file mode 100644
index 000000000000..972c4bff1640
--- /dev/null
+++ b/profiles/hardened/linux/musl/mips/package.use.force
@@ -0,0 +1,2 @@
+# The only working option
+dev-util/pkgconf pkg-config
diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
index 5a954a178242..c477ff8f99eb 100644
--- a/profiles/hardened/linux/musl/package.use.mask
+++ b/profiles/hardened/linux/musl/package.use.mask
@@ -1,6 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/package.use.mask,v 1.1 2014/10/23 11:15:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/package.use.mask,v 1.2 2015/06/14 18:07:57 blueness Exp $
 
 # See bug #504200
 sys-devel/gcc sanitize 
+
+# These cause collisions with <libintl.h>
+# even with --without-included-gettext
+sys-devel/gettext nls
+sys-fs/e2fsprogs nls
+
+# Broken
+dev-vcs/git gpg
diff --git a/profiles/hardened/linux/musl/ppc/package.mask b/profiles/hardened/linux/musl/ppc/package.mask
new file mode 100644
index 000000000000..56345622fa74
--- /dev/null
+++ b/profiles/hardened/linux/musl/ppc/package.mask
@@ -0,0 +1,2 @@
+# gcc-4.8 still doesn't work on ppc musl
+>sys-devel/gcc-4.8
diff --git a/profiles/package.mask b/profiles/package.mask
index eb59568fb5ae..dd8fa40d9569 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16621 2015/06/14 09:38:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16623 2015/06/14 16:02:36 monsieurp Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,25 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement <monsieurp@gentoo.org> (14 Jun 2015)
+# Upstream dead. No update since 2005.
+# Masked for removal in 30 days.
+dev-java/aspectwerkz
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (14 Jun 2015)
+# The CGI, Module::Build, and Module::Pluggable modules have been
+# removed from the core Perl distribution and as package now reside
+# in the dev-perl category. This means the corresponding virtuals
+# are not needed anymore and will be removed in 30 days.
+# * If you have any of these virtuals installed, uninstall
+#   (depclean) them.
+# * If the virtuals are required by some overlay package, that is
+#   a bug in the overlay; the overlay ebuild should now depend on
+#   the new dev-perl ebuild.
+virtual/perl-CGI
+virtual/perl-Module-Build
+virtual/perl-Module-Pluggable
+
 # Patrick Lauer <patrick@gentoo.org> (14 Jun 2015)
 # Has race condition / failure modes that make systems unusable
 # See #551724 and duplicates
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
index 388b6211d259..96c12c9fb5e3 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.2 2014/10/15 15:43:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.3 2015/06/14 18:56:26 ulm Exp $
 
 EAPI=5
 
@@ -19,23 +19,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	|| (
-		(
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
 	virtual/libstdc++
 	lua? ( dev-lang/lua )"
 DEPEND=""
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
index 51f2d250f8df..0c17b30f2fcc 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.9 2014/10/15 15:43:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.10 2015/06/14 18:56:26 ulm Exp $
 
 EAPI=5
 
@@ -19,23 +19,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	|| (
-		(
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
 	virtual/libstdc++
 	lua? ( dev-lang/lua )"
 DEPEND=""
diff --git a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild b/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
index d4dae300eee6..fbaf9a2a2378 100644
--- a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
+++ b/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild,v 1.4 2014/10/16 09:28:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild,v 1.5 2015/06/14 18:54:38 ulm Exp $
 
 EAPI=5
 
@@ -20,38 +20,29 @@ RESTRICT="fetch"
 
 RDEPEND="!sci-chemistry/icm
 	virtual/libstdc++:3.3
-	|| (
-		(
-			>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			media-libs/libmng[abi_x86_32(-)]
-			>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-			>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-			virtual/jpeg:62[abi_x86_32(-)]
-			virtual/krb5[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-			x11-libs/libICE[abi_x86_32(-)]
-			x11-libs/libSM[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdamage[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libXfixes[abi_x86_32(-)]
-			x11-libs/libXmu[abi_x86_32(-)]
-			x11-libs/libXrender[abi_x86_32(-)]
-			x11-libs/libXt[abi_x86_32(-)]
-			x11-libs/libXxf86vm[abi_x86_32(-)]
-			x11-libs/libdrm[abi_x86_32(-)]
-			x11-libs/libxcb[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	media-libs/libmng[abi_x86_32(-)]
+	>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+	>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
+	>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
+	virtual/jpeg:62[abi_x86_32(-)]
+	virtual/krb5[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdamage[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXfixes[abi_x86_32(-)]
+	x11-libs/libXmu[abi_x86_32(-)]
+	x11-libs/libXrender[abi_x86_32(-)]
+	x11-libs/libXt[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libdrm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
 "
 DEPEND=""
 
diff --git a/sci-chemistry/icm/icm-3.7.2e.ebuild b/sci-chemistry/icm/icm-3.7.2e.ebuild
index 684dc428451c..1a88141c437e 100644
--- a/sci-chemistry/icm/icm-3.7.2e.ebuild
+++ b/sci-chemistry/icm/icm-3.7.2e.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.2e.ebuild,v 1.6 2014/10/15 20:47:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.2e.ebuild,v 1.7 2015/06/14 18:06:29 ulm Exp $
 
 EAPI="5"
 
@@ -43,10 +43,7 @@ DEPEND="!sci-chemistry/icm-browser
 			)
 			32bit? (
 					virtual/libstdc++:3.3
-					|| (
-						>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-						app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-					)
+					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 			)
 		)
 		x86? (
diff --git a/sci-chemistry/icm/icm-3.7.3b.ebuild b/sci-chemistry/icm/icm-3.7.3b.ebuild
index 18382fbd2f9d..3c2d60ef8546 100644
--- a/sci-chemistry/icm/icm-3.7.3b.ebuild
+++ b/sci-chemistry/icm/icm-3.7.3b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.3b.ebuild,v 1.5 2014/10/15 20:47:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.3b.ebuild,v 1.6 2015/06/14 18:06:29 ulm Exp $
 
 EAPI="5"
 
@@ -43,10 +43,7 @@ DEPEND="!sci-chemistry/icm-browser
 			)
 			32bit? (
 					virtual/libstdc++:3.3
-					|| (
-						>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-						app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-					)
+					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 			)
 		)
 		x86? (
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 22c18621a952..f3879b922e0d 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,9 +1,9 @@
-DIST cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608 SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733
-DIST cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176 SHA256 1b2bba3af2bfa14194a17aa0218101f934204e54b207c0617b7d86a522ea55cd
+DIST cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608 SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733 SHA512 6a3abbd082b74a2487b398d3c82312f6b01f74015a522f4ee98210b0e610dd0fdf5499e085858444e9c7e992a355688e0b5a2e62656b189aa45d6050bdeb0f63 WHIRLPOOL 035e642b083c40be107ecc217feb1de6c18ac51cd8b2cd983e7f7c880b3de1ec83a912b8ce70bfb0a903a230233b8459f9c2b90537e2154152e0960c0b29769a
+DIST cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176 SHA256 1b2bba3af2bfa14194a17aa0218101f934204e54b207c0617b7d86a522ea55cd SHA512 b77d47c38182395d5424e2692083c6bbdc1dd03507f0acbfd00dd219d193b2c7a9aada87ed15fbee8d6a38fc34a2dcd0dd20ad9ebf5f32e8507457eaf26cc907 WHIRLPOOL 857ea502b8c112ce5bfcab8b6fd82bc95580299fd83010807cbd1b7df994c009212755fbf2e13dfbf3ed98fe288b8a180eff3110faae97599fab5c3a4607443d
 DIST eagle-lin-5.11.0.run 36691433 SHA256 b7202e45fb2cb6c3fc6104a19f7cd3ef03d8776fdd277288feda412586cbc42d SHA512 8bed866f963c397dfd634ed06c4a4f6ba640267d1bc9f377c7be99dea0b0dc1114217a24b7b90711b428650fdb47bd00cc555ceb515c6c64721e5b61faaf9add WHIRLPOOL 7fc378cb448d2c67c6cd8809854dc8d446edd3a83f3ad3957a4fa3516c166f234a845ce9644fcce7d1ecf7525956041e749317f2ceb4f666ee9a161705ebc4d8
 DIST eagle-lin-5.12.0.run 36580499 SHA256 7903438b6f171894d7503d6b6e3149d3da321c386a86d1b05f1e08a3b924dafd SHA512 b2faf4cb4521f8ec6e843f7ea70b0e0dc0df36ded2687162921a4fec15386bf002c813dd198c6812544c9a6e0c0cab2fca514f6a1aa67dd69890b5edf9b1bc3d WHIRLPOOL 6db4f6ce8d42677778d0496d704696d4b02c66a8293535d6c7d3295a3880f1530f52f48b857310cd088a2bf28ddf8cae893a4532598e0672a267fd61890e7ba8
 DIST eagle-lin-6.6.0.run 41425368 SHA256 1dd8f59a4c6b3a741e4c5e7eaa88347b9c12be8076c7cbb3580541a55a42a254 SHA512 6b28231665e4af5726799f998b3a4961be631a4b36e732d72d76af1939bec6cc144bcdebf5724c9c216771fb5fecef9549843d5c1ada6c41fb6a9f33b2cc33e2 WHIRLPOOL 6743f753f41be9a59982b993bde9eb4051049759209278a8630ea93686bf55c22a92a09996aa27faab260af7f2b1611cec72b858abeecd26498d12297713e201
 DIST eagle-lin-7.1.0.run 44697003 SHA256 1fa56d1185c6a993224020786bc21ce1f171566e30615dbbcb5b9aa27703d33b SHA512 6a196672088e451bfb708170e42d209e573e46c207bf341b875d6c0683c2c1ec552f1b0d2015291e7f50c81124f15ab14e105548e516590123ab85ca48cfb184 WHIRLPOOL 1c66558e46328ee71108f813008384273774ffc02acfee3175313afbc6f98512d07945b05f9ec327e4f1b232c596e1b7fd236081d1d7b14978e3e50e439b54bd
 DIST eagle-lin-7.2.0.run 45324128 SHA256 567caf2bdeacff17eea33ef5e083fda534706688f145a9f3035ce48547834e94 SHA512 6c1bd4b6d90baa6793fd8de465b827be30e33f96472b7715c68c4645ddbd2ecaced58065fffabccfd8537a6921fbd0b1a752d0a123477f01d9363cdad8fc12d3 WHIRLPOOL 84171ba8b2bdbdfee117a40d50b62aa56e835c3f72ad4f768538f2426744dcb01ad14853fb07b7bbc674065c41af713f26b5d51ae178b1793a54cb6159eaa997
-DIST eagle-lin-eng-4.16r2.tgz 8922532 SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4
-DIST eagle-lin-ger-4.16r2.tgz 9018957 SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259
+DIST eagle-lin-eng-4.16r2.tgz 8922532 SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4 SHA512 c44771bab9b525870c730ee199bbd5dabd6a52f99e9102547a4ac5fe98dd568cdbc9a257178e7f28292c3efd1b47f5f021768f8649dbfa2afb1bda11cfe2438e WHIRLPOOL 9caab634698a4adadfbde6ea6ffc789c026a1375f1f6319822efbbac4298c22a56e8e4e3099ba6050e9be082f605c46126ce9c2cee190ebf764135f1d16c8f72
+DIST eagle-lin-ger-4.16r2.tgz 9018957 SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259 SHA512 843e393d926fb80dc9b27183f26cbf20790143727a0219504720dff6f2679ce3913b1862abab1bae8157e9d50c5c8d851eb3f3d9358d8ff657b05c6eef6c9665 WHIRLPOOL af9c6ee1324b5df923fa10afd1d5e7591328766e1ecdea4a63c8b2ec91ffe3ca4c4138bec5f5814be8f7cc40a5747be6d727283934965a06ec6474a6c5d6c4bf
diff --git a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
index f4f1a6245f7c..a1067c2228b1 100644
--- a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.8 2015/03/21 20:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.9 2015/06/14 18:51:43 ulm Exp $
 
 EAPI=5
 
@@ -33,17 +33,10 @@ SRC_URI="linguas_de? ( ftp://ftp.cadsoft.de/pub/program/${MY_PV}/${PN}-lin-ger-$
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
 "
 
 INSTALLDIR="/opt/eagle"
diff --git a/sci-electronics/eagle/eagle-5.11.0.ebuild b/sci-electronics/eagle/eagle-5.11.0.ebuild
index a8ce3bc7b7a8..3144083e1170 100644
--- a/sci-electronics/eagle/eagle-5.11.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.7 2015/03/21 20:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.8 2015/06/14 18:51:43 ulm Exp $
 
 EAPI=5
 
@@ -21,21 +21,13 @@ QA_FLAGS_IGNORED="opt/eagle-${PV}/bin/eagle"
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
-			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXau[abi_x86_32(-)]
-			x11-libs/libXdmcp[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+	>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+	>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
 "
 
 # Append ${PV} since that's what upstream installs to
diff --git a/sci-electronics/eagle/eagle-5.12.0.ebuild b/sci-electronics/eagle/eagle-5.12.0.ebuild
index cedceeabb680..3a80eab65b0c 100644
--- a/sci-electronics/eagle/eagle-5.12.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.3 2015/03/21 20:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.4 2015/06/14 18:51:43 ulm Exp $
 
 EAPI="5"
 
@@ -19,27 +19,18 @@ QA_PREBUILT="opt/${P}/bin/eagle"
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
-			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+	>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+	>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 "
 
 # Append ${PV} since that's what upstream installs to
diff --git a/sci-electronics/eagle/eagle-6.6.0.ebuild b/sci-electronics/eagle/eagle-6.6.0.ebuild
index 75029ce3c50c..b0a1bbbc36de 100644
--- a/sci-electronics/eagle/eagle-6.6.0.ebuild
+++ b/sci-electronics/eagle/eagle-6.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.6.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.6.0.ebuild,v 1.3 2015/06/14 18:51:43 ulm Exp $
 
 EAPI="5"
 
@@ -19,27 +19,18 @@ QA_PREBUILT="opt/eagle/bin/eagle"
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
-			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+	>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+	>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 "
 
 # Append ${PV} since that's what upstream installs to
diff --git a/sci-electronics/eagle/eagle-7.1.0.ebuild b/sci-electronics/eagle/eagle-7.1.0.ebuild
index b2d6914a697b..b7bf9e257ce9 100644
--- a/sci-electronics/eagle/eagle-7.1.0.ebuild
+++ b/sci-electronics/eagle/eagle-7.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.1.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.1.0.ebuild,v 1.3 2015/06/14 18:51:43 ulm Exp $
 
 EAPI="5"
 
@@ -19,27 +19,18 @@ QA_PREBUILT="opt/eagle/bin/eagle"
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
-			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+	>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+	>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 "
 
 # Append ${PV} since that's what upstream installs to
diff --git a/sci-electronics/eagle/eagle-7.2.0.ebuild b/sci-electronics/eagle/eagle-7.2.0.ebuild
index b41f54f74003..a1a1ce51583d 100644
--- a/sci-electronics/eagle/eagle-7.2.0.ebuild
+++ b/sci-electronics/eagle/eagle-7.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.2.0.ebuild,v 1.3 2015/03/31 17:25:18 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.2.0.ebuild,v 1.4 2015/06/14 18:51:43 ulm Exp $
 
 EAPI="5"
 
@@ -19,25 +19,16 @@ QA_PREBUILT="opt/eagle/bin/eagle"
 
 RDEPEND="
 	sys-libs/glibc
-	|| (
-		(
-			dev-libs/openssl:0[abi_x86_32(-)]
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	dev-libs/openssl:0[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 "
 
 # Append ${PV} since that's what upstream installs to
diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r14.ebuild
index 592d40059041..d2e2664cc152 100644
--- a/sys-boot/grub/grub-0.97-r14.ebuild
+++ b/sys-boot/grub/grub-0.97-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.7 2015/03/16 21:39:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.8 2015/06/14 20:36:32 ulm Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -35,10 +35,7 @@ IUSE="custom-cflags ncurses netboot static"
 
 LIB_DEPEND="ncurses? (
 		>=sys-libs/ncurses-5.9-r3[static-libs(+)]
-		amd64? ( || (
-			>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		) )
+		amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
 	)"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)\]/} )"
 DEPEND="${RDEPEND}
@@ -103,16 +100,12 @@ src_configure() {
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
 
-	# Per bug 216625, the emul packages do not provide .a libs for performing
-	# suitable static linking
 	if use amd64 && use static ; then
 		if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
 			eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
 			eerror "is specifically intended for building the tarballs for the"
 			eerror "grub-static package via USE='static -ncurses'."
 			eerror "All bets are now off."
-		elif use ncurses && ! has_version ">=sys-libs/ncurses-5.9-r3[abi_x86_32,static-libs]"; then
-			die "You must use the grub-static package if you want a static Grub on amd64!"
 		fi
 	fi
 
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
index d6df37fee57f..e5424f8d9a4b 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.6 2015/05/17 20:06:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.7 2015/06/14 19:46:58 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 #file collisions, bug #540246
diff --git a/sys-devel/gcc/gcc-4.9.2.ebuild b/sys-devel/gcc/gcc-4.9.2.ebuild
index 8aa2494f8f11..7f88f6292a4e 100644
--- a/sys-devel/gcc/gcc-4.9.2.ebuild
+++ b/sys-devel/gcc/gcc-4.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.2.ebuild,v 1.19 2015/05/27 16:01:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.2.ebuild,v 1.20 2015/06/14 17:58:37 mgorny Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
new file mode 100644
index 000000000000..31f5fc2b7f99
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
@@ -0,0 +1,25 @@
+Fix build fails with using gcc-4.9 on Gentoo/FreeBSD
+https://bugs.gentoo.org/show_bug.cgi?id=548444
+
+diff --git a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
+index d6bd5c3..372f76f 100644
+--- a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
++++ b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
+@@ -22,6 +22,8 @@
+ #include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/Process.h"
+ 
++#include <cstdio>
++
+ // Include the necessary headers to interface with the Windows registry and
+ // environment.
+ #if defined(LLVM_ON_WIN32)
+@@ -212,7 +214,7 @@ bool MSVCToolChain::getWindowsSDKDir(std::string &path, int &major,
+       "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\$VERSION",
+       "InstallationFolder", path, &sdkVersion);
+   if (!sdkVersion.empty())
+-    ::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor);
++    std::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor);
+   return hasSDKDir && !path.empty();
+ }
+ 
diff --git a/sys-devel/llvm/llvm-3.6.1.ebuild b/sys-devel/llvm/llvm-3.6.1.ebuild
index 529368ebf9e6..241e0898eaa1 100644
--- a/sys-devel/llvm/llvm-3.6.1.ebuild
+++ b/sys-devel/llvm/llvm-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.6.1.ebuild,v 1.4 2015/06/05 14:48:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.6.1.ebuild,v 1.5 2015/06/14 17:56:07 mgorny Exp $
 
 EAPI=5
 
@@ -158,6 +158,9 @@ src_prepare() {
 		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
 		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+		# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
+		epatch "${FILESDIR}"/clang-3.6-fbsd-gcc49.patch
 	fi
 
 	if use prefix && use clang; then
diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild
index 08d54bcc0c80..cd2407a3cee3 100644
--- a/sys-freebsd/boot0/boot0-10.1.ebuild
+++ b/sys-freebsd/boot0/boot0-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.3 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.4 2015/06/14 18:02:43 mgorny Exp $
 
 EAPI=5
 
@@ -23,8 +23,7 @@ EXTRACTONLY="
 
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*
-	!sparc-fbsd? ( sys-devel/clang )"
+	=sys-freebsd/freebsd-lib-${RV}*"
 
 S="${WORKDIR}/sys/boot"
 
@@ -45,7 +44,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use sparc-fbsd || export CC=clang
 	sed -e '/-mno-align-long-strings/d' \
 		-i "${S}"/i386/boot2/Makefile \
 		-i "${S}"/i386/gptboot/Makefile \
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
index 4e277670f963..f6e32bd7861f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.3 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.4 2015/06/14 18:05:45 mgorny Exp $
 
 EAPI=5
 
@@ -73,7 +73,7 @@ IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
 	build crosscompile_opts_headers-only zfs
 	userland_GNU userland_BSD"
 
-QA_DT_NEEDED="lib/libc.so.7 lib32/libc.so.7"
+QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
 
 pkg_setup() {
 	[ -c /dev/zero ] || \
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index 4084c3174b2f..7d26bdd7ace9 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild,v 1.4 2015/02/18 17:09:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild,v 1.5 2015/06/14 18:05:45 mgorny Exp $
 
 EAPI=5
 
@@ -58,7 +58,7 @@ IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
 	build crosscompile_opts_headers-only zfs
 	userland_GNU userland_BSD"
 
-QA_DT_NEEDED="lib/libc.so.7"
+QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
 
 pkg_setup() {
 	[ -c /dev/zero ] || \
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
new file mode 100644
index 000000000000..5cb4cf809b12
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
@@ -0,0 +1,18 @@
+https://svnweb.freebsd.org/base?view=revision&revision=281606
+
+diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h
+index d4ed8b3..79847ee 100644
+--- a/sys/crypto/aesni/aesencdec.h
++++ b/sys/crypto/aesni/aesencdec.h
+@@ -27,6 +27,11 @@
+  *
+  */
+ 
++#if defined(__GNUC__) && defined(_KERNEL)
++/* Suppress inclusion of gcc's mm_malloc.h header */
++#define _MM_MALLOC_H_INCLUDED 1
++#endif
++
+ #include <wmmintrin.h>
+ 
+ static inline void
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
index ad916a185040..22d953f9c5a1 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.3 2015/06/14 18:04:33 mgorny Exp $
 
 EAPI=5
 
@@ -40,7 +40,6 @@ RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	!<sys-freebsd/freebsd-sources-9.2_beta1"
 DEPEND="build-kernel? (
 		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		!sparc-fbsd? ( sys-devel/clang )
 		>=sys-freebsd/freebsd-usbin-9.1
 		=sys-freebsd/freebsd-mk-defs-${RV}*
 	)"
@@ -58,11 +57,12 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	"${FILESDIR}/${PN}-7.1-includes.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" )
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
 
 pkg_setup() {
-	# Force set CC=clang. when using gcc, aesni fails to build.
-	use sparc-fbsd || export CC=clang
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
 }
 
diff --git a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
index 911b92e64584..bcf289ddb03e 100644
--- a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild,v 1.5 2015/06/11 14:20:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild,v 1.6 2015/06/14 19:45:07 maekke Exp $
 
 EAPI=5
 inherit eutils linux-info udev toolchain-funcs autotools
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 63c7da1cc3d3..a6f26f09d1bd 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,2 +1,3 @@
 DIST udev-init-scripts-27.tar.bz2 3456 SHA256 1a091c361e9845861c138b505881edcb7b68fcf91708db526dff0b320243c936 SHA512 8a526d5252d54c724ad99250141d3ffddfbe6044ff9c9b9c02a4984f03ab6492a8b6a36022b93c7c06b0869b61a3c4dfa82fc47f560e927684fad636f56e4ba8 WHIRLPOOL 270a4ae1053a0303a851d6dcc5b51d2b89c5438b93f85dfb80726d11d61e950ae13e88b6063938f4ea8b49ae7167fb58211b6ce670f8d6c52212aed5da80b339
 DIST udev-init-scripts-29.tar.gz 3650 SHA256 63fd923b259f216d8a1b1b64d8e541d67fb5ef86ac163ad087306017fa6426d9 SHA512 b6233b1ef2af6c581584faa6c640840a19c92c70a4e754bcc2d27112fb15b528799c0a3e60f8c5c4436754d3f14c598e946eeca3f0d21512f8cd40f406594514 WHIRLPOOL adbf345047416dce9848c6acf3c92b341961a25fbfb03e6488ff5899ac216e00e53061ea4f0aa4412ea90e4b0e323181abb4480fc313497a5a82f2bf286708fb
+DIST udev-init-scripts-30.tar.gz 3668 SHA256 4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f SHA512 bf9ec69d9fb9edbe37f3dec8e1d5c828ea63591382de33818297ec5e37490c2dd709a8e32251fba36a816952c98af49172c7c09f3252712ddc51820205c4efdd WHIRLPOOL e666263adbd42ec99ed31c7537361e10deea19293aadd0580410abc901d87d1befdec2231d448cc364564803d2177649037111640218eb96f79ed931e41e26a7
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild
new file mode 100644
index 000000000000..87c31cb600cf
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild,v 1.1 2015/06/14 16:31:58 williamh Exp $
+
+EAPI=5
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
+	inherit git-r3
+else
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+inherit eutils
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=">=virtual/udev-217
+	!<sys-apps/openrc-0.14"
+
+src_prepare() {
+	epatch_user
+}
+
+pkg_postinst() {
+	# Add udev and udev-trigger to the sysinit runlevel automatically.
+	for f in udev udev-trigger; do
+		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
+			-d ${ROOT%/}/etc/runlevels/sysinit &&
+			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+			ewarn "Adding ${f} to the sysinit runlevel"
+		fi
+	done
+
+	if ! has_version "sys-fs/eudev[rule-generator]" && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e8daabb37392..3a49c4fa7fef 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -25,7 +25,7 @@ DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd
 DIST patch-3.10.80.xz 1119524 SHA256 83116a94209d367fe93ffcd8031a98269279661675550d019c79cc684d420907 SHA512 504ba149bbce28621b286c1e4fe17deb1223ff6642cc43570918cccb0fd1901c2d55cc663dc623da671bc83910a77a5f03efb8b43258323cad0387e98a1f041f WHIRLPOOL ea7d56d78449c76fd667329e78e1411c1e36845e9b13f956b41dc76b59dcd3366ea8e13d846ab97edfe64f2b18d2b03232569031f857c87a98a1c20531407a83
 DIST patch-3.12.43.xz 1242492 SHA256 96ce65b950e484ba7abdfb5f7a69ee954c05d00cd4e3a1627b9fe6d742e04a34 SHA512 e06e83ad53bc0b5a44df52e057005987ff8941f57cd46fe03bdb58bdff09dc302b457399f1a2f12ad0e4c657401e14aba085d6fc687e05709e720369dea71eab WHIRLPOOL f63bb589cd87a48f438296bd65afb2c51080ecc868d54d5e32940187f7b56d47eb254a4972398e5f9ef063b96559b1a0cb6e133422276a053902aafaec3dc0db
 DIST patch-3.14.44.xz 909800 SHA256 5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0 SHA512 3eed66584f6cb3958fdbb2d0e15eb240d68d317e073c2a4fbc02d35af773429a968144e3d2eea49c58fe90395de4fd6cf8de909075b95cce0d60ad241c90df4b WHIRLPOOL 957eaa62c01c143c58a49f321aebf8dedf9ad3599c1a2b8049b8dcf35752bc17acb22f0f44aa73880dd126123d6950b741bd214b41ce7da83dd3aed88905a841
-DIST patch-3.18.14.xz 428736 SHA256 488ac8f9fb1bcc5670d2222a4f382ca4e4950c4489bc5217c244b787d2ac8974 SHA512 ba898f08a0252f3bc99b4bb3916dfd6af1935bf6d149a9204b834a16ec615a5f0f53e73c14075c40efd8a8f5cf64b9f1b7dc3e74fb5f5fab87d7b0c6b0517315 WHIRLPOOL 56c0183421104d3bc6555c3465551a8063f0f904de3ae25ef549680ccd189fd5506c646f8f6733c50c0fa7edfb7b7216d7f385f21a157d7f0c1cb8fc2dd2d6e8
+DIST patch-3.18.16.xz 470372 SHA256 f60602c8de2ae7b1507c538b6af65d5b933727a06f56075898ff64fdcf650313 SHA512 868de9793e67e741dc69d61339f66c25d08d36a7d67b09d5644e855e05faf239c1e6e01299812a68edc52a39e132d7ec459929cb5d8a0936fe6aa580a72af80c WHIRLPOOL 5c1d6b5e60cffe8e06a2f6b39ee5bf2b6fb0f05bbd90df5e199e87b5b12871fb18eaaecdf7882e9d69bed1703418436063d872082ca1298829a8975e316fe52d
 DIST patch-3.19.8.xz 250604 SHA256 2e4f01c2ce7ccb2ffee1722724df0a2c2ad6ba5fa74218aa816bda19f3ddcf5d SHA512 29c63beaab43493093a002c29d979e999d11f44eb5465b887ddf75313cd7755d20b3ea19ac1ef68ae586fb4e5275817bfe56d1dfba930ffaabd618702541aebb WHIRLPOOL d8c7fed18c9fa036f7affabc6c9cbb71e825d49e1ed16b387b466a48909cde237e4c07cb0b6d7dc99a79813fb8a2bf42d0fa73faa38a78e5e4ff34b86e31ffb0
 DIST patch-3.2.69.xz 1406184 SHA256 25e1b9752bd42004dfe5c3c362570434ce674845ea03fa53e9a6a3381f089bb0 SHA512 7e6cde3e773d1e9ab29786b7023a176cada2035466bb52b77a0e9d38c3ec010ff3cd105dcdb870a666a2c98adc511a24820c24b8274b8218df4fd138aa2c94fe WHIRLPOOL 390a68bf3261a20ad9c8c3d96f6ae24a79990cd879071b3f48c0f9fab03577ee9916209feb1f04b64b4f20be46270f2301ced15aa9b44115030790f308f615ed
 DIST patch-3.4.107.xz 1216492 SHA256 1c8c5cea7f0811064e33fd034ee35c399e376f2f0bcac37502f62e1f3a686f40 SHA512 fdc3aa1023bce84c2bb8741d7ee32d9262175d8ade2b26cc8e3f06d9d04580feb8d7f62e993dd9804c4e3eb05667f7b1397a8082ee605096e20b37ada90f7fde WHIRLPOOL 6224b2c21108b754991b11060d79a96c9afe2b5a35f94bf225b25d03f2dce39882bbd6371f752b6fbb3b8613487bd1a5832711be63a5207a00764274ea213ff5
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.16.ebuild
similarity index 88%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.18.14.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.18.16.ebuild
index 5768758896e1..22548e2ea0a1 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.18.14.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.18.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.18.14.ebuild,v 1.1 2015/05/21 08:45:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.18.16.ebuild,v 1.1 2015/06/14 23:48:24 mpagano Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/sys-libs/musl/musl-1.1.10-r1.ebuild b/sys-libs/musl/musl-1.1.10-r1.ebuild
index 5ffe52817df8..4c3d9d73c3d8 100644
--- a/sys-libs/musl/musl-1.1.10-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.10-r1.ebuild,v 1.3 2015/06/10 06:57:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.10-r1.ebuild,v 1.4 2015/06/14 17:55:57 blueness Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.musl-libc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
-	KEYWORDS="-* amd64 arm ~mips ~ppc x86"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
 fi
 
 LICENSE="MIT LGPL-2 GPL-2"
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
index 87c8fd44c0d0..49d2ce6f6eae 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild,v 1.3 2015/06/11 04:11:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild,v 1.4 2015/06/14 16:42:14 ulm Exp $
 
 EAPI=5
 inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
@@ -80,36 +80,21 @@ RDEPEND="
 	abi_x86_64? ( ${NATIVE_DEPS} )
 	abi_x86_32? (
 		amd64? (
-			|| (
-				(
-					>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-					>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-					>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-					>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-					>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-					>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-					>=dev-libs/nss-3.15.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-					>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-					>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			)
+			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+			>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
+			>=dev-libs/nss-3.15.4[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+			>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
 		)
 		x86? ( ${NATIVE_DEPS} )
 	)
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
index 2a13006a276d..954b2f5c50aa 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.4 2014/10/15 15:09:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.5 2015/06/14 18:33:06 ulm Exp $
 
 EAPI=5
 
@@ -18,18 +18,10 @@ IUSE=""
 RDEPEND=">=x11-libs/gtk+-2:2
 	net-misc/curl
 	>=sys-apps/util-linux-2.13
-	|| (
-		(
-			>=dev-libs/glib-2.34.3[abi_x86_32(-)]
-			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-		)
-		(
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		)
-	)"
+	>=dev-libs/glib-2.34.3[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXt-1.1.4[abi_x86_32(-)]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
index 0e9e671f86f1..cdd83ade9d5b 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.4 2015/06/13 10:55:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.5 2015/06/14 19:50:29 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
index 09170707b2cb..9931122f2374 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.3 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.4 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
index 669c0e1b54f0..2d47bcd0eb7f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.5 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.6 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -38,20 +38,12 @@ RDEPEND="
 	virtual/glu
 	!x11-libs/xvba-video
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
index a78cc7e4a48c..820b615f79df 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.4 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.5 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				>=virtual/glu-9.0-r1[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXinerama-1.1.3[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=virtual/glu-9.0-r1[abi_x86_32]
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+			>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
index ae79e6bc3a1d..3942da1e9dcb 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
index 67f7195cf12f..5e007ad32cf8 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild
index 530e906cf1a4..2ee856e158e2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild,v 1.2 2015/05/20 04:42:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild,v 1.3 2015/06/14 16:55:32 ulm Exp $
 
 EAPI=5
 
@@ -62,13 +62,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
index d2ea8a1a662f..6c5f0fc15726 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild,v 1.2 2015/06/12 16:35:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild,v 1.3 2015/06/14 11:48:00 zlogene Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 220f284b04c9..682d80e12cea 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
-DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
diff --git a/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch
deleted file mode 100644
index 3fe2f57992e2..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch causes the designer plugin to be built against the just-built
-qscintilla, rather than trying to build against the system qscintilla
-which may not be installed yet.
-
---- designer-Qt4Qt5/designer.pro
-+++ designer-Qt4Qt5/designer.pro
-@@ -26,4 +26,5 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
- 
--LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
-+INCLUDEPATH = ../Qt4Qt5
-+LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
deleted file mode 100644
index 8d34b47e4ef9..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.10 2013/12/23 15:31:06 ago Exp $
-
-EAPI=5
-
-inherit qt4-r2
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0/9"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc python"
-
-DEPEND="
-	dev-qt/qtcore:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.7.1-designer.patch"
-)
-
-src_unpack() {
-	qt4-r2_src_unpack
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Configuration of qscintilla"
-	eqmake4 qscintilla.pro
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Configuration of designer plugin"
-	eqmake4 designer.pro
-	popd > /dev/null
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Building of qscintilla"
-	emake
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Building of designer plugin"
-	emake
-	popd > /dev/null
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Installation of qscintilla"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Installation of designer plugin"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	dodoc NEWS
-
-	if use doc; then
-		dohtml doc/html-Qt4Qt5/*
-		insinto /usr/share/doc/${PF}
-		doins -r doc/Scintilla
-	fi
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
index 1b1b7727ef39..fc9b0a141753 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.6 2015/01/14 16:55:15 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.7 2015/06/14 16:45:41 ulm Exp $
 
 EAPI=5
 inherit cmake-multilib multilib systemd
@@ -24,29 +24,16 @@ RDEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXv[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		|| (
-			>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[abi_x86_32]
-				>=x11-libs/libXv-1.0.10[abi_x86_32]
-			)
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
-		)
-		|| (
-			(
-				>=virtual/glu-9.0-r1[abi_x86_32]
-				>=virtual/opengl-7.0-r1[abi_x86_32]
-			)
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32]
-		)
-	) )
 	virtual/glu[${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
index ea4b6f84355d..722c726d8ad6 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild,v 1.1 2015/03/28 20:46:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild,v 1.2 2015/06/14 21:34:28 mgorny Exp $
 
 EAPI=5
 EAUTORECONF=yes
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND=">=dev-libs/glib-2.24:=
 	>=x11-libs/gtk+-2.20:2=
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfcegui4-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=
 	>=xfce-base/xfce4-panel-4.10:="
 DEPEND="${RDEPEND}
 	dev-util/intltool