merge of '380d0bd7c4a4d64fd250a72fc04232264b91f091'

     and 'cd2dae68b2957306378aca79319d9d009a776ed2'

2 files changed, 2 insertions, 87 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 04fa599a70..c584140c17 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -13,7 +13,6 @@ PREFERRED_VERSION_acx-firmware ?= "1.0"
 PREFERRED_VERSION_addressbook ?= "0.1"
 PREFERRED_VERSION_adns ?= "1.0"
 PREFERRED_VERSION_agg ?= "2.5"
-PREFERRED_VERSION_aiostress ?= "0.0"
 PREFERRED_VERSION_aircrack ?= "2.41"
 PREFERRED_VERSION_aircrack-ng ?= "0.9.1"
 PREFERRED_VERSION_albumshaper ?= "2.1"
@@ -25,19 +24,6 @@ PREFERRED_VERSION_alsa-plugins ?= "1.0.14"
 PREFERRED_VERSION_alsa-state ?= "0.1.0"
 PREFERRED_VERSION_alsa-utils ?= "1.0.14"
 PREFERRED_VERSION_altboot ?= "1.1.1"
-PREFERRED_VERSION_angstrom-bootmanager ?= "1.0"
-PREFERRED_VERSION_angstrom-feed-configs ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-apps ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-base ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-game ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-pim ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-settings ?= "1.0"
-PREFERRED_VERSION_angstrom-ohand-task-pim ?= "1.0"
-PREFERRED_VERSION_angstrom-task-office ?= "1.0"
-PREFERRED_VERSION_angstrom-task-printing ?= "1.0"
-PREFERRED_VERSION_angstrom-task-sectest ?= "1.0"
-PREFERRED_VERSION_angstrom-version ?= "2007.9-test-20071013"
-PREFERRED_VERSION_angstrom-x11-base-depends ?= "1.0"
 PREFERRED_VERSION_anthy ?= "7811"
 PREFERRED_VERSION_anthy-native ?= "7811"
 PREFERRED_VERSION_antlr ?= "2.7.5"
@@ -63,7 +49,6 @@ PREFERRED_VERSION_aspell-native ?= "0.60.5"
 PREFERRED_VERSION_asterisk ?= "1.4.10"
 PREFERRED_VERSION_asterisk-sounds ?= "1.2.1"
 PREFERRED_VERSION_at ?= "3.1.8"
-PREFERRED_VERSION_at76c503a-modules ?= "0.0"
 PREFERRED_VERSION_atd ?= "0.70"
 PREFERRED_VERSION_atftp ?= "0.7"
 PREFERRED_VERSION_atk ?= "1.20.0"
@@ -91,7 +76,6 @@ PREFERRED_VERSION_bash-completion ?= "20040711"
 PREFERRED_VERSION_bazaar ?= "1.2"
 PREFERRED_VERSION_bb ?= "1.2"
 PREFERRED_VERSION_bc ?= "1.06"
-PREFERRED_VERSION_bcm2035-tool ?= "0.0"
 PREFERRED_VERSION_bdftopcf ?= "1.0.1"
 PREFERRED_VERSION_beecrypt ?= "3.1.0"
 PREFERRED_VERSION_beecrypt-native ?= "3.1.0"
@@ -111,8 +95,6 @@ PREFERRED_VERSION_bison ?= "2.0"
 PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
-PREFERRED_VERSION_bl ?= "0.0"
-PREFERRED_VERSION_blueprobe ?= "0.18"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
 PREFERRED_VERSION_bluez-cups-backend ?= "3.20"
 PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
@@ -155,7 +137,6 @@ PREFERRED_VERSION_cairo ?= "1.4.10"
 PREFERRED_VERSION_cairo-directfb ?= "1.4.8"
 PREFERRED_VERSION_cairomm ?= "1.2.4"
 PREFERRED_VERSION_calendar ?= "1.0"
-PREFERRED_VERSION_calibrateproto ?= "0.0"
 PREFERRED_VERSION_came ?= "1.7"
 PREFERRED_VERSION_camera-assistant ?= "0.2.0"
 PREFERRED_VERSION_camsource ?= "0.7.0"
