Sorted portage files alphabetically and removed net-wireless/gnome-bluetooth for now.

svn path=/trunk/; revision=716

releases/10.0/portage/package.keywords/keywords

@@ -21,6 +21,7 @@ dev-libs/glib
 dev-util/gtk-doc-am
 gnome-extra/evolution-webcal
 media-gfx/digikam
+=media-libs/taglib-1.6.1
 media-libs/taglib-extras
 media-sound/amarok
 media-sound/amarok-utils

releases/10.0/portage/package.use/use

@@ -1,42 +1,43 @@
-net-dns/avahi dbus
-gnome-extra/evolution-data-server ldap kerberos
-gnome-extra/gnome-utils -ipv6 -hal
+app-admin/conky audacious hddtemp mpd nano-syntax vim-syntax wifi rss
+app-cdr/gnomebaker -mp3
+app-misc/mc slang samba
 app-office/akonadi-server -mysql sqlite
 # The one below should not be picked by emerge anyway, but this is the 'working' default
+dev-db/mysql embedded
 dev-libs/soprano -redland java
 dev-python/PyQt4 dbus sql svg webkit X
-media-sound/phonon -gstreamer xcb xine
-x11-libs/qt-core -glib iconv
-x11-libs/qt-gui -glib -gtk mng
-x11-libs/qt-sql -firebird -odbc -mysql -postgres iconv sqlite
-x11-libs/qt-webkit kde
+gnome-base/gnome-volume-manager consolekit
+gnome-base/nautilus gnome-keyring
+gnome-extra/evolution-data-server ldap kerberos
+gnome-extra/gnome-utils -ipv6 -hal
 kde-base/kdelibs -zeroconf spell
 kde-base/kdm -consolekit pam
 kde-base/kwin -xinerama xcomposite
 kde-base/phonon-kde -pulseaudio xine
 kde-base/plasma-workspace -google-gadgets -python -xinerama rss
 kde-base/solid -bluetooth -networkmanager -wicd
-sys-auth/pambase consolekit
-dev-db/mysql embedded
-sys-block/gparted dmraid fat hfs jfs kde gnome ntfs reiserfs xfce xfs
-app-misc/mc slang samba
-xfce-extra/thunar-thumbnailers ffmpeg
-net-irc/quassel sqlite
-net-wireless/wpa_supplicant madwifi
-media-plugins/gst-plugins-meta -dvd -a52 -mad -mpeg
-app-cdr/gnomebaker -mp3
-sys-devel/gcc -gtk
 media-gfx/splashutils fbcondecor
 media-libs/freetype bindist
 media-libs/libmng lcms
-app-admin/conky audacious hddtemp mpd nano-syntax vim-syntax wifi rss
+# amarok-2.2 requires asf and mp4 built into taglib
+#media-libs/taglib -mp4
+media-libs/taglib asf mp4
+media-plugins/gst-plugins-meta -dvd -a52 -mad -mpeg
+media-sound/phonon -gstreamer xcb xine
+media-tv/xbmc joystick
+net-dns/avahi autoipd dbus mdnsresponder-compat
+net-irc/quassel sqlite
+net-wireless/wpa_supplicant madwifi
+sys-apps/hal consolekit
+sys-auth/pambase consolekit
+sys-block/gparted dmraid fat hfs jfs kde gnome ntfs reiserfs xfce xfs
+sys-devel/gcc -gtk
+sys-fs/aufs2 kernel-patch ramfs inotify
+x11-libs/qt-core -glib iconv
+x11-libs/qt-gui -glib -gtk mng
+x11-libs/qt-sql -firebird -odbc -mysql -postgres iconv sqlite
+x11-libs/qt-webkit kde
 x11-themes/gtk-engines-qt
 x11-themes/gtk-engines-qtcurve firefox3 mozilla
-gnome-base/nautilus gnome-keyring
-gnome-base/gnome-volume-manager consolekit
-sys-apps/hal consolekit
-net-dns/avahi mdnsresponder-compat
-media-tv/xbmc joystick
-sys-fs/aufs2 kernel-patch ramfs inotify
-media-libs/taglib -mp4
+xfce-extra/thunar-thumbnailers ffmpeg
 

releases/10.0/specs/amd64/livedvd-stage1.spec

@@ -456,7 +456,7 @@ livecd/packages:
 #	net-wireless/airsnort
 #	net-wireless/b43-fwcutter
 #	net-wireless/bcm43xx-fwcutter
-	net-wireless/gnome-bluetooth
+#	net-wireless/gnome-bluetooth
 	net-wireless/ipw2100-firmware
 	net-wireless/ipw2200-firmware
 	net-wireless/iwl3945-ucode