Update deps to allow native multilib gettext and libxslt.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

14 files changed, 169 insertions, 46 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0889b6af9b5b..53f79c424ac9 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.497 2014/02/21 06:31:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.498 2014/03/04 06:10:59 tetromino Exp $
+
+  04 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.6.ebuild,
+  wine-1.6.1.ebuild, wine-1.6.2.ebuild, wine-1.7.0.ebuild, wine-1.7.3.ebuild,
+  wine-1.7.4.ebuild, wine-1.7.8.ebuild, wine-1.7.9.ebuild, wine-1.7.10.ebuild,
+  wine-1.7.11.ebuild, wine-1.7.12.ebuild, wine-1.7.13.ebuild, wine-9999.ebuild:
+  Update deps to allow native multilib gettext and libxslt.
 
 *wine-1.7.13 (21 Feb 2014)
 
diff --git a/app-emulation/wine/wine-1.6.1.ebuild b/app-emulation/wine/wine-1.6.1.ebuild
index d484dcb658b5..b71aad10e2a2 100644
--- a/app-emulation/wine/wine-1.6.1.ebuild
+++ b/app-emulation/wine/wine-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.4 2014/01/26 10:55:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.5 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -166,7 +166,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -176,7 +179,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild
index d040cd88e364..a85064d9a7df 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-2014 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.1 2014/01/13 05:39:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -166,7 +166,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -176,7 +179,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.6.ebuild b/app-emulation/wine/wine-1.6.ebuild
index 148277fe9668..a34a1c9043a6 100644
--- a/app-emulation/wine/wine-1.6.ebuild
+++ b/app-emulation/wine/wine-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.11 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.12 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -170,7 +170,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -180,7 +183,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild
index 3156e464e032..664482c5a0df 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.7 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.8 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -170,7 +170,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -180,7 +183,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild
index 0b4a1d4a83f9..433e26f72f3a 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-2014 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.1 2014/01/04 03:49:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.11.ebuild b/app-emulation/wine/wine-1.7.11.ebuild
index bc7a35f557a4..223c9cd317b2 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-2014 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.1 2014/01/22 06:58:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild
index bcf0652cf69d..fd25be32d332 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-2014 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.1 2014/02/08 21:50:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild
index 5336b9ad1dbe..2c4186ad27a1 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-2014 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.1 2014/02/21 06:31:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild
index da2f2bcb71a5..96aa14d94a10 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.4 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.5 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -166,7 +166,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -176,7 +179,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild
index 0d89b1002a5a..84a6e627a0b3 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.5 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.6 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -166,7 +166,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -176,7 +179,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index ec129f3779fa..8bb0161dd257 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.4 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-1.7.9.ebuild b/app-emulation/wine/wine-1.7.9.ebuild
index d953bf981006..066f0963cfbd 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.1 2013/12/24 22:50:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index a6ab78c0f4c4..684ad776bfb8 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.163 2014/02/08 21:50:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.164 2014/03/04 06:10:59 tetromino Exp $
 
 EAPI="5"
 
@@ -167,7 +167,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
 			) )
-			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
@@ -177,7 +180,13 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[development]
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
 			) )
-			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
 			png? ( || (