remove lcms/lcms.h check as the lcms package no longer installs into the lcms subdir ... we wont worry about lcms/lcms.h autodetection as no Gentoo-supported lcms package installs like that #169408

(Portage version: 2.1.2-r14)

43 files changed, 89 insertions, 96 deletions

diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index 3c03d175e263..2612a3a6f321 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -111,7 +111,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.10.ebuild b/app-emulation/wine/wine-0.9.10.ebuild
index 69f68528ed60..4d91128ac809 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -95,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 lcms/lcms.h
+	config_cache 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 a630ce024220..07e4ec112516 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.14 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.15 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -95,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 lcms/lcms.h
+	config_cache 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 94c866ed258f..ae93ccb1e1b7 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.9 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.12.ebuild,v 1.10 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -94,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 lcms/lcms.h
+	config_cache 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 0eafd209f073..a6bc7c007cfa 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.10 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.13.ebuild,v 1.11 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -94,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 lcms/lcms.h
+	config_cache 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 96e6cef05073..140490187611 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.10 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.14.ebuild,v 1.11 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -94,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 lcms/lcms.h
+	config_cache 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 92d700acad37..ceb1c06c16da 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.16 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.17 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -91,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 lcms/lcms.h
+	config_cache 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 8c05ea3185b9..2a2425ceb97b 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.10 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.16.ebuild,v 1.11 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -90,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 lcms/lcms.h
+	config_cache 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 a83c70f5ced5..d06a76eda4d4 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.8 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.17.ebuild,v 1.9 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -90,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 lcms/lcms.h
+	config_cache 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 2c5d26bedbff..af82d6cc2354 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.9 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.18.ebuild,v 1.10 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -94,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 lcms/lcms.h
+	config_cache 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 41444857f1de..1cd8b6bfb865 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.9 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.19.ebuild,v 1.10 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 8c54f70ad728..836701d01b18 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -111,7 +111,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.20.ebuild b/app-emulation/wine/wine-0.9.20.ebuild
index 3f6e3e660f20..b672b055fa94 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.7 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.20.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 75a3c04b66d4..b232008f87f5 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.8 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.9 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 653709e75076..5c0125340232 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.22.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 144be417038f..24fd34f5a657 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.23.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 7c45cbccafab..fda0e6a00633 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.7 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.24.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 ddf0abf6983b..7128f81233be 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.25.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 aa722e73ca31..e62b0d13e5c3 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.26.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 24cbaae69340..668dd585a121 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.27.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 a2c2325b1122..d10c995e27aa 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.7 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.28.ebuild,v 1.8 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 067fb86e208d..8a43631d4954 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.4 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.29.ebuild,v 1.5 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 a9de0010e6a1..d2d2c909d975 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.14 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.15 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -111,7 +111,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.30.ebuild b/app-emulation/wine/wine-0.9.30.ebuild
index 00a441835e99..4e5c10b1febe 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.3 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.30.ebuild,v 1.4 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 d9164407964e..88fba0adba8a 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.3 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.31.ebuild,v 1.4 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache 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 d3dc95d276df..f388353f066b 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.2 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.32.ebuild,v 1.3 2007/03/07 01:28:23 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 lcms/lcms.h
+	config_cache lcms lcms.h
 
 	strip-flags
 
@@ -113,6 +113,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "~/.wine/config is now deprecated.  For configuration either use"
-	einfo "winecfg or regedit HKCU\\Software\\Wine"
+	elog "~/.wine/config is now deprecated.  For configuration either use"
+	elog "winecfg or regedit HKCU\\Software\\Wine"
 }
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index b4dbb8111d26..2f815e90a0fb 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.14 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.15 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -112,7 +112,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index eff0102db52f..1b726ee81a51 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.11 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.12 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -97,7 +97,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index 8f7f9e46144d..9800bfa93488 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.14 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.15 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -110,7 +110,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.7.ebuild b/app-emulation/wine/wine-0.9.7.ebuild
index cee7c207eeb5..6582f3be1706 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.11 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.12 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -94,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild
index e3f76b90ca17..45104a9c0e20 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.11 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.12 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -95,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 lcms/lcms.h
+	config_cache 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 056f439ee861..b966babae0e6 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -96,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 lcms/lcms.h
+	config_cache 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 fe1642920972..b5bcefc9c6c7 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -111,7 +111,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-20050111-r2.ebuild b/app-emulation/wine/wine-20050111-r2.ebuild
index 649fad519391..4e5887f29906 100644
--- a/app-emulation/wine/wine-20050111-r2.ebuild
+++ b/app-emulation/wine/wine-20050111-r2.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-20050111-r2.ebuild,v 1.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -82,7 +82,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index e7d51ec7f996..a5baa6f4d041 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.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-20050211.ebuild,v 1.26 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.27 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -104,7 +104,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index 61876e70f3be..05b0f20cbe4a 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-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-20050310-r1.ebuild,v 1.19 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.20 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -105,7 +105,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index 6bfe04d1c88f..a55a3815af8f 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.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-20050419.ebuild,v 1.21 2007/03/04 20:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.22 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -104,7 +104,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index 1c55c9e845f5..e2347d51f05d 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.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-20050524.ebuild,v 1.19 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.20 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -104,7 +104,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050628.ebuild b/app-emulation/wine/wine-20050628.ebuild
index 1e3bd89ba24a..12e30b574bc7 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.15 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.16 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -103,7 +103,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050725-r1.ebuild b/app-emulation/wine/wine-20050725-r1.ebuild
index e28e0f6c4c04..9b383c8b0bd1 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.13 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.14 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -104,7 +104,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050830.ebuild b/app-emulation/wine/wine-20050830.ebuild
index 8d3ba63adbde..6064ccee94f2 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.12 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.13 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -104,7 +104,7 @@ 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 header_lcms_lcms_h
+	config_cache lcms header_lcms_h
 
 	strip-flags
 
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index c54aea0b658f..4cef72172398 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.18 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.19 2007/03/07 01:28:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -113,7 +113,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 lcms/lcms.h
+	config_cache lcms lcms.h
 	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index dc31824e6cfb..009a43361f46 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.18 2007/03/04 20:45:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.19 2007/03/07 01:28:23 vapier Exp $
 
 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
 
@@ -13,7 +13,7 @@ SRC_URI=""
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="alsa arts cups dbus debug esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -35,10 +35,8 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
-	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	>=media-gfx/fontforge-20060703
@@ -52,7 +50,6 @@ DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
-		x11-proto/xf86dgaproto
 		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
@@ -92,13 +89,11 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
-	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	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 lcms/lcms.h
+	config_cache lcms lcms.h
 
 	strip-flags
 
@@ -110,8 +105,6 @@ src_compile() {
 		$(use_with ncurses curses) \
 		$(use_with opengl) \
 		$(use_with X x) \
-		$(use_enable debug trace) \
-		$(use_enable debug) \
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"