distro configurations: PREFERRED_PROVIDER_libx11 -> PREFERRED_PROVIDER_virtual/libx11

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 4827e458d123c011a4cc2aef0657e2e4001c5079..66dc4fb0a657ca26dfad758109f0f5f1cc678520 100644 (file)
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -53,7 +53,7 @@ require conf/distro/include/preferred-opie-versions.inc
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 

diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 1e156dd363c7dbd2ebbbe860db6a51756542fe49..5b12b6f93b76870025f9d027eb72bd9fce30a9b6 100644 (file)
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -72,7 +72,7 @@ require conf/distro/include/preferred-opie-versions.inc
 # GPE
 #
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #

diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index a04b526f5f5b40d28964219983e84d69e91044c9..6ae4e9ddc38006a54b64d69e4f85a5bc8e9d1850 100644 (file)
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -71,7 +71,7 @@ require conf/distro/include/preferred-opie-versions.inc
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #

diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
index 52659b75e282ee1f5765e9021da7c16dbb96b5b2..80fd25ae192248510e78860f45a8f64e21c92b35 100644 (file)
--- a/conf/distro/generic-unstable.conf
+++ b/conf/distro/generic-unstable.conf
@@ -48,6 +48,12 @@ PREFERRED_VERSION_glibc-intermediate = "2.4"
 #
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_tslib ?= tslib
+
 #
 # GPE
 #

diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index fb38785adda5676a6552405139110b8c9ed1ddf0..9ecdf7de7eae82db53a6658f5248b25657ee8fb0 100644 (file)
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -35,8 +35,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-PREFERRED_PROVIDER_tslib ?= tslib
-
 PREFERRED_VERSION_gcc = "3.4.4"
 PREFERRED_VERSION_gcc-cross = "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
@@ -59,6 +57,13 @@ PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 require conf/distro/include/sane-srcdates.inc
 
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_tslib ?= tslib
+
+
 #
 # GPE
 #

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
index 8c6b1225852e7c97c3e4b623e4e609accff29760..6db9d92f71603528bd506c3ef84d84e860f3a6ad 100644 (file)
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext"
 PREFERRED_PROVIDER_xext = "libxext"
 PREFERRED_PROVIDER_libxi = "libxi"
 PREFERRED_PROVIDER_libxft = "libxft"
-PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_libxpm = "libxpm"
 PREFERRED_PROVIDER_xpm = "libxpm"
 PREFERRED_PROVIDER_libxt = "libxt"

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index 4371fae61d189f0a789cd4c8e9397129501db5b8..43353dcdcd3e6225e9daea3843c483ced8ea10ca 100644 (file)
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext"
 PREFERRED_PROVIDER_xext = "libxext"
 PREFERRED_PROVIDER_libxi = "libxi"
 PREFERRED_PROVIDER_libxft = "libxft"
-PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_libxpm = "libxpm"
 PREFERRED_PROVIDER_xpm = "libxpm"
 PREFERRED_PROVIDER_libxt = "libxt"

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index c2b169106fe53151766096e38046cf2f2353a06a..5e7947f866b06fce320eab9971d597573ec7d6c9 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -179,7 +179,7 @@ PREFERRED_VERSION_ixp-osal ?= "2.1"
 PREFERRED_VERSION_ixp400-eth ?= "1.5"
 
 # Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 SRCDATE_diet-x11 ?= "20060106"
 
 # Latest wpa-supplicant which supports madwifi-ng

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 26c1311831efb89589e175a122b2fa4c3047b7b8..dbc7b3ad4169f7afe282c5a777e653651f5d87c7 100644 (file)
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -56,7 +56,7 @@ PREFERRED_VERSION_glib-1.2 = "1.2.10"
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
 #<>
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
-PREFERRED_PROVIDER_libx11        = "x11"
+PREFERRED_PROVIDER_virtual/libx11        = "x11"
 PREFERRED_PROVIDER_tslib         = "tslib"
 PREFRRED_VERSION_cairo           = "1.0.4"
 #<>

diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
index 900f24dd0332dc9b1f1c83e144dac8bced05336f..f10e89ce89cf5be2ab1f7642c3da60dd9c0f99c6 100644 (file)
--- a/conf/distro/maemo-1.0.conf
+++ b/conf/distro/maemo-1.0.conf
@@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 
 require conf/distro/include/preferred-gpe-versions.inc
 

diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index e8eef43b709b2f3bae786d1326a15de7d7cdfc56..43492944ffae2324c63ffc9a4ac9fb9a00dbf742 100644 (file)
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -67,7 +67,7 @@ require conf/distro/include/preferred-opie-versions.inc
 # GPE
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #