Cleanup modular X handling in all ebuilds and cleanup lcms handling #167240.

(Portage version: 2.1.2-r14)

47 files changed, 425 insertions, 538 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index e61eb468cab2..d5f492a66de5 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.171 2007/03/04 20:34:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.172 2007/03/04 20:45:33 vapier Exp $
+
+  04 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  -files/wine-20041019-alsa-headers.patch, wine-0.9.ebuild,
+  wine-0.9.1.ebuild, wine-0.9.2.ebuild, wine-0.9.3.ebuild,
+  wine-0.9.4.ebuild, wine-0.9.5-r1.ebuild, wine-0.9.6.ebuild,
+  wine-0.9.7.ebuild, wine-0.9.8-r1.ebuild, wine-0.9.9.ebuild,
+  wine-0.9.10.ebuild, wine-0.9.11.ebuild, wine-0.9.12.ebuild,
+  wine-0.9.13.ebuild, wine-0.9.14.ebuild, wine-0.9.15.ebuild,
+  wine-0.9.16.ebuild, wine-0.9.17.ebuild, wine-0.9.18.ebuild,
+  wine-0.9.19.ebuild, wine-0.9.20.ebuild, wine-0.9.21.ebuild,
+  wine-0.9.22.ebuild, wine-0.9.23.ebuild, wine-0.9.24.ebuild,
+  wine-0.9.25.ebuild, wine-0.9.26.ebuild, wine-0.9.27.ebuild,
+  wine-0.9.28.ebuild, wine-0.9.29.ebuild, wine-0.9.30.ebuild,
+  wine-0.9.31.ebuild, wine-0.9.32.ebuild, wine-9999.ebuild,
+  -wine-20041019-r3.ebuild, wine-20050111-r2.ebuild, wine-20050211.ebuild,
+  wine-20050310-r1.ebuild, wine-20050419.ebuild, wine-20050524.ebuild,
+  wine-20050628.ebuild, wine-20050725-r1.ebuild, wine-20050830.ebuild,
+  wine-20050930.ebuild:
+  Cleanup modular X handling in all ebuilds and cleanup lcms handling #167240.
 
 *wine-0.9.32 (04 Mar 2007)
 