@@ -199,8 +180,6 @@ PREFERRED_VERSION_clish ?= "0.7.1"
 PREFERRED_VERSION_clutter-glx ?= "0.3.1"
 PREFERRED_VERSION_cmake-native ?= "2.2.3"
 PREFERRED_VERSION_cms92init ?= "0.1"
-PREFERRED_VERSION_composite-pixbuf ?= "0.0"
-PREFERRED_VERSION_compositeext ?= "0.0"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
@@ -310,14 +289,11 @@ PREFERRED_VERSION_dpkg ?= "1.13.25"
 PREFERRED_VERSION_dpkg-native ?= "1.13.25"
 PREFERRED_VERSION_driftnet ?= "0.1.6"
 PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_drm-kernel ?= "0.0"
 PREFERRED_VERSION_dropbear ?= "0.49"
 PREFERRED_VERSION_dsniff ?= "2.3"
 PREFERRED_VERSION_duma ?= "2.5.7"
 PREFERRED_VERSION_dvb-image ?= "1.0"
-PREFERRED_VERSION_dvbstream ?= "0.0"
 PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
-PREFERRED_VERSION_dvbtune ?= "0.0"
 PREFERRED_VERSION_dviviewer ?= "1.0.2"
 PREFERRED_VERSION_e-uae ?= "0.8.28"
 PREFERRED_VERSION_e-utils ?= "0.0.0"
@@ -340,8 +316,6 @@ PREFERRED_VERSION_editres ?= "1.0.2"
 PREFERRED_VERSION_edje ?= "0.5.0.41"
 PREFERRED_VERSION_edje-editor ?= "0.0.0"
 PREFERRED_VERSION_edje-native ?= "0.5.0.41"
-PREFERRED_VERSION_edje-viewer ?= "0.0.0"
-PREFERRED_VERSION_eds-dbus ?= "1.4.0"
 PREFERRED_VERSION_eds-feed ?= "0.3.2"
 PREFERRED_VERSION_eel ?= "2.12.2"
 PREFERRED_VERSION_eet ?= "0.9.10.041"
@@ -349,7 +323,6 @@ PREFERRED_VERSION_eet-native ?= "0.9.10.041"
 PREFERRED_VERSION_eflpp ?= "0.1.0"
 PREFERRED_VERSION_efreet ?= "0.0.3.003"
 PREFERRED_VERSION_ekg ?= "1.6"
-PREFERRED_VERSION_elf2flt ?= "0.0"
 PREFERRED_VERSION_elfkickers ?= "2.0a"
 PREFERRED_VERSION_elfkickers-native ?= "2.0a"
 PREFERRED_VERSION_elftoaout ?= "2.3"
@@ -368,11 +341,8 @@ PREFERRED_VERSION_emul ?= "1.0.5"
 PREFERRED_VERSION_enca ?= "1.9"
 PREFERRED_VERSION_enchant ?= "1.3.0"
 PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_engrave ?= "0.0.0"
-PREFERRED_VERSION_enhance ?= "0.0.0"
 PREFERRED_VERSION_enna ?= "0.2.0"
 PREFERRED_VERSION_enscript ?= "1.6.4"
-PREFERRED_VERSION_entice ?= "0.0.0"
 PREFERRED_VERSION_entrance ?= "0.9.0.010"
 PREFERRED_VERSION_epdf ?= "0.1.0"
 PREFERRED_VERSION_epdfview ?= "0.1.6"
@@ -395,11 +365,7 @@ PREFERRED_VERSION_evas-native ?= "0.9.9.041"
 PREFERRED_VERSION_eventlog ?= "0.2.5"
 PREFERRED_VERSION_evieext ?= "1.0.2"
 PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_evolve ?= "0.0.0"
-PREFERRED_VERSION_evolve-native ?= "0.0.0"
 PREFERRED_VERSION_ewl ?= "0.5.1"
-PREFERRED_VERSION_examine ?= "0.0.0"
-PREFERRED_VERSION_exhibit ?= "0.0.0"
 PREFERRED_VERSION_exiv2 ?= "0.15"
 PREFERRED_VERSION_exmap-console ?= "0.4"
 PREFERRED_VERSION_exml ?= "cvs"
@@ -407,11 +373,9 @@ PREFERRED_VERSION_exo ?= "0.3.2"
 PREFERRED_VERSION_expat ?= "2.0.0"
 PREFERRED_VERSION_expat-native ?= "1.95.7"
 PREFERRED_VERSION_expect ?= "5.44.1"
-PREFERRED_VERSION_expedite ?= "0.0.0"
 PREFERRED_VERSION_ez-ipupdate ?= "3.0.10"
 PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0"
 PREFERRED_VERSION_ezx-gpiotool ?= "1877"
-PREFERRED_VERSION_ezxd ?= "0.0"
 PREFERRED_VERSION_faac ?= "1.24"
 PREFERRED_VERSION_faad2 ?= "2.0"
 PREFERRED_VERSION_fakechroot ?= "2.5"
@@ -425,7 +389,6 @@ PREFERRED_VERSION_fastcgi ?= "2.4.0"
 PREFERRED_VERSION_fastjar-native ?= "0.95"
 PREFERRED_VERSION_fbgetty ?= "0.1.698"
 PREFERRED_VERSION_fbgrab ?= "1.0"
-PREFERRED_VERSION_fbgrab-viewer-native ?= "0.0"
 PREFERRED_VERSION_fbpanel ?= "4.3"
 PREFERRED_VERSION_fbreader ?= "0.8.2a"
 PREFERRED_VERSION_fbset ?= "2.1"
@@ -435,7 +398,6 @@ PREFERRED_VERSION_fbvncserver-kmodule ?= "0.9.4"
 PREFERRED_VERSION_fceu ?= "0.98.13-pre"
 PREFERRED_VERSION_fconfig ?= "20060419"
 PREFERRED_VERSION_fcron ?= "3.0.2"
-PREFERRED_VERSION_fdclock ?= "0.0"
 PREFERRED_VERSION_feh ?= "1.2.7"
 PREFERRED_VERSION_fetchmail ?= "6.2.5"
 PREFERRED_VERSION_ffmpeg ?= "0.4.9-pre1"
@@ -451,7 +413,6 @@ PREFERRED_VERSION_findutils-native ?= "4.2.29"
 PREFERRED_VERSION_firefox ?= "1.0.7"
 PREFERRED_VERSION_fis ?= "1.0"
 PREFERRED_VERSION_fish ?= "1.1.0"
-PREFERRED_VERSION_fixesext ?= "0.0"
 PREFERRED_VERSION_fixesproto ?= "4.0"
 PREFERRED_VERSION_flac ?= "1.1.2"
 PREFERRED_VERSION_flex ?= "2.5.31"
@@ -485,10 +446,7 @@ PREFERRED_VERSION_frodo ?= "4.2"
 PREFERRED_VERSION_froot ?= "0.7.1"
 PREFERRED_VERSION_frotz ?= "2.43"
 PREFERRED_VERSION_frozen-bubble ?= "1.0.0"
-PREFERRED_VERSION_fs ?= "0.0"
 PREFERRED_VERSION_fsi-client ?= "20040803"
-PREFERRED_VERSION_fstests ?= "0.0"
-PREFERRED_VERSION_fsx-linux ?= "0.0"
 PREFERRED_VERSION_ftdi-eeprom ?= "0.2"
 PREFERRED_VERSION_ftdi-eeprom-native ?= "0.2"
 PREFERRED_VERSION_ftpd-topfield ?= "0.7.4"
@@ -511,7 +469,6 @@ PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_gchub-module ?= "0.0"
 PREFERRED_VERSION_gconf ?= "2.6.1"
 PREFERRED_VERSION_gconf-native ?= "2.6.1"
 PREFERRED_VERSION_gd ?= "2.0.33"
@@ -537,7 +494,6 @@ PREFERRED_VERSION_genboot-native ?= "1.0"
 PREFERRED_VERSION_genext2fs ?= "1.3"
 PREFERRED_VERSION_genext2fs-native ?= "1.3"
 PREFERRED_VERSION_genlist ?= "1.0"
-PREFERRED_VERSION_geoclue ?= "0.0"
 PREFERRED_VERSION_geode-accessbus5536 ?= "2.6.11"
 PREFERRED_VERSION_geode-aeslx ?= "2.6.11"
 PREFERRED_VERSION_geode-alsa5536 ?= "2.6.11"
@@ -608,7 +564,6 @@ PREFERRED_VERSION_gob2 ?= "2.0.14"
 PREFERRED_VERSION_gobby ?= "0.4.1"
 PREFERRED_VERSION_goffice ?= "0.2.1"
 PREFERRED_VERSION_gomunicator ?= "0.1.3"
-PREFERRED_VERSION_gosmore ?= "0.0"
 PREFERRED_VERSION_gparted ?= "0.3.3"
 PREFERRED_VERSION_gpdf ?= "2.10.0"
 PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
@@ -832,7 +787,6 @@ PREFERRED_VERSION_interbench ?= "0.30"
 PREFERRED_VERSION_intercom ?= "0.15"
 PREFERRED_VERSION_intltool ?= "0.35.2"
 PREFERRED_VERSION_intltool-native ?= "0.35.0"
-PREFERRED_VERSION_ion3 ?= "0.0"
 PREFERRED_VERSION_iozone3 ?= "263"
 PREFERRED_VERSION_ipaq-sleep ?= "0.9"
 PREFERRED_VERSION_ipatience ?= "0.1"
@@ -879,7 +833,6 @@ PREFERRED_VERSION_kbproto ?= "1.0.3"
 PREFERRED_VERSION_kbproto-native ?= "1.0.3"
 PREFERRED_VERSION_kdepimpi ?= "2.2.7"
 PREFERRED_VERSION_kernbench ?= "0.41"
-PREFERRED_VERSION_kernel-module-dm9601 ?= "0.0"
 PREFERRED_VERSION_kernel-module-wlags49-h1-cs ?= "718"
 PREFERRED_VERSION_kernel-module-wlags49-h2-cs ?= "718"
 PREFERRED_VERSION_kexec-tools ?= "1.101"
@@ -930,7 +883,6 @@ PREFERRED_VERSION_libart-lgpl ?= "2.3.19"
 PREFERRED_VERSION_libassa ?= "3.4.2"
 PREFERRED_VERSION_libassuan ?= "0.6.9"
 PREFERRED_VERSION_libatomics-ops ?= "1.2"
-PREFERRED_VERSION_libbacon ?= "0.0"
 PREFERRED_VERSION_libbedic ?= "1.0"
 PREFERRED_VERSION_libbonobo ?= "2.14.0"
 PREFERRED_VERSION_libbonoboui ?= "2.18.0"
@@ -991,7 +943,6 @@ PREFERRED_VERSION_libextutils-parsexs-perl ?= "2.16"
 PREFERRED_VERSION_libextutils-parsexs-perl-native ?= "2.16"
 PREFERRED_VERSION_libextutils-pkgconfig-perl ?= "1.07"
 PREFERRED_VERSION_libextutils-pkgconfig-perl-native ?= "1.07"
-PREFERRED_VERSION_libfakekey ?= "0.2"
 PREFERRED_VERSION_libffi ?= "2.0"
 PREFERRED_VERSION_libflv ?= "0.2"
 PREFERRED_VERSION_libfontenc ?= "1.0.4"
@@ -1020,7 +971,6 @@ PREFERRED_VERSION_libgpelaunch ?= "0.14"
 PREFERRED_VERSION_libgpephone ?= "0.4"
 PREFERRED_VERSION_libgpepimc ?= "0.9"
 PREFERRED_VERSION_libgpepimc-hildon ?= "0.5"
-PREFERRED_VERSION_libgpeplugin ?= "0.0"
 PREFERRED_VERSION_libgpevtype ?= "0.50"
 PREFERRED_VERSION_libgpewidget ?= "0.115"
 PREFERRED_VERSION_libgpewidget-hildon ?= "0.102"
@@ -1115,7 +1065,6 @@ PREFERRED_VERSION_libosip2 ?= "2.2.2"
 PREFERRED_VERSION_libosso ?= "1.20"
 PREFERRED_VERSION_libosso-gsf ?= "1.11.10.4"
 PREFERRED_VERSION_libosso-help ?= "2.1.2"
-PREFERRED_VERSION_libowl ?= "0.0"
 PREFERRED_VERSION_libpam ?= "0.79"
 PREFERRED_VERSION_libparams-util-perl ?= "0.20"
 PREFERRED_VERSION_libparams-util-perl-native ?= "0.20"
@@ -1168,7 +1117,6 @@ PREFERRED_VERSION_libsub-install-perl-native ?= "0.922"
 PREFERRED_VERSION_libsub-uplevel-perl ?= "0.13"
 PREFERRED_VERSION_libsub-uplevel-perl-native ?= "0.13"
 PREFERRED_VERSION_libsvg ?= "0.1.4"
-PREFERRED_VERSION_libsvg-cairo ?= "0.0"
 PREFERRED_VERSION_libsyncml ?= "0.4.2"
 PREFERRED_VERSION_libtelepathy ?= "0.0.53"
 PREFERRED_VERSION_libtest-builder-tester-perl ?= "1.01"
@@ -1212,7 +1160,6 @@ 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.4"
-PREFERRED_VERSION_libxcalibrate ?= "0.0"
 PREFERRED_VERSION_libxcb ?= "1.0"
 PREFERRED_VERSION_libxcomposite ?= "0.4.0"
 PREFERRED_VERSION_libxcursor ?= "1.1.9"
@@ -1333,7 +1280,6 @@ PREFERRED_VERSION_makeself-native ?= "cvs"
 PREFERRED_VERSION_maki ?= "1.0.4ern"
 PREFERRED_VERSION_man ?= "1.5p"
 PREFERRED_VERSION_man-pages ?= "2.41"
-PREFERRED_VERSION_mango-lassi ?= "0.0"
 PREFERRED_VERSION_manufacturers ?= "20031209"
 PREFERRED_VERSION_mapnik ?= "0.4.0"
 PREFERRED_VERSION_maradns ?= "1.0.39"
@@ -1344,13 +1290,11 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
 PREFERRED_VERSION_matchbox-applet-volume ?= "0.1"
 PREFERRED_VERSION_matchbox-common ?= "0.9.1"
-PREFERRED_VERSION_matchbox-config-gtk ?= "0.0"
 PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
 PREFERRED_VERSION_matchbox-desktop-2 ?= "0.1"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.3"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
 PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_matchbox-stroke ?= "0.0"
 PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
 PREFERRED_VERSION_matchbox-themes-extra ?= "0.3"
 PREFERRED_VERSION_matchbox-themes-gtk ?= "1.0"
@@ -1360,7 +1304,6 @@ PREFERRED_VERSION_matrixssl ?= "1.1.1"
 PREFERRED_VERSION_mb-applet-tasks ?= "1.0.0"
 PREFERRED_VERSION_mb-desktop-xine ?= "0.4"
 PREFERRED_VERSION_mbmerlin ?= "0.8.1-2"
-PREFERRED_VERSION_mboxkbd-layouts-gui ?= "0.0"
 PREFERRED_VERSION_mc ?= "4.6.1"
 PREFERRED_VERSION_mce-dev ?= "1.5.6"
 PREFERRED_VERSION_mdadm ?= "2.5.5"
@@ -1449,7 +1392,6 @@ PREFERRED_VERSION_mpfr ?= "2.1.1"
 PREFERRED_VERSION_mpfr-native ?= "2.1.1"
 PREFERRED_VERSION_mpg123 ?= "0.66"
 PREFERRED_VERSION_mpg321 ?= "0.2.10"
-PREFERRED_VERSION_mplayer ?= "0.0"
 PREFERRED_VERSION_mplayer-common ?= "0.0.1"
 PREFERRED_VERSION_mrxvt ?= "0.5.2"
 PREFERRED_VERSION_msmtp ?= "1.4.10"
@@ -1465,7 +1407,6 @@ PREFERRED_VERSION_murasaki ?= "0.8.8"
 PREFERRED_VERSION_mutt ?= "1.5.15"
 PREFERRED_VERSION_mysql ?= "4.1.18"
 PREFERRED_VERSION_mysql-native ?= "4.1.18"
