[oe] [PATCH] conf/distro/include: remove unused versions
Frans Meulenbroeks
fransmeulenbroeks at gmail.com
Tue Aug 10 16:52:37 UTC 2010
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
---
While browsing through conf/distro/include I notided some files that were not used.
Triggered by this I did a grep in conf/distro and conf/distro/include to see what files
were actually used.
I manually compared this with the contents of the include directory
The folllowing files were not used by any distro. (and there is also
no require for them in the recipes dir).
Unless someone comes up with a reason to keep one of them, I propose to remove these.
Please give me some ack's.
Frans.
PS: I would appriate it if people when removing or changing a require line check if there
are others left that use that include, and if not remove the stale .inc file
conf/distro/include/freeze.inc | 23 --
conf/distro/include/fso-autorev.inc | 33 --
conf/distro/include/insane-srcrevs.inc | 97 ------
conf/distro/include/maemo-preferred.inc | 10 -
conf/distro/include/preferred-gpe-versions-2.6.inc | 89 -----
conf/distro/include/preferred-gpe-versions-2.7.inc | 98 ------
conf/distro/include/preferred-om-2009-versions.inc | 27 --
.../distro/include/preferred-opie-cvs-versions.inc | 209 ------------
.../include/preferred-opie-versions-1.2.3.inc | 211 ------------
.../include/preferred-xorg-versions-X11R7.0.inc | 342 -------------------
.../include/preferred-xorg-versions-X11R7.1.inc | 186 ----------
.../include/preferred-xorg-versions-X11R7.2.inc | 271 ---------------
.../include/preferred-xorg-versions-X11R7.3.inc | 282 ----------------
.../preferred-xorg-versions-X11R7.4-updates.inc | 7 -
.../include/preferred-xorg-versions-X11R7.4.inc | 257 --------------
.../include/preferred-xorg-versions-live.inc | 356 --------------------
conf/distro/include/preferred-xorg-versions.inc | 111 ------
17 files changed, 0 insertions(+), 2609 deletions(-)
delete mode 100644 conf/distro/include/freeze.inc
delete mode 100644 conf/distro/include/fso-autorev.inc
delete mode 100644 conf/distro/include/insane-srcrevs.inc
delete mode 100644 conf/distro/include/maemo-preferred.inc
delete mode 100644 conf/distro/include/preferred-gpe-versions-2.6.inc
delete mode 100644 conf/distro/include/preferred-gpe-versions-2.7.inc
delete mode 100644 conf/distro/include/preferred-om-2009-versions.inc
delete mode 100644 conf/distro/include/preferred-opie-cvs-versions.inc
delete mode 100644 conf/distro/include/preferred-opie-versions-1.2.3.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.0.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.1.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.2.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.3.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.4.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions-live.inc
delete mode 100644 conf/distro/include/preferred-xorg-versions.inc
diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc
deleted file mode 100644
index 4c2c8b1..0000000
--- a/conf/distro/include/freeze.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-# general configuration file for freezing a distribution
-#
-# If freeze.conf is included (require conf/distro/include/freeze.inc) in the
-# distro conf file it will define BBFILES from the information in
-# ${DISTRO}-bbfiles.conf or ${DISTRO}-packages.conf (whichever
-# exists in that order of preference.)
-#
-# NOTE that these conf files use ${PKGDIR} and therefore that
-# variable must be defined before this file is included, or the
-# definition below (${TOPDIR}/openmebedded) must be correct.
-#
-PKGDIR ?= "${TOPDIR}/openembedded"
-FROZEN_DIR ?= "/non/-existent/-directory/-for/-security"
-
-# Pull in the frozen definitions (if they exist) The multiple
-# includes allow the frozen file to be stored alongside local.conf
-# and in a distro-specific frozen directory - the former take
-# precedence over the latter.
-include conf/${DISTRO}-packages.conf
-include ${FROZEN_DIR}/${DISTRO}-packages.conf
-
-include conf/${DISTRO}-bbfiles.conf
-include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
deleted file mode 100644
index 89a871b..0000000
--- a/conf/distro/include/fso-autorev.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-# FSO
-FSO_CORNUCOPIA_SRCREV = "${AUTOREV}"
-FSO_PYTHONHELPERS_SRCREV = "${AUTOREV}"
-
-SRCREV_pn-android-image-utils-native = "${AUTOREV}"
-SRCREV_pn-dbus-hlid = "${AUTOREV}"
-SRCREV_pn-frameworkd = "${AUTOREV}"
-SRCREV_pn-frameworkd-devel = "${AUTOREV}"
-SRCREV_pn-fso-alsa = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
-SRCREV_pn-fso-gpsd = "${AUTOREV}"
-SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "${AUTOREV}"
-SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
-SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
-SRCREV_pn-libfso-glib = "${AUTOREV}"
-# SRCREV_pn-libgee-native = "${AUTOREV}"
-# SRCREV_pn-libgee = "${AUTOREV}"
-SRCREV_pn-libgsm0710 = "${AUTOREV}"
-SRCREV_pn-libmsmcomm = "${AUTOREV}"
-SRCREV_pn-libpersistence = "${AUTOREV}"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
-SRCREV_pn-msmcommd = "${AUTOREV}"
-SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
-SRCREV_pn-vala-dbus-binding-tool = "${AUTOREV}"
-SRCREV_pn-vala = "${AUTOREV}"
-SRCREV_pn-zhone = "${AUTOREV}"
-SRCREV_pn-zhone2 = "${AUTOREV}"
-
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
deleted file mode 100644
index b0ee16f..0000000
--- a/conf/distro/include/insane-srcrevs.inc
+++ /dev/null
@@ -1,97 +0,0 @@
-SRCREV_pn-aircrack-ng ?= "${AUTOREV}"
-SRCREV_pn-dfu-util ?= "${AUTOREV}"
-SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
-SRCREV_pn-eds-dbus ?= "${AUTOREV}"
-SRCREV_pn-eglibc ?= "${AUTOREV}"
-SRCREV_pn-eglibc-initial ?= "${AUTOREV}"
-SRCREV_pn-ezxd ?= "${AUTOREV}"
-SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
-SRCREV_pn-fstests ?= "${AUTOREV}"
-SRCREV_pn-gnuradio ?= "${AUTOREV}"
-SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
-SRCREV_pn-hildon-1 ?= "${AUTOREV}"
-SRCREV_pn-kismet ?= "${AUTOREV}"
-SRCREV_pn-kismet-newcore ?= "${AUTOREV}"
-SRCREV_pn-libgsmd ?= "${AUTOREV}"
-SRCREV_pn-libjana ?= "${AUTOREV}"
-SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
-SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
-SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
-SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
-SRCREV_pn-libowl ?= "${AUTOREV}"
-SRCREV_pn-libxosd ?= "${AUTOREV}"
-SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
-SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}"
-SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}"
-SRCREV_pn-maemo-mapper ?= "${AUTOREV}"
-SRCREV_pn-matchbox-desktop-2 ?= "${AUTOREV}"
-SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
-SRCREV_pn-matchbox-keyboard-inputmethod ?= "${AUTOREV}"
-SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
-SRCREV_pn-neod ?= "${AUTOREV}"
-SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
-SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
-SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
-SRCREV_pn-openocd ?= "${AUTOREV}"
-SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-opkg ?= "${AUTOREV}"
-SRCREV_pn-opkg-native ?= "${AUTOREV}"
-SRCREV_pn-psplash ?= "${AUTOREV}"
-SRCREV_pn-settings-daemon ?= "${AUTOREV}"
-SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
-SRCREV_pn-sphyrna-python ?= "${AUTOREV}"
-SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
-SRCREV_pn-xoo ?= "${AUTOREV}"
-SRCREV_pn-mplayer ?= "${AUTOREV}"
-SRCREV_pn-usbpath ?= "${AUTOREV}"
-SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-SRCREV_pn-libfakekey ?= "${AUTOREV}"
-
-SRCREV ?= "${AUTOREV}"
diff --git a/conf/distro/include/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
deleted file mode 100644
index 3b31837..0000000
--- a/conf/distro/include/maemo-preferred.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFERRED_PROVIDER_gconf = "gconf-osso"
-PREFERRED_PROVIDER_tslib = "tslib-maemo"
-PREFERRED_VERSION_dbus = "0.23.1-osso5"
-PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
-PREFERRED_PROVIDER_esd = "osso-esd"
-PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
-PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_pango = "1.8.2"
-PREFERRED_VERSION_atk = "1.9.0"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
deleted file mode 100644
index 9eb5b90..0000000
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Specify which versions of GPE (and related) applications to build
-#
-
-#work around some breakages
-SRCDATE_xserver-kdrive="20050207"
-SRCDATE_minimo="20050401"
-SRCDATE_cairo="20050330"
-SRCDATE_xext="20050222"
-
-#set some preferred providers:
-PREFERRED_PROVIDER_gconf="gconf-dbus"
-
-#specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.6"
-PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-common ?= "0.9.1"
-PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_pango ?= "1.8.2"
-PREFERRED_VERSION_gtk+ ?= "2.6.3"
-PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.97"
-PREFERRED_VERSION_libgpepimc ?= "0.4"
-PREFERRED_VERSION_libgpevtype ?= "0.11"
-PREFERRED_VERSION_libschedule ?= "0.14"
-PREFERRED_VERSION_gpe-icons ?= "0.24"
-PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
-PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_xst ?= "0.14"
-PREFERRED_PROVIDER_xextensions = "xextensions"
-#PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.76"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
-PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
-PREFERRED_VERSION_gpe-todo ?= "0.50"
-PREFERRED_VERSION_gpe-calendar ?= "0.61"
-PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
-PREFERRED_VERSION_gpe-contacts ?= "0.36"
-PREFERRED_VERSION_gpe-today ?= "0.08"
-PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_dbus ?= "0.23"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
-PREFERRED_VERSION_gpe-su ?= "0.18"
-PREFERRED_VERSION_gpe-conf ?= "0.1.23"
-PREFERRED_VERSION_gpe-clock ?= "0.20"
-PREFERRED_VERSION_gpe-mininet ?= "0.5"
-PREFERRED_VERSION_gpe-mixer ?= "0.40"
-PREFERRED_VERSION_gpe-shield ?= "0.7"
-PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
-PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_minilite ?= "0.47"
-PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_gpe-edit ?= "0.28"
-PREFERRED_VERSION_gpe-gallery ?= "0.95"
-PREFERRED_VERSION_gpe-calculator ?= "0.2"
-PREFERRED_VERSION_gpe-package ?= "0.2"
-PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
-PREFERRED_VERSION_gpe-terminal ?= "1.1"
-PREFERRED_VERSION_gpe-watch ?= "0.10"
-PREFERRED_VERSION_gpe-what ?= "0.33"
-PREFERRED_VERSION_gpe-filemanager ?= "0.20"
-PREFERRED_VERSION_gpe-go ?= "0.05"
-PREFERRED_VERSION_gpe-irc ?= "0.07"
-PREFERRED_VERSION_gpe-lights ?= "0.13"
-#PREFERRED_VERSION_gpe-nmf ?= "0.19"
-PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
-PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
-PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linphone ?= "0.12.2"
-PREFERRED_VERSION_firefox ?= "1.0"
-
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
deleted file mode 100644
index cbdaec0..0000000
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Specify which versions of GPE (and related) applications to build
-#
-
-#work around some breakages
-#SRCDATE_minimo=20050401
-
-#set some preferred providers:
-PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
-
-#specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.7"
-PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-common ?= "0.9.1"
-PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_atk ?= "1.9.0"
-PREFERRED_VERSION_cairo ?= "0.5.2"
-PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
-PREFERRED_VERSION_pango ?= "1.8.2"
-PREFERRED_VERSION_gtk+ ?= "2.6.10"
-PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.109"
-PREFERRED_VERSION_libgpepimc ?= "0.5"
-PREFERRED_VERSION_libgpevtype ?= "0.14"
-PREFERRED_VERSION_libschedule ?= "0.15"
-PREFERRED_VERSION_libcontactsdb ?= "0.3"
-PREFERRED_VERSION_libtododb ?= "0.09"
-PREFERRED_VERSION_gpe-icons ?= "0.25"
-PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.6"
-PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_xst ?= "0.15"
-PREFERRED_PROVIDER_xextensions = "xextensions"
-PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
-PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.83"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
-PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
-PREFERRED_VERSION_gpe-todo ?= "0.55"
-PREFERRED_VERSION_gpe-calendar ?= "0.70"
-PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
-PREFERRED_VERSION_gpe-contacts ?= "0.43"
-PREFERRED_VERSION_gpe-today ?= "0.10"
-PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_dbus ?= "0.23.4"
-PREFERRED_VERSION_gpe-beam ?= "0.2.8"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
-PREFERRED_VERSION_gpe-su ?= "0.19"
-PREFERRED_VERSION_gpe-conf ?= "0.1.29"
-PREFERRED_VERSION_gpe-clock ?= "0.23"
-PREFERRED_VERSION_gpe-mininet ?= "0.7"
-PREFERRED_VERSION_gpe-mixer ?= "0.42"
-PREFERRED_VERSION_gpe-shield ?= "0.8"
-PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager ?= "0.19"
-PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_minilite ?= "0.49"
-PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_gpe-edit ?= "0.29"
-PREFERRED_VERSION_gpe-gallery ?= "0.96"
-PREFERRED_VERSION_gpe-calculator ?= "0.2"
-PREFERRED_VERSION_gpe-package ?= "0.3"
-PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
-PREFERRED_VERSION_gpe-terminal ?= "1.1"
-PREFERRED_VERSION_gpe-watch ?= "0.10"
-PREFERRED_VERSION_gpe-what ?= "0.42"
-PREFERRED_VERSION_gpe-filemanager ?= "0.23"
-PREFERRED_VERSION_gpe-go ?= "0.05"
-PREFERRED_VERSION_gpe-irc ?= "0.07"
-PREFERRED_VERSION_gpe-lights ?= "0.13"
-#PREFERRED_VERSION_gpe-nmf ?= "0.21"
-PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
-PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
-PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linphone ?= "0.12.2"
-PREFERRED_VERSION_firefox ?= "1.0"
-PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1"
-PREFERRED_VERSION_poppler ?= "0.3.3"
-PREFERRED_VERSION_evince ?= "0.3.2"
-PREFERRED_VERSION_gpe_mini_browser ?= "0.19"
diff --git a/conf/distro/include/preferred-om-2009-versions.inc b/conf/distro/include/preferred-om-2009-versions.inc
deleted file mode 100644
index c65750d..0000000
--- a/conf/distro/include/preferred-om-2009-versions.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-PREFERRED_VERSION_automake-native = "1.10"
-PREFERRED_VERSION_busybox = "1.11.3"
-PREFERRED_VERSION_cairo = "1.8.0"
-PREFERRED_VERSION_fontconfig = "2.6.0"
-PREFERRED_VERSION_glib-2.0 = "2.18.3"
-PREFERRED_VERSION_glib-2.0-native = "2.18.0"
-PREFERRED_VERSION_glibmm = "2.18.0"
-PREFERRED_VERSION_glproto = "1.4.9"
-PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.14.2"
-PREFERRED_VERSION_gtkmm = "2.14.1"
-PREFERRED_VERSION_libgemwidget = "1.0"
-PREFERRED_VERSION_libgpephone = "0.4"
-PREFERRED_VERSION_libosip2 = "2.2.2"
-PREFERRED_VERSION_libsdl-x11 = "1.2.11"
-PREFERRED_VERSION_libtool = "2.2.4"
-PREFERRED_VERSION_libtool-native = "2.2.4"
-PREFERRED_VERSION_libtool-cross = "2.2.4"
-PREFERRED_VERSION_libtool-sdk = "2.2.4"
-PREFERRED_VERSION_pango = "1.22.0"
-PREFERRED_VERSION_pixman = "0.12.0"
-PREFERRED_VERSION_pkgconfig = "0.23"
-PREFERRED_VERSION_pkgconfig-native = "0.23"
-PREFERRED_VERSION_pulseaudio = "0.9.10"
-PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_udev = "124"
-PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
deleted file mode 100644
index 79fc56c..0000000
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# Default versions
-QTE_VERSION ?= "2.3.10"
-# OPIE_VERSION ?= "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-
-#
-#
-# Opie libraries
-#
-PREFERRED_PROVIDER_virtual/libqte2 ?= '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
-PREFERRED_PROVIDER_virtual/libqpe1 ?= "libqpe-opie"
-PREFERRED_VERSION_qte-mt ?= "${QTE_VERSION}"
-PREFERRED_VERSION_qte ?= "${QTE_VERSION}"
-SRCDATE_libopie2 ?= "${OPIE_VERSION}"
-SRCDATE_libopieobex0 ?= "${OPIE_VERSION}"
-SRCDATE_libopietooth1 ?= "${OPIE_VERSION}"
-SRCDATE_libqpe-opie ?= "${OPIE_VERSION}"
-SRCDATE_libqtaux2 ?= "${OPIE_VERSION}"
-SRCDATE_libmailwrapper ?= "${OPIE_VERSION}"
-#
-# Opie applications
-#
-SRCDATE_opie-aboutapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-addressbook ?= "${OPIE_VERSION}"
-SRCDATE_opie-advancedfm ?= "${OPIE_VERSION}"
-SRCDATE_opie-alarm ?= "${OPIE_VERSION}"
-SRCDATE_opie-appearance ?= "${OPIE_VERSION}"
-SRCDATE_opie-aqpkg ?= "${OPIE_VERSION}"
-SRCDATE_opie-autorotateapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-backgammon ?= "${OPIE_VERSION}"
-SRCDATE_opie-backup ?= "${OPIE_VERSION}"
-SRCDATE_opie-bartender ?= "${OPIE_VERSION}"
-SRCDATE_opie-batteryapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-bluepin ?= "${OPIE_VERSION}"
-SRCDATE_opie-bluetoothapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-bluetoothmanager ?= "${OPIE_VERSION}"
-SRCDATE_opie-bounce ?= "${OPIE_VERSION}"
-SRCDATE_opie-brightnessapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-button-settings ?= "${OPIE_VERSION}"
-SRCDATE_opie-buzzword ?= "${OPIE_VERSION}"
-SRCDATE_opie-calculator ?= "${OPIE_VERSION}"
-SRCDATE_opie-calibrate ?= "${OPIE_VERSION}"
-SRCDATE_opie-camera ?= "${OPIE_VERSION}"
-SRCDATE_opie-cardapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-checkbook ?= "${OPIE_VERSION}"
-SRCDATE_opie-citytime ?= "${OPIE_VERSION}"
-SRCDATE_opie-clipboardapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-clockapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-clock ?= "${OPIE_VERSION}"
-SRCDATE_opie-confeditor ?= "${OPIE_VERSION}"
-SRCDATE_opie-console ?= "${OPIE_VERSION}"
-SRCDATE_opie-dagger ?= "${OPIE_VERSION}"
-SRCDATE_opie-dasher ?= "${OPIE_VERSION}"
-SRCDATE_opie-datebook ?= "${OPIE_VERSION}"
-SRCDATE_opie-datebook-chrisholidayplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-datebook-nationalholidayplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-datebook-birthdayplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-deco-flat ?= "${OPIE_VERSION}"
-SRCDATE_opie-deco-liquid ?= "${OPIE_VERSION}"
-SRCDATE_opie-deco-polished ?= "${OPIE_VERSION}"
-SRCDATE_opie-doctab ?= "${OPIE_VERSION}"
-SRCDATE_opie-drawpad ?= "${OPIE_VERSION}"
-SRCDATE_opie-dvorak ?= "${OPIE_VERSION}"
-SRCDATE_opie-embeddedkonsole ?= "${OPIE_VERSION}"
-SRCDATE_opie-euroconv ?= "${OPIE_VERSION}"
-SRCDATE_opie-examples-python ?= "${OPIE_VERSION}"
-SRCDATE_opie-examples ?= "${OPIE_VERSION}"
-SRCDATE_opie-eye ?= "${OPIE_VERSION}"
-SRCDATE_opie-fifteen ?= "${OPIE_VERSION}"
-SRCDATE_opie-formatter ?= "${OPIE_VERSION}"
-SRCDATE_opie-freetype ?= "${OPIE_VERSION}"
-SRCDATE_opie-ftplib ?= "${OPIE_VERSION}"
-SRCDATE_opie-ftp ?= "${OPIE_VERSION}"
-SRCDATE_opie-go ?= "${OPIE_VERSION}"
-SRCDATE_opie-gutenbrowser ?= "${OPIE_VERSION}"
-SRCDATE_opie-handwriting ?= "${OPIE_VERSION}"
-SRCDATE_opie-helpbrowser ?= "${OPIE_VERSION}"
-SRCDATE_opie-help-en ?= "${OPIE_VERSION}"
-SRCDATE_opie-homeapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-i18n ?= "${OPIE_VERSION}"
-SRCDATE_opie-lrelease-native ?= "${OPIE_VERSION}"
-SRCDATE_opie-lupdate-native ?= "${OPIE_VERSION}"
-SRCDATE_opie-icon-reload ?= "${OPIE_VERSION}"
-SRCDATE_opie-irc ?= "${OPIE_VERSION}"
-SRCDATE_opie-irdaapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-jumpx ?= "${OPIE_VERSION}"
-SRCDATE_opie-kbill ?= "${OPIE_VERSION}"
-SRCDATE_opie-kcheckers ?= "${OPIE_VERSION}"
-SRCDATE_opie-keyboard ?= "${OPIE_VERSION}"
-SRCDATE_opie-keypebble ?= "${OPIE_VERSION}"
-SRCDATE_opie-keytabs ?= "${OPIE_VERSION}"
-SRCDATE_opie-keyview ?= "${OPIE_VERSION}"
-SRCDATE_opie-kjumpx ?= "${OPIE_VERSION}"
-SRCDATE_opie-kpacman ?= "${OPIE_VERSION}"
-SRCDATE_opie-language ?= "${OPIE_VERSION}"
-SRCDATE_opie-launcher-settings ?= "${OPIE_VERSION}"
-SRCDATE_opie-libqrsync ?= "${OPIE_VERSION}"
-SRCDATE_opie-light-and-power ?= "${OPIE_VERSION}"
-SRCDATE_opie-lockapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-login ?= "${OPIE_VERSION}"
-SRCDATE_opie-logoutapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-mailapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-mail ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-libmadplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-libmodplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-libtremorplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1-core ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer2 ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer2-skin-default ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer2-skin-default-landscape ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer2-skin-pod ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer2-skin-techno ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediummount ?= "${OPIE_VERSION}"
-SRCDATE_opie-memoryapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-mindbreaker ?= "${OPIE_VERSION}"
-SRCDATE_opie-minesweep ?= "${OPIE_VERSION}"
-SRCDATE_opie-mobilemsg ?= "${OPIE_VERSION}"
-SRCDATE_opie-multikeyapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-multikey ?= "${OPIE_VERSION}"
-SRCDATE_opie-networkapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-networksettings ?= "${OPIE_VERSION}"
-SRCDATE_opie-notesapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-odict ?= "${OPIE_VERSION}"
-SRCDATE_opie-osearch ?= "${OPIE_VERSION}"
-SRCDATE_opie-oxygen ?= "${OPIE_VERSION}"
-SRCDATE_opie-oyatzee ?= "${OPIE_VERSION}"
-SRCDATE_opie-packagemanager ?= "${OPIE_VERSION}"
-SRCDATE_opie-parashoot ?= "${OPIE_VERSION}"
-SRCDATE_opie-pcmciaapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-performance ?= "${OPIE_VERSION}"
-SRCDATE_opie-pickboard ?= "${OPIE_VERSION}"
-SRCDATE_opie-pics ?= "${OPIE_VERSION}"
-SRCDATE_opie-pimconverter ?= "${OPIE_VERSION}"
-SRCDATE_opie-powerchord ?= "${OPIE_VERSION}"
-SRCDATE_opie-pyquicklaunchapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-qasteroids ?= "${OPIE_VERSION}"
-SRCDATE_opie-qcop ?= "${OPIE_VERSION}"
-SRCDATE_opie-quicklauncher ?= "${OPIE_VERSION}"
-SRCDATE_opie-qss ?= "${OPIE_VERSION}"
-SRCDATE_opie-rdesktop ?= "${OPIE_VERSION}"
-SRCDATE_opie-reader ?= "${OPIE_VERSION}"
-SRCDATE_opie-recorder ?= "${OPIE_VERSION}"
-SRCDATE_opie-remote ?= "${OPIE_VERSION}"
-SRCDATE_opie-restartapplet2 ?= "${OPIE_VERSION}"
-SRCDATE_opie-restartapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-restartapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-rotateapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-screenshotapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-search ?= "${OPIE_VERSION}"
-SRCDATE_opie-security ?= "${OPIE_VERSION}"
-SRCDATE_opie-securityplugin-blueping ?= "${OPIE_VERSION}"
-SRCDATE_opie-securityplugin-dummy ?= "${OPIE_VERSION}"
-SRCDATE_opie-securityplugin-notice ?= "${OPIE_VERSION}"
-SRCDATE_opie-securityplugin-pin ?= "${OPIE_VERSION}"
-SRCDATE_opie-sfcave ?= "${OPIE_VERSION}"
-SRCDATE_opie-sheet ?= "${OPIE_VERSION}"
-SRCDATE_opie-sh ?= "${OPIE_VERSION}"
-SRCDATE_opie-showimg ?= "${OPIE_VERSION}"
-SRCDATE_opie-snake ?= "${OPIE_VERSION}"
-SRCDATE_opie-solitaire ?= "${OPIE_VERSION}"
-SRCDATE_opie-sshkeys ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-flat ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-fresh ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-liquid ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-metal ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-phase ?= "${OPIE_VERSION}"
-SRCDATE_opie-style-web ?= "${OPIE_VERSION}"
-SRCDATE_opie-sounds ?= "${OPIE_VERSION}"
-SRCDATE_opie-stumbler ?= "${OPIE_VERSION}"
-SRCDATE_opie-suspendapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-symlinker ?= "${OPIE_VERSION}"
-SRCDATE_opie-sysinfo ?= "${OPIE_VERSION}"
-SRCDATE_opie-systemtime ?= "${OPIE_VERSION}"
-SRCDATE_opie-tableviewer ?= "${OPIE_VERSION}"
-SRCDATE_opie-tabmanager ?= "${OPIE_VERSION}"
-SRCDATE_opie-taskbar ?= "${OPIE_VERSION}"
-SRCDATE_opie-tetrix ?= "${OPIE_VERSION}"
-SRCDATE_opie-textedit ?= "${OPIE_VERSION}"
-SRCDATE_opie-theme ?= "${OPIE_VERSION}"
-SRCDATE_opie-tictac ?= "${OPIE_VERSION}"
-SRCDATE_opie-tinykate ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-addressbookplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-datebookplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-fortuneplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-mailplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-stocktickerplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-todolistplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-today-weatherplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-todo ?= "${OPIE_VERSION}"
-SRCDATE_opie-tonleiter ?= "${OPIE_VERSION}"
-SRCDATE_opie-unikeyboard ?= "${OPIE_VERSION}"
-SRCDATE_opie-usermanager ?= "${OPIE_VERSION}"
-SRCDATE_opie-vmemo ?= "${OPIE_VERSION}"
-SRCDATE_opie-vmemo-settings ?= "${OPIE_VERSION}"
-SRCDATE_opie-volumeapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-vtapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-wellenreiter ?= "${OPIE_VERSION}"
-SRCDATE_opie-wirelessapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-wordgame ?= "${OPIE_VERSION}"
-SRCDATE_opie-write ?= "${OPIE_VERSION}"
-SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
-SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
-SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
-SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
deleted file mode 100644
index 56bb4fb..0000000
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# Default versions
-QTE_VERSION ?= "2.3.10"
-OPIE_VERSION ?= "1.2.3"
-PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-
-#
-#
-# Opie libraries
-#
-PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
-PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
-PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
-PREFERRED_VERSION_qte = "${QTE_VERSION}"
-PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
-#
-# Opie applications
-#
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-core = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}+cvs20070922"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
deleted file mode 100644
index 158ad0f..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ /dev/null
@@ -1,342 +0,0 @@
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-PREFERRED_PROVIDER_libxext = "libxext"
-PREFERRED_PROVIDER_xext = "libxext"
-PREFERRED_PROVIDER_libxi = "libxi"
-PREFERRED_PROVIDER_libxft = "libxft"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-PREFERRED_PROVIDER_virtual/libx11-native = "libx11-native"
-PREFERRED_PROVIDER_libxpm = "libxpm"
-PREFERRED_PROVIDER_xpm = "libxpm"
-PREFERRED_PROVIDER_libxt = "libxt"
-PREFERRED_PROVIDER_libxaw = "libxaw"
-PREFERRED_PROVIDER_libice = "libice"
-PREFERRED_PROVIDER_libxrender = "libxrender"
-PREFERRED_PROVIDER_libxcursor = "libxcursor"
-PREFERRED_PROVIDER_xextensions = "xextensions"
-PREFERRED_PROVIDER_xproto = "xproto"
-PREFERRED_PROVIDER_x11 = "libx11"
-PREFERRED_PROVIDER_libxv = "libxv"
-PREFERRED_PROVIDER_xft = "libxft"
-PREFERRED_PROVIDER_libxrandr = "libxrandr"
-PREFERRED_PROVIDER_libxdamage = "libxdamage"
-PREFERRED_PROVIDER_libxcomposite = "libxcomposite"
-PREFERRED_PROVIDER_libxfixes = "libxfixes"
-PREFERRED_PROVIDER_libxinerama = "libxinerama"
-PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm"
-PREFERRED_PROVIDER_libxmu = "libxmu"
-PREFERRED_PROVIDER_libsm = "libsm"
-PREFERRED_PROVIDER_xrandr = "xrandr"
-PREFERRED_PROVIDER_xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg"
-
-PREFERRED_VERSION_task-xorg = "X11R7.0"
-
-PREFERRED_VERSION_appres = "X11R7.0-1.0.0"
-PREFERRED_VERSION_bdftopcf-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_bdftopcf = "X11R7.0-1.0.0"
-PREFERRED_VERSION_beforelight = "X11R7.0-1.0.1"
-PREFERRED_VERSION_bitmap = "X11R7.0-1.0.1"
-PREFERRED_VERSION_editres = "X11R7.0-1.0.1"
-PREFERRED_VERSION_fonttosfnt = "X11R7.0-1.0.1"
-PREFERRED_VERSION_fslsfonts = "X11R7.0-1.0.1"
-PREFERRED_VERSION_fstobdf = "X11R7.0-1.0.1"
-PREFERRED_VERSION_iceauth = "X11R7.0-1.0.1"
-PREFERRED_VERSION_ico = "X11R7.0-1.0.1"
-PREFERRED_VERSION_lbxproxy = "X11R7.0-1.0.1"
-PREFERRED_VERSION_listres = "X11R7.0-1.0.1"
-PREFERRED_VERSION_luit = "X11R7.0-1.0.1"
-PREFERRED_VERSION_mkcfm = "X11R7.0-1.0.1"
-PREFERRED_VERSION_mkfontdir-native = "X11R7.0-1.0.1"
-PREFERRED_VERSION_mkfontdir = "X11R7.0-1.0.1"
-PREFERRED_VERSION_mkfontscale-native = "X11R7.0-1.0.1"
-PREFERRED_VERSION_mkfontscale = "X11R7.0-1.0.1"
-PREFERRED_VERSION_oclock = "X11R7.0-1.0.1"
-PREFERRED_VERSION_proxymngr = "X11R7.0-1.0.1"
-PREFERRED_VERSION_rgb = "X11R7.0-1.0.0"
-PREFERRED_VERSION_rstart = "X11R7.0-1.0.1"
-PREFERRED_VERSION_scripts = "X11R7.0-1.0.1"
-PREFERRED_VERSION_sessreg = "X11R7.0-1.0.0"
-PREFERRED_VERSION_setxkbmap = "X11R7.0-1.0.1"
-PREFERRED_VERSION_showfont = "X11R7.0-1.0.1"
-PREFERRED_VERSION_smproxy = "X11R7.0-1.0.1"
-PREFERRED_VERSION_twm = "X11R7.0-1.0.1"
-PREFERRED_VERSION_viewres = "X11R7.0-1.0.1"
-PREFERRED_VERSION_x11perf = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xbiff = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcalc = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xclipboard = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xclock = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcmsdb = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xconsole = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcursorgen = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xdbedizzy = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xditview = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xdm = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xdriinfo = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xedit = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xev = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xeyes = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xf86dga = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfd = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfindproxy = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfontsel = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfs = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfsinfo = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfwp = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xgamma = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xgc = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xhost = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xinit = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbcomp = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbevd = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbprint = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbutils = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkill = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xload = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlogo = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsatoms = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsclients = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsfonts = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmag = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xman = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmessage = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmh = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmodmap = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xmore = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xphelloworld = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xplsprinters = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xpr = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xprehashprinterlist = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xprop = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xrandr = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xrdb = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xrefresh = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xrx = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xset = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xsetmode = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xsetpointer = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xsetroot = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xsm = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xstdcmap = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xtrap = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xvidtune = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xvinfo = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xwd = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xwininfo = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xwud = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xbitmaps = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcursor-themes = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbdata = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xorg-docs = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xf86-input-acecad = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-aiptek = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-calcomp = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-citron = "X11R7.0-2.1.1.5"
-PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-input-dmc = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-dynapro = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-elographics = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-fpit = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-joystick = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-keyboard = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-input-magellan = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-magictouch = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-mouse = "X11R7.0-1.0.3.1"
-PREFERRED_VERSION_xf86-input-mutouch = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-palmax = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-penmount = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-summa = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-ur98 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-void = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-apm = "X11R7.0-1.0.1.5"
-PREFERRED_VERSION_xf86-video-ark = "X11R7.0-0.5.0.5"
-PREFERRED_VERSION_xf86-video-ati = "X11R7.0-6.5.7.3"
-PREFERRED_VERSION_xf86-video-chips = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-video-cirrus = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-cyrix = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-dummy = "X11R7.0-0.1.0.5"
-PREFERRED_VERSION_xf86-video-fbdev = "X11R7.0-0.1.0.5"
-PREFERRED_VERSION_xf86-video-glint = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-video-i128 = "X11R7.0-1.1.0.5"
-PREFERRED_VERSION_xf86-video-i740 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-i810 = "X11R7.0-1.4.1.3"
-PREFERRED_VERSION_xf86-video-imstt = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-mga = "X11R7.0-1.2.1.3"
-PREFERRED_VERSION_xf86-video-neomagic = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-newport = "X11R7.0-0.1.4.1"
-PREFERRED_VERSION_xf86-video-nsc = "X11R7.0-2.7.6.5"
-PREFERRED_VERSION_xf86-video-nv = "X11R7.0-1.0.1.5"
-PREFERRED_VERSION_xf86-video-rendition = "X11R7.0-4.0.1.3"
-PREFERRED_VERSION_xf86-video-s3 = "X11R7.0-0.3.5.5"
-PREFERRED_VERSION_xf86-video-s3virge = "X11R7.0-1.8.6.5"
-PREFERRED_VERSION_xf86-video-savage = "X11R7.0-2.0.2.3"
-PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.0-1.3.1.5"
-PREFERRED_VERSION_xf86-video-sis = "X11R7.0-0.8.1.3"
-PREFERRED_VERSION_xf86-video-sisusb = "X11R7.0-0.7.1.3"
-PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-sunffb = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-video-sunleo = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-suntcx = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-tdfx = "X11R7.0-1.1.1.3"
-PREFERRED_VERSION_xf86-video-tga = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-trident = "X11R7.0-1.0.1.2"
-PREFERRED_VERSION_xf86-video-tseng = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-video-v4l = "X11R7.0-0.0.1.5"
-PREFERRED_VERSION_xf86-video-vesa = "X11R7.0-1.0.1.3"
-PREFERRED_VERSION_xf86-video-vga = "X11R7.0-4.0.0.5"
-PREFERRED_VERSION_xf86-video-via = "X11R7.0-0.1.33.2"
-PREFERRED_VERSION_xf86-video-vmware = "X11R7.0-10.11.1.3"
-PREFERRED_VERSION_xf86-video-voodoo = "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-adobe-100dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-adobe-75dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-adobe-utopia-100dpi = "X11R7.0-1.0.1"
-PREFERRED_VERSION_font-adobe-utopia-75dpi = "X11R7.0-1.0.1"
-PREFERRED_VERSION_font-adobe-utopia-type1 = "X11R7.0-1.0.1"
-PREFERRED_VERSION_font-alias = "X11R7.0-1.0.1"
-PREFERRED_VERSION_font-arabic-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-100dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-75dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-ttf = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bh-type1 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bitstream-100dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bitstream-75dpi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bitstream-speedo = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-bitstream-type1 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-cronyx-cyrillic = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-cursor-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-daewoo-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-dec-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-ibm-type1 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-isas-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-jis-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-micro-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-misc-cyrillic = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-misc-ethiopic = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-misc-meltho = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-misc-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-mutt-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-schumacher-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-screen-cyrillic = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-sony-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-sun-misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-util-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-util = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-winitzki-cyrillic = "X11R7.0-1.0.0"
-PREFERRED_VERSION_font-xfree86-type1 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_diet-x11 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libdmx = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libfontenc-native = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libfontenc = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libice = "X11R7.0-1.0.0"
-PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0"
-PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libsm = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libx11-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libx11 = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxau-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxau = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxaw = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxcomposite = "X11R7.0-0.2.2.2"
-PREFERRED_VERSION_libxcursor = "X11R7.0-1.1.5.2"
-PREFERRED_VERSION_libxdamage = "X11R7.0-1.0.2.2"
-PREFERRED_VERSION_libxdmcp-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxdmcp = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxevie = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxext = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxfixes = "X11R7.0-3.0.1.2"
-PREFERRED_VERSION_libxfont-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxfont = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxfontcache = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
-PREFERRED_VERSION_libxi = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxkbfile = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxkbui = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxmu = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxpm = "X11R7.0-3.5.4.2"
-PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxrandr = "X11R7.0-1.1.0.2"
-PREFERRED_VERSION_libxrender = "X11R7.0-0.9.0.2"
-PREFERRED_VERSION_libxres = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxscrnsaver = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxt = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxvmc = "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxxf86dga = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxxf86misc = "X11R7.0-1.0.0"
-PREFERRED_VERSION_libxxf86vm = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
-PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
-PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
-PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
-PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
-PREFERRED_VERSION_compositeproto = "X11R7.0-0.2.2"
-PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
-PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
-PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
-PREFERRED_VERSION_fixesproto = "X11R7.0-3.0.2"
-PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
-PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
-PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
-PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
-PREFERRED_VERSION_glproto = "X11R7.0-1.4.3"
-PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
-PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
-PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
-PREFERRED_VERSION_kbproto = "X11R7.0-1.0.2"
-PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
-PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
-PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
-PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
-PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
-PREFERRED_VERSION_scrnsaverproto = "X11R7.0-1.0.2"
-PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
-PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
-PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
-PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
-PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
-PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
-PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
-PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
-PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
-PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
-PREFERRED_VERSION_xproto-native = "X11R7.0-7.0.4"
-PREFERRED_VERSION_xproto = "X11R7.0-7.0.4"
-PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
-PREFERRED_VERSION_gccmakedep = "X11R7.0-1.0.1"
-PREFERRED_VERSION_imake = "X11R7.0-1.0.1"
-PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
-PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
-PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
-PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
-PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
deleted file mode 100644
index 15c7fdf..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ /dev/null
@@ -1,186 +0,0 @@
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-
-PREFERRED_PROVIDER_libxext ?= "libxext"
-PREFERRED_PROVIDER_xext ?= "libxext"
-PREFERRED_PROVIDER_libxi ?= "libxi"
-PREFERRED_PROVIDER_libxft ?= "libxft"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native"
-PREFERRED_PROVIDER_libxpm ?= "libxpm"
-PREFERRED_PROVIDER_xpm ?= "libxpm"
-PREFERRED_PROVIDER_libxt ?= "libxt"
-PREFERRED_PROVIDER_libxaw ?= "libxaw"
-PREFERRED_PROVIDER_libice ?= "libice"
-PREFERRED_PROVIDER_libxrender ?= "libxrender"
-PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
-PREFERRED_PROVIDER_xextensions ?= "xextensions"
-PREFERRED_PROVIDER_xproto ?= "xproto"
-PREFERRED_PROVIDER_x11 ?= "libx11"
-PREFERRED_PROVIDER_libxv ?= "libxv"
-PREFERRED_PROVIDER_xft ?= "libxft"
-PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
-PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
-PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
-PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
-PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
-PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
-PREFERRED_PROVIDER_libxmu ?= "libxmu"
-PREFERRED_PROVIDER_libsm ?= "libsm"
-PREFERRED_PROVIDER_xrandr ?= "xrandr"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
-
-PREFERRED_VERSION_task-xorg ?= "X11R7.1"
-
-PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_setxkbmap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1"
-PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xdm ?= "X11R7.1-1.0.4"
-PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xfs ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xinit ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xkbcomp ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xmodmap ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "X11R7.1-1.1"
-PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2"
-PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-mouse ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0"
-PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0"
-PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0"
-PREFERRED_VERSION_xf86-video-ati ?= "X11R7.1-6.6.0"
-PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "X11R7.1-0.3.0"
-PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-i128 ?= "X11R7.1-1.1.0.5"
-PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "X11R7.1-1.6.0"
-PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-mga ?= "X11R7.1-1.4.1"
-PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-newport ?= "X11R7.1-0.2.0"
-PREFERRED_VERSION_xf86-video-nsc ?= "X11R7.1-2.8.1"
-PREFERRED_VERSION_xf86-video-nv ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-rendition ?= "X11R7.1-4.1.0"
-PREFERRED_VERSION_xf86-video-s3 ?= "X11R7.1-0.4.1"
-PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1"
-PREFERRED_VERSION_xf86-video-savage ?= "X11R7.1-2.1.1"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "X11R7.1-1.4.1"
-PREFERRED_VERSION_xf86-video-sis ?= "X11R7.1-0.9.1"
-PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-tdfx ?= "X11R7.1-1.2.1"
-PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-trident ?= "X11R7.1-1.2.1"
-PREFERRED_VERSION_xf86-video-tseng ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1"
-PREFERRED_VERSION_xf86-video-vesa ?= "X11R7.1-1.2.0"
-PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "X11R7.1-0.2.1"
-PREFERRED_VERSION_xf86-video-vmware ?= "X11R7.1-10.13.0"
-PREFERRED_VERSION_xf86-video-voodoo ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_diet-x11 ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libfontenc-native ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libfontenc ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libsm ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libx11-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libx11 ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxau-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxau ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxcomposite ?= "X11R7.1-0.3"
-PREFERRED_VERSION_libxcursor ?= "X11R7.1-1.1.6"
-PREFERRED_VERSION_libxdamage ?= "X11R7.1-1.0.3"
-PREFERRED_VERSION_libxdmcp-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1"
-PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.2.0"
-PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0"
-PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3"
-PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxmu ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxpm ?= "X11R7.1-3.5.5"
-PREFERRED_VERSION_libxrandr ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_libxrender ?= "X11R7.1-0.9.1"
-PREFERRED_VERSION_libxres ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxscrnsaver ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_libxt ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxvmc ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1"
-PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0"
-PREFERRED_VERSION_glproto ?= "X11R7.1-1.4.7"
-PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xproto-native ?= "X11R7.1-7.0.5"
-PREFERRED_VERSION_xproto ?= "X11R7.1-7.0.5"
-PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
deleted file mode 100644
index 9a02d3c..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ /dev/null
@@ -1,271 +0,0 @@
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-
-PREFERRED_PROVIDER_libxext ?= "libxext"
-PREFERRED_PROVIDER_xext ?= "libxext"
-PREFERRED_PROVIDER_libxi ?= "libxi"
-PREFERRED_PROVIDER_libxft ?= "libxft"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native"
-PREFERRED_PROVIDER_libxpm ?= "libxpm"
-PREFERRED_PROVIDER_xpm ?= "libxpm"
-PREFERRED_PROVIDER_libxt ?= "libxt"
-PREFERRED_PROVIDER_libxaw ?= "libxaw"
-PREFERRED_PROVIDER_libice ?= "libice"
-PREFERRED_PROVIDER_libxrender ?= "libxrender"
-PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
-PREFERRED_PROVIDER_xextensions ?= "xextensions"
-PREFERRED_PROVIDER_xproto ?= "xproto"
-PREFERRED_PROVIDER_x11 ?= "libx11"
-PREFERRED_PROVIDER_libxv ?= "libxv"
-PREFERRED_PROVIDER_xft ?= "libxft"
-PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
-PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
-PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
-PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
-PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
-PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
-PREFERRED_PROVIDER_libxmu ?= "libxmu"
-PREFERRED_PROVIDER_libsm ?= "libsm"
-PREFERRED_PROVIDER_xrandr ?= "xrandr"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
-
-PREFERRED_VERSION_task-xorg ?= "X11R7.2"
-
-# app
-PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bdftopcf ?= "X11R7.0-1.0.0"
-PREFERRED_VERSION_beforelight ?= "1.0.2"
-PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_editres ?= "1.0.2"
-PREFERRED_VERSION_fontosfnt ?= "1.0.3"
-PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_iceauth ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_ico ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_luit ?= "1.0.2"
-PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_mkfontscale ?= "1.0.3"
-PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.2"
-PREFERRED_VERSION_setxkbmap ?= "1.0.3"
-PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.3"
-PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1"
-PREFERRED_VERSION_xauth ?= "1.0.2"
-PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcalc ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.3"
-PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfs ?= "1.0.4"
-PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xgamma ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xinit ?= "1.0.3"
-PREFERRED_VERSION_xkbcomp ?= "1.0.3"
-PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xload ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmag ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xmessage ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.2"
-PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xprop ?= "1.0.2"
-PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0"
-PREFERRED_VERSION_xsetroot ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xvinfo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1"
-
-#data
-PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1"
-
-# doc
-PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.1.1"
-
-# driver
-PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2"
-PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0"
-PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0"
-PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.6.3"
-PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
-PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
-PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1"
-PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2"
-PREFERRED_VERSION_xf86-video-nv ?= "1.2.2.1"
-PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
-PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
-PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1"
-PREFERRED_VERSION_xf86-video-savage ?= "2.1.2"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
-PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
-PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1"
-PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
-
-# font
-PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1"
-
-# lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.1"
-PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
-PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.2"
-PREFERRED_VERSION_libx11 ?= "1.1.1"
-PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
-PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxcomposite ?= "0.3.1"
-PREFERRED_VERSION_libxcursor ?= "1.1.8"
-PREFERRED_VERSION_libxdamage ?= "1.0.4"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp ?= "1.0.2"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.0.2"
-PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.2.7"
-PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxi ?= "1.0.2"
-PREFERRED_VERSION_libxinerama ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_libxkbfile ?= "1.0.4"
-PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_libxmu ?= "1.0.3"
-PREFERRED_VERSION_libxpm ?= "3.5.6"
-PREFERRED_VERSION_libxrandr ?= "1.1.2"
-PREFERRED_VERSION_libxrender ?= "0.9.2"
-PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
-PREFERRED_VERSION_libxt ?= "1.0.4"
-PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xtrans ?= "1.0.3"
-
-# proto
-PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1"
-PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0"
-PREFERRED_VERSION_glproto ?= "1.4.8"
-PREFERRED_VERSION_kbproto ?= "X11R7.1-1.0.3"
-PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xproto-native ?= "7.0.10"
-PREFERRED_VERSION_xproto ?= "7.0.10"
-
-# util
-PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.1.5"
-PREFERRED_VERSION_util-macros ?= "X11R7.1-1.1.5"
-PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
-
-# xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
-PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
deleted file mode 100644
index b6aceb0..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ /dev/null
@@ -1,282 +0,0 @@
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-
-PREFERRED_PROVIDER_libxext ?= "libxext"
-PREFERRED_PROVIDER_xext ?= "libxext"
-PREFERRED_PROVIDER_libxi ?= "libxi"
-PREFERRED_PROVIDER_libxft ?= "libxft"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native"
-PREFERRED_PROVIDER_libxpm ?= "libxpm"
-PREFERRED_PROVIDER_xpm ?= "libxpm"
-PREFERRED_PROVIDER_libxt ?= "libxt"
-PREFERRED_PROVIDER_libxaw ?= "libxaw"
-PREFERRED_PROVIDER_libice ?= "libice"
-PREFERRED_PROVIDER_libxrender ?= "libxrender"
-PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
-PREFERRED_PROVIDER_xextensions ?= "xextensions"
-PREFERRED_PROVIDER_xproto ?= "xproto"
-PREFERRED_PROVIDER_x11 ?= "libx11"
-PREFERRED_PROVIDER_libxv ?= "libxv"
-PREFERRED_PROVIDER_xft ?= "libxft"
-PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
-PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
-PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
-PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
-PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
-PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
-PREFERRED_PROVIDER_libxmu ?= "libxmu"
-PREFERRED_PROVIDER_libsm ?= "libsm"
-PREFERRED_PROVIDER_xrandr ?= "xrandr"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
-
-PREFERRED_VERSION_task-xorg ?= "X11R7.3"
-
-# app
-PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bdftopcf ?= "1.0.1"
-PREFERRED_VERSION_beforelight ?= "1.0.2"
-PREFERRED_VERSION_bitmap ?= "1.0.2"
-PREFERRED_VERSION_editres ?= "1.0.2"
-PREFERRED_VERSION_fontosfnt ?= "1.0.3"
-PREFERRED_VERSION_fslsfonts ?= "1.0.1"
-PREFERRED_VERSION_fstobdf ?= "1.0.2"
-PREFERRED_VERSION_iceauth ?= "1.0.2"
-PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.1"
-PREFERRED_VERSION_listres ?= "1.0.1"
-PREFERRED_VERSION_luit ?= "1.0.2"
-PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
-PREFERRED_VERSION_mkfontdir ?= "1.0.3"
-PREFERRED_VERSION_mkfontscale ?= "1.0.3"
-PREFERRED_VERSION_oclock ?= "1.0.1"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.1"
-PREFERRED_VERSION_rstart ?= "1.0.2"
-PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.3"
-PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.3"
-PREFERRED_VERSION_viewres ?= "1.0.1"
-PREFERRED_VERSION_x11perf ?= "1.4.1"
-PREFERRED_VERSION_xauth ?= "1.0.2"
-PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
-PREFERRED_VERSION_xclipboard ?= "1.0.1"
-PREFERRED_VERSION_xclock ?= "1.0.3"
-PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xconsole ?= "1.0.3"
-PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
-PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xedit ?= "1.0.2"
-PREFERRED_VERSION_xev ?= "1.0.1"
-PREFERRED_VERSION_xeyes ?= "1.0.1"
-PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "1.0.1"
-PREFERRED_VERSION_xfontsel ?= "1.0.1"
-PREFERRED_VERSION_xfs ?= "1.0.4"
-PREFERRED_VERSION_xfsinfo ?= "1.0.1"
-PREFERRED_VERSION_xfwp ?= "1.0.1"
-PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xgc ?= "1.0.1"
-PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.5"
-PREFERRED_VERSION_xkbcomp ?= "1.0.3"
-PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbprint ?= "1.0.1"
-PREFERRED_VERSION_xkbutils ?= "1.0.1"
-PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.1"
-PREFERRED_VERSION_xlsatoms ?= "1.0.1"
-PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "1.0.1"
-PREFERRED_VERSION_xmag ?= "1.0.2"
-PREFERRED_VERSION_xman ?= "1.0.3"
-PREFERRED_VERSION_xmessage ?= "1.0.2"
-PREFERRED_VERSION_xmh ?= "1.0.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xmore ?= "1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "1.0.1"
-PREFERRED_VERSION_xpr ?= "1.0.1"
-PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "1.0.3"
-PREFERRED_VERSION_xrandr ?= "1.2.2"
-PREFERRED_VERSION_xrdb ?= "1.0.4"
-PREFERRED_VERSION_xrefresh ?= "1.0.2"
-PREFERRED_VERSION_xrx ?= "1.0.1"
-PREFERRED_VERSION_xset ?= "1.0.3"
-PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "1.0.0"
-PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xsm ?= "1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "1.0.1"
-PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.1"
-PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.1"
-PREFERRED_VERSION_xwininfo ?= "1.0.3"
-PREFERRED_VERSION_xwud ?= "1.0.1"
-
-#data
-PREFERRED_VERSION_xbitmaps ?= "1.0.1"
-PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
-
-# doc
-PREFERRED_VERSION_xorg-docs ?= "1.4"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
-
-# driver
-PREFERRED_VERSION_xf86-input-acecad ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-citron ?= "2.2.0"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.2.3"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.1"
-PREFERRED_VERSION_xf86-input-void ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
-PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
-PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
-PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
-PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.1.1"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1"
-PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.3"
-PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
-PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
-PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
-PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
-PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
-
-# font
-PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-util-native ?= "1.0.1"
-PREFERRED_VERSION_font-util ?= "1.0.1"
-
-# lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.3"
-PREFERRED_VERSION_libdmx ?= "1.0.2"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
-PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libx11 ?= "1.1.3"
-PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
-PREFERRED_VERSION_libxaw ?= "1.0.4"
-PREFERRED_VERSION_libxcomposite ?= "0.4.0"
-PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.0.4"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp ?= "1.0.2"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.0.2"
-PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.1"
-PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxi ?= "1.1.3"
-PREFERRED_VERSION_libxinerama ?= "1.0.2"
-PREFERRED_VERSION_libxkbfile ?= "1.0.4"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_libxmu ?= "1.0.3"
-PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.2"
-PREFERRED_VERSION_libxrender ?= "0.9.4"
-PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
-PREFERRED_VERSION_libxt ?= "1.0.4"
-PREFERRED_VERSION_libxtst ?= "1.0.3"
-PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_xtrans ?= "1.0.4"
-
-# proto
-PREFERRED_VERSION_compositeproto ?= "0.4"
-PREFERRED_VERSION_damageproto ?= "1.1.0"
-PREFERRED_VERSION_fixesproto ?= "4.0"
-PREFERRED_VERSION_glproto ?= "1.4.8"
-PREFERRED_VERSION_inputproto ?= "1.4.2.1"
-PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_renderproto ?= "0.9.3"
-PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
-PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xproto-native ?= "7.0.10"
-PREFERRED_VERSION_xproto ?= "7.0.10"
-
-# util
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.2"
-PREFERRED_VERSION_makedepend ?= "1.0.1"
-PREFERRED_VERSION_util-macros-native ?= "1.1.5"
-PREFERRED_VERSION_util-macros ?= "1.1.5"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
-
-# xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.4"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
deleted file mode 100644
index 4acca00..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is for updates after X11R7.4 was released
-
-PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1"
-PREFERRED_VERSION_libxi ?= "1.2.0"
-PREFERRED_VERSION_inputproto ?= "1.5.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
deleted file mode 100644
index 39e0eb9..0000000
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ /dev/null
@@ -1,257 +0,0 @@
-# see http://www.x.org/wiki/Releases/7.4
-# WORK IN PROGRESS, 7.4 will be released on 2008-03-01
-
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-
-PREFERRED_PROVIDER_libxext ?= "libxext"
-PREFERRED_PROVIDER_xext ?= "libxext"
-PREFERRED_PROVIDER_libxi ?= "libxi"
-PREFERRED_PROVIDER_libxft ?= "libxft"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native"
-PREFERRED_PROVIDER_libxpm ?= "libxpm"
-PREFERRED_PROVIDER_xpm ?= "libxpm"
-PREFERRED_PROVIDER_libxt ?= "libxt"
-PREFERRED_PROVIDER_libxaw ?= "libxaw"
-PREFERRED_PROVIDER_libice ?= "libice"
-PREFERRED_PROVIDER_libxrender ?= "libxrender"
-PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
-PREFERRED_PROVIDER_xextensions ?= "xextensions"
-PREFERRED_PROVIDER_xproto ?= "xproto"
-PREFERRED_PROVIDER_x11 ?= "libx11"
-PREFERRED_PROVIDER_libxv ?= "libxv"
-PREFERRED_PROVIDER_xft ?= "libxft"
-PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
-PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
-PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
-PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
-PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
-PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
-PREFERRED_PROVIDER_libxmu ?= "libxmu"
-PREFERRED_PROVIDER_libsm ?= "libsm"
-PREFERRED_PROVIDER_xrandr ?= "xrandr"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
-
-PREFERRED_VERSION_task-xorg ?= "X11R7.4"
-
-# app
-PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bitmap ?= "1.0.3"
-PREFERRED_VERSION_iceauth ?= "1.0.2"
-PREFERRED_VERSION_luit ?= "1.0.3"
-PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
-PREFERRED_VERSION_mkfontdir ?= "1.0.4"
-PREFERRED_VERSION_mkfontscale ?= "1.0.5"
-PREFERRED_VERSION_sessreg ?= "1.0.4"
-PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_x11perf ?= "1.5"
-PREFERRED_VERSION_xauth ?= "1.0.3"
-PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
-PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinput ?= "1.3.0"
-PREFERRED_VERSION_xkbcomp ?= "1.0.5"
-PREFERRED_VERSION_xkbcomp-native ?= "1.0.5"
-PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbutils ?= "1.0.1"
-PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xlsatoms ?= "1.0.1"
-PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xpr ?= "1.0.2"
-PREFERRED_VERSION_xprop ?= "1.0.4"
-PREFERRED_VERSION_xrandr ?= "1.2.3"
-PREFERRED_VERSION_xrdb ?= "1.0.5"
-PREFERRED_VERSION_xrefresh ?= "1.0.2"
-PREFERRED_VERSION_xset ?= "1.0.4"
-PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.2"
-PREFERRED_VERSION_xwininfo ?= "1.0.4"
-PREFERRED_VERSION_xwud ?= "1.0.1"
-
-# data
-PREFERRED_VERSION_xbitmaps ?= "1.0.1"
-PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
-
-# doc
-PREFERRED_VERSION_xorg-docs ?= "1.4"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
-
-# driver
-PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
-PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
-PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
-PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
-PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
-PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
-PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
-PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
-PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
-PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903"
-PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0"
-PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
-PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
-PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
-PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
-PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
-PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0"
-PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
-
-# font
-PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-util-native ?= "1.0.1"
-PREFERRED_VERSION_font-util ?= "1.0.1"
-PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
-
-# lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.5"
-PREFERRED_VERSION_libapplewm ?= "1.0.0"
-PREFERRED_VERSION_libdmx ?= "1.0.2"
-PREFERRED_VERSION_libfs ?= "1.0.1"
-PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
-PREFERRED_VERSION_libpciaccess ?= "0.10.3"
-PREFERRED_VERSION_libsm ?= "1.1.0"
-PREFERRED_VERSION_libwindowswm ?= "1.0.0"
-PREFERRED_VERSION_libx11 ?= "1.1.5"
-PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.4"
-PREFERRED_VERSION_libxau-native ?= "1.0.3"
-PREFERRED_VERSION_libxaw ?= "1.0.4"
-PREFERRED_VERSION_libxcomposite ?= "0.4.0"
-PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.1.1"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp ?= "1.0.2"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.0.4"
-PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.3"
-PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxft ?= "2.1.13"
-PREFERRED_VERSION_libxi ?= "1.1.3"
-PREFERRED_VERSION_libxinerama ?= "1.0.3"
-PREFERRED_VERSION_libxkbfile ?= "1.0.5"
-PREFERRED_VERSION_libxkbfile-native ?= "1.0.5"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_libxmu ?= "1.0.4"
-PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.3"
-PREFERRED_VERSION_libxrender ?= "0.9.4"
-PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
-PREFERRED_VERSION_libxt ?= "1.0.5"
-PREFERRED_VERSION_libxtst ?= "1.0.3"
-PREFERRED_VERSION_libxv ?= "1.0.4"
-PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
-PREFERRED_VERSION_xtrans ?= "1.2.1"
-
-# This should be here but is needed until bitbake can do
-# versioned depends
-PREFERRED_VERSION_mesa ?= "7.2"
-PREFERRED_VERSION_xtrans-native ?= "1.2.1"
-
-# proto
-PREFERRED_VERSION_applewmproto ?= "1.0.3"
-PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
-PREFERRED_VERSION_compositeproto ?= "0.4"
-PREFERRED_VERSION_damageproto ?= "1.1.0"
-PREFERRED_VERSION_dmxproto ?= "2.2.2"
-PREFERRED_VERSION_dri2proto ?= "1.1"
-PREFERRED_VERSION_evieext ?= "1.0.2"
-PREFERRED_VERSION_fixesproto ?= "4.0"
-PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
-PREFERRED_VERSION_fontsproto ?= "2.0.2"
-PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.4"
-PREFERRED_VERSION_inputproto-native ?= "1.4.2"
-PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_kbproto-native ?= "1.0.3"
-PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_recordproto ?= "1.13.2"
-PREFERRED_VERSION_renderproto ?= "0.9.3"
-PREFERRED_VERSION_resourceproto ?= "1.0.2"
-PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
-PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_videoproto ?= "2.2.2"
-PREFERRED_VERSION_windowswmproto ?= "1.0.3"
-PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
-PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
-PREFERRED_VERSION_xextproto ?= "7.0.3"
-PREFERRED_VERSION_xextproto-native ?= "7.0.3"
-PREFERRED_VERSION_xineramaproto ?= "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
-PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xf86driproto ?= "2.0.4"
-PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
-PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
-PREFERRED_VERSION_xinemaroproto ?= "1.1.2"
-PREFERRED_VERSION_xproto-native ?= "7.0.13"
-PREFERRED_VERSION_xproto ?= "7.0.13"
-
-# util
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.2"
-PREFERRED_VERSION_makedepend ?= "1.0.1"
-PREFERRED_VERSION_makedepend-native ?= "1.0.1"
-PREFERRED_VERSION_util-macros-native ?= "1.1.6"
-PREFERRED_VERSION_util-macros ?= "1.1.6"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
-
-# xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
deleted file mode 100644
index 53d202a..0000000
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ /dev/null
@@ -1,356 +0,0 @@
-#Wed Aug 4 08:58:39 CEST 2010
-#app
-PREFERRED_VERSION_appres ?= "1.0.2"
-PREFERRED_VERSION_bdftopcf ?= "1.0.2"
-PREFERRED_VERSION_bdftopcf-native ?= "1.0.2"
-PREFERRED_VERSION_beforelight ?= "1.0.3"
-PREFERRED_VERSION_bitmap ?= "1.0.4"
-PREFERRED_VERSION_constype ?= "1.0.2"
-PREFERRED_VERSION_editres ?= "1.0.4"
-PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
-PREFERRED_VERSION_fslsfonts ?= "1.0.2"
-PREFERRED_VERSION_fstobdf ?= "1.0.3"
-PREFERRED_VERSION_iceauth ?= "1.0.3"
-PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.2"
-PREFERRED_VERSION_listres ?= "1.0.2"
-PREFERRED_VERSION_luit ?= "1.0.5"
-PREFERRED_VERSION_mkcfm ?= "1.0.1"
-PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
-PREFERRED_VERSION_mkfontdir ?= "1.0.5"
-PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
-PREFERRED_VERSION_mkfontscale ?= "1.0.7"
-PREFERRED_VERSION_mkfontscale-native ?= "1.0.7"
-PREFERRED_VERSION_oclock ?= "1.0.1"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rendercheck ?= "1.3"
-PREFERRED_VERSION_rgb ?= "1.0.3"
-PREFERRED_VERSION_rstart ?= "1.0.3"
-PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.6"
-PREFERRED_VERSION_setxkbmap ?= "1.1.0"
-PREFERRED_VERSION_showfont ?= "1.0.2"
-PREFERRED_VERSION_smproxy ?= "1.0.3"
-PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.2"
-PREFERRED_VERSION_x11perf ?= "1.5.1"
-PREFERRED_VERSION_xauth ?= "1.0.4"
-PREFERRED_VERSION_xbacklight ?= "1.1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.2"
-PREFERRED_VERSION_xcalc ?= "1.0.3"
-PREFERRED_VERSION_xclipboard ?= "1.1.0"
-PREFERRED_VERSION_xclock ?= "1.0.4"
-PREFERRED_VERSION_xcmsdb ?= "1.0.2"
-PREFERRED_VERSION_xcompmgr ?= "1.1.5"
-PREFERRED_VERSION_xconsole ?= "1.0.3"
-PREFERRED_VERSION_xcursorgen ?= "1.0.3"
-PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.10"
-PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
-PREFERRED_VERSION_xdriinfo ?= "1.0.3"
-PREFERRED_VERSION_xedit ?= "1.1.2"
-PREFERRED_VERSION_xev ?= "1.0.4"
-PREFERRED_VERSION_xeyes ?= "1.1.0"
-PREFERRED_VERSION_xf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "1.0.1"
-PREFERRED_VERSION_xfontsel ?= "1.0.2"
-PREFERRED_VERSION_xfs ?= "1.1.0"
-PREFERRED_VERSION_xfsinfo ?= "1.0.2"
-PREFERRED_VERSION_xfwp ?= "1.0.1"
-PREFERRED_VERSION_xgamma ?= "1.0.3"
-PREFERRED_VERSION_xgc ?= "1.0.2"
-PREFERRED_VERSION_xhost ?= "1.0.3"
-PREFERRED_VERSION_xinit ?= "1.2.1"
-PREFERRED_VERSION_xinput ?= "1.5.2"
-PREFERRED_VERSION_xkbcomp ?= "1.1.1"
-PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
-PREFERRED_VERSION_xkbevd ?= "1.1.0"
-PREFERRED_VERSION_xkbprint ?= "1.0.2"
-PREFERRED_VERSION_xkbutils ?= "1.0.2"
-PREFERRED_VERSION_xkill ?= "1.0.2"
-PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.2"
-PREFERRED_VERSION_xlsatoms ?= "1.1.0"
-PREFERRED_VERSION_xlsclients ?= "1.1.0"
-PREFERRED_VERSION_xlsfonts ?= "1.0.3"
-PREFERRED_VERSION_xmag ?= "1.0.3"
-PREFERRED_VERSION_xman ?= "1.1.0"
-PREFERRED_VERSION_xmessage ?= "1.0.3"
-PREFERRED_VERSION_xmh ?= "1.0.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.4"
-PREFERRED_VERSION_xmore ?= "1.0.2"
-PREFERRED_VERSION_xphelloworld ?= "1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "1.0.1"
-PREFERRED_VERSION_xpr ?= "1.0.3"
-PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "1.1.0"
-PREFERRED_VERSION_xrandr ?= "1.3.3"
-PREFERRED_VERSION_xrdb ?= "1.0.6"
-PREFERRED_VERSION_xrefresh ?= "1.0.3"
-PREFERRED_VERSION_xrx ?= "1.0.3"
-PREFERRED_VERSION_xset ?= "1.1.0"
-PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "1.0.1"
-PREFERRED_VERSION_xsetroot ?= "1.0.3"
-PREFERRED_VERSION_xsm ?= "1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "1.0.1"
-PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.2"
-PREFERRED_VERSION_xvinfo ?= "1.1.0"
-PREFERRED_VERSION_xwd ?= "1.0.3"
-PREFERRED_VERSION_xwininfo ?= "1.0.5"
-PREFERRED_VERSION_xwud ?= "1.0.2"
-#data
-PREFERRED_VERSION_xbitmaps ?= "1.1.0"
-PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
-PREFERRED_VERSION_xkbdata ?= "1.0.1"
-#doc
-PREFERRED_VERSION_xorg-docs ?= "1.5"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.5"
-#driver
-PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-citron ?= "2.2.2"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.2.4"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.4.0"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.99.1"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.9"
-PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-apm ?= "1.2.3"
-PREFERRED_VERSION_xf86-video-ark ?= "0.7.3"
-PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
-PREFERRED_VERSION_xf86-video-ati ?= "6.13.1"
-PREFERRED_VERSION_xf86-video-chips ?= "1.2.3"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
-PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.3.4"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.2"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.8"
-PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
-PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
-PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
-PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
-PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
-PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.5"
-PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.18"
-PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
-PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-rendition ?= "4.2.4"
-PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
-PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
-PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.4"
-PREFERRED_VERSION_xf86-video-sis ?= "0.10.3"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.4"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3"
-PREFERRED_VERSION_xf86-video-tga ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-trident ?= "1.3.4"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.2.4"
-PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
-PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "11.0.1"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.4"
-PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
-PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
-PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4"
-#font
-PREFERRED_VERSION_encodings ?= "1.0.3"
-PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1"
-PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1"
-PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2"
-PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2"
-PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2"
-PREFERRED_VERSION_font-alias ?= "1.0.2"
-PREFERRED_VERSION_font-arabic-misc ?= "1.0.1"
-PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bh-ttf ?= "1.0.1"
-PREFERRED_VERSION_font-bh-type1 ?= "1.0.1"
-PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1"
-PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1"
-PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1"
-PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-cursor-misc ?= "1.0.1"
-PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1"
-PREFERRED_VERSION_font-dec-misc ?= "1.0.1"
-PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1"
-PREFERRED_VERSION_font-isas-misc ?= "1.0.1"
-PREFERRED_VERSION_font-jis-misc ?= "1.0.1"
-PREFERRED_VERSION_font-micro-misc ?= "1.0.1"
-PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1"
-PREFERRED_VERSION_font-misc-meltho ?= "1.0.1"
-PREFERRED_VERSION_font-misc-misc ?= "1.1.0"
-PREFERRED_VERSION_font-mutt-misc ?= "1.0.1"
-PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0"
-PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2"
-PREFERRED_VERSION_font-sony-misc ?= "1.0.1"
-PREFERRED_VERSION_font-sun-misc ?= "1.0.1"
-PREFERRED_VERSION_font-util ?= "1.1.1"
-PREFERRED_VERSION_font-util-native ?= "1.1.1"
-PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2"
-#lib
-PREFERRED_VERSION_libapplewm ?= "1.4.0"
-PREFERRED_VERSION_libfs ?= "1.0.2"
-PREFERRED_VERSION_libice ?= "1.0.6"
-PREFERRED_VERSION_libice-native ?= "1.0.6"
-PREFERRED_VERSION_libsm ?= "1.1.1"
-PREFERRED_VERSION_libsm-native ?= "1.1.1"
-PREFERRED_VERSION_libwindowswm ?= "1.0.1"
-PREFERRED_VERSION_libx11 ?= "1.3.4"
-PREFERRED_VERSION_libx11-native ?= "1.3.4"
-PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
-PREFERRED_VERSION_libxtrap ?= "1.0.0"
-PREFERRED_VERSION_libxau ?= "1.0.6"
-PREFERRED_VERSION_libxau-native ?= "1.0.6"
-PREFERRED_VERSION_libxaw ?= "1.0.7"
-PREFERRED_VERSION_libxcomposite ?= "0.4.2"
-PREFERRED_VERSION_libxcursor ?= "1.1.10"
-PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
-PREFERRED_VERSION_libxdamage ?= "1.1.3"
-PREFERRED_VERSION_libxdmcp ?= "1.0.3"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.1.2"
-PREFERRED_VERSION_libxext-native ?= "1.1.2"
-PREFERRED_VERSION_libxfixes ?= "4.0.5"
-PREFERRED_VERSION_libxfixes-native ?= "4.0.5"
-PREFERRED_VERSION_libxfont ?= "1.4.2"
-PREFERRED_VERSION_libxfont-native ?= "1.4.2"
-PREFERRED_VERSION_libxfontcache ?= "1.0.5"
-PREFERRED_VERSION_libxft ?= "2.1.14"
-PREFERRED_VERSION_libxi ?= "1.3.2"
-PREFERRED_VERSION_libxinerama ?= "1.1"
-PREFERRED_VERSION_libxmu ?= "1.0.5"
-PREFERRED_VERSION_libxp ?= "1.0.0"
-PREFERRED_VERSION_libxpm ?= "3.5.8"
-PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
-PREFERRED_VERSION_libxprintutil ?= "1.0.1"
-PREFERRED_VERSION_libxrandr ?= "1.3.0"
-PREFERRED_VERSION_libxrandr-native ?= "1.3.0"
-PREFERRED_VERSION_libxrender ?= "0.9.6"
-PREFERRED_VERSION_libxrender-native ?= "0.9.6"
-PREFERRED_VERSION_libxres ?= "1.0.4"
-PREFERRED_VERSION_libxt ?= "1.0.8"
-PREFERRED_VERSION_libxt-native ?= "1.0.8"
-PREFERRED_VERSION_libxtst ?= "1.1.0"
-PREFERRED_VERSION_libxv ?= "1.0.5"
-PREFERRED_VERSION_libxvmc ?= "1.0.5"
-PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
-PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
-PREFERRED_VERSION_libdmx ?= "1.1.0"
-PREFERRED_VERSION_libfontenc ?= "1.0.5"
-PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
-PREFERRED_VERSION_liblbxutil ?= "1.1.0"
-PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libpciaccess ?= "0.12.0"
-PREFERRED_VERSION_libxkbfile ?= "1.0.6"
-PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_pixman ?= "0.18.2"
-PREFERRED_VERSION_pixman-native ?= "0.18.2"
-PREFERRED_VERSION_xtrans ?= "1.2.5"
-PREFERRED_VERSION_xtrans-native ?= "1.2.5"
-#proto
-PREFERRED_VERSION_applewmproto ?= "1.4.1"
-PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
-PREFERRED_VERSION_compositeproto ?= "0.4.1"
-PREFERRED_VERSION_damageproto ?= "1.2.0"
-PREFERRED_VERSION_dmxproto ?= "2.3"
-PREFERRED_VERSION_dri2proto ?= "2.3"
-PREFERRED_VERSION_evieext ?= "1.1.0"
-PREFERRED_VERSION_fixesproto ?= "4.1.1"
-PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
-PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
-PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
-PREFERRED_VERSION_fontsproto ?= "2.1.0"
-PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
-PREFERRED_VERSION_glproto ?= "1.4.11"
-PREFERRED_VERSION_inputproto ?= "2.0"
-PREFERRED_VERSION_inputproto-native ?= "2.0"
-PREFERRED_VERSION_kbproto ?= "1.0.4"
-PREFERRED_VERSION_kbproto-native ?= "1.0.4"
-PREFERRED_VERSION_printproto ?= "1.0.4"
-PREFERRED_VERSION_randrproto ?= "1.3.1"
-PREFERRED_VERSION_randrproto-native ?= "1.3.1"
-PREFERRED_VERSION_recordproto ?= "1.14"
-PREFERRED_VERSION_renderproto ?= "0.11"
-PREFERRED_VERSION_renderproto-native ?= "0.11"
-PREFERRED_VERSION_resourceproto ?= "1.1.0"
-PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
-PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_videoproto ?= "2.3.0"
-PREFERRED_VERSION_windowswmproto ?= "1.0.4"
-PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
-PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
-PREFERRED_VERSION_xextproto ?= "7.1.1"
-PREFERRED_VERSION_xextproto-native ?= "7.1.1"
-PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
-PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
-PREFERRED_VERSION_xf86dgaproto ?= "2.1"
-PREFERRED_VERSION_xf86driproto ?= "2.1.0"
-PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
-PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
-PREFERRED_VERSION_xineramaproto ?= "1.2"
-PREFERRED_VERSION_xproto ?= "7.0.17"
-PREFERRED_VERSION_xproto-native ?= "7.0.17"
-PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
-#util
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.3"
-PREFERRED_VERSION_lndir ?= "1.0.1"
-PREFERRED_VERSION_makedepend ?= "1.0.2"
-PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_util-macros ?= "1.10.0"
-PREFERRED_VERSION_util-macros-native ?= "1.10.0"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
-#xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.8.99.905"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
deleted file mode 100644
index 61a01bc..0000000
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ /dev/null
@@ -1,111 +0,0 @@
-PREFERRED_VERSION_applewmproto ?= "1.0.3"
-PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
-PREFERRED_VERSION_compositeproto ?= "0.4"
-PREFERRED_VERSION_damageproto ?= "1.1.0"
-PREFERRED_VERSION_diet-x11 ?= "1.1.2"
-PREFERRED_VERSION_dmxproto ?= "2.2.2"
-PREFERRED_VERSION_evieext ?= "1.0.2"
-PREFERRED_VERSION_fixesproto ?= "4.0"
-PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
-PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2"
-PREFERRED_VERSION_fontsproto ?= "2.0.2"
-PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_glproto ?= "1.4.8"
-PREFERRED_VERSION_imake ?= "1.0.2"
-PREFERRED_VERSION_inputproto ?= "1.4.2"
-PREFERRED_VERSION_inputproto-native ?= "1.4.2"
-PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_kbproto-native ?= "1.0.3"
-PREFERRED_VERSION_libapplewm ?= "1.0.0"
-PREFERRED_VERSION_libdmx ?= "1.0.2"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
-PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
-PREFERRED_VERSION_libfs ?= "1.0.0"
-PREFERRED_VERSION_libice ?= "1.0.3"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libwindowswm ?= "1.0.0"
-PREFERRED_VERSION_libx11 ?= "1.1.2"
-PREFERRED_VERSION_libx11-native ?= "1.0.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
-PREFERRED_VERSION_libxau-native ?= "1.0.3"
-PREFERRED_VERSION_libxaw ?= "1.0.3"
-PREFERRED_VERSION_libxcomposite ?= "0.4.0"
-PREFERRED_VERSION_libxcursor ?= "1.1.8"
-PREFERRED_VERSION_libxdamage ?= "1.1.1"
-PREFERRED_VERSION_libxdmcp ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.0.3"
-PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.0"
-PREFERRED_VERSION_libxfont-native ?= "1.3.0"
-PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxft ?= "2.1.12"
-PREFERRED_VERSION_libxi ?= "1.1.2"
-PREFERRED_VERSION_libxinerama ?= "1.0.2"
-PREFERRED_VERSION_libxkbfile ?= "1.0.4"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_libxmu ?= "1.0.3"
-PREFERRED_VERSION_libxp ?= "1.0.0"
-PREFERRED_VERSION_libxpm ?= "3.5.6"
-PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
-PREFERRED_VERSION_libxprintutil ?= "1.0.1"
-PREFERRED_VERSION_libxrandr ?= "1.2.1"
-PREFERRED_VERSION_libxrender ?= "0.9.2"
-PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
-PREFERRED_VERSION_libxt ?= "1.0.5"
-PREFERRED_VERSION_libxtrap ?= "1.0.0"
-PREFERRED_VERSION_libxtst ?= "1.0.2"
-PREFERRED_VERSION_libxv ?= "1.0.3"
-PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_libxxf86dga ?= "1.0.1"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_lndir ?= "1.0.1"
-PREFERRED_VERSION_makedepend ?= "1.0.1"
-PREFERRED_VERSION_makedepend-native ?= "1.0.1"
-PREFERRED_VERSION_printproto ?= "1.0.3"
-PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_recordproto ?= "1.13.2"
-PREFERRED_VERSION_renderproto ?= "0.9.2"
-PREFERRED_VERSION_resourceproto ?= "1.0.2"
-PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
-PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.1.5"
-PREFERRED_VERSION_util-macros-native ?= "1.1.5"
-PREFERRED_VERSION_videoproto ?= "2.2.2"
-PREFERRED_VERSION_windowswmproto ?= "1.0.3"
-PREFERRED_VERSION_xauth ?= "1.0.2"
-PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
-PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
-PREFERRED_VERSION_xextproto ?= "7.0.2"
-PREFERRED_VERSION_xextproto-native ?= "7.0.2"
-PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
-PREFERRED_VERSION_xf86dgaproto ?= "2.0.2"
-PREFERRED_VERSION_xf86driproto ?= "2.0.3"
-PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
-PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
-PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xineramaproto ?= "1.1.2"
-PREFERRED_VERSION_xmodmap ?= "1.0.2"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
-PREFERRED_VERSION_xproto ?= "7.0.10"
-PREFERRED_VERSION_xproto-native ?= "7.0.10"
-PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
-PREFERRED_VERSION_xrandr ?= "1.2.2"
-PREFERRED_VERSION_xrdb ?= "1.0.3"
-PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
-PREFERRED_VERSION_xset ?= "1.0.2"
-PREFERRED_VERSION_xtrans ?= "1.0.3"
-PREFERRED_VERSION_xtrans-native ?= "1.0.3"
-PREFERRED_VERSION_xinit ?= "1.0.4"
-PREFERRED_VERSION_xev ?= "1.0.2"
--
1.6.4.2
More information about the Openembedded-devel
mailing list