diff --git a/app-emulation/wine/files/digest-wine-20041019-r3 b/app-emulation/wine/files/digest-wine-20041019-r3
deleted file mode 100644
index 8cde176755b3..000000000000
--- a/app-emulation/wine/files/digest-wine-20041019-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-RMD160 87dec31b1853a447d18c15a7c3689be90150a1b2 Wine-20041019.tar.gz 11058180
-SHA256 123a443aa4c834ab9e782f17458c865ba740e8f5e2b5b36b91753dff1035c20c Wine-20041019.tar.gz 11058180
diff --git a/app-emulation/wine/files/wine-20041019-alsa-headers.patch b/app-emulation/wine/files/wine-20041019-alsa-headers.patch
deleted file mode 100644
index 683a58768534..000000000000
--- a/app-emulation/wine/files/wine-20041019-alsa-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/107822
-
---- wine-20041019/dlls/winmm/winealsa/audio_05.c
-+++ wine-20041019/dlls/winmm/winealsa/audio_05.c
-@@ -39,6 +39,7 @@
- # include <sys/mman.h>
- #endif
- #include "windef.h"
-+#include "alsa.h"
- #include "winbase.h"
- #include "wingdi.h"
- #include "winerror.h"
-@@ -46,7 +47,6 @@
- #include "mmddk.h"
- #include "dsound.h"
- #include "dsdriver.h"
--#include "alsa.h"
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(wave);
diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index b45487d1e906..3c03d175e263 100644
--- a/app-emulation/wine/wine-0.9.1.ebuild
+++ b/app-emulation/wine/wine-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -110,11 +111,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.10.ebuild b/app-emulation/wine/wine-0.9.10.ebuild
index 0206171384b9..69f68528ed60 100644
--- a/app-emulation/wine/wine-0.9.10.ebuild
+++ b/app-emulation/wine/wine-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -94,7 +95,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.11.ebuild b/app-emulation/wine/wine-0.9.11.ebuild
index dc36a9bcb3f4..a630ce024220 100644
--- a/app-emulation/wine/wine-0.9.11.ebuild
+++ b/app-emulation/wine/wine-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.13 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.14 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -94,7 +95,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.12.ebuild b/app-emulation/wine/wine-0.9.12.ebuild
index c84594dee58b..94c866ed258f 100644
--- a/app-emulation/wine/wine-0.9.12.ebuild
+++ b/app-emulation/wine/wine-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.12.ebuild,v 1.8 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.12.ebuild,v 1.9 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -93,7 +94,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.13.ebuild b/app-emulation/wine/wine-0.9.13.ebuild
index e6f76769f81f..0eafd209f073 100644
--- a/app-emulation/wine/wine-0.9.13.ebuild
+++ b/app-emulation/wine/wine-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.13.ebuild,v 1.9 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.13.ebuild,v 1.10 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -93,7 +94,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.14.ebuild b/app-emulation/wine/wine-0.9.14.ebuild
index ef4e3baf1836..96e6cef05073 100644
--- a/app-emulation/wine/wine-0.9.14.ebuild
+++ b/app-emulation/wine/wine-0.9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.14.ebuild,v 1.9 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.14.ebuild,v 1.10 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -93,7 +94,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.15.ebuild b/app-emulation/wine/wine-0.9.15.ebuild
index 20d612bf02a7..92d700acad37 100644
--- a/app-emulation/wine/wine-0.9.15.ebuild
+++ b/app-emulation/wine/wine-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.15 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.16 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -90,7 +91,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.16.ebuild b/app-emulation/wine/wine-0.9.16.ebuild
index a21e9b5e6424..8c05ea3185b9 100644
--- a/app-emulation/wine/wine-0.9.16.ebuild
+++ b/app-emulation/wine/wine-0.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.16.ebuild,v 1.9 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.16.ebuild,v 1.10 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -89,7 +90,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.17.ebuild b/app-emulation/wine/wine-0.9.17.ebuild
index d7b04cd70900..a83c70f5ced5 100644
--- a/app-emulation/wine/wine-0.9.17.ebuild
+++ b/app-emulation/wine/wine-0.9.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.17.ebuild,v 1.7 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.17.ebuild,v 1.8 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -89,7 +90,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.18.ebuild b/app-emulation/wine/wine-0.9.18.ebuild
index f6b16352408d..2c5d26bedbff 100644
--- a/app-emulation/wine/wine-0.9.18.ebuild
+++ b/app-emulation/wine/wine-0.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.18.ebuild,v 1.8 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.18.ebuild,v 1.9 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,9 +20,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -44,13 +47,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -93,7 +94,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.19.ebuild b/app-emulation/wine/wine-0.9.19.ebuild
index bf519c5fdc56..41444857f1de 100644
--- a/app-emulation/wine/wine-0.9.19.ebuild
+++ b/app-emulation/wine/wine-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.19.ebuild,v 1.8 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.19.ebuild,v 1.9 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -93,7 +93,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.2.ebuild b/app-emulation/wine/wine-0.9.2.ebuild
index 06301160b86a..8c54f70ad728 100644
--- a/app-emulation/wine/wine-0.9.2.ebuild
+++ b/app-emulation/wine/wine-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -110,11 +111,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.20.ebuild b/app-emulation/wine/wine-0.9.20.ebuild
index 9975522ac627..3f6e3e660f20 100644
--- a/app-emulation/wine/wine-0.9.20.ebuild
+++ b/app-emulation/wine/wine-0.9.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.20.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.20.ebuild,v 1.7 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -93,7 +93,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.21.ebuild b/app-emulation/wine/wine-0.9.21.ebuild
index 568eb1800cf5..75a3c04b66d4 100644
--- a/app-emulation/wine/wine-0.9.21.ebuild
+++ b/app-emulation/wine/wine-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.7 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.8 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.22.ebuild b/app-emulation/wine/wine-0.9.22.ebuild
index 141e0b02705d..653709e75076 100644
--- a/app-emulation/wine/wine-0.9.22.ebuild
+++ b/app-emulation/wine/wine-0.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.22.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.22.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.23.ebuild b/app-emulation/wine/wine-0.9.23.ebuild
index 04e6b875e5dd..144be417038f 100644
--- a/app-emulation/wine/wine-0.9.23.ebuild
+++ b/app-emulation/wine/wine-0.9.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.23.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.23.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.24.ebuild b/app-emulation/wine/wine-0.9.24.ebuild
index aa79f9a4cf9c..7c45cbccafab 100644
--- a/app-emulation/wine/wine-0.9.24.ebuild
+++ b/app-emulation/wine/wine-0.9.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.24.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.24.ebuild,v 1.7 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.25.ebuild b/app-emulation/wine/wine-0.9.25.ebuild
index 751dc6c8e253..ddf0abf6983b 100644
--- a/app-emulation/wine/wine-0.9.25.ebuild
+++ b/app-emulation/wine/wine-0.9.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.25.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.25.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.26.ebuild b/app-emulation/wine/wine-0.9.26.ebuild
index 8f36198af7f5..aa722e73ca31 100644
--- a/app-emulation/wine/wine-0.9.26.ebuild
+++ b/app-emulation/wine/wine-0.9.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.26.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.26.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.27.ebuild b/app-emulation/wine/wine-0.9.27.ebuild
index df72ba65cd0c..24cbaae69340 100644
--- a/app-emulation/wine/wine-0.9.27.ebuild
+++ b/app-emulation/wine/wine-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.27.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.27.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.28.ebuild b/app-emulation/wine/wine-0.9.28.ebuild
index dca5b333a306..a2c2325b1122 100644
--- a/app-emulation/wine/wine-0.9.28.ebuild
+++ b/app-emulation/wine/wine-0.9.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.28.ebuild,v 1.6 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.28.ebuild,v 1.7 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.29.ebuild b/app-emulation/wine/wine-0.9.29.ebuild
index 00b1218e3741..067fb86e208d 100644
--- a/app-emulation/wine/wine-0.9.29.ebuild
+++ b/app-emulation/wine/wine-0.9.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.29.ebuild,v 1.3 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.29.ebuild,v 1.4 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index c88338226f8b..a9de0010e6a1 100644
--- a/app-emulation/wine/wine-0.9.3.ebuild
+++ b/app-emulation/wine/wine-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.13 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.14 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -110,11 +111,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.30.ebuild b/app-emulation/wine/wine-0.9.30.ebuild
index b3bc1d72cdcf..00a441835e99 100644
--- a/app-emulation/wine/wine-0.9.30.ebuild
+++ b/app-emulation/wine/wine-0.9.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.30.ebuild,v 1.2 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.30.ebuild,v 1.3 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.31.ebuild b/app-emulation/wine/wine-0.9.31.ebuild
index ca5a75272822..d9164407964e 100644
--- a/app-emulation/wine/wine-0.9.31.ebuild
+++ b/app-emulation/wine/wine-0.9.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.31.ebuild,v 1.2 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.31.ebuild,v 1.3 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.32.ebuild b/app-emulation/wine/wine-0.9.32.ebuild
index 6451f4267817..d3dc95d276df 100644
--- a/app-emulation/wine/wine-0.9.32.ebuild
+++ b/app-emulation/wine/wine-0.9.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.32.ebuild,v 1.1 2007/03/04 20:34:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.32.ebuild,v 1.2 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -89,7 +89,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index 1e3765ac2aea..b4dbb8111d26 100644
--- a/app-emulation/wine/wine-0.9.4.ebuild
+++ b/app-emulation/wine/wine-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.13 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.14 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -111,11 +112,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index 14d865463840..eff0102db52f 100644
--- a/app-emulation/wine/wine-0.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.10 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.11 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -96,11 +97,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index 962b1b0c3edc..8f7f9e46144d 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.13 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.14 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -109,11 +110,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.7.ebuild b/app-emulation/wine/wine-0.9.7.ebuild
index fe7e01405ccd..cee7c207eeb5 100644
--- a/app-emulation/wine/wine-0.9.7.ebuild
+++ b/app-emulation/wine/wine-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.10 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.11 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -93,11 +94,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild
index a01090115ef3..e3f76b90ca17 100644
--- a/app-emulation/wine/wine-0.9.8-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.10 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.11 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -94,7 +95,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.9.ebuild b/app-emulation/wine/wine-0.9.9.ebuild
index 1a827394af74..056f439ee861 100644
--- a/app-emulation/wine/wine-0.9.9.ebuild
+++ b/app-emulation/wine/wine-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -43,13 +46,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -95,7 +96,7 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.ebuild b/app-emulation/wine/wine-0.9.ebuild
index 1bcc568f834c..fe1642920972 100644
--- a/app-emulation/wine/wine-0.9.ebuild
+++ b/app-emulation/wine/wine-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -110,11 +111,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-20041019-r3.ebuild b/app-emulation/wine/wine-20041019-r3.ebuild
deleted file mode 100644
index 56f4ff1ea083..000000000000
--- a/app-emulation/wine/wine-20041019-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.27 2006/06/24 07:46:36 vapier Exp $
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-*"
-IUSE="X alsa arts cups doc gif glut jack jpeg lcms nas ncurses opengl oss"
-RESTRICT="test" #72375
-
-RDEPEND=">=media-libs/freetype-2.0.0
-	media-gfx/fontforge
-	media-fonts/corefonts
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
-	)
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
-	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	glut? ( virtual/glut )
-	lcms? ( media-libs/lcms )"
-DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
-	)
-	sys-devel/bison
-	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
-	sys-devel/flex"
-
-src_unpack() {
-	unpack Wine-${PV}.tar.gz
-
-	cd "${S}"
-	epatch "${FILESDIR}"/wine-wmf.patch
-	epatch "${FILESDIR}"/wine-20041019-alsa-headers.patch
-	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
-	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
-	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
-	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-config_cache() {
-	local h ans="no"
-	use ${1} && ans="yes"
-	shift
-	for h in "$@" ; do
-		export ac_cv_${h}=${ans}
-	done
-}
-
-src_compile() {
-	export LDCONFIG=/bin/true
-	config_cache jack header_jack_jack_h
-	config_cache cups header_cups_cups_h
-	config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open
-	use arts || export ARTSCCONFIG="/bin/false"
-	config_cache nas header_audio_audiolib_h header_audio_soundlib_h
-	config_cache gif header_gif_lib_h
-	config_cache glut lib_glut_glutMainLoop
-	config_cache jpeg header_jpeglib_h
-	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
-
-	strip-flags
-	use lcms && append-flags -I${ROOT}/usr/include/lcms
-
-	#	$(use_enable amd64 win64)
-	# USE=debug is broken in this release
-	#	$(use_enable debug trace)
-	#	$(use_enable debug)
-	econf \
-		--sysconfdir=/etc/wine \
-		$(use_with ncurses curses) \
-		$(use_with opengl) \
-		$(use_with X x) \
-		|| die "configure failed"
-
-	emake -j1 depend || die "depend"
-	emake all || die "all"
-	if use doc ; then
-		VARTEXFONTS=${T} \
-		emake -j1 -C documentation doc || die "docs"
-	fi
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share \
-		includedir=${D}/usr/include/wine \
-		sysconfdir=${D}/etc/wine \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib \
-		dlldir=${D}/usr/lib/wine \
-		install || die
-	use doc && dodoc documentation/*.pdf
-
-	insinto /usr/share/wine
-	doins documentation/samples/config || die "doins config"
-
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README
-}
diff --git a/app-emulation/wine/wine-20050111-r2.ebuild b/app-emulation/wine/wine-20050111-r2.ebuild
index 480a9722fd68..649fad519391 100644
--- a/app-emulation/wine/wine-20050111-r2.ebuild
+++ b/app-emulation/wine/wine-20050111-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,9 +20,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -34,13 +37,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
@@ -81,10 +82,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I${ROOT}/usr/include/lcms
 
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 128127d84a44..e7d51ec7f996 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.25 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.26 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
@@ -103,10 +104,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index e31889b00385..61876e70f3be 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.18 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.19 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
@@ -104,10 +105,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index cf9abda04e4f..6bfe04d1c88f 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.20 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.21 2007/03/04 20:45:34 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
@@ -103,10 +104,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index 12f4ab987236..1c55c9e845f5 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.18 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.19 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -103,10 +104,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 #	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 #		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050628.ebuild b/app-emulation/wine/wine-20050628.ebuild
index 37422c75b4b4..1e3bd89ba24a 100644
--- a/app-emulation/wine/wine-20050628.ebuild
+++ b/app-emulation/wine/wine-20050628.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.14 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.15 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -102,10 +103,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 #	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 #		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050725-r1.ebuild b/app-emulation/wine/wine-20050725-r1.ebuild
index 28260492c566..e28e0f6c4c04 100644
--- a/app-emulation/wine/wine-20050725-r1.ebuild
+++ b/app-emulation/wine/wine-20050725-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.12 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -103,10 +104,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 #	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 #		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050830.ebuild b/app-emulation/wine/wine-20050830.ebuild
index c867fdd073f3..8d3ba63adbde 100644
--- a/app-emulation/wine/wine-20050830.ebuild
+++ b/app-emulation/wine/wine-20050830.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.11 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.12 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -103,10 +104,9 @@ src_compile() {
 	config_cache glut lib_glut_glutMainLoop
 	config_cache jpeg header_jpeglib_h
 	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
-	config_cache lcms header_lcms_h
+	config_cache lcms header_lcms_h header_lcms_lcms_h
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 #	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 #		export DB2PDF=true
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index 8bcb5f41fd74..c54aea0b658f 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.17 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.18 2007/03/04 20:45:33 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -42,13 +45,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
@@ -112,11 +113,10 @@ src_compile() {
 	config_cache glut glut:glutMainLoop
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
-	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(use_enable amd64 win64)
 	econf \
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 7c4f17b61251..dc31824e6cfb 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.17 2007/03/04 06:56:15 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.18 2007/03/04 20:45:33 vapier Exp $
 
 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
 
@@ -22,9 +22,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -95,7 +98,7 @@ src_compile() {
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
+	config_cache lcms lcms.h lcms/lcms.h
 
 	strip-flags