-PREFERRED_VERSION_mystun-server ?= "0.0"
 PREFERRED_VERSION_mythfront-config ?= "1.10"
 PREFERRED_VERSION_mythfront-session ?= "1.5"
 PREFERRED_VERSION_nabi ?= "0.17"
@@ -1498,7 +1439,6 @@ PREFERRED_VERSION_netperf ?= "2.4.2"
 PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
 PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
 PREFERRED_VERSION_networkmanager ?= "0.7"
-PREFERRED_VERSION_networkmanager-applet ?= "0.0"
 PREFERRED_VERSION_nfs-utils ?= "1.0.6"
 PREFERRED_VERSION_ngrep ?= "1.42"
 PREFERRED_VERSION_nis-all ?= "1.0"
@@ -1528,22 +1468,18 @@ PREFERRED_VERSION_obexpush-native ?= "1.0.0"
 PREFERRED_VERSION_octave ?= "2.9.14"
 PREFERRED_VERSION_offlineimap ?= "4.0.14"
 PREFERRED_VERSION_oh-puzzles ?= "0.1"
-PREFERRED_VERSION_ohm ?= "0.0"
 PREFERRED_VERSION_olsr ?= "0.3-1"
 PREFERRED_VERSION_olsrd ?= "0.5.3"
 PREFERRED_VERSION_omext ?= "0.2"
 PREFERRED_VERSION_omniorb ?= "4.0.7"
 PREFERRED_VERSION_omniorb-native ?= "4.0.7"
 PREFERRED_VERSION_openal ?= "0.0.8"
-PREFERRED_VERSION_opencvs ?= "0.0"
 PREFERRED_VERSION_openh323 ?= "1.13.5.4"
 PREFERRED_VERSION_openjade ?= "1.3.2"
 PREFERRED_VERSION_openjade-native ?= "1.3.2"
 PREFERRED_VERSION_openldap ?= "2.3.11"
 PREFERRED_VERSION_openntpd ?= "3.9p1"
 PREFERRED_VERSION_openobex ?= "1.3"
-PREFERRED_VERSION_openocd ?= "0.0"
-PREFERRED_VERSION_openocd-native ?= "0.0"
 PREFERRED_VERSION_openpbx.org ?= "1.2_rc3"
 PREFERRED_VERSION_openpbx.org-perl ?= "1.0"
 PREFERRED_VERSION_openprotium-init ?= "0.10"
@@ -1634,7 +1570,6 @@ PREFERRED_VERSION_pmtools ?= "20050926"
 PREFERRED_VERSION_poboxserver ?= "1.2.5"
 PREFERRED_VERSION_pocketcellar ?= "1.1"
 PREFERRED_VERSION_pocketsphinx ?= "0.2.1"
-PREFERRED_VERSION_pointercal ?= "0.0"
 PREFERRED_VERSION_poppler ?= "0.6"
 PREFERRED_VERSION_poppler-data ?= "0.1"
 PREFERRED_VERSION_poppler0.6 ?= "0.5.9"
@@ -1670,7 +1605,6 @@ PREFERRED_VERSION_procps ?= "3.2.7"
 PREFERRED_VERSION_proj-4 ?= "4.9"
 PREFERRED_VERSION_proj-4-native ?= "4.9"
 PREFERRED_VERSION_psmisc ?= "22.2"
-PREFERRED_VERSION_psplash ?= "0.0"
 PREFERRED_VERSION_psplash-zap ?= "1.0"
 PREFERRED_VERSION_pth ?= "2.0.2"
 PREFERRED_VERSION_ptim-engine ?= "0.1"
@@ -1703,7 +1637,6 @@ PREFERRED_VERSION_python-fam ?= "1.1.1"
 PREFERRED_VERSION_python-fnorb ?= "1.3"
 PREFERRED_VERSION_python-formencode ?= "0.4"
 PREFERRED_VERSION_python-fpconst ?= "0.6.0"
