Temporarily disabled Gallium until r600 can be enabled w/o r300,

due to r300's llvm dependency causing all Gallium drivers to be
built against llvm.

Build-time fixes for a significant portage tree upgrade.

Added MIME and desktop databases update to the build, since ebuilds
of many packages don't update those.

check

@@ -73,7 +73,7 @@ ${FIND} -name '.*' ! \( -path '/home/anon/*' -o -path '/root/*' \) \
         ! -path '/usr/share/gnumeric/*.category'
 
 sinfo "Cache, backup, and temp:"
-${FIND} -name '*.cache'
+${FIND} -name '*.cache' -o -name '*.loaders' -o -name '*.immodules'
 ${FIND} \( -name '*~*' -o -name '*-' -o -name '*#*' -o -name '*.bak' \
            -o -name '*;*' -o -name '*.orig' \
            -o \( -path '*/tmp/*' ! -path '*/tmp/transient/*' \) \) \

conf/rootfs.excludes

@@ -85,7 +85,7 @@
 /usr/bin/*-config
 /usr/bin/*-config-[0-9]*
 /usr/games/bin/*-config
-/usr/lib/mesa/r[36]00_dri.*
+# /usr/lib/mesa/r[36]00_dri.*
 /usr/lib/mesa/*g_dri.*
 /usr/lib/dri/*g_dri.*
 /usr/lib/egl/pipe_*.*

doc/info.txt

@@ -43,9 +43,10 @@ aircrack-ng             ssl                     ssl
 
 networkmanager          gnutls, nss             gnutls
 wpa_supplicant          ssl, gnutls, libtom     gnutls          networkmanager
-net-misc/openvpn        ssl                     ssl             networkmanager-openvpn
-dev-libs/pkcs11-helper  !ssl, gnutls, nss       ssl             openvpn
+openvpn                 ssl                     ssl             networkmanager-openvpn
+pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn
 
+glib-networking         gnutls                  gnutls          libsoup(midori, gst-plugins-soup)
 libsoup                 gnutls                  gnutls          midori, gst-plugins-soup
 curl                    ssl, gnutls, nss        gnutls          gnupg, fbreader
 neon                    ssl, gnutls             gnutls          audacious-plugins

src/etc/make.conf

@@ -29,15 +29,14 @@ MAKEOPTS="-j3"
 # USE flags (aggregative)
 
 USE="aac acpi alsa aspell bidi bluetooth bs2b cairo caps cdda cjk consolekit
-     cue dbus dhcp djvu drm dynamic eap-tls exif expat fbcondecor flac
-     fontconfig gallium gmp grammar gconf groupwise gtk hires-icons
-     hybrid-auth id3tag idn iproute2 irda jbig jpeg jpeg2k lcms libnotify
-     lzma mad madwifi mktemp mmx mp3 multicall networkmanager ogg opengl
-     openvg ots pcmcia pcsc-lite pkcs11 png policykit pth scsi silc
-     smartcard smime sndfile speex spell sse startup-notification
-     staticsocket svg symlink thesaurus thin-splines threads tiff tordns
-     truetype unicode usb v4l2 vorbis wavpack wimax wmf X X509 x86emu xattr
-     xinerama xmp xv xvmc"
+     cue dbus dhcp djvu dynamic eap-tls exif expat fbcondecor flac
+     fontconfig gmp grammar gconf groupwise gtk hires-icons hybrid-auth
+     id3tag idn iproute2 irda jbig jpeg jpeg2k lcms libnotify lzma mad
+     madwifi mktemp mmx mp3 multicall networkmanager ogg opengl ots pcmcia
+     pcsc-lite pkcs11 png policykit pth scsi silc smartcard smime sndfile
+     speex spell sse startup-notification staticsocket svg symlink thesaurus
+     thin-splines threads tiff tordns truetype unicode usb v4l2 vorbis
+     wavpack wimax wmf X X509 x86emu xattr xinerama xmp xv xvmc"
 
 USE="${USE} -ant -berkdb -cddb -cracklib -cramfs -cups -cxx -dirac -encode
      -fts3 -gdbm -git -http-cache -hunspell -live -lvm1 -mng -mudflap -perl

src/etc/portage/package.use

@@ -17,8 +17,10 @@ media-libs/jasper               -opengl
 
 # Drivers
 # (fbdev conflicts with vesa, mesa's vmware is gallium-only)
+# [temporarily disable gallium until r600 can be enabled w/o r300 due to llvm dependency]
+# [also modified: rootfs.excludes#r[36]00_dri.*, setup#eselect mesa]
 x11-base/xorg-drivers           -video_cards_fbdev
-media-libs/mesa                 -video_cards_vmware
+media-libs/mesa                 -video_cards_vmware shared-dricore -gallium -egl -llvm
 media-video/mplayer             -video_cards_*
 sys-fs/udev                     extras
 sys-fs/ntfsprogs                minimal -crypt
@@ -28,6 +30,7 @@ dev-lang/python                 ssl
 mail-client/claws-mail          -ssl -gnutls -imap
 net-misc/wget                   ssl
 net-libs/libsoup                ssl
+net-libs/glib-networking        ssl
 net-misc/curl                   ssl   gnutls -nss
 net-libs/neon                   ssl   gnutls
 media-video/rtmpdump            ssl   gnutls
@@ -73,6 +76,7 @@ dev-libs/libxslt                -crypt
 media-libs/libwmf               -expat
 app-text/ghostscript-gpl        -djvu
 media-gfx/splashutils           -truetype
+net-libs/glib-networking        -gnome -libproxy
 
 # Extra functionality
 sys-apps/busybox                static savedconfig

src/root/setup

@@ -293,7 +293,7 @@ awk -F '\t' '!/^#/ { printf "%s %s \"%s\"\n", $1, $3, $4 }' /usr/share/zoneinfo/
 
 
 sinfo "Selectively disabling PAX"
-paxctl -m /usr/bin/mplayer /usr/bin/audacious2 /usr/bin/jamvm
+paxctl -m /usr/bin/mplayer /usr/bin/audacious /usr/bin/jamvm
 
 
 sinfo "Configuring fontconfig"
@@ -324,9 +324,9 @@ fi
 
 # http://www.x.org/wiki/GalliumStatus
 sinfo "Configuring Mesa, OpenGL and XvMC"
-for mfam in r300 r600; do
-    eselect mesa set ${mfam} gallium
-done
+# for mfam in r300 r600; do
+#     eselect mesa set ${mfam} gallium
+# done
 eselect mesa   set --auto
 eselect opengl set xorg-x11
 eselect xvmc   set xorg-x11

src/root/setup-copy

@@ -211,6 +211,7 @@ for mod in `find /usr/lib/GraphicsMagick* -name '*.so'`; do
 done
 
 
+# Not necessary anymore?
 if [ -e /etc/gtk-2.0/gtk.immodules ]; then
     sinfo "Fixing gtk.immodules"
     mv /etc/gtk-2.0/gtk.immodules /etc/gtk-2.0/`portageq envvar CHOST`/
@@ -318,11 +319,16 @@ sinfo "Regenerating fonts cache"
 fc-cache -fs
 
 
+sinfo "Regenerating MIME and desktop DBs"
+update-mime-database       /usr/share/mime
+update-desktop-database -q /usr/share/applications
+
+
 # http://www.freedesktop.org/wiki/Specifications/mime-actions-spec
 sinfo "Modifying MIME actions ordering preferences"
 sed -i 's/\<geeqie.desktop;gpicview.desktop;/gpicview.desktop;geeqie.desktop;/ ;
         s/\<epdfview.desktop;evince.desktop;/evince.desktop;epdfview.desktop;/ ;
-        s/\<gnome-mplayer.desktop;audacious2.desktop;/audacious2.desktop;gnome-mplayer.desktop;/' \
+        s/\<gnome-mplayer.desktop;audacious.desktop;/audacious.desktop;gnome-mplayer.desktop;/' \
     /usr/share/applications/mimeinfo.cache