-PREFERRED_VERSION_python-fuse ?= "0.0"
 PREFERRED_VERSION_python-gammu ?= "0.21"
 PREFERRED_VERSION_python-gmpy ?= "1.0.1"
 PREFERRED_VERSION_python-gnosis ?= "1.2.2"
@@ -1850,14 +1783,12 @@ PREFERRED_VERSION_readline-native ?= "4.3"
 PREFERRED_VERSION_reaim ?= "7.0.1.13"
 PREFERRED_VERSION_recode ?= "3.6"
 PREFERRED_VERSION_recode-native ?= "3.6"
-PREFERRED_VERSION_recordext ?= "0.0"
 PREFERRED_VERSION_recordproto ?= "1.13.2"
 PREFERRED_VERSION_redfang ?= "2.5"
 PREFERRED_VERSION_refdbg ?= "1.2"
 PREFERRED_VERSION_regex-markup ?= "0.10.0"
 PREFERRED_VERSION_reiser4progs ?= "1.0.4"
 PREFERRED_VERSION_reiserfsprogs ?= "3.6.19"
-PREFERRED_VERSION_renderext ?= "0.0"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
 PREFERRED_VERSION_resistorui ?= "0.9"
 PREFERRED_VERSION_resolvconf ?= "1.28"
@@ -1869,9 +1800,7 @@ PREFERRED_VERSION_rhythmbox ?= "0.8.7"
 PREFERRED_VERSION_rlpr ?= "2.05"
 PREFERRED_VERSION_rng-tools ?= "2-1"
 PREFERRED_VERSION_roadmap-gtk2 ?= "1.0.12"
-PREFERRED_VERSION_roadster ?= "0.0"
 PREFERRED_VERSION_rocksndiamonds ?= "3.2.0"
-PREFERRED_VERSION_rosetta ?= "0.0"
 PREFERRED_VERSION_rott ?= "1.0"
 PREFERRED_VERSION_rox-filer ?= "2.5"
 PREFERRED_VERSION_rp-pppoe ?= "3.8"
@@ -1925,7 +1854,6 @@ PREFERRED_VERSION_sessreg ?= "1.0.3"
 PREFERRED_VERSION_setmixer ?= "27DEC94"
 PREFERRED_VERSION_setpwc ?= "1.1"
 PREFERRED_VERSION_setserial ?= "2.17"
-PREFERRED_VERSION_settings-daemon ?= "0.0"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
 PREFERRED_VERSION_sgml-common ?= "0.6.3"
 PREFERRED_VERSION_sgml-common-native ?= "0.6.3"
@@ -1980,12 +1908,10 @@ PREFERRED_VERSION_soundtracker-gtk2 ?= "0.6.7"
 PREFERRED_VERSION_sox ?= "13.0.0"
 PREFERRED_VERSION_sox-native ?= "13.0.0"
 PREFERRED_VERSION_spandsp ?= "0.0.3"
-PREFERRED_VERSION_sparse ?= "0.0"
 PREFERRED_VERSION_spca5xx ?= "20060501"
 PREFERRED_VERSION_spectrum-fw ?= "1.0"
 PREFERRED_VERSION_speex ?= "1.1.12"
 PREFERRED_VERSION_sphinxbase ?= "0.1"
-PREFERRED_VERSION_sphyrna ?= "0.0"
 PREFERRED_VERSION_sqlite ?= "2.8.17"
 PREFERRED_VERSION_sqlite3 ?= "3.4.1"
 PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
@@ -2100,7 +2026,6 @@ PREFERRED_VERSION_ttf-gentium ?= "1.02"
 PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0"
 PREFERRED_VERSION_ttf-liberation ?= "0.2"
 PREFERRED_VERSION_ttf-sazanami ?= "20040629"
-PREFERRED_VERSION_ttimgextract ?= "0.0"
 PREFERRED_VERSION_ttyconv ?= "0.2.3"
 PREFERRED_VERSION_ttyrec ?= "1.0.8"
 PREFERRED_VERSION_tuxnes ?= "0.75"
@@ -2166,7 +2091,6 @@ PREFERRED_VERSION_videoplayer ?= "0.1"
 PREFERRED_VERSION_videoproto ?= "2.2.2"
 PREFERRED_VERSION_vim ?= "7.0"
 PREFERRED_VERSION_vim-tiny ?= "7.0"
-PREFERRED_VERSION_vincent ?= "0.0"
 PREFERRED_VERSION_vino ?= "2.16.0"
 PREFERRED_VERSION_visiscript ?= "0.4.3"
 PREFERRED_VERSION_visual-boot ?= "0.0.1"
@@ -2184,13 +2108,10 @@ PREFERRED_VERSION_vte ?= "0.16.8"
 PREFERRED_VERSION_vtun ?= "2.6"
 PREFERRED_VERSION_vtype-utils ?= "0.6"
 PREFERRED_VERSION_w3cam ?= "0.7.2"
-PREFERRED_VERSION_waimea ?= "0.0"
 PREFERRED_VERSION_wakelan ?= "1.1"
 PREFERRED_VERSION_watchdog ?= "5.3.1"
 PREFERRED_VERSION_wbxml2 ?= "0.9.0"
-PREFERRED_VERSION_web ?= "0.0"
 PREFERRED_VERSION_webcam-server ?= "0.50"
-PREFERRED_VERSION_webkit-gtk ?= "0.0"
 PREFERRED_VERSION_wget ?= "1.9.1"
 PREFERRED_VERSION_whois ?= "4.5.25"
 PREFERRED_VERSION_wifistix-modules ?= "5.0.16.p0"
@@ -2232,7 +2153,6 @@ PREFERRED_VERSION_xcb-util ?= "0.2"
 PREFERRED_VERSION_xchat ?= "2.8.4"
 PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
 PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
-PREFERRED_VERSION_xcompmgr ?= "0.0"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
@@ -2295,7 +2215,6 @@ PREFERRED_VERSION_xhost ?= "1.0.2"
 PREFERRED_VERSION_xineramaproto ?= "1.1.2"
 PREFERRED_VERSION_xinetd ?= "2.3.13"
 PREFERRED_VERSION_xinit ?= "1.0.5"
-PREFERRED_VERSION_xirssi ?= "0.0"
 PREFERRED_VERSION_xkbd ?= "0.8.15"
 PREFERRED_VERSION_xmame ?= "0.100"
 PREFERRED_VERSION_xmame-tiny ?= "0.100"
@@ -2335,16 +2254,11 @@ PREFERRED_VERSION_xsetroot ?= "1.0.2"
 PREFERRED_VERSION_xsp ?= "1.0.0-8"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xstroke ?= "0.6"
-PREFERRED_VERSION_xsvg ?= "0.0"
 PREFERRED_VERSION_xterm ?= "207"
 PREFERRED_VERSION_xtrans ?= "1.0.4"
 PREFERRED_VERSION_xtrans-native ?= "1.0.3"
 PREFERRED_VERSION_xtscal ?= "0.6.3"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xxf86dgaext ?= "0.0"
-PREFERRED_VERSION_xxf86vmext ?= "0.0"
-PREFERRED_VERSION_yaffs2-utils ?= "0.0.0"
-PREFERRED_VERSION_yaffs2-utils-native ?= "0.0.0"
 PREFERRED_VERSION_yamonenv ?= "1.0.0"
 PREFERRED_VERSION_yeaphone ?= "0.1"
 PREFERRED_VERSION_yp-tools ?= "2.9"
@@ -2352,7 +2266,6 @@ PREFERRED_VERSION_ypbind-mt ?= "1.19"
 PREFERRED_VERSION_ypserv ?= "2.17"
 PREFERRED_VERSION_zauralign ?= "1.0.2"
 PREFERRED_VERSION_zaurus-tarball-native ?= "1.0"
-PREFERRED_VERSION_zaurusd ?= "0.0"
 PREFERRED_VERSION_zbedic ?= "1.0"
 PREFERRED_VERSION_zbench ?= "2.0"
 PREFERRED_VERSION_zcip ?= "4"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2aa59e211b..d3396ae8a3 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -100,6 +100,8 @@ SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
 SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-webkit-qt ?= "26079"
+SRCREV_pn-webkit-qtopia ?= "26079"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-networkmanager ?= "2887"