[Lunar-commits] <moonbase> This is the huge update....

Samuel Verstraete elangelo at lunar-linux.org
Fri Jul 4 09:30:08 CEST 2008


commit 8afa3ac6f315bc6f0d1bd6aa1bbb8e4300b1b1b6
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Fri Jul 4 09:30:08 2008 +0200

    This is the huge update....
    Squashed commit of the following:
    
    commit b1247e88c4405622484e0418e2138be98bac81e5
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Jul 4 09:06:35 2008 +0200
    
        gnome-games2 > gnome-games
    
    commit feeee8d22e77ef4db5ac81085893b9e149e853ac
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Jul 4 09:02:35 2008 +0200
    
        gnome-common2 > gnome-common
    
    commit ef652a6b21b01a738cf3c7ab34d807412253fdc3
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Jul 4 08:57:26 2008 +0200
    
        gnome-mime-data2 > gnome-mime-data
    
    commit 22a8766b24d882244056cc3e66a8c99a7f76739f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Jul 4 08:45:28 2008 +0200
    
        libgtop2 > libgtop
    
    commit 456375480797b9459e7de139a8e98565336e472a
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Thu Jul 3 11:23:04 2008 -0700
    
        gnome-session add support for gnome-mount
    
    commit 8e8f0b247b8a7a28cdb71b54abcc69b0e779edfe
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 14:30:40 2008 +0200
    
        gtkmm
    
    commit 47f6d491bb3e3911230681db7e8abc7ef12b56d4
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 10:03:41 2008 +0200
    
        readding build and depends file for gnome-python
    
    commit 8ba4aa1b6656e79e7bbb2c12f66dddc6b6c7c1eb
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 10:01:39 2008 +0200
    
        gtkmm2 > gtkmm
    
    commit fa29709d98887a1ad3967488c8909619cc04d471
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 09:54:50 2008 +0200
    
        gnome-ython: adjuste DETAILS
    
    commit 7e5c2521cdc5f38f273dd20bb18cedd21ad71faf
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 09:54:14 2008 +0200
    
        gnome-python2 > gnome-python
    
    commit c1716e7913b94283b776b706dc00e1156583080f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 08:03:48 2008 +0200
    
        pygtk2 > pygtk
    
    commit a7caf987399528264167095b9242ac6373d79ee7
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 07:50:13 2008 +0200
    
        gtkhtml312 > /dev/null
    
    commit 71ada49414990e40c5710b67df788205eae53dc4
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 22:47:06 2008 -0700
    
        gnome-mount: Initial import
    
    commit 9692c856823f19cbb62b6907c985996de83bc0f1
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 07:38:25 2008 +0200
    
        goffice2 >> goffice
    
    commit c552c1429044ad73a5dba5b10f5a6171d161558f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 07:35:39 2008 +0200
    
        gnumeric2 >> gnumeric
    
    commit 70fb848ed758a4f6a2179b09c9b68940c0e100b4
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 07:33:07 2008 +0200
    
        gtkhtml312 is not needed anymore
    
    commit 70c69bc54e20c2f41d1c19caa6a0e1d8f2981e8a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jul 3 07:32:13 2008 +0200
    
        We still need gail if we stick at gtk 2.12*
        Revert "removed gail again"
    
        This reverts commit 1056051071dea91272762c4f129143728654bc6b.
    
    commit 72bca8eed14026598058754ef64548eaac3857ac
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 23:57:29 2008 -0500
    
        abiword: This now uses its own internal copy of goffice.
        So now there is no need for goffice1. goffice2 is good enough for
        gnucash and gnumeric2.
    
    commit 21acf7f5ec4c8bff2787e21274502f7369726e13
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 22:49:44 2008 -0500
    
        abiword: Version bump to 2.6.3.
    
    commit 371334ffac5c50569a1338e0982cfcb146dbbe68
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 22:41:26 2008 -0500
    
        gnumeric2, goffice2: Version bump to goffice-0.6.4, gnumeric2 now DEPENDS on goffice2.
    
    commit 93f63eefa72212c86d2e73286e46dd3f09928995
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 20:23:06 2008 -0700
    
        gnome-audio: version bump
        gnome-volume-manager: version bump
        libgnomecanvas: depends on gail
        gtk+-2: update to 2.12.11
    
    commit f42187ffbd6f012c1f857447930f86772f171772
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 16:47:50 2008 -0700
    
        Revert "removed gail again"
    
        This reverts commit 1056051071dea91272762c4f129143728654bc6b.
    
    commit 8e22b4ec56e3a6255db6639b88a379aa2951b763
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 16:19:29 2008 -0700
    
        gnome-media does not conflict with gnome-media
    
    commit 42457d2e47b63b314155f25c756f1c33a5b986dc
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 16:12:22 2008 -0700
    
        remove libcm. No longer needed by metacity
    
    commit 5e50023b5c2cea019fa2500acc63df78ed19817d
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 17:58:38 2008 -0500
    
        gnucash: Version bump to 2.2.5.
    
    commit 3cd70d6e29ba30f28d97f6c007a4659772ddcad6
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 17:48:49 2008 -0500
    
        gtk+-2: reverted to 2.12.11. Evolution complains about gtk+-2.13.2
    
    commit 679d506351c97db28a72a46594732b59605e4e6e
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 15:48:25 2008 -0700
    
        cleanup metacity, allow it to determine defaults
    
    commit 1d0730824e2576d45a248d6e95383f50c915cbf3
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 17:22:50 2008 -0500
    
        gnumeric2: Version bump to latest stable 1.8.3.
    
    commit 7e88c3b27901e3d84e337c4a46ce194367a0daa7
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 17:16:10 2008 -0500
    
        evolution, evolution-data-server, evolution-exchange: Version bumps to latest stable.
        evolution-2.22.3.1, evolution-data-server-2.22.3, evolution-exchange-2.22.3.
    
    commit be43b31d19585d23979a983c1929bcbbb80f4c59
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jul 2 15:14:55 2008 -0700
    
        Remove gnome-media2
    
    commit 39742fb1b06d01860cbdcc8f59a7debc0c1e3dbb
    Author: Terry Chan <tchan at lunar-linux.org>
    Date:   Wed Jul 2 16:34:44 2008 -0500
    
        balsa: Fixed the DEPENDS to use gtkhtml3 instead of libgtkhtml.
    
    commit 381edfe4997d5e2ce5a240d07242b67b0ab0b392
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 22:51:55 2008 +0200
    
        libwnck 2.22.3
    
    commit c597a1390148148da817c434678c0b8ae09d06a4
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 15:46:56 2008 +0200
    
        gtk+-2: removed remains of flashpatch
    
    commit 9b5159415a2f708d27994915e75b52a2f17b4ad9
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 15:46:05 2008 +0200
    
        gtk+-2 tweak DEPENDS
    
    commit f9635b5309a29da5cc78ea1047e01c3492c54d2e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 14:30:56 2008 +0200
    
        gtk+-2: version bump to 2.13.2
    
    commit f8bbcfe36b3bb8debb5c6dd3e35968fc55a18f0d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 12:57:54 2008 +0200
    
        GECKO_RENDERER >> xulrunner
    
    commit 6a170544717104f43e58b3441cd98cb5854d032d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 12:39:51 2008 +0200
    
        linc >> /dev/null
    
    commit 4a01e8bcaed3fe89f7f138437d979e617793fcb6
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 11:58:20 2008 +0200
    
        gtksourceview2 >> /dev/null
    
    commit 56c61f166adb840f3c4c15d2553e34c4886cfd66
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 11:57:57 2008 +0200
    
        cleansing... gtksourceview2 > gtksourceview
    
    commit 1056051071dea91272762c4f129143728654bc6b
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 2 11:17:30 2008 +0200
    
        removed gail again
    
    commit c054934b254dafcdcd59a14f6bc6dc683dba8e80
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Tue Jul 1 22:27:08 2008 -0700
    
        fix depends
    
    commit bb27ab0d8533b36c59a91f33eab0ba7337ecb12a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Tue Jul 1 22:26:14 2008 +0200
    
        hmmm
    
    commit 061faa9dc97fc3c52819b2b0376e39ed0e2dfceb
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 22:04:45 2008 -0700
    
        fix depends
    
    commit d47d607636cbb51de0757f9faa2893f8b625c87c
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 22:04:34 2008 -0700
    
        fix URL
    
    commit 5d179ec5c409bbf1cf17d0431771e476e3554e39
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 22:01:20 2008 -0700
    
        fix module name
    
    commit 2ff65692fd6e407a772d9e4a9252b9f1622c06de
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 22:00:32 2008 -0700
    
        fix module name
    
    commit b66e69dfe6a85375ec78afcec9d48536da0ad04f
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 21:54:52 2008 -0700
    
        gnome-applets: update to 2.22.2
    
    commit 19a1268b33a14e6b4a559328ad8b6669d0ef51f1
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 21:54:17 2008 -0700
    
        gnome-applets2 -> gnome-applets
    
    commit 59653f2372d1c040c30eeae3ee9bb84cae282989
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 21:46:00 2008 -0700
    
        pygtksourceview2 -> pygtksourceview
    
    commit 1f6dbde6e8e31b290d4f008e720e5c1716c585f9
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 21:44:34 2008 -0700
    
        remove pygtksourceview
    
    commit 54095ead1936b25175bcb55629d7d1ce473f53e3
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 29 21:39:58 2008 -0700
    
        GConf2 -> GConf rename
    
    commit b069646dbf104b4839aa4d07dcf8924a7d57dcce
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:45:23 2008 -0700
    
        gedit-plugins: update to 2.22.2
    
    commit 829a4b18e91ce5afd00042354e8540c58e43f2ed
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:44:40 2008 -0700
    
        gtksourceview: update to 2.2.2
    
    commit 83d07c1031beb789f1f20cabb4ecdc047982ea2e
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:43:36 2008 -0700
    
        gst-plugins-base: update to 0.10.20
    
    commit a350bfcb4c63ecb59e523d7fb7a227d625c2b373
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:42:43 2008 -0700
    
        gstreamer-10: Update to 0.10.20
    
    commit 8d293a2841658f60f4ccdcf5f3fa72d0885322bf
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:41:50 2008 -0700
    
        pygtksourceview2: fix url for download
    
    commit 59130f477b341a3c16fd9b147da1e11891c7ddc3
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 09:41:17 2008 -0700
    
        libgtop: fix url for download
    
    commit d6905f0845b5f79458850122ccf2389bb4eadcf7
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 08:26:28 2008 -0700
    
        gnome-vfs2: Gone! (Renamed to gnome-vfs)
    
    commit 52974cea3b0684e285fecf4684b0a66ebdc49e9a
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 08:11:02 2008 -0700
    
        fix depends renames
    
    commit 9b0235fade83a2f670cfa3440a7cea93069aff5d
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 27 08:03:37 2008 -0700
    
        Fix depends: libglade2 -> libglade
    
    commit bc8eae056089f0bb6c7978b030b4b44e1a9aa44f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Jun 27 08:06:38 2008 +0200
    
        nautilus requires gvfs now
    
    commit 8b1de571502295fc8b178c5c0e7b6342bb88f195
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Thu Jun 26 13:06:15 2008 -0700
    
        fix merge conflicts
    
    commit ada0339c2513eee2cd111caed7e0ae874868f165
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Thu Jun 26 12:22:38 2008 -0700
    
        fix some conflicting merges
    
    commit 023d37943e1788888c91ed796b083e57fbdb07bb
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Thu Jun 26 11:57:51 2008 -0700
    
        libxklavier: Update to 3.6
    
    commit 82c88e6f331add11140f81998adea85e83fe433c
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jun 26 11:14:56 2008 +0200
    
        gnomecontrolcenter not controlcetner
    
    commit 633af1e9c4762cad90c23e0e1cb03e8d30735918
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jun 26 20:05:46 2008 +0200
    
        updating stuff
    
        Conflicts:
    
        	gnome2/desktop/gnome-system-monitor/DEPENDS
    
    commit 5cf7a2a533f14156d8412774c2b6df8968f97916
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jun 26 14:20:14 2008 +0200
    
        done
    
    commit 40d3a30c7972efd84613cbc5ec487d2f198198c7
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Jun 26 14:21:09 2008 +0200
    
        gnome-settings-daemno new module
    
    commit 064e5ba3bd9af0c03d25f83e6d3b3089fb55d53b
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Jun 20 10:59:29 2008 -0700
    
        gtkmm2: update to latest
    
    commit 69595f0557d096563465240f90ba869995d0cf76
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Wed Jun 18 10:30:15 2008 -0700
    
        gnome updates
    
    commit e194dd0e4250f2551f565ad09e4efcf33b33f8ca
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Tue Jun 17 20:06:08 2008 -0700
    
        gdm update to 2.20.6
    
    commit 58c56b85195fea0289b7667dde406c764ce7efe2
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Tue Jun 17 19:46:48 2008 -0700
    
        Subversion patch to allow bzr-svn to work.
    
    commit 37fdb4fc80215dcc8537d1a86d2852ae5a04c385
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Jun 1 14:58:54 2008 -0700
    
        gnome update
    
    commit 4dd5f8d71f41adeda3444015acf2c831a74d613a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Apr 24 19:07:18 2008 +0200
    
        gnome-panel: tune DEPENDS
    
    commit b367c9e89d7cb977399cd3c18d95f4635953e103
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Apr 21 22:58:02 2008 +0200
    
        gnome-power-manager: fix the depends and configure
    
    commit 60875261824598bb49709df761cb43d2d4c9bbc1
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Sun Apr 20 19:57:29 2008 +0200
    
        libgweather: new module, required by gnome-panel
    
    commit d1dbdf15c99e67c012d50f70027d604c6118905f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Sun Apr 20 10:14:00 2008 +0200
    
        gtk-sharp2 version 2.12
    
    commit 5fe3f7dc2c4450845f27dbb1e8a9bc1fa82464ae
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Sun Apr 20 10:01:01 2008 +0200
    
        gvfs: 0.2.3, initial commit
    
    commit 90cdf9f83a5b1ce89e0d06916c0e750ca842cc4a
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Apr 18 10:13:00 2008 -0700
    
        gnome 2.22.1
    
    commit bf032bc92e55a7e1956decbe95237f6d2233b816
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Apr 17 09:07:25 2008 +0200
    
        vte: fix the UPDATED field
    
    commit 515dae5ac1a01cf7d14d2aa1c06d3cdf31e979ee
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Apr 17 00:03:16 2008 +0200
    
        glib-2: update to 2.16.3
    
    commit 28a812f5e699eea2a07ab184d31aafec639aa70a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:56 2008 +0200
    
        zenity: update to 2.22.1
    
    commit bfbb33d64a389155830c1a399431278ba25ca72d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:55 2008 +0200
    
        yelp: update to 2.22.1
    
    commit 6c60ca903c715ad3c26b7b1ddfc0a99eb3d8dd76
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:53 2008 +0200
    
        vte: update to 0.16.13
    
    commit f7d8c4fc93adc6aa022397356a64ecaf5e43d279
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:52 2008 +0200
    
        vino: update to 2.22.1
    
    commit 0d83deef1f7acd5046860cadc2194cc92d6b93c7
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:49 2008 +0200
    
        totem: update to 2.22.1
    
    commit 3e2c3c95af2e604a673095c1b32c21fe41dbcff3
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:47 2008 +0200
    
        tomboy: update to 0.10.1
    
    commit 8c3ba69df0dc56384a406fac0f82e43a1a8f5043
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:45 2008 +0200
    
        sound-juicer: update to 2.22.0
    
    commit 530f39daf27706ddc8835520c2b8e645fba9d112
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:42 2008 +0200
    
        pygobject: update to 2.14.1
    
    commit a2ce5b7acf2696abc760a71c1655112b6c8ee26f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:40 2008 +0200
    
        pango: update to 1.20.1
    
    commit cf7ad992b6542b314e312dca55151059845a15dc
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:39 2008 +0200
    
        orca: update to 2.22.1
    
    commit 54ecf402ea94f77d6a956c61b288e7c888747ab2
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:37 2008 +0200
    
        nautilus-cd-burner: update to 2.22.1
    
    commit 71ea0c8f04d58712a1e3ccda20792b869237d76b
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:35 2008 +0200
    
        nautilus: update to 2.22.2
    
    commit 821abd62f645dc85b3d9d3fb3133f762cb9ba588
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:33 2008 +0200
    
        metacity: update to 2.22.0
    
    commit 7c3d774bdef4c90ee4a2fce83125ad47d83b068a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:32 2008 +0200
    
        libxml++: update to 2.22.0
    
    commit 98a3f379d80b4b59e2cb114c82af1e7c19504f66
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:30 2008 +0200
    
        libwnck: update to 2.22.1
    
    commit 80a3169a02e54123b5b8b518bea6a0472f3b5bfe
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:29 2008 +0200
    
        libsoup: update to 2.4.1
    
    commit 0ba43b631603807e219bccff97f8e1b40e22d8cb
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:28 2008 +0200
    
        librsvg: update to 2.22.2
    
    commit c23436fda80afd2f0b65f8104389cf5de6bd081e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:26 2008 +0200
    
        liboobs: update to 2.22.0
    
    commit ee55e7d14a68ec07af5e16f3d7c074684f4e3129
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:22 2008 +0200
    
        libgnomeuimm: update to 2.22.0
    
    commit 7b3204628709f2ad1d73882032fec2520c84e37f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:21 2008 +0200
    
        libgnomeui: update to 2.22.1
    
    commit a2bf1894412d21ef7ee69c51474f9399749223c7
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:20 2008 +0200
    
        libgnomeprintui: update to 2.18.2
    
    commit 37261767acaa2f00324ba9c5bf3a85db816cb904
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:18 2008 +0200
    
        libgnomeprint: update to 2.18.4
    
    commit d97cc5e642a5fa3dc68ddbd599b7c1c022989979
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:17 2008 +0200
    
        libgnomemm: update to 2.22.0
    
    commit 5b3afa0774ecce844bd21c1a8c015f6b19287691
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:15 2008 +0200
    
        libgnomekbd: update to 2.22.0
    
    commit c474d1e9571bc9d27d0377cfcee01b28fb127817
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:13 2008 +0200
    
        libgnomecanvasmm: update to 2.22.0
    
    commit 7fcf9eaa114ebf4c6a05aafe7caf5d950fb47689
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:11 2008 +0200
    
        libgnome: update to 2.22.0
    
    commit 0da7d5baa6e008956b605bdcf52acc6f8773a6bd
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:09 2008 +0200
    
        libglademm: update to 2.6.6
    
    commit c355da2422bd276744e810631642d16d6996561f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:06 2008 +0200
    
        libgail-gnome: update to 1.20.0
    
    commit 490949217ebe56c68d583949c8aee4115bbfc714
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:05 2008 +0200
    
        libbonoboui: update to 2.22.0
    
    commit 4682f122c8aae472f302dac032871a1657b0ef39
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:04 2008 +0200
    
        libbonobo: update to 2.22.0
    
    commit 20b6f9a1c873d6d583550155670a9cd96e156e8e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:53:02 2008 +0200
    
        libart_lgpl: update to 2.3.20
    
    commit b2bf313af922c9dfb4b25373ba73711da8896cba
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:59 2008 +0200
    
        gucharmap: update to 2.22.1
    
    commit 26ae3755d471d59d738c32f5fbcdf99caaa7d72c
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:57 2008 +0200
    
        gtkmm: update to 2.12.7
    
    commit f893781185ea73b207111b465e79173df6776468
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:53 2008 +0200
    
        gst-plugins-base: update to 0.10.19
    
    commit 4751237faf8b4a0a9a6dfe2a05ac96b295ab6403
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:52 2008 +0200
    
        gok: update to 1.3.7
    
    commit 17116a2021bf1dabce05aae945097f365208a012
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:50 2008 +0200
    
        gnome-volume-manager: update to 2.22.1
    
    commit b405e5f6bc6175c38abad0eb42eef02f26d7268b
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:48 2008 +0200
    
        gnome-vfsmm: update to 2.22.0
    
    commit 2a5d7383fae62f9e3ca34bb1e8a97abc7d151e79
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:47 2008 +0200
    
        gnome-vfs: update to 2.22.0
    
    commit 8e33db37d8678fa7652a6841fd39ec7038f92fdc
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:45 2008 +0200
    
        gnome-user-docs: update to 2.22.0
    
    commit 4c2671545aa1b38636bae62ea4713327f5c0c1cb
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:43 2008 +0200
    
        gnome-themes: update to 2.22.0
    
    commit 18ed5470b7e4775bc63078bcef623467eeefa500
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:42 2008 +0200
    
        gnome-terminal: update to 2.22.1
    
    commit 32cf2eebf15b028f48050e1b4e0607b1f3471c87
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:40 2008 +0200
    
        gnome-system-tools: update to 2.22.0
    
    commit 942fd47b13737294886509f13cef157fc274368c
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:38 2008 +0200
    
        gnome-system-monitor: update to 2.22.0
    
    commit 2027eccab8f16a290f102c451a2dacc52852c991
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:37 2008 +0200
    
        gnome-speech: update to 0.4.18
    
    commit c52e8e77f4f6924fc69c1e44c7060c33287a04be
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:36 2008 +0200
    
        gnome-sharp: update to 2.20.0
    
    commit 4f27859ce9cc5111502b8fb9b9473c91806c52ad
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:33 2008 +0200
    
        gnome-session: update to 2.22.1
    
    commit a774e6ef79687685d1c291813a7d3008cc92507a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:31 2008 +0200
    
        gnome-screensaver: update to 2.22.2
    
    commit f30680ae52d566c79dd385c5979690ce56b92722
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:30 2008 +0200
    
        gnome-python-desktop: update to 2.22.0
    
    commit 51dfdb9a41b610c075086e00b49c2fdba4198efe
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:28 2008 +0200
    
        gnome-power-manager: update to 2.22.1
    
    commit a994639ba0dca68f9990ba55a1ad4648fb61d5f1
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:27 2008 +0200
    
        gnome-panel: update to 2.22.1.1
    
    commit fb82a361bcef374078b3cec7776550753698e3e8
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:25 2008 +0200
    
        gnome-nettool: update to 2.22.0
    
    commit 99b01f6e5d826732f9dad7d37d40cbdc2f636f80
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:22 2008 +0200
    
        gnome-menus: update to 2.22.1
    
    commit cffeef0137479e2a1e93ccfb38c484d86c2f333e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:20 2008 +0200
    
        gnome-media: update to 2.22.0
    
    commit 0dd470010e4652cbd2ecd1166fe6469abae71fec
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:19 2008 +0200
    
        gnome-mag: update to 0.15.0
    
    commit 1ca226b2a2c1c54428886d6acae41deddebd3346
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:18 2008 +0200
    
        gnome-keyring: update to 2.22.1
    
    commit ee57a15ec7c1f46eb1a29bf99e689451d16fa97e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:16 2008 +0200
    
        gnome-icon-theme: update to 2.22.0
    
    commit 632e9e0730df4422cfee20366c7341c939d50f2f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:13 2008 +0200
    
        gnome-doc-utils: update to 0.12.2
    
    commit 03a4ecfe8cb91b9fd683690bbdd1f5648c9c710d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:12 2008 +0200
    
        gnome-desktop: update to 2.22.1
    
    commit 00e9fe1015d562664860a0a6e21e6ca287298002
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:10 2008 +0200
    
        gnome-control-center: update to 2.22.1
    
    commit 92e1fac611ace6172268f72d4eb30e42069c330a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:09 2008 +0200
    
        gnome-backgrounds: update to 2.22.0
    
    commit 515bdf25177d078561cb8a60326e13fa7dcb3e04
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:07 2008 +0200
    
        gnome-applets: update to 2.22.1
    
    commit 69c263a51400cd4d865f417963ef31220b30d781
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:06 2008 +0200
    
        glibmm: update to 2.16.1
    
    commit d577a9a7161b474a6948f6bd29f0e3d7dfdf33f6
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:04 2008 +0200
    
        gedit: update to 2.22.1
    
    commit c876e3cb2a30b1d1582ede560f2d1696ce647436
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:02 2008 +0200
    
        gdm: update to 2.20.5
    
    commit 479fda7fde31519ed176dc0f5e6e8eaea3b93f3b
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:52:01 2008 +0200
    
        gconfmm: update to 2.22.0
    
    commit a47c1b79d6f4ae7f14572835fea4e3646058cd96
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:59 2008 +0200
    
        gconf-editor: update to 2.22.0
    
    commit d21d765702acf1d26320c1b5ab83187848d93a08
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:58 2008 +0200
    
        GConf: update to 2.22.0
    
    commit ccb6c9a5a1e8ba314b502cd2ea297f7273acca2e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:57 2008 +0200
    
        gcalctool: update to 5.22.1
    
    commit 74fa812fb990a78ea242dc9e6f10c6affc207027
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:55 2008 +0200
    
        gail: update to 1.22.1
    
    commit 782da48474c4d76f7d14953428bac3b6bbe16d66
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:54 2008 +0200
    
        file-roller: update to 2.22.2
    
    commit a7c833c8e86f89d7f342fb3736b50b7f1a07e74e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:52 2008 +0200
    
        fast-user-switch-applet: update to 2.22.0
    
    commit 2c69facfaf6f3f160e30edc4d9a92b081a21f9ba
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:51 2008 +0200
    
        evince: update to 2.22.1.1
    
    commit e9e50c8977a729c60f89e8075261a2b25381bf15
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:49 2008 +0200
    
        epiphany: update to 2.22.1.1
    
    commit 72b59f0a8267666e39b876ea6aef6308efa54344
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:47 2008 +0200
    
        eog: update to 2.22.1
    
    commit 6baf9ebd66099f38d30eca8d4632d37a5403e2a4
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:46 2008 +0200
    
        ekiga: update to 2.0.12
    
    commit 70b3d928942357c54118345c8543ce272353c9c8
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:45 2008 +0200
    
        eel: update to 2.22.1
    
    commit 7f126116d97adb40b7172541738910d51fada35e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:43 2008 +0200
    
        deskbar-applet: update to 2.22.1
    
    commit c2e18026cea4da60467e7f3710c0b5dc51ab0d83
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:42 2008 +0200
    
        dasher: update to 4.7.3
    
    commit 1ba417edb4a2bb0187d4777b0fd4fab4e0628c38
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:40 2008 +0200
    
        bug-buddy: update to 2.22.0
    
    commit f743f5ddf6ef830bcb99f7269335bd2b5d4184d5
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:38 2008 +0200
    
        at-spi: update to 1.22.1
    
    commit a8bd5c7ff371f259d1234ffff4f33d16aae98d81
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:51:36 2008 +0200
    
        atk: update to 1.22.0
    
    commit 56c8dd1d3e301b25d67a37694d580515ead21cef
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:45:27 2008 +0200
    
        gnome-python2-extras -> gnome-python-extras
    
    commit d33424ae8170d7ee8837cb700411c4ae08253fb2
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:41:47 2008 +0200
    
        gnome-python2 -> gnome-python
    
    commit efb17c7d34393ff4709b431c0e4ba98918f68e7d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 23:04:49 2008 +0200
    
        gnome-applets2 -> gnome-applets && control-center2 -> gnome-control-center
    
    commit e7f0fe71f863079bdc90cdaad7917438de40f2f5
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 22:54:25 2008 +0200
    
        gnome-vfs2 -> gnome-vfs
    
    commit 21cd70bdf409d372945d5c492d4117bae3eafd09
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 22:52:07 2008 +0200
    
        gnome-media2 -> gnome-media && libgtop2 -> libgtop
    
    commit cca28ba1804f5e722bb02a1e15589e32d017aadb
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 22:46:05 2008 +0200
    
        gtkmm2 -> gtkmm
    
    commit 3e1fce1e5babafec88d3744b7f6c55e1c8d3e23f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 22:43:56 2008 +0200
    
        GConf2 -> GConf
    
    commit fd391d76d072c0b36c803a76b7c2ba4d034b291a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Apr 16 22:24:29 2008 +0200
    
        libglade2 -> libglade
        rename libglade2 to libglade
        + adjustment of all DEPENDS
    
    commit e1405d86e1e74cdb7d28160e7c1c1c9f1aa0b502
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Apr 13 19:28:09 2008 -0700
    
        gnome-control-center: 2.22.1
    
        Replaces control-center2
    
    commit e6445150484cac6ba49234a30b0da63023c68a2f
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Apr 13 19:27:10 2008 -0700
    
        gnome-settings-daemon: 2.22.1
    
    commit 615dd016a62213ac232490250a19c6d5e7effbd2
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Sun Apr 13 19:25:48 2008 -0700
    
        libgweather: 2.22.1
    
    commit f5951d6339beb51a1df6cf2700024c68d0dc1993
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Tue Apr 1 20:10:57 2008 -0700
    
        test
    
    commit 15f64b6b0b049465474d4303d450e95db90fe399
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:55:07 2008 -0700
    
        totem-pl-parser: Add new module for Gnome 2.22
    
    commit 4181abbe9a9d6e1d36c0f07db679700584ea9c37
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:53:55 2008 -0700
    
        gvfs: Add new module for Gnome 2.22
    
    commit 78fb95bf59896ba307e8c609dc8cde39b6406a35
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:49:57 2008 -0700
    
        libgnomekbd: Update to Gnome 2.22 release
    
    commit c7b5ec3bf5f2dafd49749aa3291efbd1c34d22e6
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:49:35 2008 -0700
    
        gnome-games-extra-data: Update to Gnome 2.22 release
    
    commit e31dd3b5f26f38a79aeed2b336403b062dabaef6
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:49:00 2008 -0700
    
        nautilus: +0.0.1 Various bugfixes
    
    commit e8d4657fee705adb9548750918fc6e97592df37d
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:48:28 2008 -0700
    
        gstreamer-10: +0.0.1 Various bugfixes
    
    commit d39754376409c458e3f8800d505b56f5e7aaa834
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:47:58 2008 -0700
    
        libgnomeuimm: Bump to match gnome's 2.22 release
    
    commit b264e273c1a2a06ab299c27c3f1d4b970b0c00f6
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:47:40 2008 -0700
    
        gmime: +0.1 Various bugfixes
    
    commit 1118a4fbea5f69abc2eb97711c8a00d236f1dbc9
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:45:50 2008 -0700
    
        gst-plugins-base: +0.0.1 Lots of bugfixes
    
    commit adae6fccd7567f5c0e46b3d9a47d82e8dd10b2a2
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:45:20 2008 -0700
    
        gnome-audio: Update to the latest sounds
    
    commit 4b73cecb23dfe45f72bd5aa5d448460247002c1a
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:44:38 2008 -0700
    
        gtk-doc: +0.1 Various bug fixes
    
    commit 1b3f709ef56a8c41095e454e103a42813b9a2642
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 21:43:44 2008 -0700
    
        gnome-python2-extras: Verion bump. Garnome says this is now stable despite the odd number.
    
    commit d611be76a279bb5527a70f7555b0e0a7e644e986
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 20:31:05 2008 -0700
    
        eel: +0.0.1
    
    commit 8e3a80c563db084de197513765734533770fd7b9
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Fri Mar 28 20:23:36 2008 -0700
    
        gnome-power-manager: +0.0.1
    
        Various bug fixes, and no more annoying beeps when closing/opening the laptop lid
    
    commit df8b7892e880dd03346e1801f92aea7e0a83b35b
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Tue Mar 25 01:54:03 2008 -0700
    
        Gnome 2.22: Bump Gnome to version 2.22
    
        This is Gnome and all associated modules.
    
    commit e89962ebc06a4f1a52306c5e948d57c8dd862f4a
    Author: Zachary McGrew <zmcgrew at gmail.com>
    Date:   Mon Mar 24 20:02:33 2008 -0700
    
        sound-juicer: version bump, now supports more id3 tag fields
---
 app-themes/gnome-themes-extras/DETAILS         |    9 ++++---
 audio/abraca/DEPENDS                           |    2 +-
 audio/amSynth/DEPENDS                          |    2 +-
 audio/ardour/DEPENDS                           |    2 +-
 audio/audacious/DEPENDS                        |    2 +-
 audio/exaile/DEPENDS                           |    4 +-
 audio/glurp/DEPENDS                            |    2 +-
 audio/gmpc/DEPENDS                             |    2 +-
 audio/gst-player/DEPENDS                       |    2 +-
 audio/gst-plugins-base/DEPENDS                 |    2 +-
 audio/gst-plugins-base/DETAILS                 |    6 ++--
 audio/gst-plugins-good/DEPENDS                 |    2 +-
 audio/gst-plugins/DEPENDS                      |    4 +-
 audio/gstreamer-10/DETAILS                     |   18 +++++++-------
 audio/last-exit/DEPENDS                        |    2 +-
 audio/rhythmbox/DEPENDS                        |    9 ++++---
 audio/rhythmbox/DETAILS                        |   10 ++++----
 audio/seq24/DEPENDS                            |    2 +-
 audio/sonata/DEPENDS                           |    2 +-
 audio/tagtool/DEPENDS                          |    2 +-
 cd/burgner/DEPENDS                             |    2 +-
 cd/graveman/DEPENDS                            |    2 +-
 chat/gajim/DEPENDS                             |    2 +-
 chat/pidgin/DEPENDS                            |    2 +-
 crypto/seahorse/BUILD                          |    2 +-
 crypto/seahorse/DEPENDS                        |    2 +-
 crypto/seahorse/DETAILS                        |   17 +++++++------
 devel/anjuta/DEPENDS                           |    4 +-
 devel/anjuta2/DEPENDS                          |    2 +-
 devel/devhelp/DEPENDS                          |    4 +-
 devel/devhelp/DETAILS                          |    5 ++-
 devel/gdl/DETAILS                              |    6 ++--
 devel/giggle/DEPENDS                           |    2 +-
 devel/glade3/DEPENDS                           |    2 +-
 devel/glademm/DEPENDS                          |    2 +-
 devel/gtk-sharp2/DEPENDS                       |    2 +-
 devel/gtk-sharp2/DETAILS                       |   10 ++++----
 devel/gtksourceview-sharp/BUILD                |   14 -----------
 devel/gtksourceview-sharp/DEPENDS              |    2 -
 devel/gtksourceview-sharp/DETAILS              |   11 --------
 devel/gtranslator/DEPENDS                      |    2 +-
 devel/kiwi/DEPENDS                             |    4 +-
 devel/orbitcpp/DEPENDS                         |    2 +-
 devel/rep-gtk/DEPENDS                          |    2 +-
 devel/subversion/BUILD                         |    1 +
 distributed/BitTorrent/DEPENDS                 |    2 +-
 distributed/deluge/DEPENDS                     |    2 +-
 distributed/nicotine+/DEPENDS                  |    2 +-
 distributed/nicotine/DEPENDS                   |    2 +-
 doc-tools/gtk-doc/DETAILS                      |    6 ++--
 doc-tools/intltool/DETAILS                     |    8 +++---
 docs/gnome-user-docs/DETAILS                   |    8 +++---
 editors/scribes/DEPENDS                        |    4 +-
 filemanagers/baobab/DEPENDS                    |    2 +-
 gnome2/applets/drwright/DEPENDS                |    2 +-
 gnome2/applets/gnome-blog/DEPENDS              |    2 +-
 gnome2/applets/grandr_applet/DEPENDS           |    2 +-
 gnome2/applets/netspeed_applet/DEPENDS         |    2 +-
 gnome2/applets/quick-lounge-applet/DEPENDS     |    2 +-
 gnome2/apps/abiword/DEPENDS                    |    1 -
 gnome2/apps/abiword/DETAILS                    |    8 +++---
 gnome2/apps/blogtk/DEPENDS                     |    2 +-
 gnome2/apps/gnome-btdownload/DEPENDS           |    2 +-
 gnome2/apps/gnumeric/BUILD                     |   15 ++++++++++++
 gnome2/apps/gnumeric/DEPENDS                   |   30 ++++++++++++++++++++++++
 gnome2/apps/gnumeric/DETAILS                   |   21 ++++++++++++++++
 gnome2/apps/gnumeric/profile.d/gnumeric.rc     |    2 +
 gnome2/apps/gnumeric2/DEPENDS                  |    4 +-
 gnome2/apps/gnumeric2/DETAILS                  |    8 +++---
 gnome2/apps/gramps/DEPENDS                     |    2 +-
 gnome2/apps/katoob/DEPENDS                     |    2 +-
 gnome2/apps/meld/DEPENDS                       |    3 +-
 gnome2/apps/myBudget/DEPENDS                   |    2 +-
 gnome2/apps/straw/DEPENDS                      |    2 +-
 gnome2/bindings/gconfmm/DEPENDS                |    4 +-
 gnome2/bindings/gconfmm/DETAILS                |    8 +++---
 gnome2/bindings/glibmm/DETAILS                 |    8 +++---
 gnome2/bindings/gnome-python-desktop/DEPENDS   |    2 +-
 gnome2/bindings/gnome-python-desktop/DETAILS   |   14 +++++-----
 gnome2/bindings/gnome-python-extras/BUILD      |   12 +++++++++
 gnome2/bindings/gnome-python-extras/DEPENDS    |    4 +++
 gnome2/bindings/gnome-python-extras/DETAILS    |   16 ++++++++++++
 gnome2/bindings/gnome-python/BUILD             |   13 ++++++++++
 gnome2/bindings/gnome-python/DEPENDS           |    4 +++
 gnome2/bindings/gnome-python/DETAILS           |   16 ++++++++++++
 gnome2/bindings/gnome-python2-extras/BUILD     |   12 ---------
 gnome2/bindings/gnome-python2-extras/DEPENDS   |    4 ---
 gnome2/bindings/gnome-python2-extras/DETAILS   |   18 --------------
 gnome2/bindings/gnome-python2/BUILD            |   12 ---------
 gnome2/bindings/gnome-python2/DEPENDS          |    4 ---
 gnome2/bindings/gnome-python2/DETAILS          |   17 -------------
 gnome2/bindings/gnome-vfsmm/DEPENDS            |    2 +-
 gnome2/bindings/gnome-vfsmm/DETAILS            |    8 +++---
 gnome2/bindings/gtkmm/BUILD                    |   14 +++++++++++
 gnome2/bindings/gtkmm/DEPENDS                  |    3 ++
 gnome2/bindings/gtkmm/DETAILS                  |   15 ++++++++++++
 gnome2/bindings/gtkmm2/BUILD                   |   14 -----------
 gnome2/bindings/gtkmm2/DEPENDS                 |    3 --
 gnome2/bindings/gtkmm2/DETAILS                 |   16 ------------
 gnome2/bindings/libglademm/DEPENDS             |    4 +-
 gnome2/bindings/libglademm/DETAILS             |    6 ++--
 gnome2/bindings/libgnomecanvasmm/DETAILS       |    8 +++---
 gnome2/bindings/libgnomemm/DEPENDS             |    2 +-
 gnome2/bindings/libgnomemm/DETAILS             |    8 +++---
 gnome2/bindings/libgnomeuimm/DEPENDS           |    2 +-
 gnome2/bindings/libgnomeuimm/DETAILS           |    8 +++---
 gnome2/bindings/pygobject/DETAILS              |    8 +++---
 gnome2/bindings/pygtksourceview/DEPENDS        |    4 +-
 gnome2/bindings/pygtksourceview/DETAILS        |   19 ++++++++------
 gnome2/bindings/pygtksourceview2/DEPENDS       |    2 -
 gnome2/bindings/pygtksourceview2/DETAILS       |   14 -----------
 gnome2/core/gDesklets/DEPENDS                  |    2 +-
 gnome2/core/gnome-audio/BUILD                  |    7 -----
 gnome2/core/gnome-audio/DETAILS                |   12 ++++-----
 gnome2/core/gnome-common/BUILD                 |   12 +++++++++
 gnome2/core/gnome-common/DEPENDS               |    1 +
 gnome2/core/gnome-common/DETAILS               |   20 ++++++++++++++++
 gnome2/core/gnome-common2/BUILD                |   12 ---------
 gnome2/core/gnome-common2/DEPENDS              |    1 -
 gnome2/core/gnome-common2/DETAILS              |   21 ----------------
 gnome2/core/gtk-engines2/DETAILS               |    9 ++++---
 gnome2/core/linc/BUILD                         |   12 ---------
 gnome2/core/linc/DEPENDS                       |    1 -
 gnome2/core/linc/DETAILS                       |   15 ------------
 gnome2/core/linc/PRE_BUILD                     |    6 ----
 gnome2/core/nautilus-media/BUILD               |   12 ---------
 gnome2/core/nautilus-media/DEPENDS             |    2 -
 gnome2/core/nautilus-media/DETAILS             |   13 ----------
 gnome2/desktop/alacarte/DEPENDS                |    2 +-
 gnome2/desktop/bug-buddy/DEPENDS               |    2 +-
 gnome2/desktop/bug-buddy/DETAILS               |    8 +++---
 gnome2/desktop/control-center2/BUILD           |   14 -----------
 gnome2/desktop/control-center2/DEPENDS         |   15 ------------
 gnome2/desktop/control-center2/DETAILS         |   15 ------------
 gnome2/desktop/dasher/DETAILS                  |    8 +++---
 gnome2/desktop/deskbar-applet/DEPENDS          |    2 +-
 gnome2/desktop/deskbar-applet/DETAILS          |    8 +++---
 gnome2/desktop/eel/DETAILS                     |    8 +++---
 gnome2/desktop/ekiga/BUILD                     |    2 +-
 gnome2/desktop/ekiga/DETAILS                   |    9 +++----
 gnome2/desktop/eog/DEPENDS                     |    2 +-
 gnome2/desktop/eog/DETAILS                     |    8 +++---
 gnome2/desktop/epiphany/DETAILS                |    8 +++---
 gnome2/desktop/evince/DEPENDS                  |    2 +-
 gnome2/desktop/evince/DETAILS                  |    8 +++---
 gnome2/desktop/evolution-data-server/DEPENDS   |    2 +-
 gnome2/desktop/evolution-data-server/DETAILS   |    8 +++---
 gnome2/desktop/evolution-exchange/DETAILS      |    8 +++---
 gnome2/desktop/evolution/DETAILS               |    8 +++---
 gnome2/desktop/fast-user-switch-applet/DETAILS |    8 +++---
 gnome2/desktop/file-roller/DETAILS             |    8 +++---
 gnome2/desktop/gcalctool/DETAILS               |    8 +++---
 gnome2/desktop/gconf-editor/DETAILS            |   10 ++++----
 gnome2/desktop/gdm/DEPENDS                     |    3 +-
 gnome2/desktop/gdm/DETAILS                     |    6 ++--
 gnome2/desktop/gedit-plugins/DETAILS           |    8 +++---
 gnome2/desktop/gedit/DEPENDS                   |    4 +-
 gnome2/desktop/gedit/DETAILS                   |    8 +++---
 gnome2/desktop/gnome-applets/BUILD             |   13 ++++++++++
 gnome2/desktop/gnome-applets/DEPENDS           |   11 ++++++++
 gnome2/desktop/gnome-applets/DETAILS           |   14 +++++++++++
 gnome2/desktop/gnome-applets2/BUILD            |   13 ----------
 gnome2/desktop/gnome-applets2/DEPENDS          |    6 ----
 gnome2/desktop/gnome-applets2/DETAILS          |   16 ------------
 gnome2/desktop/gnome-backgrounds/DETAILS       |    8 +++---
 gnome2/desktop/gnome-control-center/BUILD      |   14 +++++++++++
 gnome2/desktop/gnome-control-center/DEPENDS    |   15 ++++++++++++
 gnome2/desktop/gnome-control-center/DETAILS    |   14 +++++++++++
 gnome2/desktop/gnome-desktop/DEPENDS           |    3 ++
 gnome2/desktop/gnome-desktop/DETAILS           |    8 +++---
 gnome2/desktop/gnome-doc-utils/DETAILS         |    6 ++--
 gnome2/desktop/gnome-games-extra-data/DETAILS  |    8 +++---
 gnome2/desktop/gnome-games/BUILD               |   13 ++++++++++
 gnome2/desktop/gnome-games/DEPENDS             |   11 ++++++++
 gnome2/desktop/gnome-games/DETAILS             |   16 ++++++++++++
 gnome2/desktop/gnome-games2/BUILD              |   13 ----------
 gnome2/desktop/gnome-games2/DEPENDS            |   11 --------
 gnome2/desktop/gnome-games2/DETAILS            |   17 -------------
 gnome2/desktop/gnome-icon-theme/DETAILS        |    8 +++---
 gnome2/desktop/gnome-keyring/DETAILS           |    8 +++---
 gnome2/desktop/gnome-mag/DETAILS               |    6 ++--
 gnome2/desktop/gnome-media/BUILD               |   12 +++++++++
 gnome2/desktop/gnome-media/DEPENDS             |    4 +++
 gnome2/desktop/gnome-media/DETAILS             |   13 ++++++++++
 gnome2/desktop/gnome-media2/BUILD              |   12 ---------
 gnome2/desktop/gnome-media2/CONFLICTS          |    1 -
 gnome2/desktop/gnome-media2/DEPENDS            |    4 ---
 gnome2/desktop/gnome-media2/DETAILS            |   15 ------------
 gnome2/desktop/gnome-menus/DETAILS             |    8 +++---
 gnome2/desktop/gnome-netstatus/DEPENDS         |    2 +-
 gnome2/desktop/gnome-nettool/DEPENDS           |    4 +-
 gnome2/desktop/gnome-nettool/DETAILS           |    8 +++---
 gnome2/desktop/gnome-panel/BUILD               |    5 ----
 gnome2/desktop/gnome-panel/DEPENDS             |    2 +
 gnome2/desktop/gnome-panel/DETAILS             |    8 +++---
 gnome2/desktop/gnome-power-manager/CONFIGURE   |    2 +
 gnome2/desktop/gnome-power-manager/DEPENDS     |    5 ++++
 gnome2/desktop/gnome-power-manager/DETAILS     |    9 ++++---
 gnome2/desktop/gnome-screensaver/DEPENDS       |    2 +
 gnome2/desktop/gnome-screensaver/DETAILS       |    8 +++---
 gnome2/desktop/gnome-session/DEPENDS           |    8 ++++--
 gnome2/desktop/gnome-session/DETAILS           |    8 +++---
 gnome2/desktop/gnome-settings-daemon/BUILD     |   11 ++++++++
 gnome2/desktop/gnome-settings-daemon/DEPENDS   |    4 +++
 gnome2/desktop/gnome-settings-daemon/DETAILS   |   14 +++++++++++
 gnome2/desktop/gnome-sharp/DEPENDS             |    2 +-
 gnome2/desktop/gnome-sharp/DETAILS             |    8 +++---
 gnome2/desktop/gnome-speech/DETAILS            |    6 ++--
 gnome2/desktop/gnome-system-monitor/DEPENDS    |    3 +-
 gnome2/desktop/gnome-system-monitor/DETAILS    |    8 +++---
 gnome2/desktop/gnome-system-tools/DETAILS      |    8 +++---
 gnome2/desktop/gnome-terminal/DETAILS          |    8 +++---
 gnome2/desktop/gnome-themes/DETAILS            |    8 +++---
 gnome2/desktop/gnome-utils/DEPENDS             |    2 +-
 gnome2/desktop/gnome-volume-manager/DEPENDS    |    2 +-
 gnome2/desktop/gnome-volume-manager/DETAILS    |    8 +++---
 gnome2/desktop/gok/DETAILS                     |    8 +++---
 gnome2/desktop/gtkhtml3/DETAILS                |    8 +++---
 gnome2/desktop/gtksourceview/DETAILS           |   10 ++++----
 gnome2/desktop/gtksourceview2/DEPENDS          |    3 --
 gnome2/desktop/gtksourceview2/DETAILS          |   17 -------------
 gnome2/desktop/gucharmap/DETAILS               |   10 ++++----
 gnome2/desktop/gvfs/BUILD                      |   12 +++++++++
 gnome2/desktop/gvfs/DEPENDS                    |   12 +++++++++
 gnome2/desktop/gvfs/DETAILS                    |   14 +++++++++++
 gnome2/desktop/libgail-gnome/DETAILS           |    8 +++---
 gnome2/desktop/libgnomekbd/DETAILS             |    8 +++---
 gnome2/desktop/libgnomeprint/DETAILS           |    6 ++--
 gnome2/desktop/libgnomeprintui/DETAILS         |    8 +++---
 gnome2/desktop/libgtkhtml/DEPENDS              |    2 +-
 gnome2/desktop/libgtop/BUILD                   |   12 +++++++++
 gnome2/desktop/libgtop/DEPENDS                 |    2 +
 gnome2/desktop/libgtop/DETAILS                 |   18 ++++++++++++++
 gnome2/desktop/libgtop2/BUILD                  |   12 ---------
 gnome2/desktop/libgtop2/DEPENDS                |    2 -
 gnome2/desktop/libgtop2/DETAILS                |   20 ----------------
 gnome2/desktop/libgweather/BUILD               |   12 +++++++++
 gnome2/desktop/libgweather/DEPENDS             |    3 ++
 gnome2/desktop/libgweather/DETAILS             |   14 +++++++++++
 gnome2/desktop/liboobs/DETAILS                 |    8 +++---
 gnome2/desktop/librsvg/DETAILS                 |    8 +++---
 gnome2/desktop/libsoup/DETAILS                 |   10 ++++----
 gnome2/desktop/libwnck/DETAILS                 |    8 +++---
 gnome2/desktop/metacity/BUILD                  |   16 ------------
 gnome2/desktop/metacity/CONFIGURE              |    1 -
 gnome2/desktop/metacity/DEPENDS                |    4 +--
 gnome2/desktop/metacity/DETAILS                |    8 +++---
 gnome2/desktop/nautilus-cd-burner/DETAILS      |    8 +++---
 gnome2/desktop/nautilus/DEPENDS                |    3 +-
 gnome2/desktop/nautilus/DETAILS                |    8 +++---
 gnome2/desktop/orca/DETAILS                    |   14 +++++-----
 gnome2/desktop/sound-juicer/DEPENDS            |    2 +-
 gnome2/desktop/sound-juicer/DETAILS            |   10 ++++----
 gnome2/desktop/system-tools-backends/DETAILS   |    8 +++---
 gnome2/desktop/tomboy/DETAILS                  |    6 ++--
 gnome2/desktop/totem-pl-parser/DEPENDS         |    5 ++++
 gnome2/desktop/totem-pl-parser/DETAILS         |   15 ++++++++++++
 gnome2/desktop/totem/DEPENDS                   |    6 +++-
 gnome2/desktop/totem/DETAILS                   |    8 +++---
 gnome2/desktop/vino/DEPENDS                    |    6 +---
 gnome2/desktop/vino/DETAILS                    |    8 +++---
 gnome2/desktop/vte/DEPENDS                     |    2 +-
 gnome2/desktop/vte/DETAILS                     |    6 ++--
 gnome2/desktop/yelp/DEPENDS                    |    7 +++--
 gnome2/desktop/yelp/DETAILS                    |    8 +++---
 gnome2/desktop/zenity/DETAILS                  |    8 +++---
 gnome2/extra/ghex/DETAILS                      |    8 +++---
 gnome2/extra/gnome-mount/BUILD                 |    7 +++++
 gnome2/extra/gnome-mount/DETAILS               |   13 ++++++++++
 gnome2/extra/gnome-spell/DEPENDS               |    2 +-
 gnome2/platform/GConf/DEPENDS                  |    3 ++
 gnome2/platform/GConf/DETAILS                  |   19 +++++++++++++++
 gnome2/platform/GConf2/DEPENDS                 |    3 --
 gnome2/platform/GConf2/DETAILS                 |   21 ----------------
 gnome2/platform/ORBit2/DETAILS                 |    7 ++---
 gnome2/platform/at-spi/DETAILS                 |   10 ++++----
 gnome2/platform/gail/DETAILS                   |   10 ++++----
 gnome2/platform/gnome-mime-data/BUILD          |   12 +++++++++
 gnome2/platform/gnome-mime-data/DEPENDS        |    3 ++
 gnome2/platform/gnome-mime-data/DETAILS        |   14 +++++++++++
 gnome2/platform/gnome-mime-data2/BUILD         |   12 ---------
 gnome2/platform/gnome-mime-data2/DEPENDS       |    3 --
 gnome2/platform/gnome-mime-data2/DETAILS       |   15 ------------
 gnome2/platform/gnome-vfs-monikers/DEPENDS     |    2 +-
 gnome2/platform/gnome-vfs/BUILD                |   22 +++++++++++++++++
 gnome2/platform/gnome-vfs/DEPENDS              |   18 ++++++++++++++
 gnome2/platform/gnome-vfs/DETAILS              |   14 +++++++++++
 gnome2/platform/gnome-vfs2/BUILD               |   22 -----------------
 gnome2/platform/gnome-vfs2/DEPENDS             |   18 --------------
 gnome2/platform/gnome-vfs2/DETAILS             |   16 ------------
 gnome2/platform/libIDL/BUILD                   |    2 -
 gnome2/platform/libIDL/DETAILS                 |    2 +-
 gnome2/platform/libbonobo/DETAILS              |   10 ++++----
 gnome2/platform/libbonoboui/DETAILS            |    8 +++---
 gnome2/platform/libglade/BUILD                 |   12 +++++++++
 gnome2/platform/libglade/DEPENDS               |    2 +
 gnome2/platform/libglade/DETAILS               |   18 ++++++++++++++
 gnome2/platform/libglade/POST_INSTALL          |    8 ++++++
 gnome2/platform/libglade/POST_REMOVE           |    8 ++++++
 gnome2/platform/libglade2/BUILD                |   12 ---------
 gnome2/platform/libglade2/DEPENDS              |    2 -
 gnome2/platform/libglade2/DETAILS              |   20 ----------------
 gnome2/platform/libglade2/POST_INSTALL         |    8 ------
 gnome2/platform/libglade2/POST_REMOVE          |    8 ------
 gnome2/platform/libgnome/DEPENDS               |    2 +-
 gnome2/platform/libgnome/DETAILS               |   10 ++++----
 gnome2/platform/libgnomecanvas/DEPENDS         |    4 +-
 gnome2/platform/libgnomeui/DETAILS             |   10 ++++----
 graphics/gimmage/DEPENDS                       |    2 +-
 graphics/gimp/DEPENDS                          |    2 +-
 graphics/gtk+-2/BUILD                          |    5 ----
 graphics/gtk+-2/CONFIGURE                      |    1 -
 graphics/gtk+-2/DEPENDS                        |    1 +
 graphics/gtk+-2/DETAILS                        |   14 ++++------
 graphics/inkscape/DEPENDS                      |    2 +-
 graphics/libcm/DETAILS                         |   14 -----------
 graphics/mirage/DEPENDS                        |    2 +-
 graphics/pyclutter/DEPENDS                     |    2 +-
 libs/atk/DETAILS                               |    8 +++---
 libs/glib-2/DETAILS                            |    9 +++----
 libs/goffice/DEPENDS                           |    5 ++-
 libs/goffice/DETAILS                           |   14 ++++++----
 libs/goffice2/BUILD                            |   13 ----------
 libs/goffice2/DEPENDS                          |    3 --
 libs/goffice2/DETAILS                          |   20 ----------------
 libs/lablgtk/DEPENDS                           |    2 +-
 libs/libart_lgpl/DETAILS                       |    6 ++--
 libs/libgsf/DEPENDS                            |    2 +-
 libs/libgsf/DETAILS                            |    6 ++--
 libs/libmcs/DEPENDS                            |    2 +-
 libs/libsexymm/DEPENDS                         |    2 +-
 libs/libsigc++2/DETAILS                        |   11 ++++----
 libs/libxml++/DETAILS                          |    8 +++---
 libs/pango/DETAILS                             |    8 +++---
 libs/pwlib/DETAILS                             |    5 ++-
 libs/swfdec/DEPENDS                            |    2 +-
 mail/balsa/DEPENDS                             |    2 +-
 mail/gmime/DETAILS                             |   11 ++++----
 mail/thunderbird/DEPENDS                       |    2 +-
 net/avahi/DEPENDS                              |    2 +-
 net/gnaughty/DEPENDS                           |    2 +-
 news/liferea/DEPENDS                           |    2 +-
 profiles/gnome2/DEPENDS                        |   22 ++++++++---------
 profiles/gnome2/DETAILS                        |    7 ++---
 python/gst-python/DEPENDS                      |    2 +-
 python/pygtk/BUILD                             |    7 +++++
 python/pygtk/CONFLICTS                         |    1 -
 python/pygtk/DEPENDS                           |    7 ++++-
 python/pygtk/DETAILS                           |   27 +++++++++++----------
 python/pygtk/PRE_BUILD                         |    6 ++++
 python/pygtk2/BUILD                            |    7 -----
 python/pygtk2/CONFLICTS                        |    1 -
 python/pygtk2/DEPENDS                          |    5 ----
 python/pygtk2/DETAILS                          |   18 --------------
 python/pygtk2/PRE_BUILD                        |    6 ----
 python/pypoppler/DEPENDS                       |    2 +-
 python/sexy-python/DEPENDS                     |    2 +-
 python/winzig/DEPENDS                          |    2 +-
 science/galculator/DEPENDS                     |    2 +-
 science/qalculate-gtk/DEPENDS                  |    2 +-
 security/revelation/DEPENDS                    |    2 +-
 security/setools/DEPENDS                       |    2 +-
 sql/mysql-administrator/DEPENDS                |    4 +-
 sql/mysql-gui-tools/DEPENDS                    |    4 +-
 sql/mysql-query-browser/DEPENDS                |    4 +-
 video/kino/DEPENDS                             |    2 +-
 video/miro/DEPENDS                             |    2 +-
 video/subtitleeditor/DEPENDS                   |    2 +-
 video/vlc/DEPENDS                              |    7 +----
 web/epiphany-extensions/DETAILS                |    8 +++---
 web/firefox/DEPENDS                            |    2 +-
 web/firefox2/DEPENDS                           |    2 +-
 x11-apps/dia/DEPENDS                           |    2 +-
 x11-apps/gnucash/DEPENDS                       |    2 +-
 x11-apps/gnucash/DETAILS                       |    6 ++--
 x11-apps/openoffice-src/DEPENDS                |    2 +-
 x11-utils/cairo-clock/DEPENDS                  |    2 +-
 x11-utils/devilspie/DEPENDS                    |    2 +-
 x11-utils/gparted/DEPENDS                      |    2 +-
 x11-utils/notification-daemon/DEPENDS          |    2 +-
 x11-utils/obconf/DEPENDS                       |    2 +-
 x11/driconf/DEPENDS                            |    2 +-
 x11/libgksu/DEPENDS                            |    2 +-
 x11/libxklavier/DETAILS                        |   17 +++++++------
 xfce4/core/exo/DEPENDS                         |    2 +-
 xfce4/xfc/DEPENDS                              |    2 +-
 zbeta/brasero/DETAILS                          |    8 +++---
 zbeta/compiz-fusion/compiz/DEPENDS             |    2 +-
 zbeta/gcompris/DEPENDS                         |    2 +-
 zbeta/pan-cvs/DEPENDS                          |    2 +-
 390 files changed, 1381 insertions(+), 1403 deletions(-)

diff --git a/app-themes/gnome-themes-extras/DETAILS b/app-themes/gnome-themes-extras/DETAILS
index 082cdd3..4af726c 100644
--- a/app-themes/gnome-themes-extras/DETAILS
+++ b/app-themes/gnome-themes-extras/DETAILS
@@ -1,11 +1,12 @@
           MODULE=gnome-themes-extras
-         VERSION=2.20
+           MAJOR=2.22
+         VERSION=2.22.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/2.20/
-      SOURCE_VFY=sha1:6a99b3170d10e3f82cb3bd4b579a91e1b078c52b
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:94068c930a1c8071d2c380273db9bbb685b885c1
         WEB_SITE=http://www.gnome.org
          ENTERED=20030612
-         UPDATED=20071117
+         UPDATED=20080413
            SHORT="a collection gtk+-2 themes from gnome.org"
 
 cat << EOF
diff --git a/audio/abraca/DEPENDS b/audio/abraca/DEPENDS
index c22f09b..67f7447 100644
--- a/audio/abraca/DEPENDS
+++ b/audio/abraca/DEPENDS
@@ -1,3 +1,3 @@
 depends xmms2-beta
-depends libglade2
+depends libglade
 
diff --git a/audio/amSynth/DEPENDS b/audio/amSynth/DEPENDS
index f799bea..5217ed3 100644
--- a/audio/amSynth/DEPENDS
+++ b/audio/amSynth/DEPENDS
@@ -1,2 +1,2 @@
-depends gtkmm2 &&
+depends gtkmm &&
 depends jack
diff --git a/audio/ardour/DEPENDS b/audio/ardour/DEPENDS
index da302ad..e5ca661 100644
--- a/audio/ardour/DEPENDS
+++ b/audio/ardour/DEPENDS
@@ -4,7 +4,7 @@ depends liblrdf
 depends libart_lgpl
 depends libsamplerate
 depends libsndfile
-depends gtkmm2
+depends gtkmm
 depends jack
 depends libxml2
 depends libgnomecanvas
diff --git a/audio/audacious/DEPENDS b/audio/audacious/DEPENDS
index 9a8ecf3..4d91b06 100644
--- a/audio/audacious/DEPENDS
+++ b/audio/audacious/DEPENDS
@@ -1,4 +1,4 @@
-depends  libglade2  &&
+depends  libglade  &&
 depends  libmcs     &&
 
 optional_depends  "libsamplerate"               \
diff --git a/audio/exaile/DEPENDS b/audio/exaile/DEPENDS
index 2420b9a..7ada338 100644
--- a/audio/exaile/DEPENDS
+++ b/audio/exaile/DEPENDS
@@ -3,9 +3,9 @@ depends gst-python
 depends pysqlite
 depends mutagen
 depends dbus-python
-depends GConf2
+depends GConf
 
 optional_depends "gst-plugins-ugly"  ""  ""  "for mp3 support"
 optional_depends "gamin"             ""  ""  "for directory monitoring"
 optional_depends "PythonDaap"        ""  ""  "for music sharing support"
-optional_depends "gnome-python2-extras"  ""  ""  "for additional song information (like lyrics)"
+optional_depends "gnome-python-extras"  ""  ""  "for additional song information (like lyrics)"
diff --git a/audio/glurp/DEPENDS b/audio/glurp/DEPENDS
index 771606a..86e761a 100644
--- a/audio/glurp/DEPENDS
+++ b/audio/glurp/DEPENDS
@@ -1,2 +1,2 @@
-depends  libglade2  &&
+depends  libglade  &&
 depends  mpd
diff --git a/audio/gmpc/DEPENDS b/audio/gmpc/DEPENDS
index 3d6662e..4fa7f49 100644
--- a/audio/gmpc/DEPENDS
+++ b/audio/gmpc/DEPENDS
@@ -1,5 +1,5 @@
 depends  glib-2     &&
 depends  gtk+-2     &&
-depends  libglade2  &&
+depends  libglade  &&
 depends  mpd        &&
 depends  libmpd
diff --git a/audio/gst-player/DEPENDS b/audio/gst-player/DEPENDS
index 8a6e9f7..3c5cd9d 100644
--- a/audio/gst-player/DEPENDS
+++ b/audio/gst-player/DEPENDS
@@ -1,3 +1,3 @@
 depends gst-plugins &&
 depends gnome-desktop &&
-depends GConf2
+depends GConf
diff --git a/audio/gst-plugins-base/DEPENDS b/audio/gst-plugins-base/DEPENDS
index e8a8594..efdf45d 100644
--- a/audio/gst-plugins-base/DEPENDS
+++ b/audio/gst-plugins-base/DEPENDS
@@ -7,4 +7,4 @@ optional_depends  "libvorbis"   ""  ""  "for Ogg/Vorbis support"
 optional_depends  "libtheora"   ""  ""  "for Theora support"
 optional_depends  "libvisual"   ""  ""  "for visualization support"
 optional_depends  "cdparanoia"  ""  ""  "for CDDA support"
-optional_depends  "gnome-vfs2"  ""  ""  "for Gnome VFS support"
+optional_depends  "gnome-vfs"  ""  ""  "for Gnome VFS support"
diff --git a/audio/gst-plugins-base/DETAILS b/audio/gst-plugins-base/DETAILS
index d187cf1..d7a72a2 100644
--- a/audio/gst-plugins-base/DETAILS
+++ b/audio/gst-plugins-base/DETAILS
@@ -1,11 +1,11 @@
           MODULE=gst-plugins-base
-         VERSION=0.10.19
+         VERSION=0.10.20
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://gstreamer.freedesktop.org/src/$MODULE/
-      SOURCE_VFY=sha1:4d133c00faaa4b3234727b03ec57d338f69deb32
+      SOURCE_VFY=sha1:e887f071eda3128249657805dc5a42b2ad2d3bef
         WEB_SITE=http://gstreamer.freedesktop.org/modules/gst-plugins-base.html
          ENTERED=20060311
-         UPDATED=20080403
+         UPDATED=20080627
            SHORT="The base set of plugins for Gstreamer 0.10.x"
 
 cat << EOF
diff --git a/audio/gst-plugins-good/DEPENDS b/audio/gst-plugins-good/DEPENDS
index 667ce93..63d32d3 100644
--- a/audio/gst-plugins-good/DEPENDS
+++ b/audio/gst-plugins-good/DEPENDS
@@ -1,6 +1,6 @@
 depends  gst-plugins-base  &&
 
-optional_depends  "GConf2"  ""  ""  "for GConf schemas (needed by exaile)" &&
+optional_depends  "GConf"  ""  ""  "for GConf schemas (needed by exaile)" &&
 optional_depends  "aalib"     ""  "--disable-aalib --disable-aalibtest"    \
                   "for the ASCII art image plugin"                         &&
 optional_depends  "esound"    ""  "--disable-esd --disable-esdtest"        \
diff --git a/audio/gst-plugins/DEPENDS b/audio/gst-plugins/DEPENDS
index 361a570..647511a 100644
--- a/audio/gst-plugins/DEPENDS
+++ b/audio/gst-plugins/DEPENDS
@@ -30,8 +30,8 @@ optional_depends "alsa-lib"      "--enable-alsa"       "--disable-alsa"       \
                                  "for ALSA output support"                    &&
 optional_depends "avifile"       "--enable-avifile"    "--disable-avifile"    \
                                  "for avi video support"                      &&
-optional_depends "gnome-vfs2"    "--enable-gnome_vfs"  "--disable-gnome_vfs"  \
-                                 "for gnome-vfs2 support"                     &&
+optional_depends "gnome-vfs"    "--enable-gnome_vfs"  "--disable-gnome_vfs"  \
+                                 "for gnome-vfs support"                     &&
 optional_depends "libdv"         "--enable-libdv"      "--disable-libdv"      \
                                  "for digital video support"                  &&
 optional_depends "flac"          "--enable-flac"       "--disable-flac"       \
diff --git a/audio/gstreamer-10/DETAILS b/audio/gstreamer-10/DETAILS
index 7b2cd66..4dbf45e 100644
--- a/audio/gstreamer-10/DETAILS
+++ b/audio/gstreamer-10/DETAILS
@@ -1,20 +1,20 @@
           MODULE=gstreamer-10
          RMODULE=gstreamer
-         VERSION=0.10.19
+         VERSION=0.10.20
           SOURCE=$RMODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$RMODULE-$VERSION
       SOURCE_URL=http://gstreamer.freedesktop.org/src/$RMODULE/
-      SOURCE_VFY=sha1:7c8e59ec9e59990665b30aa9d0c6bb13d7da667a
+      SOURCE_VFY=sha1:a95e731ee2d377c80eecd61a700cfa1090aaae92
         WEB_SITE=http://gstreamer.freedesktop.org/
          ENTERED=20060311
-         UPDATED=20080202
+         UPDATED=20080627
            SHORT="A multimedia (video and audio) framework (the 0.10.x version)"
 
 cat << EOF
-GStreamer allows the construction of graphs of media-handling 
-components, ranging from simple mp3 playback to complex audio (mixing) 
-and video (non-linear editing) processing. Applications can take 
-advantage of advances in codec and filter technology transparently. 
-Developers can add new codecs and filters by writing a simple plugin 
-with a clean, generic interface. 
+GStreamer allows the construction of graphs of media-handling
+components, ranging from simple mp3 playback to complex audio (mixing)
+and video (non-linear editing) processing. Applications can take
+advantage of advances in codec and filter technology transparently.
+Developers can add new codecs and filters by writing a simple plugin
+with a clean, generic interface.
 EOF
diff --git a/audio/last-exit/DEPENDS b/audio/last-exit/DEPENDS
index da1303c..0b497e5 100644
--- a/audio/last-exit/DEPENDS
+++ b/audio/last-exit/DEPENDS
@@ -1,4 +1,4 @@
-depends  GConf2
+depends  GConf
 depends  gnome-sharp
 depends  gst-plugins-base
 depends  ndesk-dbus-glib
diff --git a/audio/rhythmbox/DEPENDS b/audio/rhythmbox/DEPENDS
index b1e265f..866841e 100644
--- a/audio/rhythmbox/DEPENDS
+++ b/audio/rhythmbox/DEPENDS
@@ -1,6 +1,7 @@
-depends  libgnomeui   &&
-depends  gst-plugins  &&
-depends  libid3tag    &&
-depends  totem        &&
+depends  libgnomeui
+depends  gst-plugins-good
+depends  libid3tag
+depends  totem
 
 optional_depends "sound-juicer" "" "" "for cd ripping support"
+optional_depends "gst-python" "" "" "for Python plugin support"
diff --git a/audio/rhythmbox/DETAILS b/audio/rhythmbox/DETAILS
index a317564..5a253ce 100644
--- a/audio/rhythmbox/DETAILS
+++ b/audio/rhythmbox/DETAILS
@@ -1,15 +1,15 @@
            MODULE=rhythmbox
-         VERSION=0.9.4.1
-           MAJOR=0.9
+         VERSION=0.11.5
+           MAJOR=0.11
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:dc59634de9471a14f62528c5a8453a284c74f7b0
+      SOURCE_VFY=sha1:ccec2523f3a6f3746bf1091558819b602f74114f
         WEB_SITE=http://www.gnome.org/projects/$MODULE/
          ENTERED=20020730
-         UPDATED=20060506
+         UPDATED=20080317
            SHORT="clone of the iTunes plyer for Gnome"
 
-cat << EOF 
+cat << EOF
 Rhythmbox which takes its inspiration from Apple's
 iTunes application, an application that lets you do everything from
 importing your audio cd's into mp3 or Ogg Vorbis format, and play
diff --git a/audio/seq24/DEPENDS b/audio/seq24/DEPENDS
index f799bea..5217ed3 100644
--- a/audio/seq24/DEPENDS
+++ b/audio/seq24/DEPENDS
@@ -1,2 +1,2 @@
-depends gtkmm2 &&
+depends gtkmm &&
 depends jack
diff --git a/audio/sonata/DEPENDS b/audio/sonata/DEPENDS
index 3bc1687..14c077d 100644
--- a/audio/sonata/DEPENDS
+++ b/audio/sonata/DEPENDS
@@ -1,2 +1,2 @@
-depends pygtk2
+depends pygtk
 depends pysqlite
diff --git a/audio/tagtool/DEPENDS b/audio/tagtool/DEPENDS
index f240aee..c236e15 100644
--- a/audio/tagtool/DEPENDS
+++ b/audio/tagtool/DEPENDS
@@ -1,3 +1,3 @@
-depends libglade2
+depends libglade
 depends id3lib
 depends libvorbis
diff --git a/cd/burgner/DEPENDS b/cd/burgner/DEPENDS
index d954b09..33a8778 100644
--- a/cd/burgner/DEPENDS
+++ b/cd/burgner/DEPENDS
@@ -1,2 +1,2 @@
 depends popt &&
-depends gnome-vfs2
+depends gnome-vfs
diff --git a/cd/graveman/DEPENDS b/cd/graveman/DEPENDS
index bc38ff5..5a4d117 100644
--- a/cd/graveman/DEPENDS
+++ b/cd/graveman/DEPENDS
@@ -1,4 +1,4 @@
-depends  libglade2  &&
+depends  libglade  &&
 depends  intltool   &&
 depends  cdrtools   &&
 depends  cdrdao     &&
diff --git a/chat/gajim/DEPENDS b/chat/gajim/DEPENDS
index 075b9bd..2b1ca88 100644
--- a/chat/gajim/DEPENDS
+++ b/chat/gajim/DEPENDS
@@ -1,4 +1,4 @@
-depends  pygtk2    &&
+depends  pygtk    &&
 depends  pysqlite  &&
 
 optional_depends  "dbus-python"   ""  ""  "for remote control"
diff --git a/chat/pidgin/DEPENDS b/chat/pidgin/DEPENDS
index 00650cd..53d5104 100644
--- a/chat/pidgin/DEPENDS
+++ b/chat/pidgin/DEPENDS
@@ -55,7 +55,7 @@ optional_depends  "meanwhile"       ""          "--disable-meanwhile" \
 optional_depends  "perl"            ""          "--disable-perl"  \
                   "for Perl based plugin support"
 
-optional_depends  "GConf2"    ""                ""                \
+optional_depends  "GConf"    ""                ""                \
                   "for GNOME support of Gaim URI handlers"
 
 optional_depends  "libXScrnSaver"   ""          "--disable-screensaver" \
diff --git a/crypto/seahorse/BUILD b/crypto/seahorse/BUILD
index d7fd03f..a4217b0 100644
--- a/crypto/seahorse/BUILD
+++ b/crypto/seahorse/BUILD
@@ -1,5 +1,5 @@
 ( 
 #OPTS="$OPTS --with-GPGME_CONFIG=/opt/lunar/gpgme-3.x/"
-export GPGME_CONFIG="/opt/lunar/gpgme-0.3.x/bin/gpgme-config"
+#export GPGME_CONFIG="/opt/lunar/gpgme-0.3.x/bin/gpgme-config"
 default_build
 ) > $C_FIFO 2>&1
diff --git a/crypto/seahorse/DEPENDS b/crypto/seahorse/DEPENDS
index b061f9c..adca9bf 100644
--- a/crypto/seahorse/DEPENDS
+++ b/crypto/seahorse/DEPENDS
@@ -1,2 +1,2 @@
-depends  gtk+  &&
+depends  gtk+-2
 depends  gpgme
diff --git a/crypto/seahorse/DETAILS b/crypto/seahorse/DETAILS
index d747145..35952b1 100644
--- a/crypto/seahorse/DETAILS
+++ b/crypto/seahorse/DETAILS
@@ -1,12 +1,13 @@
-           MODULE=seahorse
-         VERSION=1.0
-         MAJOR=1.0
-          SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/$MAJOR
-        WEB_SITE=http://sourceforge.net/projects/seahorse/
+          MODULE=seahorse
+         VERSION=2.22.2
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
+      SOURCE_VFY=sha1:d7b5c8d4176a2f4384fc032312c5b0f01883c7ae
+        WEB_SITE=http://live.gnome.org/Seahorse
          ENTERED=20011123
-         UPDATED=20070315
-           SHORT="seahorse: a GNOME front end for GnuPG."
+         UPDATED=20080601
+           SHORT="a GNOME front end for GnuPG"
 cat << EOF
 Seahorse is a tool for secure communications and data storage.  Data
 encryption, digital signature creation, and key management can all
diff --git a/devel/anjuta/DEPENDS b/devel/anjuta/DEPENDS
index 0d9fb97..39f0de5 100644
--- a/devel/anjuta/DEPENDS
+++ b/devel/anjuta/DEPENDS
@@ -4,13 +4,13 @@ depends  libgnomeui       &&
 depends  libgnomeprintui  &&
 depends  vte              &&
 
-optional_depends  "gtkmm2"        ""  ""                    \
+optional_depends  "gtkmm"        ""  ""                    \
                   "for developing GTK+-2 C++ applications"  &&
 optional_depends  "libgnomeuimm"  ""  ""                    \
                   "for developing C++ Gnome applications"   &&
 optional_depends  "SDL"           ""  ""                    \
                   "for developing SDL applications"         &&
-optional_depends  "libglade2"     ""  ""                    \
+optional_depends  "libglade"     ""  ""                    \
                   "for developing libglade-based projects"  &&
 optional_depends  "libglademm"    ""  ""                    \
                   "for developing libglade c++ apps"        &&
diff --git a/devel/anjuta2/DEPENDS b/devel/anjuta2/DEPENDS
index 30d24c2..352a84e 100644
--- a/devel/anjuta2/DEPENDS
+++ b/devel/anjuta2/DEPENDS
@@ -1,4 +1,4 @@
-depends  gtksourceview2
+depends  gtksourceview
 depends  autogen
 depends  devhelp
 depends  gnome-build
diff --git a/devel/devhelp/DEPENDS b/devel/devhelp/DEPENDS
index 45f9325..5601355 100644
--- a/devel/devhelp/DEPENDS
+++ b/devel/devhelp/DEPENDS
@@ -1,4 +1,4 @@
-depends  GConf2
-depends  libglade2
+depends  GConf
+depends  libglade
 depends  libwnck
 depends  %GECKO_RENDERER
diff --git a/devel/devhelp/DETAILS b/devel/devhelp/DETAILS
index 2ff6933..c347af7 100644
--- a/devel/devhelp/DETAILS
+++ b/devel/devhelp/DETAILS
@@ -1,11 +1,12 @@
           MODULE=devhelp
+           MAJOR=0.19
          VERSION=0.19
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/$VERSION/
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
       SOURCE_VFY=sha1:8d0976b4004a156b491379befb55391208d8a945
         WEB_SITE=http://developer.imendio.com/projects/devhelp
          ENTERED=20030720
-         UPDATED=20080216
+         UPDATED=20080211
            SHORT="an API documentation browser for GNOME 2"
 
 cat << EOF
diff --git a/devel/gdl/DETAILS b/devel/gdl/DETAILS
index 0bab15c..6c264e9 100644
--- a/devel/gdl/DETAILS
+++ b/devel/gdl/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gdl
-         VERSION=0.7.9
+         VERSION=0.7.11
            MAJOR=0.7
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:6f552c6435a2842ad2ecf208e081afc57df4a8f5
+      SOURCE_VFY=sha1:53e8f2972fa13d6cea4c1e83ae23c5efb5dc6481
         WEB_SITE=http://www.gnome.org/
          ENTERED=20060423
-         UPDATED=20080216
+         UPDATED=20080311
            SHORT="GNOME Development Libraries"
 
 cat << EOF
diff --git a/devel/giggle/DEPENDS b/devel/giggle/DEPENDS
index b900439..e496a0b 100644
--- a/devel/giggle/DEPENDS
+++ b/devel/giggle/DEPENDS
@@ -1,2 +1,2 @@
 depends git
-depends gtksourceview2
+depends gtksourceview
diff --git a/devel/glade3/DEPENDS b/devel/glade3/DEPENDS
index d5f0dbd..828e81c 100644
--- a/devel/glade3/DEPENDS
+++ b/devel/glade3/DEPENDS
@@ -1,4 +1,4 @@
-depends  libglade2
+depends  libglade
 
 optional_depends  "libgnomeui"  "--enable-gnome"  "--disable-gnome"  \
                   "to be able to create GUIs with GNOME widgets"
diff --git a/devel/glademm/DEPENDS b/devel/glademm/DEPENDS
index 359e94e..c42dbb7 100644
--- a/devel/glademm/DEPENDS
+++ b/devel/glademm/DEPENDS
@@ -1,3 +1,3 @@
-depends  gtkmm2        &&
+depends  gtkmm        &&
 depends  libgnomeuimm  &&
 depends  glade2
diff --git a/devel/gtk-sharp2/DEPENDS b/devel/gtk-sharp2/DEPENDS
index 647adc7..1ea7bce 100644
--- a/devel/gtk-sharp2/DEPENDS
+++ b/devel/gtk-sharp2/DEPENDS
@@ -2,4 +2,4 @@ depends  mono
 depends  gtk+-2
 
 optional_depends  "monodoc"      ""  ""  "for documenation support"
-optional_depends  "libglade2"    ""  ""  "to build glade-sharp.dll"
+optional_depends  "libglade"    ""  ""  "to build glade-sharp.dll"
diff --git a/devel/gtk-sharp2/DETAILS b/devel/gtk-sharp2/DETAILS
index 18228c0..e84a630 100644
--- a/devel/gtk-sharp2/DETAILS
+++ b/devel/gtk-sharp2/DETAILS
@@ -1,14 +1,14 @@
           MODULE=gtk-sharp2
              MOD=gtk-sharp
-           MAJOR=2.10
-         VERSION=2.10.4
+           MAJOR=2.12
+         VERSION=2.12.0
           SOURCE=$MOD-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=http://go-mono.com/sources/${MOD}210/
-      SOURCE_VFY=sha1:818744c98fc559e018d8fdd891c39255e19e9c37
+      SOURCE_URL=ftp://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12
+      SOURCE_VFY=sha1:6840a0bacc1ad2a4cd22b8f129b291775ab25038
         WEB_SITE=http://www.mono-project.com/
          ENTERED=20051007
-         UPDATED=20080319
+         UPDATED=20080420
            SHORT="Gtk+-2 bindings for Mono"
            PSAFE=no
 
diff --git a/devel/gtksourceview-sharp/BUILD b/devel/gtksourceview-sharp/BUILD
deleted file mode 100644
index f9da242..0000000
--- a/devel/gtksourceview-sharp/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                                  &&
-    rm -fr /usr/lib/mono/gtk-sharp/gtksourceview-sharp.dll &&
-    ln -sf /usr/lib/mono/gac/gtksourceview-sharp/1.0.0.1__35e10195dab3c99f/gtksourceview-sharp.dll /usr/lib/mono/gtk-sharp/gtksourceview-sharp.dll
-
-) > $C_FIFO 2>&1
diff --git a/devel/gtksourceview-sharp/DEPENDS b/devel/gtksourceview-sharp/DEPENDS
deleted file mode 100644
index 9e82ec3..0000000
--- a/devel/gtksourceview-sharp/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  monodoc  &&
-depends  gtksourceview
diff --git a/devel/gtksourceview-sharp/DETAILS b/devel/gtksourceview-sharp/DETAILS
deleted file mode 100644
index 5e51e1b..0000000
--- a/devel/gtksourceview-sharp/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-          MODULE=gtksourceview-sharp
-         VERSION=0.5
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://mono2.ximian.com/archive/1.0/
-        WEB_SITE=http://www.mono-project.com
-         ENTERED=20040505
-         UPDATED=20040716
-           SHORT="C# bindings for gtksourceview"
-cat << EOF
-gtksourceview-sharp is C# bindings for gtksourceview
-EOF
diff --git a/devel/gtranslator/DEPENDS b/devel/gtranslator/DEPENDS
index 939d120..e523cae 100644
--- a/devel/gtranslator/DEPENDS
+++ b/devel/gtranslator/DEPENDS
@@ -1,6 +1,6 @@
 depends  gtkspell       &&
 depends  libxml2        &&
 depends  libgnomeui     &&
-depends  gnome-vfs2     &&
+depends  gnome-vfs     &&
 depends  intltool       &&
 depends  scrollkeeper
diff --git a/devel/kiwi/DEPENDS b/devel/kiwi/DEPENDS
index 61bfd74..a37960e 100644
--- a/devel/kiwi/DEPENDS
+++ b/devel/kiwi/DEPENDS
@@ -1,2 +1,2 @@
-depends  libglade2
-depends  pygtk2
+depends  libglade
+depends  pygtk
diff --git a/devel/orbitcpp/DEPENDS b/devel/orbitcpp/DEPENDS
index 84f9822..2acfefe 100644
--- a/devel/orbitcpp/DEPENDS
+++ b/devel/orbitcpp/DEPENDS
@@ -1,2 +1,2 @@
 depends ORBit2 &&
-depends gtkmm2
+depends gtkmm
diff --git a/devel/rep-gtk/DEPENDS b/devel/rep-gtk/DEPENDS
index 45519df..1b22e01 100644
--- a/devel/rep-gtk/DEPENDS
+++ b/devel/rep-gtk/DEPENDS
@@ -1,2 +1,2 @@
 depends  librep
-depends  libglade2
+depends  libglade
diff --git a/devel/subversion/BUILD b/devel/subversion/BUILD
index 9177c8a..76e3c65 100644
--- a/devel/subversion/BUILD
+++ b/devel/subversion/BUILD
@@ -1,4 +1,5 @@
 (
+  patch_it ${SOURCE2} 1
 
   if in_depends $MODULE sun-jdk; then
     JAVA_HOME=$(expr /usr/lib/jdk*)
diff --git a/distributed/BitTorrent/DEPENDS b/distributed/BitTorrent/DEPENDS
index 1c7d1f0..2230cfc 100644
--- a/distributed/BitTorrent/DEPENDS
+++ b/distributed/BitTorrent/DEPENDS
@@ -2,6 +2,6 @@ depends Python
 depends pycrypto
 depends Twisted
 
-optional_depends "pygtk2"    "" "" "For a GUI using pygtk2"
+optional_depends "pygtk"    "" "" "For a GUI using pygtk"
 optional_depends "dnspython" "" "" "For version update notification"
 
diff --git a/distributed/deluge/DEPENDS b/distributed/deluge/DEPENDS
index 3a67ac4..c4b1cc5 100644
--- a/distributed/deluge/DEPENDS
+++ b/distributed/deluge/DEPENDS
@@ -1,4 +1,4 @@
-depends pygtk2
+depends pygtk
 depends pyxdg
 depends boost 
 depends dbus-python
diff --git a/distributed/nicotine+/DEPENDS b/distributed/nicotine+/DEPENDS
index ace64e8..64a27cd 100644
--- a/distributed/nicotine+/DEPENDS
+++ b/distributed/nicotine+/DEPENDS
@@ -1,4 +1,4 @@
-depends pygtk2 &&
+depends pygtk &&
 depends geoip-python &&
 
 optional_depends "pyvorbis" "" "" "for integrated OGG support"  
diff --git a/distributed/nicotine/DEPENDS b/distributed/nicotine/DEPENDS
index a6b7f6d..a227235 100644
--- a/distributed/nicotine/DEPENDS
+++ b/distributed/nicotine/DEPENDS
@@ -1,4 +1,4 @@
-depends pygtk2 &&
+depends pygtk &&
 
 optional_depends "pyvorbis" "" "" "for integrated OGG support"   &&
 optional_depends "geoip-python" "" "" "for geographical user pin-pointing"
diff --git a/doc-tools/gtk-doc/DETAILS b/doc-tools/gtk-doc/DETAILS
index bf85a6d..f3467e3 100644
--- a/doc-tools/gtk-doc/DETAILS
+++ b/doc-tools/gtk-doc/DETAILS
@@ -1,11 +1,11 @@
           MODULE=gtk-doc
-         VERSION=1.9
+         VERSION=1.10
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$VERSION/
-      SOURCE_VFY=sha1:be74d08ddd720ba94321d0212d9f3ebc952e325e
+      SOURCE_VFY=sha1:861c977b011efd1bf91957d1a02fb792f39e5509
         WEB_SITE=http://www.gtk.org/gtk-doc/
          ENTERED=20020716
-         UPDATED=20080316
+         UPDATED=20080328
            SHORT="Tools for authors of the GTK+ reference documentation."
 
 cat << EOF
diff --git a/doc-tools/intltool/DETAILS b/doc-tools/intltool/DETAILS
index acd7b00..7306700 100644
--- a/doc-tools/intltool/DETAILS
+++ b/doc-tools/intltool/DETAILS
@@ -1,12 +1,12 @@
           MODULE=intltool
-         VERSION=0.37.1
-           MAJOR=0.37
+         VERSION=0.40.0
+           MAJOR=0.40
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:7aaa684177589fe321ceb863c3f6fc716e01dff2
+      SOURCE_VFY=sha1:493513b66d9006e7a6a6d2fafd1e0b6560db50cc
         WEB_SITE=http://freedesktop.org/wiki/Software/intltool
          ENTERED=20010922
-         UPDATED=20080308
+         UPDATED=20080617
            SHORT="xml internationalization tools"
 
 cat << EOF
diff --git a/docs/gnome-user-docs/DETAILS b/docs/gnome-user-docs/DETAILS
index bf9f617..8f2a897 100644
--- a/docs/gnome-user-docs/DETAILS
+++ b/docs/gnome-user-docs/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-user-docs
-           MAJOR=2.20
-         VERSION=2.20.1
+           MAJOR=2.22
+         VERSION=2.22.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:4c22c4e1076be68cc0686cc750889d06c0711e9c
+      SOURCE_VFY=sha1:6d7f052a787d5891d47cec904b9cf1d3f93edfa2
         WEB_SITE=http://www.gnome.org/
          ENTERED=20010922
-         UPDATED=20071030
+         UPDATED=20080601
            SHORT="documentation for GNOME"
            PSAFE=no
 
diff --git a/editors/scribes/DEPENDS b/editors/scribes/DEPENDS
index 18cf13d..f0917c7 100644
--- a/editors/scribes/DEPENDS
+++ b/editors/scribes/DEPENDS
@@ -1,6 +1,6 @@
 depends   dbus           &&
 depends   yelp           &&
 depends   Python         &&
-depends   gnome-python2  &&
-depends   gnome-python2-extras &&
+depends   gnome-python  &&
+depends   gnome-python-extras &&
 depends   gnome-python-desktop
diff --git a/filemanagers/baobab/DEPENDS b/filemanagers/baobab/DEPENDS
index 19663f8..6df8333 100644
--- a/filemanagers/baobab/DEPENDS
+++ b/filemanagers/baobab/DEPENDS
@@ -1,2 +1,2 @@
 depends  libgnomeui  &&
-depends  libgtop2
+depends  libgtop
diff --git a/gnome2/applets/drwright/DEPENDS b/gnome2/applets/drwright/DEPENDS
index 3feb459..097e91a 100644
--- a/gnome2/applets/drwright/DEPENDS
+++ b/gnome2/applets/drwright/DEPENDS
@@ -1 +1 @@
-depends libglade2
+depends libglade
diff --git a/gnome2/applets/gnome-blog/DEPENDS b/gnome2/applets/gnome-blog/DEPENDS
index f98d048..c83ea78 100644
--- a/gnome2/applets/gnome-blog/DEPENDS
+++ b/gnome2/applets/gnome-blog/DEPENDS
@@ -1,2 +1,2 @@
-depends pygtk2 &&
+depends pygtk &&
 depends gnome-panel
diff --git a/gnome2/applets/grandr_applet/DEPENDS b/gnome2/applets/grandr_applet/DEPENDS
index a442937..08bf011 100644
--- a/gnome2/applets/grandr_applet/DEPENDS
+++ b/gnome2/applets/grandr_applet/DEPENDS
@@ -1,2 +1,2 @@
 depends gnome-panel &&
-depends libglade2
+depends libglade
diff --git a/gnome2/applets/netspeed_applet/DEPENDS b/gnome2/applets/netspeed_applet/DEPENDS
index 138a5f1..749c504 100644
--- a/gnome2/applets/netspeed_applet/DEPENDS
+++ b/gnome2/applets/netspeed_applet/DEPENDS
@@ -1,3 +1,3 @@
 depends intltool &&
 depends gnome-panel &&
-depends libgtop2
+depends libgtop
diff --git a/gnome2/applets/quick-lounge-applet/DEPENDS b/gnome2/applets/quick-lounge-applet/DEPENDS
index a442937..08bf011 100644
--- a/gnome2/applets/quick-lounge-applet/DEPENDS
+++ b/gnome2/applets/quick-lounge-applet/DEPENDS
@@ -1,2 +1,2 @@
 depends gnome-panel &&
-depends libglade2
+depends libglade
diff --git a/gnome2/apps/abiword/DEPENDS b/gnome2/apps/abiword/DEPENDS
index a9f8627..86cce05 100644
--- a/gnome2/apps/abiword/DEPENDS
+++ b/gnome2/apps/abiword/DEPENDS
@@ -5,5 +5,4 @@ depends  enchant
 depends  boost
 
 optional_depends  "gucharmap" "" "" "enable character map for abiword"
-optional_depends  "goffice"   "" "" "enable some plugins for abiword" 
 optional_depends  "gtkmathview" "" "" "enable a built-in formula editor"
diff --git a/gnome2/apps/abiword/DETAILS b/gnome2/apps/abiword/DETAILS
index 5d155a6..0905fd1 100644
--- a/gnome2/apps/abiword/DETAILS
+++ b/gnome2/apps/abiword/DETAILS
@@ -1,14 +1,14 @@
           MODULE=abiword
-         VERSION=2.6.2
+         VERSION=2.6.3
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-plugins-$VERSION.tar.gz
       SOURCE_URL=http://www.abisource.com/downloads/$MODULE/$VERSION/source
      SOURCE2_URL=http://www.abisource.com/downloads/$MODULE/$VERSION/source
-      SOURCE_VFY=sha1:b7179ac4c14b476a2abc407aaf534f7b4b7786d7
-     SOURCE2_VFY=sha1:96c48febc058d14907cf069429e32c5d1374a95d
+      SOURCE_VFY=sha1:91e6dd8e0cb9c82dec35d3d3d9089f22c9ab5bcc
+     SOURCE2_VFY=sha1:56ab0ffe3e9ca0e397baac4289f9faef6f498cfd
         WEB_SITE=http://www.abisource.com
          ENTERED=20011224
-         UPDATED=20080411
+         UPDATED=20080702
            SHORT="a full-featured, yet light and fast word processor"
 
 cat << EOF
diff --git a/gnome2/apps/blogtk/DEPENDS b/gnome2/apps/blogtk/DEPENDS
index e5c54d5..331d0e0 100644
--- a/gnome2/apps/blogtk/DEPENDS
+++ b/gnome2/apps/blogtk/DEPENDS
@@ -1 +1 @@
-depends gnome-python2
+depends gnome-python
diff --git a/gnome2/apps/gnome-btdownload/DEPENDS b/gnome2/apps/gnome-btdownload/DEPENDS
index 0ec5aa9..cc550ae 100644
--- a/gnome2/apps/gnome-btdownload/DEPENDS
+++ b/gnome2/apps/gnome-btdownload/DEPENDS
@@ -1,2 +1,2 @@
 depends  BitTorrent  &&
-depends  gnome-python2
+depends  gnome-python
diff --git a/gnome2/apps/gnumeric/BUILD b/gnome2/apps/gnumeric/BUILD
new file mode 100644
index 0000000..c65655e
--- /dev/null
+++ b/gnome2/apps/gnumeric/BUILD
@@ -0,0 +1,15 @@
+(
+
+    ./configure --sysconfdir=/etc                               \
+                --prefix=/opt/lunar/$MOD                        \
+                --localstatedir=/var                            \
+                --infodir=/opt/lunar/$MOD/share/info            \
+                --mandir=/opt/lunar/$MOD/share/man              \
+                --with-graphs                                   \
+                $OPTS                                           &&
+
+   default_make                                                 &&
+   install -m 755 -d /usr/share/pixmaps/                        &&
+   cp /opt/lunar/$MOD/share/pixmaps/gnome-gnumeric.png /usr/share/pixmaps/
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/apps/gnumeric/DEPENDS b/gnome2/apps/gnumeric/DEPENDS
new file mode 100644
index 0000000..98a8123
--- /dev/null
+++ b/gnome2/apps/gnumeric/DEPENDS
@@ -0,0 +1,30 @@
+depends  libgnomeprintui  &&
+depends  goffice2         &&
+
+optional_depends  libgnomedb    ""  ""                 "enable gnome-db for gnumeric"  &&
+optional_depends  scrollkeeper  ""  "--without-gnome"  "enable cataloging system"      &&
+
+optional_depends  "pygtk" \
+                  "--with-python" \
+                  "--without-python" \
+                  "Compile the Python plugin loader"  &&
+
+optional_depends  "perl" \
+                  "--with-perl" \
+                  "--without-perl" \
+                  "Compile the Perl plugin loader"  &&
+
+optional_depends  "libgda2" \
+                  "--with-gda" \
+                  "--without-gda" \
+                  "Compile the Gnome Database Access plugin"  &&
+
+optional_depends  "psiconv" \
+                  "--with-psiconv" \
+                  "--without-psiconv" \
+                  "Compile with Psiconv support"  &&
+
+optional_depends  "libgnomeui" \
+                  "--with-gnome" \
+                  "--without-gnome" \
+                  "Compile with gnome support"
diff --git a/gnome2/apps/gnumeric/DETAILS b/gnome2/apps/gnumeric/DETAILS
new file mode 100644
index 0000000..43dec0c
--- /dev/null
+++ b/gnome2/apps/gnumeric/DETAILS
@@ -0,0 +1,21 @@
+          MODULE=gnumeric
+         VERSION=1.8.3
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/1.8/
+      SOURCE_VFY=sha1:5a6585549bd705bf1d0e590981c3ef38173f8c08
+        WEB_SITE=http://www.gnumeric.org
+         ENTERED=20021224
+         UPDATED=20080702
+           SHORT="the GNOME spreadsheet application"
+
+cat << EOF
+Gnumeric is a powerful spreadsheet application that interoperates well
+with other spreadsheets.  It comes with plugins that enable it to deal
+with commonly used spreadsheet file formats.  Gnumeric is intended to
+be a drop in replacement for commercial spreadsheets.
+
+Gnumeric will import your existing Excel, 1-2-3, Applix, Sylk, XBase 
+and Oleo files.  Gnumeric can export to LaTeX 2e (.tex), TROFF (.me)
+and HTML as well.
+EOF
diff --git a/gnome2/apps/gnumeric/profile.d/gnumeric.rc b/gnome2/apps/gnumeric/profile.d/gnumeric.rc
new file mode 100644
index 0000000..6b73ea2
--- /dev/null
+++ b/gnome2/apps/gnumeric/profile.d/gnumeric.rc
@@ -0,0 +1,2 @@
+export PATH=$PATH:/opt/lunar/gnumeric/bin
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/lunar/gnumeric/share
diff --git a/gnome2/apps/gnumeric2/DEPENDS b/gnome2/apps/gnumeric2/DEPENDS
index 49b0073..98a8123 100644
--- a/gnome2/apps/gnumeric2/DEPENDS
+++ b/gnome2/apps/gnumeric2/DEPENDS
@@ -1,10 +1,10 @@
 depends  libgnomeprintui  &&
-depends  goffice          &&
+depends  goffice2         &&
 
 optional_depends  libgnomedb    ""  ""                 "enable gnome-db for gnumeric"  &&
 optional_depends  scrollkeeper  ""  "--without-gnome"  "enable cataloging system"      &&
 
-optional_depends  "pygtk2" \
+optional_depends  "pygtk" \
                   "--with-python" \
                   "--without-python" \
                   "Compile the Python plugin loader"  &&
diff --git a/gnome2/apps/gnumeric2/DETAILS b/gnome2/apps/gnumeric2/DETAILS
index 3d3bfb7..e685fc0 100644
--- a/gnome2/apps/gnumeric2/DETAILS
+++ b/gnome2/apps/gnumeric2/DETAILS
@@ -1,13 +1,13 @@
           MODULE=gnumeric2
              MOD=gnumeric
-         VERSION=1.6.3
+         VERSION=1.8.3
           SOURCE=$MOD-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/1.6/
-      SOURCE_VFY=sha1:2261b3276ed5ead65047208a6ddb7f3436b7e544
+      SOURCE_URL=$GNOME_URL/sources/$MOD/1.8/
+      SOURCE_VFY=sha1:5a6585549bd705bf1d0e590981c3ef38173f8c08
         WEB_SITE=http://www.gnumeric.org
          ENTERED=20021224
-         UPDATED=20060323
+         UPDATED=20080702
            SHORT="the GNOME spreadsheet application"
 
 cat << EOF
diff --git a/gnome2/apps/gramps/DEPENDS b/gnome2/apps/gramps/DEPENDS
index 49a8496..1e8f285 100644
--- a/gnome2/apps/gramps/DEPENDS
+++ b/gnome2/apps/gramps/DEPENDS
@@ -1,3 +1,3 @@
-depends gnome-python2 &&
+depends gnome-python &&
 depends pil &&
 depends reportlab 
diff --git a/gnome2/apps/katoob/DEPENDS b/gnome2/apps/katoob/DEPENDS
index 6732587..31ef844 100644
--- a/gnome2/apps/katoob/DEPENDS
+++ b/gnome2/apps/katoob/DEPENDS
@@ -1,4 +1,4 @@
-depends gtkmm2 &&
+depends gtkmm &&
 
 optional_depends "gtkspell" \
                  "--enable-spell" \
diff --git a/gnome2/apps/meld/DEPENDS b/gnome2/apps/meld/DEPENDS
index 6d78d8d..79257b7 100644
--- a/gnome2/apps/meld/DEPENDS
+++ b/gnome2/apps/meld/DEPENDS
@@ -1,2 +1,3 @@
-depends gnome-python2
+depends gnome-python
 depends libgnomeui
+optional_depends "pygtksourceview" "" "" "For syntax highlighting"
diff --git a/gnome2/apps/myBudget/DEPENDS b/gnome2/apps/myBudget/DEPENDS
index 0c21586..67cbcf7 100644
--- a/gnome2/apps/myBudget/DEPENDS
+++ b/gnome2/apps/myBudget/DEPENDS
@@ -1,4 +1,4 @@
-depends  gnome-python2  &&
+depends  gnome-python  &&
 
 optional_depends  "abiword"    ""  ""  "for exporting to abiword"  &&
 optional_depends  "gnumeric2"  ""  ""  "for exporting to gnumeric"
diff --git a/gnome2/apps/straw/DEPENDS b/gnome2/apps/straw/DEPENDS
index b145a0f..21520b1 100644
--- a/gnome2/apps/straw/DEPENDS
+++ b/gnome2/apps/straw/DEPENDS
@@ -1,4 +1,4 @@
-depends gnome-python2
+depends gnome-python
 depends db
 depends adns-python
 depends egenix-mx
diff --git a/gnome2/bindings/gconfmm/DEPENDS b/gnome2/bindings/gconfmm/DEPENDS
index ff5975a..e61b044 100644
--- a/gnome2/bindings/gconfmm/DEPENDS
+++ b/gnome2/bindings/gconfmm/DEPENDS
@@ -1,2 +1,2 @@
-depends  GConf2
-depends  gtkmm2
+depends  GConf
+depends  gtkmm
diff --git a/gnome2/bindings/gconfmm/DETAILS b/gnome2/bindings/gconfmm/DETAILS
index 7ce892b..77e6b60 100644
--- a/gnome2/bindings/gconfmm/DETAILS
+++ b/gnome2/bindings/gconfmm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gconfmm
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:26b134dea429bd659f57816d00e5bff1dc07b5f8
+      SOURCE_VFY=sha1:5ce223e13372a7efd95c86fcfd37816a325d0893
         WEB_SITE=http://gtkmm.org
          ENTERED=20031208
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="C++ Bindings for GConf2"
 
 cat << EOF
diff --git a/gnome2/bindings/glibmm/DETAILS b/gnome2/bindings/glibmm/DETAILS
index 45772d5..52dc279 100644
--- a/gnome2/bindings/glibmm/DETAILS
+++ b/gnome2/bindings/glibmm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=glibmm
-         VERSION=2.14.2
-           MAJOR=2.14
+         VERSION=2.16.3
+           MAJOR=2.16
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:4edeb23a13b068c3ef93c6f0acfd5decbdd7a91d
+      SOURCE_VFY=sha1:9711cec3951633034cb591e8832c06bcaea452fb
         WEB_SITE=http://www.gtkmm.org/
          ENTERED=20040409
-         UPDATED=20071104
+         UPDATED=20080617
            SHORT="C++ bindings for glib2"
 
 cat << EOF
diff --git a/gnome2/bindings/gnome-python-desktop/DEPENDS b/gnome2/bindings/gnome-python-desktop/DEPENDS
index 09337b5..04f444d 100644
--- a/gnome2/bindings/gnome-python-desktop/DEPENDS
+++ b/gnome2/bindings/gnome-python-desktop/DEPENDS
@@ -1,4 +1,4 @@
 depends  libgnomeprintui  &&
 depends  libgnomeui       &&
 depends  pyorbit          &&
-depends  pygtk2
+depends  pygtk
diff --git a/gnome2/bindings/gnome-python-desktop/DETAILS b/gnome2/bindings/gnome-python-desktop/DETAILS
index f9cb812..07d3028 100644
--- a/gnome2/bindings/gnome-python-desktop/DETAILS
+++ b/gnome2/bindings/gnome-python-desktop/DETAILS
@@ -1,18 +1,18 @@
           MODULE=gnome-python-desktop
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9de5c7fb6d08752fbea7cb5fca51f1b709616f75
+      SOURCE_VFY=sha1:6f1a93aacfc256ca878f8f3636a0270580d2354b
         WEB_SITE=http://www.pygtk.org/
          ENTERED=20050319
-         UPDATED=20070315
+         UPDATED=20080416
            SHORT="Python bindings for the GNOME desktop"
 
 cat << EOF
-GnomePythonDesktop  provides python interfacing modules for some GNOME 
-libraries part of the GNOME Desktop (gnomeapplet, gnomeprint, 
-gnomeprint.ui, gtksourceview, wnck, totem.plparser, gtop, nautilusburn, 
+GnomePythonDesktop  provides python interfacing modules for some GNOME
+libraries part of the GNOME Desktop (gnomeapplet, gnomeprint,
+gnomeprint.ui, gtksourceview, wnck, totem.plparser, gtop, nautilusburn,
 mediaprofiles, metacity).
 EOF
diff --git a/gnome2/bindings/gnome-python-extras/BUILD b/gnome2/bindings/gnome-python-extras/BUILD
new file mode 100644
index 0000000..80d990a
--- /dev/null
+++ b/gnome2/bindings/gnome-python-extras/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/bindings/gnome-python-extras/DEPENDS b/gnome2/bindings/gnome-python-extras/DEPENDS
new file mode 100644
index 0000000..3853f29
--- /dev/null
+++ b/gnome2/bindings/gnome-python-extras/DEPENDS
@@ -0,0 +1,4 @@
+depends  gnome-panel
+depends  gtksourceview
+depends  gnome-python
+optional_depends gtkspell "" "" "For gtkspell support, needed by scribes"
diff --git a/gnome2/bindings/gnome-python-extras/DETAILS b/gnome2/bindings/gnome-python-extras/DETAILS
new file mode 100644
index 0000000..de03d02
--- /dev/null
+++ b/gnome2/bindings/gnome-python-extras/DETAILS
@@ -0,0 +1,16 @@
+          MODULE=gnome-python-extras
+         VERSION=2.14.3
+           MAJOR=2.14
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:35b48fe0a3716c5323337be7d601066e9fd8e0a0
+        WEB_SITE=http://www.pygtk.org/
+         ENTERED=20080416
+         UPDATED=20080416
+           SHORT="python interfacing for GNOME libraries"
+
+cat << EOF
+GnomePythonExtras  provides python interfacing modules for some GNOME
+libraries not part of the Developer or Desktop platforms (gtkhtml2,
+egg.trayicon, egg.recent, gtkspell, gtkmozembed, gdl, gda, gksu, gksu.ui).
+EOF
diff --git a/gnome2/bindings/gnome-python/BUILD b/gnome2/bindings/gnome-python/BUILD
new file mode 100644
index 0000000..07280ab
--- /dev/null
+++ b/gnome2/bindings/gnome-python/BUILD
@@ -0,0 +1,13 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make
+
+) > $C_FIFO 2>&1
+
diff --git a/gnome2/bindings/gnome-python/DEPENDS b/gnome2/bindings/gnome-python/DEPENDS
new file mode 100644
index 0000000..1c77460
--- /dev/null
+++ b/gnome2/bindings/gnome-python/DEPENDS
@@ -0,0 +1,4 @@
+depends libgnomeprintui
+depends libgnomeui
+depends pyorbit
+depends pygtk
diff --git a/gnome2/bindings/gnome-python/DETAILS b/gnome2/bindings/gnome-python/DETAILS
new file mode 100644
index 0000000..d5c653e
--- /dev/null
+++ b/gnome2/bindings/gnome-python/DETAILS
@@ -0,0 +1,16 @@
+          MODULE=gnome-python
+         VERSION=2.22.1
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:91402febafd40d59c0eb3f9da80a3406e4e7a76e
+        WEB_SITE=http://www.pygtk.org/
+         ENTERED=20050319
+         UPDATED=20080703
+           SHORT="Python bindings for the GNOME desktop"
+
+cat << EOF
+gnome-python2 provides Python bindings for the GNOME desktop.  This
+includes gnomeui, gnomecanvas, gnomevfs, gconf, and bonobo bindings.
+EOF
diff --git a/gnome2/bindings/gnome-python2-extras/BUILD b/gnome2/bindings/gnome-python2-extras/BUILD
deleted file mode 100644
index 80d990a..0000000
--- a/gnome2/bindings/gnome-python2-extras/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/bindings/gnome-python2-extras/DEPENDS b/gnome2/bindings/gnome-python2-extras/DEPENDS
deleted file mode 100644
index 3b91849..0000000
--- a/gnome2/bindings/gnome-python2-extras/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  gnome-panel
-depends  gtksourceview2
-depends  gnome-python2
-optional_depends gtkspell "" "" "For gtkspell support, needed by scribes"
diff --git a/gnome2/bindings/gnome-python2-extras/DETAILS b/gnome2/bindings/gnome-python2-extras/DETAILS
deleted file mode 100644
index e775011..0000000
--- a/gnome2/bindings/gnome-python2-extras/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=gnome-python2-extras
-             MOD=gnome-python-extras
-         VERSION=2.14.3
-           MAJOR=2.14
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:35b48fe0a3716c5323337be7d601066e9fd8e0a0
-        WEB_SITE=http://www.pygtk.org/
-         ENTERED=20060803
-         UPDATED=20070823
-           SHORT="python interfacing for GNOME libraries"
-
-cat << EOF
-GnomePythonExtras  provides python interfacing modules for some GNOME
-libraries not part of the Developer or Desktop platforms (gtkhtml2,
-egg.trayicon, egg.recent, gtkspell, gtkmozembed, gdl, gda, gksu, gksu.ui).
-EOF
diff --git a/gnome2/bindings/gnome-python2/BUILD b/gnome2/bindings/gnome-python2/BUILD
deleted file mode 100644
index 62fc456..0000000
--- a/gnome2/bindings/gnome-python2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/bindings/gnome-python2/DEPENDS b/gnome2/bindings/gnome-python2/DEPENDS
deleted file mode 100644
index 2d93ec7..0000000
--- a/gnome2/bindings/gnome-python2/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  libgnomeprintui
-depends  libgnomeui
-depends  pyorbit
-depends  pygtk2
diff --git a/gnome2/bindings/gnome-python2/DETAILS b/gnome2/bindings/gnome-python2/DETAILS
deleted file mode 100644
index f1f4a99..0000000
--- a/gnome2/bindings/gnome-python2/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-          MODULE=gnome-python2
-             MOD=gnome-python
-         VERSION=2.20.1
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:654419b0082d101d76ecc79d9fe47b0d8ea5461b
-        WEB_SITE=http://www.pygtk.org/
-         ENTERED=20050319
-         UPDATED=20071125
-           SHORT="Python bindings for the GNOME desktop"
-
-cat << EOF
-gnome-python2 provides Python bindings for the GNOME desktop.  This
-includes gnomeui, gnomecanvas, gnomevfs, gconf, and bonobo bindings.
-EOF
diff --git a/gnome2/bindings/gnome-vfsmm/DEPENDS b/gnome2/bindings/gnome-vfsmm/DEPENDS
index bdc9b14..6aab0fc 100644
--- a/gnome2/bindings/gnome-vfsmm/DEPENDS
+++ b/gnome2/bindings/gnome-vfsmm/DEPENDS
@@ -1,2 +1,2 @@
 depends  glibmm
-depends  gnome-vfs2
+depends  gnome-vfs
diff --git a/gnome2/bindings/gnome-vfsmm/DETAILS b/gnome2/bindings/gnome-vfsmm/DETAILS
index 53613b5..30bf8da 100644
--- a/gnome2/bindings/gnome-vfsmm/DETAILS
+++ b/gnome2/bindings/gnome-vfsmm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-vfsmm
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:8b49b8299c03be5bf0fce16bfa4cc63d78b26d4c
+      SOURCE_VFY=sha1:cd739e1b2b68af080089b52bcfffd3e96b35d6e9
         WEB_SITE=http://gtkmm.org
          ENTERED=20050319
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="C++ wrappers for gnome-vfs"
 
 cat << EOF
diff --git a/gnome2/bindings/gtkmm/BUILD b/gnome2/bindings/gtkmm/BUILD
new file mode 100644
index 0000000..f7c97d8
--- /dev/null
+++ b/gnome2/bindings/gtkmm/BUILD
@@ -0,0 +1,14 @@
+(
+
+    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                 --build=$BUILD                     \
+                 --sysconfdir=/etc                  \
+                 --localstatedir=/var               \
+                 --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
+                 --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
+                 --disable-examples                 \
+                 --disable-demos                    \
+                 $OPTS                              &&
+    default_make
+ 
+) > $C_FIFO 2>&1
diff --git a/gnome2/bindings/gtkmm/DEPENDS b/gnome2/bindings/gtkmm/DEPENDS
new file mode 100644
index 0000000..086dde1
--- /dev/null
+++ b/gnome2/bindings/gtkmm/DEPENDS
@@ -0,0 +1,3 @@
+depends gtk+-2
+depends glibmm
+depends cairomm
diff --git a/gnome2/bindings/gtkmm/DETAILS b/gnome2/bindings/gtkmm/DETAILS
new file mode 100644
index 0000000..31e4128
--- /dev/null
+++ b/gnome2/bindings/gtkmm/DETAILS
@@ -0,0 +1,15 @@
+          MODULE=gtkmm
+         VERSION=2.12.7
+           MAJOR=2.12
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:ee7211c99e860c4b22091e81e6d1676d12fbb23c
+        WEB_SITE=http://gtkmm.org
+         ENTERED=20021225
+         UPDATED=20080703
+           SHORT="C++ bindings for gtk2 and glib2"
+
+cat << EOF
+gtkmm2 is the official C++ binding for GTK+2 and Glib2.
+EOF
diff --git a/gnome2/bindings/gtkmm2/BUILD b/gnome2/bindings/gtkmm2/BUILD
deleted file mode 100644
index 22deba1..0000000
--- a/gnome2/bindings/gtkmm2/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                     \
-                --sysconfdir=/etc                  \
-                --localstatedir=/var               \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
-                --disable-examples                 \
-                --disable-demos                    \
-                $OPTS                              &&
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/bindings/gtkmm2/DEPENDS b/gnome2/bindings/gtkmm2/DEPENDS
deleted file mode 100644
index 7732ecc..0000000
--- a/gnome2/bindings/gtkmm2/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  gtk+-2
-depends  glibmm
-depends  cairomm
diff --git a/gnome2/bindings/gtkmm2/DETAILS b/gnome2/bindings/gtkmm2/DETAILS
deleted file mode 100644
index 1ba8708..0000000
--- a/gnome2/bindings/gtkmm2/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=gtkmm2
-             MOD=gtkmm
-         VERSION=2.12.5
-           MAJOR=2.12
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:49b7f20980e643f265a4cf260a10059794c2e00a
-        WEB_SITE=http://gtkmm.org
-         ENTERED=20021225
-         UPDATED=20080330
-           SHORT="C++ bindings for gtk2 and glib2"
-
-cat << EOF
-gtkmm2 is the official C++ binding for GTK+2 and Glib2.
-EOF
diff --git a/gnome2/bindings/libglademm/DEPENDS b/gnome2/bindings/libglademm/DEPENDS
index 19ba9f1..e118261 100644
--- a/gnome2/bindings/libglademm/DEPENDS
+++ b/gnome2/bindings/libglademm/DEPENDS
@@ -1,2 +1,2 @@
-depends libglade2 &&
-depends gtkmm2
+depends libglade &&
+depends gtkmm
diff --git a/gnome2/bindings/libglademm/DETAILS b/gnome2/bindings/libglademm/DETAILS
index b92f0bd..72d26e1 100644
--- a/gnome2/bindings/libglademm/DETAILS
+++ b/gnome2/bindings/libglademm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libglademm
-         VERSION=2.6.4
+         VERSION=2.6.6
            MAJOR=2.6
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:7db86cb5942e7eed5668776e49aeb3731b3a34c9
+      SOURCE_VFY=sha1:5d3a43bc08fd0c0ba06c8288efa6d2f5d18ce42e
         WEB_SITE=http://www.gnome.org
          ENTERED=20031208
-         UPDATED=20070823
+         UPDATED=20080416
            SHORT="C++ Bindings for libglade2"
 cat << EOF
 C++ Bindings for libglade2
diff --git a/gnome2/bindings/libgnomecanvasmm/DETAILS b/gnome2/bindings/libgnomecanvasmm/DETAILS
index d5df985..eee6ea5 100644
--- a/gnome2/bindings/libgnomecanvasmm/DETAILS
+++ b/gnome2/bindings/libgnomecanvasmm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgnomecanvasmm
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:229a78a3b4a671d052f6d368b89401d4069147e6
+      SOURCE_VFY=sha1:6a0834b21fb4744106d1471f763466e20c5f6067
         WEB_SITE=http://gtkmm.org
          ENTERED=20031208
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="C++ Bindings for libgnomecanvas"
 
 cat << EOF
diff --git a/gnome2/bindings/libgnomemm/DEPENDS b/gnome2/bindings/libgnomemm/DEPENDS
index f98af5a..a867469 100644
--- a/gnome2/bindings/libgnomemm/DEPENDS
+++ b/gnome2/bindings/libgnomemm/DEPENDS
@@ -1,2 +1,2 @@
 depends libgnome
-depends gtkmm2
+depends gtkmm
diff --git a/gnome2/bindings/libgnomemm/DETAILS b/gnome2/bindings/libgnomemm/DETAILS
index f8faad2..cbf2f7a 100644
--- a/gnome2/bindings/libgnomemm/DETAILS
+++ b/gnome2/bindings/libgnomemm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgnomemm
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:0b870762d04ccb3e519572093049d171344e9f4c
+      SOURCE_VFY=sha1:b74c74f234415ddcc86e6f66c307ec544ee2a2b8
         WEB_SITE=http://gtkmm.org
          ENTERED=20031208
-         UPDATED=20071220
+         UPDATED=20080416
            SHORT="C++ Bindings for libgnome"
 
 cat << EOF
diff --git a/gnome2/bindings/libgnomeuimm/DEPENDS b/gnome2/bindings/libgnomeuimm/DEPENDS
index fb4f71f..5857451 100644
--- a/gnome2/bindings/libgnomeuimm/DEPENDS
+++ b/gnome2/bindings/libgnomeuimm/DEPENDS
@@ -1,4 +1,4 @@
-depends  libglade2
+depends  libglade
 depends  libgnomecanvasmm
 depends  libgnomemm
 depends  gconfmm
diff --git a/gnome2/bindings/libgnomeuimm/DETAILS b/gnome2/bindings/libgnomeuimm/DETAILS
index 5f3bced..f0d0a51 100644
--- a/gnome2/bindings/libgnomeuimm/DETAILS
+++ b/gnome2/bindings/libgnomeuimm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgnomeuimm
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:1cea52b484c21e176d8faa95e4dceaaebbc227e0
+      SOURCE_VFY=sha1:af21b8a18ee1fb525154e89594e8c807655d7910
         WEB_SITE=http://gtkmm.org
          ENTERED=20031208
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="C++ Bindings for libgnomeui"
 
 cat << EOF
diff --git a/gnome2/bindings/pygobject/DETAILS b/gnome2/bindings/pygobject/DETAILS
index 6afc4bf..457f655 100644
--- a/gnome2/bindings/pygobject/DETAILS
+++ b/gnome2/bindings/pygobject/DETAILS
@@ -1,12 +1,12 @@
           MODULE=pygobject
-         VERSION=2.12.3
-           MAJOR=2.12
+         VERSION=2.14.2
+           MAJOR=2.14
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:8679463abeee085b2dd2db5b6f2a1cf78ca71ad6
+      SOURCE_VFY=sha1:e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc
         WEB_SITE=http://www.pygtk.org/
          ENTERED=20050319
-         UPDATED=20061118
+         UPDATED=20080601
            SHORT="Python bindings for GObject"
 
 cat << EOF
diff --git a/gnome2/bindings/pygtksourceview/DEPENDS b/gnome2/bindings/pygtksourceview/DEPENDS
index 83db4f3..f075458 100644
--- a/gnome2/bindings/pygtksourceview/DEPENDS
+++ b/gnome2/bindings/pygtksourceview/DEPENDS
@@ -1,2 +1,2 @@
-depends gtksourceview
-depends gnome-python-desktop
+depends  gtksourceview
+depends  gnome-python-desktop
diff --git a/gnome2/bindings/pygtksourceview/DETAILS b/gnome2/bindings/pygtksourceview/DETAILS
index 3da0de2..8ceb893 100644
--- a/gnome2/bindings/pygtksourceview/DETAILS
+++ b/gnome2/bindings/pygtksourceview/DETAILS
@@ -1,11 +1,14 @@
-           MODULE=pygtksourceview
-          VERSION=1.1.0
-           SOURCE=$MODULE-$VERSION.tar.gz
-       SOURCE_URL=$SFORGE_URL/$MODULE/
-         WEB_SITE=http://$MODULE.sf.net/
-          ENTERED=20060914
-          UPDATED=20060914
-            SHORT="Python bindings for gtksourceview widget"
+          MODULE=pygtksourceview
+         VERSION=2.2.0
+           MAJOR=2.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:45d52fe11b17228f78ec784beac15bafbf91d00b
+        WEB_SITE=http://$MODULE.sf.net/
+         ENTERED=20060914
+         UPDATED=20080311
+           SHORT="Python bindings for gtksourceview widget"
+
 cat << EOF
 This package contains Python bindings for the gtk sourceview package.
 EOF
diff --git a/gnome2/bindings/pygtksourceview2/DEPENDS b/gnome2/bindings/pygtksourceview2/DEPENDS
deleted file mode 100644
index 33b46e0..0000000
--- a/gnome2/bindings/pygtksourceview2/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  gtksourceview2
-depends  gnome-python-desktop
diff --git a/gnome2/bindings/pygtksourceview2/DETAILS b/gnome2/bindings/pygtksourceview2/DETAILS
deleted file mode 100644
index ec5370d..0000000
--- a/gnome2/bindings/pygtksourceview2/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=pygtksourceview2
-         VERSION=2.0.0
-           MAJOR=2.0
-          SOURCE=pygtksourceview-$VERSION.tar.gz
-      SOURCE_URL=$GNOME_URL/sources/pygtksourceview/$MAJOR/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pygtksourceview-$VERSION
-         WEB_SITE=http://gnome.org/
-          ENTERED=20070927
-          UPDATED=20070927
-            SHORT="Python bindings for the gtksourceview2 widget"
-
-cat << EOF
-This package contains Python bindings for the gtksourceview2 package.
-EOF
diff --git a/gnome2/core/gDesklets/DEPENDS b/gnome2/core/gDesklets/DEPENDS
index 5da38cd..38dcaff 100644
--- a/gnome2/core/gDesklets/DEPENDS
+++ b/gnome2/core/gDesklets/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-python2 &&
+depends gnome-python &&
 depends swig
diff --git a/gnome2/core/gnome-audio/BUILD b/gnome2/core/gnome-audio/BUILD
deleted file mode 100644
index 78480a1..0000000
--- a/gnome2/core/gnome-audio/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
-  prepare_install       &&
-  make install
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/core/gnome-audio/DETAILS b/gnome2/core/gnome-audio/DETAILS
index 6e5ae5f..cbec0c7 100644
--- a/gnome2/core/gnome-audio/DETAILS
+++ b/gnome2/core/gnome-audio/DETAILS
@@ -1,14 +1,12 @@
            MODULE=gnome-audio
-         VERSION=2.0.0
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=$MODULE-$VERSION-makefile.patch
-   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/2.0/
-      SOURCE_VFY=md5:cd14b84af59fb2ec673527d32f4e379f
-  SOURCE2_URL[0]=$PATCH_URL
-     SOURCE2_VFY=md5:0c2eda8234dba8c7037ae727535ada8c
+   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:88bc38387a7b556eb32232f4148fd09abd59ab6d
         WEB_SITE=http://www.gnome.org
          ENTERED=20020812
-         UPDATED=20040426
+         UPDATED=20080702
            SHORT="This package contains a collection of sounds for use with Gnome."
 cat << EOF
 This package contains a collection of sounds for use with Gnome.
diff --git a/gnome2/core/gnome-common/BUILD b/gnome2/core/gnome-common/BUILD
new file mode 100644
index 0000000..8d803e7
--- /dev/null
+++ b/gnome2/core/gnome-common/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/core/gnome-common/DEPENDS b/gnome2/core/gnome-common/DEPENDS
new file mode 100644
index 0000000..a708cc1
--- /dev/null
+++ b/gnome2/core/gnome-common/DEPENDS
@@ -0,0 +1 @@
+depends pkgconfig
diff --git a/gnome2/core/gnome-common/DETAILS b/gnome2/core/gnome-common/DETAILS
new file mode 100644
index 0000000..4570ab4
--- /dev/null
+++ b/gnome2/core/gnome-common/DETAILS
@@ -0,0 +1,20 @@
+          MODULE=gnome-common
+         VERSION=2.20.0
+           MAJOR=2.20
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:8fc9eeacdf6b77d8e6d1735979bbc3d678f49d95 
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20020701
+         UPDATED=20080703
+           SHORT="set of aclocal files for GNOME"
+
+cat << EOF
+Gnome-Common is a set of various files needed to bootstrap Gnome 2
+modules built from CVS.  It contains the following components:
+  1. A common "autogen.sh" script that can be used to configure a
+     source directory checked out from CVS.
+  2. Some commonly used macros
+  3. Some files used to build user documentation.
+EOF
diff --git a/gnome2/core/gnome-common2/BUILD b/gnome2/core/gnome-common2/BUILD
deleted file mode 100644
index 8d803e7..0000000
--- a/gnome2/core/gnome-common2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/core/gnome-common2/DEPENDS b/gnome2/core/gnome-common2/DEPENDS
deleted file mode 100644
index a708cc1..0000000
--- a/gnome2/core/gnome-common2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends pkgconfig
diff --git a/gnome2/core/gnome-common2/DETAILS b/gnome2/core/gnome-common2/DETAILS
deleted file mode 100644
index f37bbf1..0000000
--- a/gnome2/core/gnome-common2/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-          MODULE=gnome-common2
-             MOD=gnome-common
-         VERSION=2.20.0
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:8fc9eeacdf6b77d8e6d1735979bbc3d678f49d95 
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020701
-         UPDATED=20071117
-           SHORT="set of aclocal files for GNOME"
-
-cat << EOF
-Gnome-Common is a set of various files needed to bootstrap Gnome 2
-modules built from CVS.  It contains the following components:
-  1. A common "autogen.sh" script that can be used to configure a
-     source directory checked out from CVS.
-  2. Some commonly used macros
-  3. Some files used to build user documentation.
-EOF
diff --git a/gnome2/core/gtk-engines2/DETAILS b/gnome2/core/gtk-engines2/DETAILS
index 9e948ca..ba61bb3 100644
--- a/gnome2/core/gtk-engines2/DETAILS
+++ b/gnome2/core/gtk-engines2/DETAILS
@@ -1,12 +1,13 @@
           MODULE=gtk-engines2
-         VERSION=2.14.1
+           MAJOR=2.14
+         VERSION=2.14.2
           SOURCE=gtk-engines-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk-engines-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/gtk-engines/2.14/
-      SOURCE_VFY=sha1:e4713d44df431c83b1640457b90abc3ddc71d9b1
+      SOURCE_URL=$GNOME_URL/sources/gtk-engines/$MAJOR/
+      SOURCE_VFY=sha1:31ed1b8fdce79cd89558c9069e4b71a4eff19ce6
         WEB_SITE=http://www.gtk.org/
          ENTERED=20020714
-         UPDATED=20080407
+         UPDATED=20080601
            SHORT="Theme engines for GTK+-2"
 
 cat << EOF
diff --git a/gnome2/core/linc/BUILD b/gnome2/core/linc/BUILD
deleted file mode 100644
index 8d803e7..0000000
--- a/gnome2/core/linc/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/core/linc/DEPENDS b/gnome2/core/linc/DEPENDS
deleted file mode 100644
index 7c5f131..0000000
--- a/gnome2/core/linc/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends glib-2
diff --git a/gnome2/core/linc/DETAILS b/gnome2/core/linc/DETAILS
deleted file mode 100644
index ea4d019..0000000
--- a/gnome2/core/linc/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=linc
-         VERSION=1.1.1
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/1.1/
-      SOURCE_VFY=md5:265d5de469fdc5be76c7c4cd72a27433
-        WEB_SITE=http://orbit-resource.sourceforge.net
-         ENTERED=20020714
-         UPDATED=20040409
-           SHORT="library for writing networked servers & clients."
-cat << EOF
-linc is a library that eases the task of writing networked servers &
-clients. It takes care of connection initiation and maintainance, and
-the details of various transports. It is used by the new ORBit to
-handle message transmission/receipt.
-EOF
diff --git a/gnome2/core/linc/PRE_BUILD b/gnome2/core/linc/PRE_BUILD
deleted file mode 100644
index 8f112ee..0000000
--- a/gnome2/core/linc/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build
-echo "Removing old Gnome Installation if its there"
-if [ -e "/opt/lunar/gnome" ]; then
-  rm -fr /opt/lunar/gnome || true
-fi
-
diff --git a/gnome2/core/nautilus-media/BUILD b/gnome2/core/nautilus-media/BUILD
deleted file mode 100644
index 8d803e7..0000000
--- a/gnome2/core/nautilus-media/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/core/nautilus-media/DEPENDS b/gnome2/core/nautilus-media/DEPENDS
deleted file mode 100644
index 30d8332..0000000
--- a/gnome2/core/nautilus-media/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends nautilus &&
-depends gst-plugins
diff --git a/gnome2/core/nautilus-media/DETAILS b/gnome2/core/nautilus-media/DETAILS
deleted file mode 100644
index cbcbab9..0000000
--- a/gnome2/core/nautilus-media/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-           MODULE=nautilus-media
-         VERSION=0.8.0
-          SOURCE=$MODULE-$VERSION.tar.bz2
-   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/0.8/
-      SOURCE_VFY=md5:78b2cdc9146af482cac52a549440e1ca 
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20021202
-         UPDATED=20040409
-           SHORT="Gstreamer VFS for embedding gstreamer and media files in nautilus"
-cat << EOF
-Nautilus Media is a Gstreamer VFS for embedding gstreamer and
-media files in nautilus
-EOF
diff --git a/gnome2/desktop/alacarte/DEPENDS b/gnome2/desktop/alacarte/DEPENDS
index af08582..b2ee240 100644
--- a/gnome2/desktop/alacarte/DEPENDS
+++ b/gnome2/desktop/alacarte/DEPENDS
@@ -1,3 +1,3 @@
 depends  intltool
 depends  gnome-menus
-depends  gnome-python2
+depends  gnome-python
diff --git a/gnome2/desktop/bug-buddy/DEPENDS b/gnome2/desktop/bug-buddy/DEPENDS
index 8e7a24f..8fa3dd1 100644
--- a/gnome2/desktop/bug-buddy/DEPENDS
+++ b/gnome2/desktop/bug-buddy/DEPENDS
@@ -1,4 +1,4 @@
-depends  gnome-vfs2
+depends  gnome-vfs
 depends  gnome-menus
 depends  gnome-desktop
 depends  libelf
diff --git a/gnome2/desktop/bug-buddy/DETAILS b/gnome2/desktop/bug-buddy/DETAILS
index 1ccf159..c304a45 100644
--- a/gnome2/desktop/bug-buddy/DETAILS
+++ b/gnome2/desktop/bug-buddy/DETAILS
@@ -1,12 +1,12 @@
           MODULE=bug-buddy
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ef6f82b2444e3b72bd6ac4197086d9b1697ae928
+      SOURCE_VFY=sha1:1fd3bd2b0e6160d0e2d9dee93cd49a4c3fa2770e
         WEB_SITE=http://www.gnome.org
          ENTERED=20020716
-         UPDATED=20071031
+         UPDATED=20080416
            SHORT="Bug/crash submittal tool for GNOME"
 
 cat << EOF
diff --git a/gnome2/desktop/control-center2/BUILD b/gnome2/desktop/control-center2/BUILD
deleted file mode 100644
index e7bad47..0000000
--- a/gnome2/desktop/control-center2/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-# temporary hack here to acknowlege that dbus api is not yet to 1.0, remove this later
-   export CPPFLAGS=$CPPFLAGS" -DDBUS_API_SUBJECT_TO_CHANGE=1"
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr} \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/control-center2/DEPENDS b/gnome2/desktop/control-center2/DEPENDS
deleted file mode 100644
index bcd17aa..0000000
--- a/gnome2/desktop/control-center2/DEPENDS
+++ /dev/null
@@ -1,15 +0,0 @@
-depends gtk+-2             &&
-depends GConf2             &&
-depends libgnome           &&
-depends libglade2          &&
-depends gnome-desktop      &&
-depends gnome-icon-theme   &&
-depends gnome-menus        &&
-depends esound             &&
-depends libxklavier        &&
-depends nautilus           &&
-depends metacity           &&
-depends desktop-file-utils &&
-depends gst-plugins-base   &&
-depends libgnomekbd        &&
-optional_depends hal "--enable-hal" "--disable-hal" "for optional hal support"
diff --git a/gnome2/desktop/control-center2/DETAILS b/gnome2/desktop/control-center2/DETAILS
deleted file mode 100644
index 76cb091..0000000
--- a/gnome2/desktop/control-center2/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=control-center2
-             MOD=control-center
-         VERSION=2.18.1
-           MAJOR=2.18
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_VFY=sha1:4325caeb94de9b77cd57fc210f1ba623458a2aa8
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020701
-         UPDATED=20070823
-           SHORT="Control-center for gnome"
-cat << EOF
-Control-center for Gnome2
-EOF
diff --git a/gnome2/desktop/dasher/DETAILS b/gnome2/desktop/dasher/DETAILS
index 6d5b2f3..a07f1bd 100644
--- a/gnome2/desktop/dasher/DETAILS
+++ b/gnome2/desktop/dasher/DETAILS
@@ -1,12 +1,12 @@
           MODULE=dasher
-         VERSION=4.4.0
-           MAJOR=4.4
+         VERSION=4.7.3
+           MAJOR=4.7
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:f00f0c1c08f59d1a0679ec6467fea472f67d9885
+      SOURCE_VFY=sha1:962cec3050e6a0b0f3670971734bd0595076b959
         WEB_SITE=http://www.gnome.org
          ENTERED=20040111
-         UPDATED=20070315
+         UPDATED=20080416
            SHORT="an information-efficient text-entry interface, driven by natural continuous pointing gestures."
 cat << EOF
 Dasher is an information-efficient text-entry interface, driven by 
diff --git a/gnome2/desktop/deskbar-applet/DEPENDS b/gnome2/desktop/deskbar-applet/DEPENDS
index c215ae6..f6156fe 100644
--- a/gnome2/desktop/deskbar-applet/DEPENDS
+++ b/gnome2/desktop/deskbar-applet/DEPENDS
@@ -1,4 +1,4 @@
-depends  gnome-python2         &&
+depends  gnome-python         &&
 depends  gnome-desktop         &&
 depends  gnome-python-desktop  &&
 depends  dbus-python           &&
diff --git a/gnome2/desktop/deskbar-applet/DETAILS b/gnome2/desktop/deskbar-applet/DETAILS
index 386f92a..4563960 100644
--- a/gnome2/desktop/deskbar-applet/DETAILS
+++ b/gnome2/desktop/deskbar-applet/DETAILS
@@ -1,12 +1,12 @@
           MODULE=deskbar-applet
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:5366175651ca188fcb2d9ceb4c52a19cff463f06
+      SOURCE_VFY=sha1:e1f7784af5ac4493b3800424018b4a10eac69425
         WEB_SITE=http://raphael.slinckx.net/deskbar/
          ENTERED=20070315
-         UPDATED=20071130
+         UPDATED=20080416
            SHORT="A versatile search interface for the GNOME panel"
 
 cat << EOF
diff --git a/gnome2/desktop/eel/DETAILS b/gnome2/desktop/eel/DETAILS
index e966172..b62b03d 100644
--- a/gnome2/desktop/eel/DETAILS
+++ b/gnome2/desktop/eel/DETAILS
@@ -1,12 +1,12 @@
           MODULE=eel
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:642348e57d02aba46a8f84240745b91577f3e4aa
+      SOURCE_VFY=sha1:503af67ee6fe89491cc9214e1d726fa34cb355b4
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071031
+         UPDATED=20080601
            SHORT="widgets and functions for use with GNOME."
 cat << EOF
 The Eazel Extensions Library is a collection of widgets and extensions
diff --git a/gnome2/desktop/ekiga/BUILD b/gnome2/desktop/ekiga/BUILD
index 6276606..930e29c 100644
--- a/gnome2/desktop/ekiga/BUILD
+++ b/gnome2/desktop/ekiga/BUILD
@@ -1,6 +1,6 @@
 (
 
-   patch_it $SOURCE2 1 &&  
+#   patch_it $SOURCE2 0 &&  
 
    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD                    \
diff --git a/gnome2/desktop/ekiga/DETAILS b/gnome2/desktop/ekiga/DETAILS
index ae1dec6..ded8381 100644
--- a/gnome2/desktop/ekiga/DETAILS
+++ b/gnome2/desktop/ekiga/DETAILS
@@ -1,15 +1,14 @@
           MODULE=ekiga
-         VERSION=2.0.11
+         VERSION=2.0.12
            MAJOR=2.0
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-$VERSION-no-gnome.patch
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
      SOURCE2_URL=$PATCH_URL/
-      SOURCE_VFY=sha1:9096a4d7bb737981920a8141f0305c616cd442c6
-     SOURCE2_VFY=sha1:772345dabe88e2ab6abb8f6fad58ddeb7a7b3e80
-        WEB_SITE=http://www.gnome.org
+      SOURCE_VFY=sha1:e80a2dae4541708768ac8c38ebb1452a2d0911d4
+     SOURCE2_VFY=sha1:sha1:772345dabe88e2ab6abb8f6fad58ddeb7a7b3e80
          ENTERED=20070315
-         UPDATED=20071019
+         UPDATED=20080312
            SHORT="opensource VoIP"
 cat << EOF
 Ekiga (formely known as GnomeMeeting) is an open source VoIP and video
diff --git a/gnome2/desktop/eog/DEPENDS b/gnome2/desktop/eog/DEPENDS
index 7471595..da7c910 100644
--- a/gnome2/desktop/eog/DEPENDS
+++ b/gnome2/desktop/eog/DEPENDS
@@ -4,7 +4,7 @@ depends gnome-icon-theme
 
 optional_depends  "libexif" "--with-libexif"  "--without-libexif"  \
                   "for EXIF support"
-optional_depends  "pygtk2"  "--enable-python"  "--disable-python"  \
+optional_depends  "pygtk"  "--enable-python"  "--disable-python"  \
                   "for Python support"
 optional_depends  "lcms"    "--with-lcms"   "--without-lcms"  \
                   "for color management support"
diff --git a/gnome2/desktop/eog/DETAILS b/gnome2/desktop/eog/DETAILS
index 33e8d63..b7eeb55 100644
--- a/gnome2/desktop/eog/DETAILS
+++ b/gnome2/desktop/eog/DETAILS
@@ -1,12 +1,12 @@
           MODULE=eog
-         VERSION=2.20.3
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:7a89765c9c87b0c029b4bf92458440884951f659
+      SOURCE_VFY=sha1:b9091c25b31fea262c9557d1148f5e6d4af08f9e
         WEB_SITE=http://www.gnome.org
          ENTERED=20020701
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="fast and functional image viewer"
 
 cat << EOF
diff --git a/gnome2/desktop/epiphany/DETAILS b/gnome2/desktop/epiphany/DETAILS
index 1b9b2c1..df7dad7 100644
--- a/gnome2/desktop/epiphany/DETAILS
+++ b/gnome2/desktop/epiphany/DETAILS
@@ -1,13 +1,13 @@
           MODULE=epiphany
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:e1950b7abb0f25fb3fd15cab08bf4b6ccc60fa97
+      SOURCE_VFY=sha1:bd57901dec8684e6f39bfadb426eac475a353a97
         WEB_SITE=http://www.gnome.org
          ENTERED=20030413
-         UPDATED=20071130
+         UPDATED=20080601
        MAINTAINER=jannis at lunar-linux.org
            SHORT="GNOME Web browser based on Gecko (Mozilla)."
 
diff --git a/gnome2/desktop/evince/DEPENDS b/gnome2/desktop/evince/DEPENDS
index 4e1ebbb..c6e768c 100644
--- a/gnome2/desktop/evince/DEPENDS
+++ b/gnome2/desktop/evince/DEPENDS
@@ -1,6 +1,6 @@
 depends  poppler
 depends  gnome-icon-theme
-depends  gnome-vfs2
+depends  gnome-vfs
 depends  gnome-keyring
 depends  gnome-doc-utils
 
diff --git a/gnome2/desktop/evince/DETAILS b/gnome2/desktop/evince/DETAILS
index 40a83ae..dd699e7 100644
--- a/gnome2/desktop/evince/DETAILS
+++ b/gnome2/desktop/evince/DETAILS
@@ -1,12 +1,12 @@
           MODULE=evince
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9d8d847314d728e579009eae76f2a84e17c9c893
+      SOURCE_VFY=sha1:c1be08426c8d7220021d20502a7ffafbe82108b4
         WEB_SITE=http://www.gnome.org/projects/evince/
          ENTERED=20050918
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="a document viewer for multiple formats (PDF, Postscript)"
 
 cat << EOF
diff --git a/gnome2/desktop/evolution-data-server/DEPENDS b/gnome2/desktop/evolution-data-server/DEPENDS
index e4dd0a4..db80841 100644
--- a/gnome2/desktop/evolution-data-server/DEPENDS
+++ b/gnome2/desktop/evolution-data-server/DEPENDS
@@ -1,5 +1,5 @@
 depends libsoup
-depends gnome-vfs2
+depends gnome-vfs
 optional_depends  "openldap"             \
                   "--with-openldap=yes"  \
                   ""                     \
diff --git a/gnome2/desktop/evolution-data-server/DETAILS b/gnome2/desktop/evolution-data-server/DETAILS
index 68784c1..634429e 100644
--- a/gnome2/desktop/evolution-data-server/DETAILS
+++ b/gnome2/desktop/evolution-data-server/DETAILS
@@ -1,15 +1,15 @@
           MODULE=evolution-data-server
-         VERSION=1.12.3
-           MAJOR=1.12
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-1.12.3-gtkdoc-rebase.patch
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:12b8b23fb77ff6436def3cc5ea472886c8e0350e
+      SOURCE_VFY=sha1:5d01b1248fcacef9c478787892f223338dff731b
      SOURCE2_VFY=sha1:8947bce20b0fe967d29aa86d5f282c4b3699fb18
         WEB_SITE=http://gnome.org/projects/evolution/
          ENTERED=20011109
-         UPDATED=20080221
+         UPDATED=20080702
            SHORT="backend data manager for Evolution"
 PSAFE=no
 
diff --git a/gnome2/desktop/evolution-exchange/DETAILS b/gnome2/desktop/evolution-exchange/DETAILS
index bf9344d..5c14fc2 100644
--- a/gnome2/desktop/evolution-exchange/DETAILS
+++ b/gnome2/desktop/evolution-exchange/DETAILS
@@ -1,12 +1,12 @@
           MODULE=evolution-exchange
-         VERSION=2.12.3
-           MAJOR=2.12
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=${MODULE}-${VERSION}.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:099f61a31528b7cb6f14f382eb39e7e2e110dcd5
+      SOURCE_VFY=sha1:162383003589100f0239612e2d184cb720164de2
         WEB_SITE=http://www.gnome.org
          ENTERED=20060317
-         UPDATED=20080221
+         UPDATED=20080702
            SHORT="allows Evolution to talk to Exchange"
 cat << EOF
 This is the Ximian Connector for Microsoft Exchange, which adds
diff --git a/gnome2/desktop/evolution/DETAILS b/gnome2/desktop/evolution/DETAILS
index 84fb231..c7b74e4 100644
--- a/gnome2/desktop/evolution/DETAILS
+++ b/gnome2/desktop/evolution/DETAILS
@@ -1,12 +1,12 @@
           MODULE=evolution
-           MAJOR=2.12
-         VERSION=2.12.3
+           MAJOR=2.22
+         VERSION=2.22.3.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:14861dd497e935074424269f2d1e6c11be56abfe
+      SOURCE_VFY=sha1:806058728c497bbb2ac6c4ddb5182eebdf97d078
         WEB_SITE=http://gnome.org/projects/evolution/
          ENTERED=20011109
-         UPDATED=20080221
+         UPDATED=20080702
            SHORT="email, calendar and notes information management solution."
 cat << EOF
 Ximian Evolution is the premiere personal and workgroup information
diff --git a/gnome2/desktop/fast-user-switch-applet/DETAILS b/gnome2/desktop/fast-user-switch-applet/DETAILS
index 8c8cee6..0ddf52c 100644
--- a/gnome2/desktop/fast-user-switch-applet/DETAILS
+++ b/gnome2/desktop/fast-user-switch-applet/DETAILS
@@ -1,12 +1,12 @@
           MODULE=fast-user-switch-applet
-         VERSION=2.18.0
-           MAJOR=2.18
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:8bea178630ab5dc2ab4d542f76f4286dfd225b1b
+      SOURCE_VFY=sha1:bc7e39edba559be5cb8e18b1aab7bf2554e55941
         WEB_SITE=http://www.gnome.org
          ENTERED=20070315
-         UPDATED=20071130
+         UPDATED=20080416
            SHORT="a user-switching applet for the GNOME panel"
 
 cat << EOF
diff --git a/gnome2/desktop/file-roller/DETAILS b/gnome2/desktop/file-roller/DETAILS
index 658b29e..b0ba57d 100644
--- a/gnome2/desktop/file-roller/DETAILS
+++ b/gnome2/desktop/file-roller/DETAILS
@@ -1,12 +1,12 @@
           MODULE=file-roller
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9aac902667e93738bcf0cfc6c5a82718c1119c8c
+      SOURCE_VFY=sha1:ccc082dcc9b31428ec51fc0ca863de26179c7590
         WEB_SITE=http://www.gnome.org
          ENTERED=20021013
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="an archive manager for the GNOME environment"
 
 cat << EOF
diff --git a/gnome2/desktop/gcalctool/DETAILS b/gnome2/desktop/gcalctool/DETAILS
index bcc0b10..144f119 100644
--- a/gnome2/desktop/gcalctool/DETAILS
+++ b/gnome2/desktop/gcalctool/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gcalctool
-         VERSION=5.20.2
-           MAJOR=5.20
+         VERSION=5.22.2
+           MAJOR=5.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:c33733a5885f33e21d64628393feaaf93b4db345
+      SOURCE_VFY=sha1:279306371d4ddb70b3cb9ef2033ac5262e83aa03
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021013
-         UPDATED=20071020
+         UPDATED=20080601
            SHORT="a GNOME based scientific calculator"
 
 cat << EOF
diff --git a/gnome2/desktop/gconf-editor/DETAILS b/gnome2/desktop/gconf-editor/DETAILS
index 962cb82..768ee00 100644
--- a/gnome2/desktop/gconf-editor/DETAILS
+++ b/gnome2/desktop/gconf-editor/DETAILS
@@ -1,15 +1,15 @@
           MODULE=gconf-editor
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:628404983b89e005cbd688d841291ddc46c361a2
+      SOURCE_VFY=sha1:7ca44dbb09136203b37d7dd5398b62bcf15ee528
         WEB_SITE=http://www.gnome.org/
          ENTERED=20020716
-         UPDATED=20071104
+         UPDATED=20080416
            SHORT="an editor for the GConf configuration system"
 
 cat << EOF
-GConf-Editor is a tool used for editing the GConf configuration 
+GConf-Editor is a tool used for editing the GConf configuration
 database.
 EOF
diff --git a/gnome2/desktop/gdm/DEPENDS b/gnome2/desktop/gdm/DEPENDS
index 822fdad..7a8a2dd 100644
--- a/gnome2/desktop/gdm/DEPENDS
+++ b/gnome2/desktop/gdm/DEPENDS
@@ -1,3 +1,2 @@
-depends librsvg         &&
-depends libgnomecanvas  &&
+depends librsvg
 depends gnome-doc-utils
diff --git a/gnome2/desktop/gdm/DETAILS b/gnome2/desktop/gdm/DETAILS
index 9fadf4b..719e50a 100644
--- a/gnome2/desktop/gdm/DETAILS
+++ b/gnome2/desktop/gdm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gdm
-         VERSION=2.20.2
+         VERSION=2.20.6
            MAJOR=2.20
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:4e2ad85df9ef61fa304c9a28cf7416a4121db12a
+      SOURCE_VFY=sha1:f86c0289641da6732957fb52fea05fefd595d5d2
         WEB_SITE=http://www.gnome.org/projects/gdm/
          ENTERED=20020716
-         UPDATED=20071130
+         UPDATED=20080602
            SHORT="the Gnome Display Manager"
 
 cat << EOF
diff --git a/gnome2/desktop/gedit-plugins/DETAILS b/gnome2/desktop/gedit-plugins/DETAILS
index 3de4a6c..0d02ab6 100644
--- a/gnome2/desktop/gedit-plugins/DETAILS
+++ b/gnome2/desktop/gedit-plugins/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gedit-plugins
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ea652f4d50dfff7526b2004b908e6a3c4e91c838
+      SOURCE_VFY=sha1:88579a75df9a39ab871952aeac6ba356c749e14b
         WEB_SITE=http://www.gnome.org/projects/gedit/plugins.html
          ENTERED=20020908
-         UPDATED=20071002
+         UPDATED=20080627
            SHORT="additional plugins for gedit"
 
 cat << EOF
diff --git a/gnome2/desktop/gedit/DEPENDS b/gnome2/desktop/gedit/DEPENDS
index d3a6e61..7c0947d 100644
--- a/gnome2/desktop/gedit/DEPENDS
+++ b/gnome2/desktop/gedit/DEPENDS
@@ -1,7 +1,7 @@
 depends  libgnomeui
-depends  gtksourceview2
+depends  gtksourceview
 
-optional_depends  "pygtksourceview2"      "--enable-python"  ""  \
+optional_depends  "pygtksourceview"      "--enable-python"  ""  \
                   "for Python based plugin support"
 optional_depends  "enchant"               ""  "--disable-spell"  \
                   "for spell checking support"
diff --git a/gnome2/desktop/gedit/DETAILS b/gnome2/desktop/gedit/DETAILS
index 742b8c1..8b3173f 100644
--- a/gnome2/desktop/gedit/DETAILS
+++ b/gnome2/desktop/gedit/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gedit
-         VERSION=2.20.4
-           MAJOR=2.20
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:82bf5fe2e119018936fca0b89196c9e86c69ee3f
+      SOURCE_VFY=sha1:3582e532c6c18f1b49b92878540484693976307b
         WEB_SITE=http://gedit.org
          ENTERED=20020716
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="a text editor for the GNOME Desktop"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-applets/BUILD b/gnome2/desktop/gnome-applets/BUILD
new file mode 100644
index 0000000..49ff50d
--- /dev/null
+++ b/gnome2/desktop/gnome-applets/BUILD
@@ -0,0 +1,13 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                --enable-ipv6                     \
+                $OPTS                             &&
+    default_make
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-applets/DEPENDS b/gnome2/desktop/gnome-applets/DEPENDS
new file mode 100644
index 0000000..2cee6a4
--- /dev/null
+++ b/gnome2/desktop/gnome-applets/DEPENDS
@@ -0,0 +1,11 @@
+depends  gnome-panel
+depends  libgtop
+depends  libxklavier
+depends  system-tools-backends
+depends  gail
+depends  gucharmap
+
+optional_depends  "gst-plugins-base" "--enable-gstreamer"  ""  \
+                  "enable gstreamer support"
+optional_depends  "apmd"       ""                    ""  \
+                  "for a battery status monitor"
diff --git a/gnome2/desktop/gnome-applets/DETAILS b/gnome2/desktop/gnome-applets/DETAILS
new file mode 100644
index 0000000..6843b18
--- /dev/null
+++ b/gnome2/desktop/gnome-applets/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gnome-applets
+         VERSION=2.22.2
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:c134d2fedf2089a17ee2b3c82a6d5df1e6ea16e2
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20020701
+         UPDATED=20080601
+           SHORT="Applets for the Gnome Panel"
+
+cat << EOF
+Applets for the Gnome Panel
+EOF
diff --git a/gnome2/desktop/gnome-applets2/BUILD b/gnome2/desktop/gnome-applets2/BUILD
deleted file mode 100644
index 49ff50d..0000000
--- a/gnome2/desktop/gnome-applets2/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                --enable-ipv6                     \
-                $OPTS                             &&
-    default_make
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-applets2/DEPENDS b/gnome2/desktop/gnome-applets2/DEPENDS
deleted file mode 100644
index 353057f..0000000
--- a/gnome2/desktop/gnome-applets2/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends  gnome-panel
-depends  libgtop2
-depends  libxklavier
-
-optional_depends  "gstreamer-10"  ""  ""  "enable sound support"
-optional_depends  "apmd"          ""  ""  "for battery status support via apm"
diff --git a/gnome2/desktop/gnome-applets2/DETAILS b/gnome2/desktop/gnome-applets2/DETAILS
deleted file mode 100644
index b4842c3..0000000
--- a/gnome2/desktop/gnome-applets2/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=gnome-applets2
-             MOD=gnome-applets
-         VERSION=2.20.1
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:de6258cae42a827dbd4c3f1479d80157838dacc7
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020701
-         UPDATED=20080406
-           SHORT="Applets for the Gnome Panel"
-
-cat << EOF
-Applets for the Gnome Panel
-EOF
diff --git a/gnome2/desktop/gnome-backgrounds/DETAILS b/gnome2/desktop/gnome-backgrounds/DETAILS
index 09cf61d..fa23a3e 100644
--- a/gnome2/desktop/gnome-backgrounds/DETAILS
+++ b/gnome2/desktop/gnome-backgrounds/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-backgrounds
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:2567947d7694d1e11d45f76b1ae03fdf8373221c
+      SOURCE_VFY=sha1:eede46b91595b4f72fe8d160a13fcaee8e4b0236
         WEB_SITE=http://www.gnome.org/
          ENTERED=20050317
-         UPDATED=20071104
+         UPDATED=20080416
            SHORT="a set of offical GNOME desktop backgrounds"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-control-center/BUILD b/gnome2/desktop/gnome-control-center/BUILD
new file mode 100644
index 0000000..e7bad47
--- /dev/null
+++ b/gnome2/desktop/gnome-control-center/BUILD
@@ -0,0 +1,14 @@
+(
+
+# temporary hack here to acknowlege that dbus api is not yet to 1.0, remove this later
+   export CPPFLAGS=$CPPFLAGS" -DDBUS_API_SUBJECT_TO_CHANGE=1"
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr} \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-control-center/DEPENDS b/gnome2/desktop/gnome-control-center/DEPENDS
new file mode 100644
index 0000000..be2b433
--- /dev/null
+++ b/gnome2/desktop/gnome-control-center/DEPENDS
@@ -0,0 +1,15 @@
+depends gtk+-2
+depends GConf
+depends libgnome
+depends libglade
+depends gnome-desktop
+depends gnome-icon-theme
+depends gnome-menus
+depends libxklavier
+depends nautilus
+depends desktop-file-utils
+depends gst-plugins-base
+depends libgnomekbd
+depends gnome-settings-daemon
+optional_depends hal "--enable-hal" "--disable-hal" "for optional hal support"
+optional_depends metacity
diff --git a/gnome2/desktop/gnome-control-center/DETAILS b/gnome2/desktop/gnome-control-center/DETAILS
new file mode 100644
index 0000000..32421e4
--- /dev/null
+++ b/gnome2/desktop/gnome-control-center/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gnome-control-center
+         VERSION=2.22.2.1
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_VFY=sha1:686151d59b99fb311481ba365b0dd3fd3680cac6
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20070920
+         UPDATED=20080601
+           SHORT="Control-center for gnome"
+cat << EOF
+Control-center for Gnome
+EOF
diff --git a/gnome2/desktop/gnome-desktop/DEPENDS b/gnome2/desktop/gnome-desktop/DEPENDS
index 4995286..7c8ce4c 100644
--- a/gnome2/desktop/gnome-desktop/DEPENDS
+++ b/gnome2/desktop/gnome-desktop/DEPENDS
@@ -1,2 +1,5 @@
 depends  libgnomeui
 depends  gnome-doc-utils
+depends  startup-notification
+depends  gnome-themes
+depends  gnome-keyring
diff --git a/gnome2/desktop/gnome-desktop/DETAILS b/gnome2/desktop/gnome-desktop/DETAILS
index 3f23133..3e5d241 100644
--- a/gnome2/desktop/gnome-desktop/DETAILS
+++ b/gnome2/desktop/gnome-desktop/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-desktop
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:064751161705aa61fc456ed3ffadaa366dba3e9d
+      SOURCE_VFY=sha1:fb46b036c50fa77a41ef2bcf8aa4b3c56568bc99
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="the libgnomedesktop library"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-doc-utils/DETAILS b/gnome2/desktop/gnome-doc-utils/DETAILS
index a7f2ae2..8420a77 100644
--- a/gnome2/desktop/gnome-doc-utils/DETAILS
+++ b/gnome2/desktop/gnome-doc-utils/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-doc-utils
-         VERSION=0.12.1
+         VERSION=0.12.2
            MAJOR=0.12
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ee22a56fe9e57ac5a75542d35bc2ed950d0ee369
+      SOURCE_VFY=sha1:8006f6c2c3cf41c6be0295b4ba48df0d4d4f51d1
         WEB_SITE=http://www.gnome.org/
          ENTERED=20050315
-         UPDATED=20080216
+         UPDATED=20080416
            SHORT="documentation utilities for the GNOME project"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-games-extra-data/DETAILS b/gnome2/desktop/gnome-games-extra-data/DETAILS
index bdd08d5..e26ef37 100644
--- a/gnome2/desktop/gnome-games-extra-data/DETAILS
+++ b/gnome2/desktop/gnome-games-extra-data/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-games-extra-data
-         VERSION=2.18.0
-           MAJOR=2.18
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9ba55f5353cb4f66a8f15d0a6dcaf2aaa76b862a
+      SOURCE_VFY=sha1:ad9ed0f3fbe9e688f77b52eea5c8b03d20ef590a
         WEB_SITE=http://www.gnome.org/
          ENTERED=20060424
-         UPDATED=20070823
+         UPDATED=20080328
            SHORT="optional additional graphics for gnome-games"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-games/BUILD b/gnome2/desktop/gnome-games/BUILD
new file mode 100644
index 0000000..d6b5669
--- /dev/null
+++ b/gnome2/desktop/gnome-games/BUILD
@@ -0,0 +1,13 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                     \
+                --sysconfdir=/etc                  \
+                --localstatedir=/var               \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
+                --disable-tests                    \
+                $OPTS                              &&
+    default_make
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-games/DEPENDS b/gnome2/desktop/gnome-games/DEPENDS
new file mode 100644
index 0000000..d73a286
--- /dev/null
+++ b/gnome2/desktop/gnome-games/DEPENDS
@@ -0,0 +1,11 @@
+depends  libgnomeui
+depends  gnome-python-desktop
+depends  librsvg
+depends  libggz
+depends  ggz-client-libs
+
+optional_depends  "guile"                             \
+                  ""  "--enable-omitgames=aisleriot"  \
+                  "to build the AisleRiot card game"
+optional_depends  "gnome-games-extra-data"  ""  ""    \
+                  "for additional themes/graphics within the various games"
diff --git a/gnome2/desktop/gnome-games/DETAILS b/gnome2/desktop/gnome-games/DETAILS
new file mode 100644
index 0000000..f27f622
--- /dev/null
+++ b/gnome2/desktop/gnome-games/DETAILS
@@ -0,0 +1,16 @@
+          MODULE=gnome-games
+         VERSION=2.22.2
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:68881fb0dbb8a089423d1eec7f052c1fdf0ee417
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20020715
+         UPDATED=20080703
+           SHORT="a collection of games for the GNOME desktop"
+
+cat << EOF
+gnome-games2 is a collection of games designed for the GNOME 2
+desktop user.
+EOF
diff --git a/gnome2/desktop/gnome-games2/BUILD b/gnome2/desktop/gnome-games2/BUILD
deleted file mode 100644
index d6b5669..0000000
--- a/gnome2/desktop/gnome-games2/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                     \
-                --sysconfdir=/etc                  \
-                --localstatedir=/var               \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
-                --disable-tests                    \
-                $OPTS                              &&
-    default_make
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-games2/DEPENDS b/gnome2/desktop/gnome-games2/DEPENDS
deleted file mode 100644
index 797e2c8..0000000
--- a/gnome2/desktop/gnome-games2/DEPENDS
+++ /dev/null
@@ -1,11 +0,0 @@
-depends  libgnomeui
-depends  gnome-python-desktop
-depends  librsvg
-
-optional_depends  "libggz"                  ""  ""    \
-                  "for mutliplayer support in certain games"
-optional_depends  "guile"                             \
-                  ""  "--enable-omitgames=aisleriot"  \
-                  "to build the AisleRiot card game"
-optional_depends  "gnome-games-extra-data"  ""  ""    \
-                  "for additional themes/graphics within the various games"
diff --git a/gnome2/desktop/gnome-games2/DETAILS b/gnome2/desktop/gnome-games2/DETAILS
deleted file mode 100644
index cd5f1a5..0000000
--- a/gnome2/desktop/gnome-games2/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-          MODULE=gnome-games2
-             MOD=gnome-games
-         VERSION=2.20.2
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:f6d91695d5ac96e5ebdea3facaec84c8fa452415
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020715
-         UPDATED=20071127
-           SHORT="a collection of games for the GNOME desktop"
-
-cat << EOF
-gnome-games2 is a collection of games designed for the GNOME 2
-desktop user.
-EOF
diff --git a/gnome2/desktop/gnome-icon-theme/DETAILS b/gnome2/desktop/gnome-icon-theme/DETAILS
index 2b2dddc..3e5caf5 100644
--- a/gnome2/desktop/gnome-icon-theme/DETAILS
+++ b/gnome2/desktop/gnome-icon-theme/DETAILS
@@ -1,13 +1,13 @@
 
           MODULE=gnome-icon-theme
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:72202cc724cf080964f6e2ff7c3a99340606769f 
+      SOURCE_VFY=sha1:d492b459d7b0a34e2303cba663536b9026dddeb4
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021202
-         UPDATED=20071115
+         UPDATED=20080416
            SHORT="default icon themes for GNOME 2"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-keyring/DETAILS b/gnome2/desktop/gnome-keyring/DETAILS
index 1afefc4..3d6dfc6 100644
--- a/gnome2/desktop/gnome-keyring/DETAILS
+++ b/gnome2/desktop/gnome-keyring/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-keyring
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:adad679a8980c7c32358a90b73bf6f002e902f20
+      SOURCE_VFY=sha1:b3276e2c349b761d167df9bdbb9c19268af2bd4b
         WEB_SITE=http://www.gnome.org
          ENTERED=20031208
-         UPDATED=20071125
+         UPDATED=20080601
            SHORT="the GNOME keyring services (daemon and tools)"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-mag/DETAILS b/gnome2/desktop/gnome-mag/DETAILS
index f69172f..92134ad 100644
--- a/gnome2/desktop/gnome-mag/DETAILS
+++ b/gnome2/desktop/gnome-mag/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-mag
-         VERSION=0.14.6
+         VERSION=0.14.10
            MAJOR=0.14
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9fab986efc9779d449ba4154dcb72f3533efcc34
+      SOURCE_VFY=sha1:05fc28ede8462884cd1735fbde23b77912308197
         WEB_SITE=http://www.gnome.org
          ENTERED=20040111
-         UPDATED=20070823
+         UPDATED=20070920
            PSAFE=no
            SHORT="screen magnifier"
 cat << EOF
diff --git a/gnome2/desktop/gnome-media/BUILD b/gnome2/desktop/gnome-media/BUILD
new file mode 100644
index 0000000..80d990a
--- /dev/null
+++ b/gnome2/desktop/gnome-media/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-media/DEPENDS b/gnome2/desktop/gnome-media/DEPENDS
new file mode 100644
index 0000000..109ec8f
--- /dev/null
+++ b/gnome2/desktop/gnome-media/DEPENDS
@@ -0,0 +1,4 @@
+depends gail &&
+depends gst-plugins-base &&
+depends nautilus-cd-burner &&
+depends scrollkeeper 
diff --git a/gnome2/desktop/gnome-media/DETAILS b/gnome2/desktop/gnome-media/DETAILS
new file mode 100644
index 0000000..c22964e
--- /dev/null
+++ b/gnome2/desktop/gnome-media/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=gnome-media
+         VERSION=2.22.0
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:9dc92fbde0dda0ef2e7028bf2b80f190b8b6b016
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20080416
+         UPDATED=20080416
+           SHORT="Media utilities for the GNOME 2.6 Desktop"
+cat << EOF
+Media utilities for the GNOME 2.6 Desktop
+EOF
diff --git a/gnome2/desktop/gnome-media2/BUILD b/gnome2/desktop/gnome-media2/BUILD
deleted file mode 100644
index 80d990a..0000000
--- a/gnome2/desktop/gnome-media2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-media2/CONFLICTS b/gnome2/desktop/gnome-media2/CONFLICTS
deleted file mode 100644
index ddb38b5..0000000
--- a/gnome2/desktop/gnome-media2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gnome-media
diff --git a/gnome2/desktop/gnome-media2/DEPENDS b/gnome2/desktop/gnome-media2/DEPENDS
deleted file mode 100644
index 109ec8f..0000000
--- a/gnome2/desktop/gnome-media2/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends gail &&
-depends gst-plugins-base &&
-depends nautilus-cd-burner &&
-depends scrollkeeper 
diff --git a/gnome2/desktop/gnome-media2/DETAILS b/gnome2/desktop/gnome-media2/DETAILS
deleted file mode 100644
index 96981a1..0000000
--- a/gnome2/desktop/gnome-media2/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=gnome-media2
-             MOD=gnome-media
-         VERSION=2.18.0
-           MAJOR=2.18
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:954b4d5069e29d60f28f63d3e2b7cd654247948f
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020715
-         UPDATED=20070315
-           SHORT="Media utilities for the GNOME 2.6 Desktop"
-cat << EOF
-Media utilities for the GNOME 2.6 Desktop
-EOF
diff --git a/gnome2/desktop/gnome-menus/DETAILS b/gnome2/desktop/gnome-menus/DETAILS
index 73e9a10..c9f8076 100644
--- a/gnome2/desktop/gnome-menus/DETAILS
+++ b/gnome2/desktop/gnome-menus/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-menus
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:8a00c7007e9e76a60884e34c894e871b3e72755f
+      SOURCE_VFY=sha1:48d2557cd33265a760e43402b4f87faf6a8990db
         WEB_SITE=http://www.gnome.org/
          ENTERED=20050316
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="an implementation of the fdo menu specification for GNOME"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-netstatus/DEPENDS b/gnome2/desktop/gnome-netstatus/DEPENDS
index 1f1856d..1212b59 100644
--- a/gnome2/desktop/gnome-netstatus/DEPENDS
+++ b/gnome2/desktop/gnome-netstatus/DEPENDS
@@ -1 +1 @@
-depends gnome-applets2
+depends gnome-applets
diff --git a/gnome2/desktop/gnome-nettool/DEPENDS b/gnome2/desktop/gnome-nettool/DEPENDS
index 001dd32..6357c18 100644
--- a/gnome2/desktop/gnome-nettool/DEPENDS
+++ b/gnome2/desktop/gnome-nettool/DEPENDS
@@ -1,5 +1,5 @@
-depends  libglade2
-depends  GConf2
+depends  libglade
+depends  GConf
 
 optional_depends  "iputils"     ""  ""  "for extended IP based features"
 optional_depends  "whois"       ""  ""  "for WHOIS support"
diff --git a/gnome2/desktop/gnome-nettool/DETAILS b/gnome2/desktop/gnome-nettool/DETAILS
index db86e99..290b57c 100644
--- a/gnome2/desktop/gnome-nettool/DETAILS
+++ b/gnome2/desktop/gnome-nettool/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-nettool
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:7931bc885fda5f4dc7c88a2fbfcea2566ea256ee
+      SOURCE_VFY=sha1:1f8dd3329cb1d5d026d57afc5dacd8c93d8b7998
         WEB_SITE=http://www.gnome.org/projects/gnome-network/
          ENTERED=20050316
-         UPDATED=20071103
+         UPDATED=20080416
            SHORT="GNOME interface for various networking tools"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-panel/BUILD b/gnome2/desktop/gnome-panel/BUILD
index c5bdec8..62fc456 100644
--- a/gnome2/desktop/gnome-panel/BUILD
+++ b/gnome2/desktop/gnome-panel/BUILD
@@ -1,10 +1,5 @@
 (
 
-  if !in_depends libxml2 Python; then
-    message "${PROBLEM_COLOR} lin --reconfigure libxml2 and install the optional Python dependency ${DEFAULT_COLOR}";
-    exit 1;
-  fi
-
    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD                    \
                 --sysconfdir=/etc                 \
diff --git a/gnome2/desktop/gnome-panel/DEPENDS b/gnome2/desktop/gnome-panel/DEPENDS
index 2e904fa..9b5b6e0 100644
--- a/gnome2/desktop/gnome-panel/DEPENDS
+++ b/gnome2/desktop/gnome-panel/DEPENDS
@@ -1,6 +1,8 @@
 depends  gnome-desktop
 depends  gnome-menus
+depends  gnome-vfs
 depends  libwnck
+depends  libgweather
 
 optional_depends  "evolution-data-server"  "--enable-eds"  "--disable-eds"  \
                   "for intergrated date and time with evo"
diff --git a/gnome2/desktop/gnome-panel/DETAILS b/gnome2/desktop/gnome-panel/DETAILS
index 67691c1..3c95587 100644
--- a/gnome2/desktop/gnome-panel/DETAILS
+++ b/gnome2/desktop/gnome-panel/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-panel
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:d3bf83e825afc47e620129f63b0fd00229ef12a7
+      SOURCE_VFY=sha1:73752c3ce6224886c2381b0b13111253008bc6f7
         WEB_SITE=http://live.gnome.org/GnomePanel
          ENTERED=20020714
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="Panel for GNOME"
            PSAFE=no
 
diff --git a/gnome2/desktop/gnome-power-manager/CONFIGURE b/gnome2/desktop/gnome-power-manager/CONFIGURE
new file mode 100644
index 0000000..b50abf3
--- /dev/null
+++ b/gnome2/desktop/gnome-power-manager/CONFIGURE
@@ -0,0 +1,2 @@
+mquery ENABLE_XEVENTS "Support XEvents?" y "--enable-xevents" "--disable-xevents"
+mquery ENABLE_APPLET "Build the extra power applet?" y "--enable-applets" "--disable-applets"
diff --git a/gnome2/desktop/gnome-power-manager/DEPENDS b/gnome2/desktop/gnome-power-manager/DEPENDS
index 22f67c4..82e7e17 100644
--- a/gnome2/desktop/gnome-power-manager/DEPENDS
+++ b/gnome2/desktop/gnome-power-manager/DEPENDS
@@ -1,2 +1,7 @@
 depends  libgnomeui
 depends  libnotify
+depends  hal
+depends  libwnck
+depends  gnome-panel
+depends  gstreamer-10
+depends  docbook-4.1
diff --git a/gnome2/desktop/gnome-power-manager/DETAILS b/gnome2/desktop/gnome-power-manager/DETAILS
index 565b64d..b7fe6db 100644
--- a/gnome2/desktop/gnome-power-manager/DETAILS
+++ b/gnome2/desktop/gnome-power-manager/DETAILS
@@ -1,12 +1,13 @@
         MODULE=gnome-power-manager
-       VERSION=2.20.2
-         MAJOR=2.20
+       VERSION=2.22.1
+         MAJOR=2.22
         SOURCE=$MODULE-$VERSION.tar.bz2
     SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-    SOURCE_VFY=sha1:7cda3b71ae8ccc5825f194b6865326b9727f0da9
+    SOURCE_VFY=sha1:bba77f4403643f10a26d7abf5a4681cd50ff08d4
       WEB_SITE=http://gnome.org
        ENTERED=20070315
-       UPDATED=20071215
+       UPDATED=20080416
+         PSAFE=no
          SHORT="A GNOME power manager"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-screensaver/DEPENDS b/gnome2/desktop/gnome-screensaver/DEPENDS
index c6bc18b..2757aa5 100644
--- a/gnome2/desktop/gnome-screensaver/DEPENDS
+++ b/gnome2/desktop/gnome-screensaver/DEPENDS
@@ -1,4 +1,6 @@
 depends  libgnomeui
+depends  dbus
+depends  libgnomekbd
 
 optional_depends  "libnotify"  ""  "--without-libnotify"  \
                   "for libnotify support"
diff --git a/gnome2/desktop/gnome-screensaver/DETAILS b/gnome2/desktop/gnome-screensaver/DETAILS
index e0ddd32..930df95 100644
--- a/gnome2/desktop/gnome-screensaver/DETAILS
+++ b/gnome2/desktop/gnome-screensaver/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-screensaver
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:0b99de04caf897642338c61edc12cb7cea27e0a4
+      SOURCE_VFY=sha1:473b00fc6306742ada4e89520c991c31d1f79984
         WEB_SITE=http://live.gnome.org/GnomeScreensaver
          ENTERED=20061130
-         UPDATED=20071123
+         UPDATED=20080416
            SHORT="screensaver control for Gnome"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-session/DEPENDS b/gnome2/desktop/gnome-session/DEPENDS
index 57f189e..6b822f7 100644
--- a/gnome2/desktop/gnome-session/DEPENDS
+++ b/gnome2/desktop/gnome-session/DEPENDS
@@ -1,3 +1,5 @@
-depends esound &&
-depends gnome-panel &&
-depends control-center2
+depends gnome-panel
+depends gnome-control-center
+depends gnome-mount
+
+optional_depends esound
diff --git a/gnome2/desktop/gnome-session/DETAILS b/gnome2/desktop/gnome-session/DETAILS
index ee19615..7dfd953 100644
--- a/gnome2/desktop/gnome-session/DETAILS
+++ b/gnome2/desktop/gnome-session/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-session
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:d1dedcafe8685cfd8763e04ae3d5d696eb353797
+      SOURCE_VFY=sha1:7b3fa9e614f9c97943dfbc251b0ca1115cad2b56
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071031
+         UPDATED=20080601
            SHORT="Gnome Session"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-settings-daemon/BUILD b/gnome2/desktop/gnome-settings-daemon/BUILD
new file mode 100644
index 0000000..2fb404f
--- /dev/null
+++ b/gnome2/desktop/gnome-settings-daemon/BUILD
@@ -0,0 +1,11 @@
+(
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr} \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gnome-settings-daemon/DEPENDS b/gnome2/desktop/gnome-settings-daemon/DEPENDS
new file mode 100644
index 0000000..c76a750
--- /dev/null
+++ b/gnome2/desktop/gnome-settings-daemon/DEPENDS
@@ -0,0 +1,4 @@
+depends gnome-desktop
+depends libglade
+depends dbus-glib
+depends libgnomekbd
diff --git a/gnome2/desktop/gnome-settings-daemon/DETAILS b/gnome2/desktop/gnome-settings-daemon/DETAILS
new file mode 100644
index 0000000..178e926
--- /dev/null
+++ b/gnome2/desktop/gnome-settings-daemon/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gnome-settings-daemon
+           MAJOR=2.22
+         VERSION=2.22.2.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:0424486b6e53ab0d2dd676c375d02e35341b3a20
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080312
+         UPDATED=20080601
+           SHORT="Gnome settings library"
+
+cat << EOF
+Gnome settings daemon to store configuration data
+EOF
diff --git a/gnome2/desktop/gnome-sharp/DEPENDS b/gnome2/desktop/gnome-sharp/DEPENDS
index 559b67e..278f5e4 100644
--- a/gnome2/desktop/gnome-sharp/DEPENDS
+++ b/gnome2/desktop/gnome-sharp/DEPENDS
@@ -6,4 +6,4 @@ optional_depends  "gnome-panel"  ""  ""  "to build gnome-sharp.dll"    &&
 optional_depends  "librsvg"      ""  ""  "to build rsvg-sharp.dll"     &&
 optional_depends  "gtkhtml3"     ""  ""  "to build gtkhtml-sharp.dll"  &&
 optional_depends  "vte"          ""  ""  "to build vte-sharp.dll"      &&
-optional_depends  "gnome-vfs2"   ""  ""  "to build gnomevfs-sharp.dll"
+optional_depends  "gnome-vfs"   ""  ""  "to build gnomevfs-sharp.dll"
diff --git a/gnome2/desktop/gnome-sharp/DETAILS b/gnome2/desktop/gnome-sharp/DETAILS
index 0ba2479..ba5354b 100644
--- a/gnome2/desktop/gnome-sharp/DETAILS
+++ b/gnome2/desktop/gnome-sharp/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-sharp
-           MAJOR=2.16
-         VERSION=2.16.1
+           MAJOR=2.20
+         VERSION=2.20.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:161a5b86534cbdd95c896e1415f4d1882ac072c1
+      SOURCE_VFY=sha1:4a142ec30195828f57f3f294d1d279843355d531
         WEB_SITE=http://www.gnome.org/
          ENTERED=20060908
-         UPDATED=20080216
+         UPDATED=20080416
            PSAFE=no
            SHORT="GNOME bindings for Mono"
 
diff --git a/gnome2/desktop/gnome-speech/DETAILS b/gnome2/desktop/gnome-speech/DETAILS
index 0ced032..2c78b8c 100644
--- a/gnome2/desktop/gnome-speech/DETAILS
+++ b/gnome2/desktop/gnome-speech/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-speech
-         VERSION=0.4.17
+         VERSION=0.4.18
            MAJOR=0.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:d9dc96ffac1d16a86580ae45d60da22999fa1c98
+      SOURCE_VFY=sha1:c50e86fff5fe9656a5839c11b648998323a8adb7
         WEB_SITE=http://live.gnome.org/Orca/GnomeSpeech
          ENTERED=20030914
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="Provides text to speech in GNOME"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-system-monitor/DEPENDS b/gnome2/desktop/gnome-system-monitor/DEPENDS
index 074b9f7..1aa9e56 100644
--- a/gnome2/desktop/gnome-system-monitor/DEPENDS
+++ b/gnome2/desktop/gnome-system-monitor/DEPENDS
@@ -1,3 +1,4 @@
 depends  gnome-icon-theme
 depends  libgnomeui
-depends  libgtop2
+depends  gtkmm
+depends  libgtop
diff --git a/gnome2/desktop/gnome-system-monitor/DETAILS b/gnome2/desktop/gnome-system-monitor/DETAILS
index b476d0b..50a9e5b 100644
--- a/gnome2/desktop/gnome-system-monitor/DETAILS
+++ b/gnome2/desktop/gnome-system-monitor/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-system-monitor
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:d14ca0b41d95bd533b875c58152cb9dddfbee631
+      SOURCE_VFY=sha1:ef17df7f623222aabdd6571958772f1a33877759
         WEB_SITE=http://www.gnome.org/
          ENTERED=20050316
-         UPDATED=20071103
+         UPDATED=20080601
            SHORT="process viewer and system resource monitor for GNOME 2"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-system-tools/DETAILS b/gnome2/desktop/gnome-system-tools/DETAILS
index 41cdccd..2cf12dc 100644
--- a/gnome2/desktop/gnome-system-tools/DETAILS
+++ b/gnome2/desktop/gnome-system-tools/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-system-tools
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:757d37239cdb62ce9a389bb672bc3cdde5b657ee
+      SOURCE_VFY=sha1:780a7e03d4245bba1c102c59e84b4d23d7022f8d
         WEB_SITE=http://www.gnome.org
          ENTERED=20050316
-         UPDATED=20071031
+         UPDATED=20080416
            SHORT="Tools to simplify the tasks of configuring a Unix system"
 cat << EOF
 These tools are intended to simplify the tasks of configuring a Unix system
diff --git a/gnome2/desktop/gnome-terminal/DETAILS b/gnome2/desktop/gnome-terminal/DETAILS
index 2de888a..a268200 100644
--- a/gnome2/desktop/gnome-terminal/DETAILS
+++ b/gnome2/desktop/gnome-terminal/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-terminal
-         VERSION=2.18.3
-           MAJOR=2.18
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ca8e55a1a033c731462ac27a1b92e52cac2dc238
+      SOURCE_VFY=sha1:c8948f815c5d3ac76354aa8ae25840c2fbe19912
         WEB_SITE=http://www.gnome.org/
          ENTERED=20020714
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="The GNOME 2 terminal emulator"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-themes/DETAILS b/gnome2/desktop/gnome-themes/DETAILS
index 79597af..522667f 100644
--- a/gnome2/desktop/gnome-themes/DETAILS
+++ b/gnome2/desktop/gnome-themes/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-themes
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:16f23925a6740b915faff53d7d639f21665ed647
+      SOURCE_VFY=sha1:ec386aea350cd22d1a5769a8ca011f59660d9ff6
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021202
-         UPDATED=20071127
+         UPDATED=20080601
            SHORT="offical themes for the GNOME 2 desktop"
 
 cat << EOF
diff --git a/gnome2/desktop/gnome-utils/DEPENDS b/gnome2/desktop/gnome-utils/DEPENDS
index c90edd3..63c8f2a 100644
--- a/gnome2/desktop/gnome-utils/DEPENDS
+++ b/gnome2/desktop/gnome-utils/DEPENDS
@@ -1,4 +1,4 @@
 depends e2fsprogs
 depends gnome-panel
 depends libgnomeprintui
-depends libgtop2
+depends libgtop
diff --git a/gnome2/desktop/gnome-volume-manager/DEPENDS b/gnome2/desktop/gnome-volume-manager/DEPENDS
index e7a78db..d53b286 100644
--- a/gnome2/desktop/gnome-volume-manager/DEPENDS
+++ b/gnome2/desktop/gnome-volume-manager/DEPENDS
@@ -1,3 +1,3 @@
 depends libgnomeui &&
-depends libglade2 &&
+depends libglade &&
 depends hal
diff --git a/gnome2/desktop/gnome-volume-manager/DETAILS b/gnome2/desktop/gnome-volume-manager/DETAILS
index 2c71475..aeefdcf 100644
--- a/gnome2/desktop/gnome-volume-manager/DETAILS
+++ b/gnome2/desktop/gnome-volume-manager/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnome-volume-manager
-         VERSION=2.17.0
-           MAJOR=2.17
+         VERSION=2.22.5
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:2b2f1367823c92fbeb269c10959adca2d3db1918
+      SOURCE_VFY=sha1:108a3c7cab897680f202a796ee7f4f07809a790e
         WEB_SITE=http://www.gnome.org
          ENTERED=20050316
-         UPDATED=20070315
+         UPDATED=20080702
            SHORT="A Volume Manager for GNOME"
 cat << EOF
 gnome-volume-manager is a desktop-level daemon that enforces volume-related
diff --git a/gnome2/desktop/gok/DETAILS b/gnome2/desktop/gok/DETAILS
index 65db3d4..0326e00 100644
--- a/gnome2/desktop/gok/DETAILS
+++ b/gnome2/desktop/gok/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gok
-         VERSION=1.2.5
-           MAJOR=1.2
+         VERSION=1.3.7
+           MAJOR=1.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:95a3079d24c4d02cd6a5c590266cad6a678aef43
+      SOURCE_VFY=sha1:ffb465a8fc9e89644770432ebfd17e7843d842ea
         WEB_SITE=http://www.gnome.org
          ENTERED=20030409
-         UPDATED=20070823
+         UPDATED=20080416
            SHORT="Gnome OnScreen Keyboard"
 cat << EOF
 The GNOME Onscreen Keyboard (GOK) is a dynamic onscreen keyboard for
diff --git a/gnome2/desktop/gtkhtml3/DETAILS b/gnome2/desktop/gtkhtml3/DETAILS
index 35ff2fc..52a4908 100644
--- a/gnome2/desktop/gtkhtml3/DETAILS
+++ b/gnome2/desktop/gtkhtml3/DETAILS
@@ -1,14 +1,14 @@
           MODULE=gtkhtml3
              MOD=gtkhtml
-         VERSION=3.16.3
-           MAJOR=3.16
+         VERSION=3.18.1
+           MAJOR=3.18
           SOURCE=$MOD-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
       SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:6fbf5736a9f10cd45287e7aa50bf558510f2dbf5
+      SOURCE_VFY=sha1:6f2310fd7ef392941593f873e3181827705f6021
         WEB_SITE=http://www.gnome.org
          ENTERED=20021118
-         UPDATED=20080221
+         UPDATED=20080413
            SHORT="html rendering/editing library."
 cat  <<  EOF
 GtkHTML is a HTML rendering/editing library.  It is not designed to be
diff --git a/gnome2/desktop/gtksourceview/DETAILS b/gnome2/desktop/gtksourceview/DETAILS
index 749fcab..ee90da3 100644
--- a/gnome2/desktop/gtksourceview/DETAILS
+++ b/gnome2/desktop/gtksourceview/DETAILS
@@ -1,16 +1,16 @@
           MODULE=gtksourceview
-         VERSION=1.8.5
-           MAJOR=1.8
+         VERSION=2.2.2
+           MAJOR=2.2
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:4e61b6cda043c44dc918edecd2bd9ccfc5438d2c
+      SOURCE_VFY=sha1:220e49ad8348a0a746ce48300222892ec281397d
         WEB_SITE=http://www.gnome.org/
          ENTERED=20030510
-         UPDATED=20070312
+         UPDATED=20080627
            SHORT="text widget that extends the gtk+-2 text widget GtkTextView"
 
 cat << EOF
 GtkSourceView is a text widget that extends the standard gtk+-2 text
-widget GtkTextView.  It improves GtkTextView by implementing syntax 
+widget GtkTextView.  It improves GtkTextView by implementing syntax
 highlighting and other features typical of a source editor.
 EOF
diff --git a/gnome2/desktop/gtksourceview2/DEPENDS b/gnome2/desktop/gtksourceview2/DEPENDS
deleted file mode 100644
index 5823f54..0000000
--- a/gnome2/desktop/gtksourceview2/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  gtk+-2
-
-optional_depends  "gtk-doc"  ""  ""  "to build extra documentation"
diff --git a/gnome2/desktop/gtksourceview2/DETAILS b/gnome2/desktop/gtksourceview2/DETAILS
deleted file mode 100644
index 47ac142..0000000
--- a/gnome2/desktop/gtksourceview2/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-          MODULE=gtksourceview2
-         VERSION=2.0.2
-           MAJOR=2.0
-          SOURCE=gtksourceview-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/gtksourceview/$MAJOR/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtksourceview-$VERSION
-      SOURCE_VFY=sha1:df728a822b55dc6c3370e011c8904a5be5c357a8
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20030510
-         UPDATED=20071127
-           SHORT="text widget that extends the gtk+-2 text widget GtkTextView"
-
-cat << EOF
-GtkSourceView2 is a text widget that extends the standard gtk+-2 text
-widget GtkTextView.  It improves GtkTextView by implementing syntax 
-highlighting and other features typical of a source editor.
-EOF
diff --git a/gnome2/desktop/gucharmap/DETAILS b/gnome2/desktop/gucharmap/DETAILS
index 95d8697..ff8099f 100644
--- a/gnome2/desktop/gucharmap/DETAILS
+++ b/gnome2/desktop/gucharmap/DETAILS
@@ -1,16 +1,16 @@
           MODULE=gucharmap
-         VERSION=1.10.1
-           MAJOR=1.10
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ff2148d6e5fbd6e79b2e5d68eacb053f6136128f
+      SOURCE_VFY=sha1:4663b36b725eed7c8e2f7025768993202def465c
         WEB_SITE=http://gucharmap.sourceforge.net/
          ENTERED=20030421
-         UPDATED=20071104
+         UPDATED=20080416
            SHORT="A GTK+-2 Unicode character map viewer"
 
 cat << EOF
-gucharmap allows you to browse though all the available Unicode 
+gucharmap allows you to browse though all the available Unicode
 characters and categories for the installed fonts, and to examine
 their detailed properties.
 EOF
diff --git a/gnome2/desktop/gvfs/BUILD b/gnome2/desktop/gvfs/BUILD
new file mode 100644
index 0000000..62fc456
--- /dev/null
+++ b/gnome2/desktop/gvfs/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gvfs/DEPENDS b/gnome2/desktop/gvfs/DEPENDS
new file mode 100644
index 0000000..e877ca5
--- /dev/null
+++ b/gnome2/desktop/gvfs/DEPENDS
@@ -0,0 +1,12 @@
+depends glib-2
+depends dbus
+depends intltool
+depends XML-Parser
+optional_depends "obexftp" "" "" "ObexFTP support"
+optional_depends "libsoup" "" "" "FTP/HTTP/WebDAV support"
+optional_depends "fuse" "" "" "FUSE support"
+optional_depends "GConf" "" "" "GConf support"
+optional_depends "libgphoto2" "" "" "Gphoto2 support"
+optional_depends "hal" "" "" "Use HAL for volume monitor"
+optional_depends "gnome-keyring" "" "" "GNOME Keyring support"
+optional_depends "samba"  ""  ""  "for samba support"
diff --git a/gnome2/desktop/gvfs/DETAILS b/gnome2/desktop/gvfs/DETAILS
new file mode 100644
index 0000000..aec4d5d
--- /dev/null
+++ b/gnome2/desktop/gvfs/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gvfs
+           MAJOR=0.2
+         VERSION=0.2.3
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:9b2a73b4d0edf77a623eeda001f634f11d8ea74b
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080312
+         UPDATED=20080413
+           SHORT="Replacement for Gnome-VFS"
+
+cat << EOF
+GVFS is designed to supercede Gnome-VFS.
+EOF
diff --git a/gnome2/desktop/libgail-gnome/DETAILS b/gnome2/desktop/libgail-gnome/DETAILS
index 7ea6fbd..eb197e9 100644
--- a/gnome2/desktop/libgail-gnome/DETAILS
+++ b/gnome2/desktop/libgail-gnome/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgail-gnome
-         VERSION=1.18.0
-           MAJOR=1.18
+         VERSION=1.20.0
+           MAJOR=1.20
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ea197633601511de421bbf150a8151d340dcd86e
+      SOURCE_VFY=sha1:47237d9c50dcefed7580b000522856ecd135dd9f
         WEB_SITE=http://developer.gnome.org/projects/gap/
          ENTERED=20020714
-         UPDATED=20070315
+         UPDATED=20080416
            SHORT="the Gail libraries for GNOME"
 
 cat << EOF
diff --git a/gnome2/desktop/libgnomekbd/DETAILS b/gnome2/desktop/libgnomekbd/DETAILS
index c5e5fad..d23b187 100644
--- a/gnome2/desktop/libgnomekbd/DETAILS
+++ b/gnome2/desktop/libgnomekbd/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgnomekbd
-         VERSION=2.18.2
-           MAJOR=2.18
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:7328ad1967b45e4964f75df6d394df22f831a2ea
+      SOURCE_VFY=sha1:62a11b227d4bcbc3df64fbdfc7e075e9366140da
         WEB_SITE=http://www.gnome.org/
          ENTERED=20070315
-         UPDATED=20070823
+         UPDATED=20080416
            SHORT="the GNOME keyboard configuration library"
 
 cat << EOF
diff --git a/gnome2/desktop/libgnomeprint/DETAILS b/gnome2/desktop/libgnomeprint/DETAILS
index 3585b0d..b5ac42b 100644
--- a/gnome2/desktop/libgnomeprint/DETAILS
+++ b/gnome2/desktop/libgnomeprint/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgnomeprint
-         VERSION=2.18.2
+         VERSION=2.18.4
            MAJOR=2.18
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:25c468b78fedfc708b26e95941d51dddbbf25562
+      SOURCE_VFY=sha1:5d79f3ce210b9a11bc67983852064513a12ac97f
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="an API that implements the Postscript imaging model"
 
 cat << EOF
diff --git a/gnome2/desktop/libgnomeprintui/DETAILS b/gnome2/desktop/libgnomeprintui/DETAILS
index 02ba22b..778636f 100644
--- a/gnome2/desktop/libgnomeprintui/DETAILS
+++ b/gnome2/desktop/libgnomeprintui/DETAILS
@@ -1,18 +1,18 @@
           MODULE=libgnomeprintui
-         VERSION=2.18.1
+         VERSION=2.18.2
            MAJOR=2.18
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:52ac5cd12272c3e2f8a5e699041b8acdf7e79a7f
+      SOURCE_VFY=sha1:335a8e0396fb1b80d94ff0322b816bbbf772262d
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071123
+         UPDATED=20080416
            SHORT="API that implements the Postscript imaging model"
 cat << EOF
 gnome-print is a C-based API that implements the Postscript imaging
 model. It is an actively developed project, and it is being used by
 various GNOME applications. There are two extensions to the Postscript
-imaging model supported by gnome-print: Alpha channel support and 
+imaging model supported by gnome-print: Alpha channel support and
 anti-aliasing. gnome-print includes a rasterizing engine that
 transforms the requests into bitmaps for native drivers.
 EOF
diff --git a/gnome2/desktop/libgtkhtml/DEPENDS b/gnome2/desktop/libgtkhtml/DEPENDS
index 5184d05..cdd446b 100644
--- a/gnome2/desktop/libgtkhtml/DEPENDS
+++ b/gnome2/desktop/libgtkhtml/DEPENDS
@@ -1,3 +1,3 @@
-depends gnome-vfs2
+depends gnome-vfs
 depends librsvg
 optional_depends x gail "--enable--accessibility" "--disable-accessibility" "enable accessibility support"
diff --git a/gnome2/desktop/libgtop/BUILD b/gnome2/desktop/libgtop/BUILD
new file mode 100644
index 0000000..32423c9
--- /dev/null
+++ b/gnome2/desktop/libgtop/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make 
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/libgtop/DEPENDS b/gnome2/desktop/libgtop/DEPENDS
new file mode 100644
index 0000000..a2a11dd
--- /dev/null
+++ b/gnome2/desktop/libgtop/DEPENDS
@@ -0,0 +1,2 @@
+depends  glib-2
+depends  popt
diff --git a/gnome2/desktop/libgtop/DETAILS b/gnome2/desktop/libgtop/DETAILS
new file mode 100644
index 0000000..e7b38b0
--- /dev/null
+++ b/gnome2/desktop/libgtop/DETAILS
@@ -0,0 +1,18 @@
+          MODULE=libgtop
+         VERSION=2.22.2
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:e0922b4b6574db001a93d56bf500e6080e7c0426
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20020714
+         UPDATED=20080601
+           SHORT="a library to provide top functionality to applications"
+
+cat << EOF
+libgtop is a library that fetches information about the running
+system such as cpu and memory usage, active processes etc. On Linux
+systems, these information are taken directly from the /proc filesystem
+while on other systems a server is used to read those information from
+/dev/kmem or similar.
+EOF
diff --git a/gnome2/desktop/libgtop2/BUILD b/gnome2/desktop/libgtop2/BUILD
deleted file mode 100644
index 32423c9..0000000
--- a/gnome2/desktop/libgtop2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make 
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/libgtop2/DEPENDS b/gnome2/desktop/libgtop2/DEPENDS
deleted file mode 100644
index a2a11dd..0000000
--- a/gnome2/desktop/libgtop2/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  glib-2
-depends  popt
diff --git a/gnome2/desktop/libgtop2/DETAILS b/gnome2/desktop/libgtop2/DETAILS
deleted file mode 100644
index 2c08f2e..0000000
--- a/gnome2/desktop/libgtop2/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-          MODULE=libgtop2
-             MOD=libgtop
-         VERSION=2.20.0
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:0b7b7ad57c5b9e8d2fcd3e3f70bf61ba85fbb962
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020714
-         UPDATED=20071103
-           SHORT="a library to provide top functionality to applications"
-
-cat << EOF
-libgtop is a library that fetches information about the running
-system such as cpu and memory usage, active processes etc. On Linux
-systems, these information are taken directly from the /proc filesystem
-while on other systems a server is used to read those information from
-/dev/kmem or similar.
-EOF
diff --git a/gnome2/desktop/libgweather/BUILD b/gnome2/desktop/libgweather/BUILD
new file mode 100644
index 0000000..32423c9
--- /dev/null
+++ b/gnome2/desktop/libgweather/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make 
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/libgweather/DEPENDS b/gnome2/desktop/libgweather/DEPENDS
new file mode 100644
index 0000000..22618bd
--- /dev/null
+++ b/gnome2/desktop/libgweather/DEPENDS
@@ -0,0 +1,3 @@
+depends gtk+-2
+depends gnome-vfs
+depends GConf
diff --git a/gnome2/desktop/libgweather/DETAILS b/gnome2/desktop/libgweather/DETAILS
new file mode 100644
index 0000000..1837d6f
--- /dev/null
+++ b/gnome2/desktop/libgweather/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=libgweather
+           MAJOR=2.22
+         VERSION=2.22.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:d059557766d100d7f2a576419ae2ab4e212737fe
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080312
+         UPDATED=20080601
+           SHORT="Weather library used by Gnome"
+
+cat << EOF
+libgweather is a small library used by various gnome components
+EOF
diff --git a/gnome2/desktop/liboobs/DETAILS b/gnome2/desktop/liboobs/DETAILS
index 3d6e0ed..65cce01 100644
--- a/gnome2/desktop/liboobs/DETAILS
+++ b/gnome2/desktop/liboobs/DETAILS
@@ -1,12 +1,12 @@
           MODULE=liboobs
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:1c33bb12c97d5bea48cca1a6650426a0d4a15ba2
+      SOURCE_VFY=sha1:109282db84fc809df5ea10a4cfb8bb37863c8aca
         WEB_SITE=http://www.gnome.org/
          ENTERED=20070315
-         UPDATED=20071117
+         UPDATED=20080416
            SHORT="library wrapping System Tools Backends"
 
 cat << EOF
diff --git a/gnome2/desktop/librsvg/DETAILS b/gnome2/desktop/librsvg/DETAILS
index af3f115..1b2f8e7 100644
--- a/gnome2/desktop/librsvg/DETAILS
+++ b/gnome2/desktop/librsvg/DETAILS
@@ -1,12 +1,12 @@
           MODULE=librsvg
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:906877feaa189606caa012cc51706cc7daef9fb4
+      SOURCE_VFY=sha1:a42ad2dd0a1b3b7195fe7d4e89c7e1f0352a51cf
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20080121
+         UPDATED=20080416
            PSAFE=no
            SHORT="A library for operating on files in SVG format"
 
diff --git a/gnome2/desktop/libsoup/DETAILS b/gnome2/desktop/libsoup/DETAILS
index d0d670e..a6077aa 100644
--- a/gnome2/desktop/libsoup/DETAILS
+++ b/gnome2/desktop/libsoup/DETAILS
@@ -1,17 +1,17 @@
           MODULE=libsoup
-         VERSION=2.2.105
-           MAJOR=2.2
+         VERSION=2.4.1
+           MAJOR=2.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:45756c61d48bc9ec3919d5375b06d952bb65bf58
+      SOURCE_VFY=sha1:a63a1124abffa1a335642c78ce87a606162361dc
         WEB_SITE=http://www.gnome.org/
          ENTERED=20030413
-         UPDATED=20080221
+         UPDATED=20080416
            PSAFE=no
            SHORT="a SOAP implementation in C"
 
 cat << EOF
-Soup is a SOAP (Simple Object Access Protocol) implementation in C. 
+Soup is a SOAP (Simple Object Access Protocol) implementation in C.
 
 It provides an queued asynchronous callback-based mechanism for sending and
 servicing SOAP requests, and a WSDL (Web Service Definition Language) to C
diff --git a/gnome2/desktop/libwnck/DETAILS b/gnome2/desktop/libwnck/DETAILS
index 60304fd..9edae08 100644
--- a/gnome2/desktop/libwnck/DETAILS
+++ b/gnome2/desktop/libwnck/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libwnck
-         VERSION=2.20.2
-           MAJOR=2.20
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:5d6b3ee98dbeed9d6de469642174d6e0bfaa142c
+      SOURCE_VFY=sha1:57d97639287dee0d62492418b10cd2ad5b17f5b3
         WEB_SITE=http://www.gnome.org/
          ENTERED=20020714
-         UPDATED=20071127
+         UPDATED=20080702
            SHORT="A window navigator construction kit"
 
 cat << EOF
diff --git a/gnome2/desktop/metacity/BUILD b/gnome2/desktop/metacity/BUILD
deleted file mode 100644
index a435c2e..0000000
--- a/gnome2/desktop/metacity/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-
-    if [ "$XINER" == "y" ] ; then
-    OPTS="$OPTS --enable-xinerama"
-    fi
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/metacity/CONFIGURE b/gnome2/desktop/metacity/CONFIGURE
deleted file mode 100644
index 266ecdb..0000000
--- a/gnome2/desktop/metacity/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery XINER "Enable Xinerama Support?" y
diff --git a/gnome2/desktop/metacity/DEPENDS b/gnome2/desktop/metacity/DEPENDS
index 3d48a90..097e91a 100644
--- a/gnome2/desktop/metacity/DEPENDS
+++ b/gnome2/desktop/metacity/DEPENDS
@@ -1,3 +1 @@
-depends libglade2
-optional_depends "libcm" "--enable-compositor" "--disable-compositor" \
-                 "For compositing support"
+depends libglade
diff --git a/gnome2/desktop/metacity/DETAILS b/gnome2/desktop/metacity/DETAILS
index 4ee2b71..a8d715d 100644
--- a/gnome2/desktop/metacity/DETAILS
+++ b/gnome2/desktop/metacity/DETAILS
@@ -1,12 +1,12 @@
           MODULE=metacity
-         VERSION=2.18.5
-           MAJOR=2.18
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:77ab171c6b84a4235ee6819049e2f0c26a15a19f
+      SOURCE_VFY=sha1:18e7761152d033b31b13a455be459d986f55a8ba
         WEB_SITE=http://www.gnome.org
          ENTERED=20020729
-         UPDATED=20070706
+         UPDATED=20080416
            PSAFE=no
            SHORT="window manager based on GTK 2.x"
 
diff --git a/gnome2/desktop/nautilus-cd-burner/DETAILS b/gnome2/desktop/nautilus-cd-burner/DETAILS
index 88f7bf1..6902598 100644
--- a/gnome2/desktop/nautilus-cd-burner/DETAILS
+++ b/gnome2/desktop/nautilus-cd-burner/DETAILS
@@ -1,12 +1,12 @@
           MODULE=nautilus-cd-burner
-         VERSION=2.18.2
-           MAJOR=2.18
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:e74bb102625c49ad2a20636a309fbedde3a80311
+      SOURCE_VFY=sha1:005d431f723e5b0b4af66ae049e00f8b2bc28546
         WEB_SITE=http://www.gnome.org
          ENTERED=20021222
-         UPDATED=20070823
+         UPDATED=20080416
            SHORT="Gnome Desktop"
 
 cat << EOF
diff --git a/gnome2/desktop/nautilus/DEPENDS b/gnome2/desktop/nautilus/DEPENDS
index 7832419..c5d3de5 100644
--- a/gnome2/desktop/nautilus/DEPENDS
+++ b/gnome2/desktop/nautilus/DEPENDS
@@ -1,5 +1,6 @@
 depends esound
-depends gnome-vfs2
+depends gnome-vfs
+depends gvfs
 depends librsvg
 depends libexif
 depends eel
diff --git a/gnome2/desktop/nautilus/DETAILS b/gnome2/desktop/nautilus/DETAILS
index ee0db75..2a0f7ec 100644
--- a/gnome2/desktop/nautilus/DETAILS
+++ b/gnome2/desktop/nautilus/DETAILS
@@ -1,12 +1,12 @@
           MODULE=nautilus
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:f6a75a854728ef308e2721424a9638d228661b1d
+      SOURCE_VFY=sha1:cc14a5201fe7357913a2a30c1c96aedc248a51b2
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20080225
+         UPDATED=20080601
            SHORT="official file manager for the GNOME desktop"
 
 cat << EOF
diff --git a/gnome2/desktop/orca/DETAILS b/gnome2/desktop/orca/DETAILS
index 50aa85e..6193c90 100644
--- a/gnome2/desktop/orca/DETAILS
+++ b/gnome2/desktop/orca/DETAILS
@@ -1,17 +1,17 @@
         MODULE=orca
-       VERSION=2.18.0
-         MAJOR=2.18
+       VERSION=2.22.2
+         MAJOR=2.22
         SOURCE=$MODULE-$VERSION.tar.bz2
     SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-    SOURCE_VFY=sha1:af3b7f3379cafb9db3ea1352a778e51c4f123a6c
+    SOURCE_VFY=sha1:1012c24c0fc839936dcce2eb2fc34cfe2de70736
        ENTERED=20070315
-       UPDATED=20070315
+       UPDATED=20080601
       WEB_SITE=http://gnome.org
          SHORT="assistive technology for ppl with visual impairments"
 
 cat << EOF
-Orca is a flexible, extensible, and powerful assistive technology for people 
-with visual impairments. Using various combinations of speech synthesis, 
-braille, and magnification, Orca helps provide access to applications and 
+Orca is a flexible, extensible, and powerful assistive technology for people
+with visual impairments. Using various combinations of speech synthesis,
+braille, and magnification, Orca helps provide access to applications and
 toolkits that support the AT-SPI (e.g., the GNOME desktop).
 EOF
diff --git a/gnome2/desktop/sound-juicer/DEPENDS b/gnome2/desktop/sound-juicer/DEPENDS
index 86de1ef..0bf63c1 100644
--- a/gnome2/desktop/sound-juicer/DEPENDS
+++ b/gnome2/desktop/sound-juicer/DEPENDS
@@ -1,4 +1,4 @@
 depends libgnomeui &&
 depends nautilus-cd-burner &&
 depends libmusicbrainz &&
-depends gnome-media2
+depends gnome-media
diff --git a/gnome2/desktop/sound-juicer/DETAILS b/gnome2/desktop/sound-juicer/DETAILS
index 411a87c..e02f636 100644
--- a/gnome2/desktop/sound-juicer/DETAILS
+++ b/gnome2/desktop/sound-juicer/DETAILS
@@ -1,15 +1,15 @@
           MODULE=sound-juicer
-         VERSION=2.16.3
-           MAJOR=2.16
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:336d647dc052e6e1fe4ba9737e604cc3207d2e8f
+      SOURCE_VFY=sha1:d710d2041f4214a80387d6518056856c6401719a
         WEB_SITE=http://www.gnome.org
          ENTERED=20030504
-         UPDATED=20070315
+         UPDATED=20080416
            SHORT="CD-Ripping tool with clean interface"
 
 cat << EOF
-Sound Juicer is a CD-Ripping tool that aims to provide a clean interface 
+Sound Juicer is a CD-Ripping tool that aims to provide a clean interface
 and automatic file tagging
 EOF
diff --git a/gnome2/desktop/system-tools-backends/DETAILS b/gnome2/desktop/system-tools-backends/DETAILS
index a0161de..b6e1c35 100644
--- a/gnome2/desktop/system-tools-backends/DETAILS
+++ b/gnome2/desktop/system-tools-backends/DETAILS
@@ -1,12 +1,12 @@
           MODULE=system-tools-backends
-         VERSION=2.4.1
-           MAJOR=2.4
+         VERSION=2.6.0
+           MAJOR=2.6
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:bdd7a295c4b265173861e88deb7b12104dde76a2
+      SOURCE_VFY=sha1:6be9e8c4f8f62e8be363ffb39831901c9a7981f7
         WEB_SITE=http://www.gnome.org/projects/gst/
          ENTERED=20050316
-         UPDATED=20071117
+         UPDATED=20080312
            SHORT="Backend for the gnome-system-tools"
 
 cat << EOF
diff --git a/gnome2/desktop/tomboy/DETAILS b/gnome2/desktop/tomboy/DETAILS
index dfe9d90..8029439 100644
--- a/gnome2/desktop/tomboy/DETAILS
+++ b/gnome2/desktop/tomboy/DETAILS
@@ -1,12 +1,12 @@
         MODULE=tomboy
-       VERSION=0.10.0
+       VERSION=0.10.1
          MAJOR=0.10
         SOURCE=$MODULE-$VERSION.tar.bz2
     SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-    SOURCE_VFY=sha1:bca097650666e38bebfedb736d75c8cc474e42ea
+    SOURCE_VFY=sha1:9d3466bc8406788651e3864cd52ef576444731a6
       WEB_SITE=http://www.gnome.org/projects/tomboy/
        ENTERED=20061130
-       UPDATED=20080330
+       UPDATED=20080416
          SHORT="a MONO-based, note-taking application"
 
 cat << EOF
diff --git a/gnome2/desktop/totem-pl-parser/DEPENDS b/gnome2/desktop/totem-pl-parser/DEPENDS
new file mode 100644
index 0000000..83471b2
--- /dev/null
+++ b/gnome2/desktop/totem-pl-parser/DEPENDS
@@ -0,0 +1,5 @@
+depends gtk+-2
+depends gnome-vfs
+depends dbus
+depends hal
+depends libxml2
diff --git a/gnome2/desktop/totem-pl-parser/DETAILS b/gnome2/desktop/totem-pl-parser/DETAILS
new file mode 100644
index 0000000..3792b6c
--- /dev/null
+++ b/gnome2/desktop/totem-pl-parser/DETAILS
@@ -0,0 +1,15 @@
+          MODULE=totem-pl-parser
+           MAJOR=2.22
+         VERSION=2.22.3
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:65ec8c18384cb40fcbb006c948c9d6fad961b124
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080312
+         UPDATED=20080601
+           SHORT="GObject-based library to parse and save playlists"
+
+cat << EOF
+totem-pl-parser is a simple GObject-based library to parse and save a host of
+playlist formats.
+EOF
diff --git a/gnome2/desktop/totem/DEPENDS b/gnome2/desktop/totem/DEPENDS
index 6594957..00f3094 100644
--- a/gnome2/desktop/totem/DEPENDS
+++ b/gnome2/desktop/totem/DEPENDS
@@ -1,6 +1,8 @@
 depends  iso-codes
+depends  eel
 depends  libmusicbrainz
-depends  gst-plugins-base
+depends  gst-plugins-good
+depends  totem-pl-parser
 
 optional_depends  "hal"  "--with-hal"  "--without-hal"  \
                   "for extended mountable media support"
@@ -11,7 +13,7 @@ optional_depends  "udev"  "--with-udev"  "--without-udev"  \
 optional_depends  "%GECKO_RENDERER"  ""  "--without-gecko"  \
                   "for HTML rendering support"
 
-optional_depends  "pygtk2"  "--enable-python"  "--disable-python"  \
+optional_depends  "pygtk"  "--enable-python"  "--disable-python"  \
                   "for Python plugin and bindings support"
 
 optional_depends  "nautilus-cd-burner"  "--enable-nautilus"  "--disable-nautilus"  \
diff --git a/gnome2/desktop/totem/DETAILS b/gnome2/desktop/totem/DETAILS
index 2dd01fe..e83af89 100644
--- a/gnome2/desktop/totem/DETAILS
+++ b/gnome2/desktop/totem/DETAILS
@@ -1,12 +1,12 @@
           MODULE=totem
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:7e63abc87f02dec12e7e4b2986792947a452c461
+      SOURCE_VFY=sha1:c552809554bf341bbe2e6cafd453e019efc7cb44
         WEB_SITE=http://www.gnome.org
          ENTERED=20050317
-         UPDATED=20071222
+         UPDATED=20080601
            SHORT="movie player for the Gnome desktop based on xine"
 
 cat << EOF
diff --git a/gnome2/desktop/vino/DEPENDS b/gnome2/desktop/vino/DEPENDS
index 49d2068..dcf20ee 100644
--- a/gnome2/desktop/vino/DEPENDS
+++ b/gnome2/desktop/vino/DEPENDS
@@ -1,8 +1,6 @@
-depends  GConf2
+depends  GConf
 
-optional_depends  "libnotify"      "--enable-libnotify"      ""  \
+optional_depends  "libnotify"  "--enable-libnotify"  ""          \
                   "to display notification area messages"
 optional_depends  "gnome-keyring"  "--enable-gnome-keyring"  ""  \
                   "for password storing support"
-optional_depends  "avahi"          "--enable-avahi"          ""  \
-                  "for Avahi service broadcasting"
diff --git a/gnome2/desktop/vino/DETAILS b/gnome2/desktop/vino/DETAILS
index 6cd3b22..3283083 100644
--- a/gnome2/desktop/vino/DETAILS
+++ b/gnome2/desktop/vino/DETAILS
@@ -1,12 +1,12 @@
           MODULE=vino
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:5e503b9eb694bcc0838a9ee7aaa13680b4a1249d
+      SOURCE_VFY=sha1:ded4b0ce4e05caa31f6378ba65dc172b20a9594d
         WEB_SITE=http://www.gnome.org
          ENTERED=20050316
-         UPDATED=20071118
+         UPDATED=20080601
            SHORT="an integrated VNC server for GNOME"
 
 cat << EOF
diff --git a/gnome2/desktop/vte/DEPENDS b/gnome2/desktop/vte/DEPENDS
index cd4b2ea..f35b554 100644
--- a/gnome2/desktop/vte/DEPENDS
+++ b/gnome2/desktop/vte/DEPENDS
@@ -1,3 +1,3 @@
 depends  libwnck
 
-optional_depends  "pygtk2"  ""  "--disable-python"  "for Python support"
+optional_depends  "pygtk"  ""  "--disable-python"  "for Python support"
diff --git a/gnome2/desktop/vte/DETAILS b/gnome2/desktop/vte/DETAILS
index 7ab23b2..42650dd 100644
--- a/gnome2/desktop/vte/DETAILS
+++ b/gnome2/desktop/vte/DETAILS
@@ -1,15 +1,15 @@
           MODULE=vte
-         VERSION=0.16.11
+         VERSION=0.16.14
            MAJOR=0.16
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=vte-0.11.11-termcap.patch
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:59273ad4dd6e46483f333aeb652b723de0f1780f
+      SOURCE_VFY=sha1:4d3ff513d4b0ebeb89babb284260b7fdc2dcd752
      SOURCE2_URL=$PATCH_URL
      SOURCE2_VFY=sha1:7446b031e0f8d7fe5095c3e9022d42c52ff5c11d
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021013
-         UPDATED=20071222
+         UPDATED=20080617
            SHORT="Experimental Virtual Terminal Emulator widget"
 
 cat << EOF
diff --git a/gnome2/desktop/yelp/DEPENDS b/gnome2/desktop/yelp/DEPENDS
index e4bffef..44b26ad 100644
--- a/gnome2/desktop/yelp/DEPENDS
+++ b/gnome2/desktop/yelp/DEPENDS
@@ -1,3 +1,4 @@
-depends gnome-session &&
-depends gnome-doc-utils &&
-depends firefox 
+depends gnome-session
+depends gnome-doc-utils
+depends rarian
+depends xulrunner
diff --git a/gnome2/desktop/yelp/DETAILS b/gnome2/desktop/yelp/DETAILS
index 0f9d0fd..881ba9e 100644
--- a/gnome2/desktop/yelp/DETAILS
+++ b/gnome2/desktop/yelp/DETAILS
@@ -1,12 +1,12 @@
           MODULE=yelp
-         VERSION=2.18.1
-           MAJOR=2.18
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:66e446596c22902290d6614b2d356b64d5bd304c
+      SOURCE_VFY=sha1:29586dd5415fc6470c43dbd68fdb491f91778231
         WEB_SITE=http://www.gnome.org
          ENTERED=20020715
-         UPDATED=20070823
+         UPDATED=20080416
            SHORT="help browser for Gnome"
 cat << EOF
 Help browser for GNOME which supports docbook documents, info and man.
diff --git a/gnome2/desktop/zenity/DETAILS b/gnome2/desktop/zenity/DETAILS
index 18f95e4..930b1a8 100644
--- a/gnome2/desktop/zenity/DETAILS
+++ b/gnome2/desktop/zenity/DETAILS
@@ -1,12 +1,12 @@
           MODULE=zenity
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:25f2e7c6736d408c24f201b0847c82c9b49cc313
+      SOURCE_VFY=sha1:776c5c84ad07bb87ba2f796ace8268aa298b0819
         WEB_SITE=http://www.gnome.org/
          ENTERED=20030205
-         UPDATED=20071127
+         UPDATED=20080416
            SHORT="displays graphical dialog boxes from the command line"
 
 cat << EOF
diff --git a/gnome2/extra/ghex/DETAILS b/gnome2/extra/ghex/DETAILS
index 70a88a5..4f6dde0 100644
--- a/gnome2/extra/ghex/DETAILS
+++ b/gnome2/extra/ghex/DETAILS
@@ -1,12 +1,12 @@
           MODULE=ghex
-         VERSION=2.20.1
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:768ebcec49d4628aaf8b3fcfc1fb7b977f0061f1
+      SOURCE_VFY=sha1:22764d71a8932c09b3e10baed13c3a5d7948aed4
         WEB_SITE=http://www.gnome.org
          ENTERED=20021223
-         UPDATED=20071222
+         UPDATED=20080413
            SHORT="a binary/hexadecimal editor"
 
 cat << EOF
diff --git a/gnome2/extra/gnome-mount/BUILD b/gnome2/extra/gnome-mount/BUILD
new file mode 100644
index 0000000..aa10776
--- /dev/null
+++ b/gnome2/extra/gnome-mount/BUILD
@@ -0,0 +1,7 @@
+(
+
+  OPTS="$OPTS --enable-nautilus-extension"
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/extra/gnome-mount/DETAILS b/gnome2/extra/gnome-mount/DETAILS
new file mode 100644
index 0000000..f4f6e63
--- /dev/null
+++ b/gnome2/extra/gnome-mount/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=gnome-mount
+         VERSION=0.8
+          SOURCE=${MODULE}-${VERSION}.tar.gz
+      SOURCE_URL=http://hal.freedesktop.org/releases/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_VFY=sha1:846ba178cf9009f3e32c7f55f912b3ca6b9ecedb
+        WEB_SITE="http://people.freedesktop.org/~david/dist/"
+         ENTERED=20071120
+         UPDATED=20080702
+           SHORT="Allows Gnome to use HAL to enable hardware access"
+cat <<EOF
+Allows Gnome to mount drives and ejects cds
+EOF
diff --git a/gnome2/extra/gnome-spell/DEPENDS b/gnome2/extra/gnome-spell/DEPENDS
index b2b8c46..6d94b5e 100644
--- a/gnome2/extra/gnome-spell/DEPENDS
+++ b/gnome2/extra/gnome-spell/DEPENDS
@@ -1,3 +1,3 @@
 depends aspell &&
 depends libgnomeui &&
-depends libglade2
+depends libglade
diff --git a/gnome2/platform/GConf/DEPENDS b/gnome2/platform/GConf/DEPENDS
new file mode 100644
index 0000000..56118cc
--- /dev/null
+++ b/gnome2/platform/GConf/DEPENDS
@@ -0,0 +1,3 @@
+depends  ORBit2
+
+optional_depends  "gtk+-2"  "--enable-gtk"  ""  "for GTK+-2 Support"
diff --git a/gnome2/platform/GConf/DETAILS b/gnome2/platform/GConf/DETAILS
new file mode 100644
index 0000000..11cb34f
--- /dev/null
+++ b/gnome2/platform/GConf/DETAILS
@@ -0,0 +1,19 @@
+          MODULE=GConf
+         VERSION=2.22.0
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:2a9ca649ef58394e425a030dc99b863b499a8a56
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20080416
+         UPDATED=20080416
+           SHORT="A system for storing configuration information"
+
+cat << EOF
+GConf is a system for storing configuration information, that is,
+key-value pairs. GConf provides a notification service so applications
+can be notified when a key's value is changed. GConf also allows for
+pluggable storage mechanisms (text files, databases, etc.); allows
+administrators to install default values; and allows application authors
+to document their configuration keys for the benefit of administrators.
+EOF
diff --git a/gnome2/platform/GConf2/DEPENDS b/gnome2/platform/GConf2/DEPENDS
deleted file mode 100644
index 56118cc..0000000
--- a/gnome2/platform/GConf2/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  ORBit2
-
-optional_depends  "gtk+-2"  "--enable-gtk"  ""  "for GTK+-2 Support"
diff --git a/gnome2/platform/GConf2/DETAILS b/gnome2/platform/GConf2/DETAILS
deleted file mode 100644
index f8d5820..0000000
--- a/gnome2/platform/GConf2/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-          MODULE=GConf2
-             MOD=GConf
-         VERSION=2.20.1
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:c628e2645a91b15749f1ebacc62ea685cbfa681c
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020701
-         UPDATED=20071104
-           SHORT="A system for storing configuration information"
-
-cat << EOF
-GConf is a system for storing configuration information, that is,
-key-value pairs. GConf provides a notification service so applications
-can be notified when a key's value is changed. GConf also allows for
-pluggable storage mechanisms (text files, databases, etc.); allows
-administrators to install default values; and allows application authors
-to document their configuration keys for the benefit of administrators.
-EOF
diff --git a/gnome2/platform/ORBit2/DETAILS b/gnome2/platform/ORBit2/DETAILS
index 3d8d3ac..478cb52 100644
--- a/gnome2/platform/ORBit2/DETAILS
+++ b/gnome2/platform/ORBit2/DETAILS
@@ -1,12 +1,12 @@
           MODULE=ORBit2
-         VERSION=2.14.12
+         VERSION=2.14.13
            MAJOR=2.14
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:0ae64c5e458c5cadab5af0e22d69ffea25f9f3fb
+      SOURCE_VFY=sha1:eb565df83480ccab606821a7d1942c0c23a4e8d7
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20080316
+         UPDATED=20080617
            PSAFE="no"
            SHORT="High-performance CORBA Object Request Broker"
 
@@ -19,4 +19,3 @@ enables communication between program objects, regardless of the
 programming language they're written in or the operating system they
 run on.
 EOF
-
diff --git a/gnome2/platform/at-spi/DETAILS b/gnome2/platform/at-spi/DETAILS
index 8d25a2a..3edf20f 100644
--- a/gnome2/platform/at-spi/DETAILS
+++ b/gnome2/platform/at-spi/DETAILS
@@ -1,14 +1,14 @@
           MODULE=at-spi
-         VERSION=1.21.1
-           MAJOR=1.21
+         VERSION=1.22.1
+           MAJOR=1.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:3c27b9832dec91c2928dc5b18d7cecc183f2b278
+      SOURCE_VFY=sha1:b7dca093dbe9617e65a0c44ec0e255700a2ab048
         WEB_SITE=http://www.gnome.org
          ENTERED=20020701
-         UPDATED=20071114
+         UPDATED=20080416
            SHORT="GNOME Assistive Technology Service Provider Interface."
 cat << EOF
 This is the Gnome Accessibility Project's Assistive Technology Service
 Provider Interface.
-EOF
\ No newline at end of file
+EOF
diff --git a/gnome2/platform/gail/DETAILS b/gnome2/platform/gail/DETAILS
index 1b7a9c4..c6614be 100644
--- a/gnome2/platform/gail/DETAILS
+++ b/gnome2/platform/gail/DETAILS
@@ -1,17 +1,17 @@
           MODULE=gail
-         VERSION=1.20.2
-           MAJOR=1.20
+         VERSION=1.22.3
+           MAJOR=1.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:781a6147e327c88a80a9711750995ef7aa1c7078
+      SOURCE_VFY=sha1:275fac22693b02eb9c4c46c8d45e8259c4799bce
         WEB_SITE=http://developer.gnome.org/projects/gap/
          ENTERED=20020714
-         UPDATED=20071130
+         UPDATED=20080701
            SHORT="accessibility support for Gtk+-2/GNOME applications"
 
 cat << EOF
 gail (GNOME Accessibility Implementation Library) implements ATK
-interfaces for GTK+-2 widgets which are dynamically loadable at 
+interfaces for GTK+-2 widgets which are dynamically loadable at
 runtime by a GTK+-2 application.  Once loaded, those parts of an
 application that use standard GTK+-2 widgets will have a basic level
 of accessibility features, without the need to modify the application
diff --git a/gnome2/platform/gnome-mime-data/BUILD b/gnome2/platform/gnome-mime-data/BUILD
new file mode 100644
index 0000000..80d990a
--- /dev/null
+++ b/gnome2/platform/gnome-mime-data/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/platform/gnome-mime-data/DEPENDS b/gnome2/platform/gnome-mime-data/DEPENDS
new file mode 100644
index 0000000..4b0b153
--- /dev/null
+++ b/gnome2/platform/gnome-mime-data/DEPENDS
@@ -0,0 +1,3 @@
+depends libbonobo &&
+depends shared-mime-info &&
+depends GConf  
diff --git a/gnome2/platform/gnome-mime-data/DETAILS b/gnome2/platform/gnome-mime-data/DETAILS
new file mode 100644
index 0000000..fe34756
--- /dev/null
+++ b/gnome2/platform/gnome-mime-data/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gnome-mime-data
+         VERSION=2.18.0
+           MAJOR=2.18
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:9ce7b1a24a97f275f60b416fae82d81c1010cb65
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20020702
+         UPDATED=20080703
+           SHORT="Gnome Mime Data"
+cat << EOF
+Gnome Mime Data
+EOF
diff --git a/gnome2/platform/gnome-mime-data2/BUILD b/gnome2/platform/gnome-mime-data2/BUILD
deleted file mode 100644
index 80d990a..0000000
--- a/gnome2/platform/gnome-mime-data2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/platform/gnome-mime-data2/DEPENDS b/gnome2/platform/gnome-mime-data2/DEPENDS
deleted file mode 100644
index dd48a95..0000000
--- a/gnome2/platform/gnome-mime-data2/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends libbonobo &&
-depends shared-mime-info &&
-depends GConf2  
diff --git a/gnome2/platform/gnome-mime-data2/DETAILS b/gnome2/platform/gnome-mime-data2/DETAILS
deleted file mode 100644
index 958d866..0000000
--- a/gnome2/platform/gnome-mime-data2/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=gnome-mime-data2
-             MOD=gnome-mime-data
-         VERSION=2.18.0
-           MAJOR=2.18
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:9ce7b1a24a97f275f60b416fae82d81c1010cb65
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020702
-         UPDATED=20070823
-           SHORT="Gnome Mime Data"
-cat << EOF
-Gnome Mime Data
-EOF
diff --git a/gnome2/platform/gnome-vfs-monikers/DEPENDS b/gnome2/platform/gnome-vfs-monikers/DEPENDS
index 21d4a85..006568a 100644
--- a/gnome2/platform/gnome-vfs-monikers/DEPENDS
+++ b/gnome2/platform/gnome-vfs-monikers/DEPENDS
@@ -1,2 +1,2 @@
-depends  gnome-vfs2  &&
+depends  gnome-vfs  &&
 depends  libbonobo
diff --git a/gnome2/platform/gnome-vfs/BUILD b/gnome2/platform/gnome-vfs/BUILD
new file mode 100644
index 0000000..2e674a8
--- /dev/null
+++ b/gnome2/platform/gnome-vfs/BUILD
@@ -0,0 +1,22 @@
+(
+
+   if module_installed openssl ; then
+        OPTS="$OPTS --enable-openssl \
+                    --with-openssl-includes=/usr/include/openssl \
+                    --with-openssl-libs=/usr/lib \
+                    --disable-gnutls"
+   else
+        OPTS="$OPTS --enable-gnutls --disable-openssl"
+   fi &&
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                --enable-cdda                          \
+                $OPTS                             &&
+    default_make
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/platform/gnome-vfs/DEPENDS b/gnome2/platform/gnome-vfs/DEPENDS
new file mode 100644
index 0000000..7403b10
--- /dev/null
+++ b/gnome2/platform/gnome-vfs/DEPENDS
@@ -0,0 +1,18 @@
+depends  gamin
+depends  GConf
+depends  gnome-mime-data
+depends  %SSL
+depends  neon
+depends  dbus-glib
+
+optional_depends  "hal"    "--enable-hal"    "--disable-hal"   \
+                  "for hal support"
+optional_depends  "avahi"  "--enable-avahi"  "--disable-avahi" \
+                  "for avahi zeroconf network support (say 'n' if you plan to say 'y' to howl)"
+optional_depends  "howl"  "--enable-howl"  "--disable-howl"  \
+                  "for howl zeroconf networking support (say 'n' if you said yes to avahi)"
+optional_depends  "samba"  "--enable-samba --with-samba-includes=/usr/include --with-samba-libs=/usr/lib"  "--disable-samba"  \
+                  "for samba support"
+optional_depends  "gtk-doc" "--enable-gtk-doc" "--disable-gtk-doc" \
+                  "for building documentation"
+
diff --git a/gnome2/platform/gnome-vfs/DETAILS b/gnome2/platform/gnome-vfs/DETAILS
new file mode 100644
index 0000000..567cdcd
--- /dev/null
+++ b/gnome2/platform/gnome-vfs/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=gnome-vfs
+         VERSION=2.22.0
+           MAJOR=2.22
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:a58fb0654bb2c434372ee313a591ecfa8195fe18
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080416
+         UPDATED=20080416
+           SHORT="a file system abstraction library for GNOME"
+
+cat << EOF
+Gnome-VFS is a file system abstraction library for GNOME.
+EOF
diff --git a/gnome2/platform/gnome-vfs2/BUILD b/gnome2/platform/gnome-vfs2/BUILD
deleted file mode 100644
index 2e674a8..0000000
--- a/gnome2/platform/gnome-vfs2/BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-
-   if module_installed openssl ; then
-        OPTS="$OPTS --enable-openssl \
-                    --with-openssl-includes=/usr/include/openssl \
-                    --with-openssl-libs=/usr/lib \
-                    --disable-gnutls"
-   else
-        OPTS="$OPTS --enable-gnutls --disable-openssl"
-   fi &&
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                --enable-cdda                          \
-                $OPTS                             &&
-    default_make
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/platform/gnome-vfs2/DEPENDS b/gnome2/platform/gnome-vfs2/DEPENDS
deleted file mode 100644
index 276462d..0000000
--- a/gnome2/platform/gnome-vfs2/DEPENDS
+++ /dev/null
@@ -1,18 +0,0 @@
-depends  gamin
-depends  GConf2
-depends  gnome-mime-data2
-depends  %SSL
-depends  neon
-depends  dbus-glib
-
-optional_depends  "hal"    "--enable-hal"    "--disable-hal"   \
-                  "for hal support"
-optional_depends  "avahi"  "--enable-avahi"  "--disable-avahi" \
-                  "for avahi zeroconf network support (say 'n' if you plan to say 'y' to howl)"
-optional_depends  "howl"  "--enable-howl"  "--disable-howl"  \
-                  "for howl zeroconf networking support (say 'n' if you said yes to avahi)"
-optional_depends  "samba"  "--enable-samba --with-samba-includes=/usr/include --with-samba-libs=/usr/lib"  "--disable-samba"  \
-                  "for samba support"
-optional_depends  "gtk-doc" "--enable-gtk-doc" "--disable-gtk-doc" \
-                  "for building documentation"
-
diff --git a/gnome2/platform/gnome-vfs2/DETAILS b/gnome2/platform/gnome-vfs2/DETAILS
deleted file mode 100644
index 819ef9b..0000000
--- a/gnome2/platform/gnome-vfs2/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=gnome-vfs2
-             MOD=gnome-vfs
-         VERSION=2.20.1
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:03afa10e84425f7f38e05f0db0ecf55ae5fb7b15 
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020714
-         UPDATED=20071118
-           SHORT="a file system abstraction library for GNOME"
-
-cat << EOF
-Gnome-VFS is a file system abstraction library for GNOME.
-EOF
diff --git a/gnome2/platform/libIDL/BUILD b/gnome2/platform/libIDL/BUILD
index 7aad931..80d990a 100644
--- a/gnome2/platform/libIDL/BUILD
+++ b/gnome2/platform/libIDL/BUILD
@@ -1,7 +1,5 @@
 (
 
-   sedit 's/^%p 5000$/%pointer 5000/' lexer.l     &&
-
    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD                    \
                 --sysconfdir=/etc                 \
diff --git a/gnome2/platform/libIDL/DETAILS b/gnome2/platform/libIDL/DETAILS
index ca331dd..209bad1 100644
--- a/gnome2/platform/libIDL/DETAILS
+++ b/gnome2/platform/libIDL/DETAILS
@@ -6,7 +6,7 @@
       SOURCE_VFY=sha1:643d1aa2a4be94dd568f8d585d7df22e69706cdd
         WEB_SITE=http://www.gnome.org/
          ENTERED=20020713
-         UPDATED=20080216
+         UPDATED=20080211
            SHORT="a library for creating trees of CORBA IDL files"
 
 cat << EOF
diff --git a/gnome2/platform/libbonobo/DETAILS b/gnome2/platform/libbonobo/DETAILS
index ad27a79..4f95009 100644
--- a/gnome2/platform/libbonobo/DETAILS
+++ b/gnome2/platform/libbonobo/DETAILS
@@ -1,18 +1,18 @@
           MODULE=libbonobo
-         VERSION=2.20.3
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:4200a3d6812368fe43fb469873e50063013ccacb
+      SOURCE_VFY=sha1:517e8f1ca24cea4ce77cdb1d7485c61da3096be2
         WEB_SITE=http://www.gnome.org
          ENTERED=20020729
-         UPDATED=20071222
+         UPDATED=20080416
            SHORT="the GNOME CORBA framework library"
 
 cat << EOF
 Bonobo is a set of language and system independent CORBA interfaces
 for creating reusable components, controls, and creating compound
 documents.  It was designed and implemented to address the needs and
-problems of the free-software community for developing large-scale 
+problems of the free-software community for developing large-scale
 applications.
 EOF
diff --git a/gnome2/platform/libbonoboui/DETAILS b/gnome2/platform/libbonoboui/DETAILS
index 21e2862..3b04db1 100644
--- a/gnome2/platform/libbonoboui/DETAILS
+++ b/gnome2/platform/libbonoboui/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libbonoboui
-         VERSION=2.20.0
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:0f28da17b5d65c6b0cf912005a3f0b7af29c18b2 
+      SOURCE_VFY=sha1:48fcf81966b839b328ab63bae4ee128246eb0a63
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071114
+         UPDATED=20080416
            SHORT="part of the GNOME 2.0 bonobo implementation"
 cat << EOF
 Bonobo is the GNOME architecture for creating reusable software
diff --git a/gnome2/platform/libglade/BUILD b/gnome2/platform/libglade/BUILD
new file mode 100644
index 0000000..80d990a
--- /dev/null
+++ b/gnome2/platform/libglade/BUILD
@@ -0,0 +1,12 @@
+(
+
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+                --build=$BUILD                    \
+                --sysconfdir=/etc                 \
+                --localstatedir=/var              \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
+                $OPTS                             &&
+    default_make                   
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/platform/libglade/DEPENDS b/gnome2/platform/libglade/DEPENDS
new file mode 100644
index 0000000..0a3376a
--- /dev/null
+++ b/gnome2/platform/libglade/DEPENDS
@@ -0,0 +1,2 @@
+depends  libxml2  &&
+depends  gtk+-2
diff --git a/gnome2/platform/libglade/DETAILS b/gnome2/platform/libglade/DETAILS
new file mode 100644
index 0000000..f677e99
--- /dev/null
+++ b/gnome2/platform/libglade/DETAILS
@@ -0,0 +1,18 @@
+          MODULE=libglade
+         VERSION=2.6.2
+           MAJOR=2.6
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:99ffcf33bcd0fdd67191c99b117a0cefc26b84bc
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20080416
+         UPDATED=20080416
+           SHORT="loads user interfaces from XML files"
+
+cat << EOF
+The Libglade library gives applications the ability to load user
+interfaces from XML files at runtime. These interface files can
+be created with the GLADE user interface builder. Libglade is also
+capable of automatically connecting handlers to the signals defined in
+the interface file.
+EOF
diff --git a/gnome2/platform/libglade/POST_INSTALL b/gnome2/platform/libglade/POST_INSTALL
new file mode 100644
index 0000000..04ef102
--- /dev/null
+++ b/gnome2/platform/libglade/POST_INSTALL
@@ -0,0 +1,8 @@
+#Running rebuild-docbook-catalog due to the libglade installer
+#putting the right entry into the wrong docbook-catalog file
+if [ -x /usr/sbin/rebuild-docbook-catalog ]; then
+      echo Rebuilding your docbook catalogs &&
+      /usr/sbin/rebuild-docbook-catalog
+fi
+
+true
diff --git a/gnome2/platform/libglade/POST_REMOVE b/gnome2/platform/libglade/POST_REMOVE
new file mode 100644
index 0000000..04ef102
--- /dev/null
+++ b/gnome2/platform/libglade/POST_REMOVE
@@ -0,0 +1,8 @@
+#Running rebuild-docbook-catalog due to the libglade installer
+#putting the right entry into the wrong docbook-catalog file
+if [ -x /usr/sbin/rebuild-docbook-catalog ]; then
+      echo Rebuilding your docbook catalogs &&
+      /usr/sbin/rebuild-docbook-catalog
+fi
+
+true
diff --git a/gnome2/platform/libglade2/BUILD b/gnome2/platform/libglade2/BUILD
deleted file mode 100644
index 80d990a..0000000
--- a/gnome2/platform/libglade2/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make                   
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/platform/libglade2/DEPENDS b/gnome2/platform/libglade2/DEPENDS
deleted file mode 100644
index 0a3376a..0000000
--- a/gnome2/platform/libglade2/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  libxml2  &&
-depends  gtk+-2
diff --git a/gnome2/platform/libglade2/DETAILS b/gnome2/platform/libglade2/DETAILS
deleted file mode 100644
index 0087a8d..0000000
--- a/gnome2/platform/libglade2/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-          MODULE=libglade2
-             MOD=libglade
-         VERSION=2.6.2
-           MAJOR=2.6
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:99ffcf33bcd0fdd67191c99b117a0cefc26b84bc
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020714
-         UPDATED=20070823
-           SHORT="loads user interfaces from XML files"
-
-cat << EOF
-The Libglade library gives applications the ability to load user
-interfaces from XML files at runtime. These interface files can
-be created with the GLADE user interface builder. Libglade is also
-capable of automatically connecting handlers to the signals defined in
-the interface file.
-EOF
diff --git a/gnome2/platform/libglade2/POST_INSTALL b/gnome2/platform/libglade2/POST_INSTALL
deleted file mode 100644
index 04ef102..0000000
--- a/gnome2/platform/libglade2/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-#Running rebuild-docbook-catalog due to the libglade installer
-#putting the right entry into the wrong docbook-catalog file
-if [ -x /usr/sbin/rebuild-docbook-catalog ]; then
-      echo Rebuilding your docbook catalogs &&
-      /usr/sbin/rebuild-docbook-catalog
-fi
-
-true
diff --git a/gnome2/platform/libglade2/POST_REMOVE b/gnome2/platform/libglade2/POST_REMOVE
deleted file mode 100644
index 04ef102..0000000
--- a/gnome2/platform/libglade2/POST_REMOVE
+++ /dev/null
@@ -1,8 +0,0 @@
-#Running rebuild-docbook-catalog due to the libglade installer
-#putting the right entry into the wrong docbook-catalog file
-if [ -x /usr/sbin/rebuild-docbook-catalog ]; then
-      echo Rebuilding your docbook catalogs &&
-      /usr/sbin/rebuild-docbook-catalog
-fi
-
-true
diff --git a/gnome2/platform/libgnome/DEPENDS b/gnome2/platform/libgnome/DEPENDS
index 0fb3edf..04bc005 100644
--- a/gnome2/platform/libgnome/DEPENDS
+++ b/gnome2/platform/libgnome/DEPENDS
@@ -1,4 +1,4 @@
-depends  gnome-vfs2
+depends  gnome-vfs
 depends  libbonobo
 
 optional_depends  "esound"  "--enable-esd"  "--disable-esd"  \
diff --git a/gnome2/platform/libgnome/DETAILS b/gnome2/platform/libgnome/DETAILS
index e3252a8..c81a3df 100644
--- a/gnome2/platform/libgnome/DETAILS
+++ b/gnome2/platform/libgnome/DETAILS
@@ -1,17 +1,17 @@
           MODULE=libgnome
-         VERSION=2.20.1.1
-           MAJOR=2.20
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:59c1e8d8f8b50e290eb513eeadd729f271c20d2b
+      SOURCE_VFY=sha1:2d263acdd313d37d1018356c74e9d1cc7a9c2e0d
         WEB_SITE=http://www.gnome.org
          ENTERED=20020714
-         UPDATED=20071218
+         UPDATED=20080416
            SHORT="The GNOME Library functions"
 
 cat << EOF
 The GNOME Library functions - these are the calls that handle all
 of the core library functions (E.g., initialization, configuration,
-mime-types, etc.).  None of these calls deal with the graphical 
+mime-types, etc.).  None of these calls deal with the graphical
 front-end.
 EOF
diff --git a/gnome2/platform/libgnomecanvas/DEPENDS b/gnome2/platform/libgnomecanvas/DEPENDS
index 9ea8ac8..a44092b 100644
--- a/gnome2/platform/libgnomecanvas/DEPENDS
+++ b/gnome2/platform/libgnomecanvas/DEPENDS
@@ -1,3 +1,3 @@
-depends libglade2
-depends gail
+depends libglade
 depends libart_lgpl
+depends gail
diff --git a/gnome2/platform/libgnomeui/DETAILS b/gnome2/platform/libgnomeui/DETAILS
index 15c71db..0e0b9a0 100644
--- a/gnome2/platform/libgnomeui/DETAILS
+++ b/gnome2/platform/libgnomeui/DETAILS
@@ -1,17 +1,17 @@
           MODULE=libgnomeui
-         VERSION=2.20.1.1
-           MAJOR=2.20
+         VERSION=2.22.1
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:e1704b328de6f6f7130147062b3262b3df77484a
+      SOURCE_VFY=sha1:fedbc56ac42d32e97310220469a8d6c52c3732cc
         WEB_SITE=http://www.gnome.org
          ENTERED=20020713
-         UPDATED=20071218
+         UPDATED=20080416
            SHORT="The GNOME User Interface Library Functions"
 cat << EOF
 The GNOME User Interface Library Functions - This includes
 miscellaneous calls used for the graphical frontend. This includes
-window manager interaction. 
+window manager interaction.
 
 Also included are all of the basic graphical calls for
 GNOME. This includes all GNOME widgets.
diff --git a/graphics/gimmage/DEPENDS b/graphics/gimmage/DEPENDS
index 4301594..8a5a654 100644
--- a/graphics/gimmage/DEPENDS
+++ b/graphics/gimmage/DEPENDS
@@ -1,2 +1,2 @@
 depends gtk+-2
-depends gtkmm2
+depends gtkmm
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 4f40cfe..d2061ed 100644
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -15,7 +15,7 @@ optional_depends  "aalib"                   \
                   "--without-aa"            \
                   "for ASCII art support"
 
-optional_depends  "pygtk2"                  \
+optional_depends  "pygtk"                  \
                   "--enable-python"         \
                   "--disable-python"        \
                   "for Python support"
diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 3db5dea..3c7451c 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -5,11 +5,6 @@
      OPTS="$OPTS --with-xinput=yes --enable-debug=no"
   fi &&
 
-  if [ "$FLASH_PATCH" == "y" ]; then
-    # This patch is necessary so flash 9.0.48 works with qt browsers
-    patch_it $SOURCE2 0 
-  fi &&
-
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/gtk+-2/CONFIGURE b/graphics/gtk+-2/CONFIGURE
index c5b18cc..96c931d 100644
--- a/graphics/gtk+-2/CONFIGURE
+++ b/graphics/gtk+-2/CONFIGURE
@@ -1,2 +1 @@
 mquery USE_XINPUT "Install XINPUT support? This is needed for wacom tablets in gimp!" y
-mquery FLASH_PATCH "You want to patch gtk+-2 so you can use flash with opera or konqueror?" n
diff --git a/graphics/gtk+-2/DEPENDS b/graphics/gtk+-2/DEPENDS
index 5859eeb..8dff3f8 100644
--- a/graphics/gtk+-2/DEPENDS
+++ b/graphics/gtk+-2/DEPENDS
@@ -5,3 +5,4 @@ depends  jpeg
 depends  %X
 
 optional_depends  "cups"  ""  ""  "for the CUPS based printing backed"
+optional_depends  "jasper"  ""  "--without-jasper"  "jpeg2000 support"
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index 3bfe796..ab03b4e 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -1,16 +1,14 @@
           MODULE=gtk\+-2
-         VERSION=12.10
+         VERSION=12.11
+           MAJOR=2.12
           SOURCE=$MODULE.$VERSION.tar.bz2
-         SOURCE2=flash-9.0.48-fix.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
-   SOURCE_URL[0]=$GNOME_URL/sources/gtk+/2.12
-   SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v2.12
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:03ba66925d3ef8509c2aa227cdb7b11c194055ee
-     SOURCE2_VFY=sha1:ed07cf3d2a7ee26f53f414ec5cd4d0f1b4514249
+   SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$MAJOR
+   SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v$MAJOR
+      SOURCE_VFY=sha1:c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b
         WEB_SITE=http://www.gtk.org
          ENTERED=20020313
-         UPDATED=20080610
+         UPDATED=20080702
            SHORT="A multi-platform toolkit for creating GUIs"
 
 cat << EOF
diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index 0c87034..bec44b9 100644
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -1,4 +1,4 @@
-depends gtkmm2
+depends gtkmm
 depends libart_lgpl
 depends libxml2
 depends gc
diff --git a/graphics/libcm/DETAILS b/graphics/libcm/DETAILS
deleted file mode 100644
index d59b5e6..0000000
--- a/graphics/libcm/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=libcm
-         VERSION=0.1.1
-           MAJOR=0.1
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:f8b38a84fd83d5cc3c9e3268ebaa89b259a1fc9f
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020716
-         UPDATED=20070706
-           SHORT="Compositing manager library"
-
-cat << EOF
-
-EOF
diff --git a/graphics/mirage/DEPENDS b/graphics/mirage/DEPENDS
index 4e6e738..8478248 100644
--- a/graphics/mirage/DEPENDS
+++ b/graphics/mirage/DEPENDS
@@ -1 +1 @@
-depends  pygtk2
+depends  pygtk
diff --git a/graphics/pyclutter/DEPENDS b/graphics/pyclutter/DEPENDS
index b4a0405..191adb7 100644
--- a/graphics/pyclutter/DEPENDS
+++ b/graphics/pyclutter/DEPENDS
@@ -1,4 +1,4 @@
 depends  clutter
-depends  pygtk2
+depends  pygtk
 depends  clutter-gtk
 depends  clutter-gst
diff --git a/libs/atk/DETAILS b/libs/atk/DETAILS
index 7dc48c4..5d3d90f 100644
--- a/libs/atk/DETAILS
+++ b/libs/atk/DETAILS
@@ -1,12 +1,12 @@
           MODULE=atk
-           MAJOR=1.20
-         VERSION=1.20.0
+           MAJOR=1.22
+         VERSION=1.22.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:e309fed4154819194ddbf9be4ca3252cc31434cf
+      SOURCE_VFY=sha1:d07a42aff241f58e3bde7fe25be94f989361c605
         WEB_SITE=http://www.gtk.org
          ENTERED=20020313
-         UPDATED=20070920
+         UPDATED=20080416
            SHORT="A library of useful C routines required for gtk+2"
 
 cat << EOF
diff --git a/libs/glib-2/DETAILS b/libs/glib-2/DETAILS
index aff4871..7de59db 100644
--- a/libs/glib-2/DETAILS
+++ b/libs/glib-2/DETAILS
@@ -1,15 +1,14 @@
-# Do NOT BUMP this unless you bump ALL of gnome to 2.20 !!!
           MODULE=glib-2
-           MAJOR=2.14
-         VERSION=14.6
+           MAJOR=2.16
+         VERSION=16.3
           SOURCE=$MODULE.$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/glib/$MAJOR/
    SOURCE_URL[1]=ftp://ftp.gtk.org/pub/glib/$MAJOR/
-      SOURCE_VFY=sha1:f2e2a5323357516ccb813d9e7f3921ef1e490079
+      SOURCE_VFY=sha1:f73fd53130a46f21ff4ee9faa69b9956787c571e
         WEB_SITE=http://www.gtk.org/
          ENTERED=20020313
-         UPDATED=20080318
+         UPDATED=20080416
            SHORT="A library of useful C routines for trees, hashes, and lists"
 
 cat << EOF
diff --git a/libs/goffice/DEPENDS b/libs/goffice/DEPENDS
index 1930be9..4d0a267 100644
--- a/libs/goffice/DEPENDS
+++ b/libs/goffice/DEPENDS
@@ -1,2 +1,3 @@
-depends libgsf &&
-depends libglade2
+depends libgsf
+depends libglade
+optional_depends cairo "--with-cairo" "--without-cairo" "Enables cairo rendering, needed for gnucash"
diff --git a/libs/goffice/DETAILS b/libs/goffice/DETAILS
index 5cd3f20..61f2915 100644
--- a/libs/goffice/DETAILS
+++ b/libs/goffice/DETAILS
@@ -1,15 +1,17 @@
           MODULE=goffice
-           MAJOR=0.2
-         VERSION=0.2.2
+           MAJOR=0.6
+         VERSION=0.6.4
           SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION/
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9b19d14218ebb3b52eb7d83e4905bb2c176d26ce
+      SOURCE_VFY=sha1:b6ce7576396fc69a1a44c9fea4b2b2f159948101
         WEB_SITE=www.gnome.org
-         ENTERED=20051010
-         UPDATED=20071104
+         ENTERED=20071104
+         UPDATED=20080702
            SHORT="A glib/gtk set of document centric objects and utilities"
 cat << EOF
-GOffice provides some added capabilities for abiword and gnumeric2.
+This version is specific to gnucash-2.2.x.
+GOffice provides some added capabilities for abiword and gnumeric2 and gnucash.
 There are common operations for document centric applications that are
 conceptually simple, but complex to implement fully.
     - plugins
diff --git a/libs/goffice2/BUILD b/libs/goffice2/BUILD
deleted file mode 100644
index 15e177e..0000000
--- a/libs/goffice2/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-  
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make
-
-    
-) > $C_FIFO 2>&1
diff --git a/libs/goffice2/DEPENDS b/libs/goffice2/DEPENDS
deleted file mode 100644
index 5c97f2f..0000000
--- a/libs/goffice2/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends libgsf
-depends libglade2
-optional_depends cairo "--with-cairo" "--without-cairo" "Enables cairo rendering, needed for gnucash"
diff --git a/libs/goffice2/DETAILS b/libs/goffice2/DETAILS
deleted file mode 100644
index 903fbc6..0000000
--- a/libs/goffice2/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-          MODULE=goffice2
-           MAJOR=0.4
-         VERSION=0.4.3
-          SOURCE=goffice-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION/
-      SOURCE_URL=$GNOME_URL/sources/goffice/$MAJOR/
-      SOURCE_VFY=sha1:56386b7554ec8e0d2fac47251344ab7edaa7fea4
-        WEB_SITE=www.gnome.org
-         ENTERED=20071104
-         UPDATED=20071104
-           SHORT="A glib/gtk set of document centric objects and utilities"
-cat << EOF
-This version is specific to gnucash-2.2.x.
-GOffice provides some added capabilities for abiword and gnumeric2 and gnucash.
-There are common operations for document centric applications that are
-conceptually simple, but complex to implement fully.
-    - plugins
-    - load/save documents
-    - undo/redo
-EOF
diff --git a/libs/lablgtk/DEPENDS b/libs/lablgtk/DEPENDS
index 4a7cd07..20c8acf 100644
--- a/libs/lablgtk/DEPENDS
+++ b/libs/lablgtk/DEPENDS
@@ -1,3 +1,3 @@
 depends ocaml &&
-depends libglade2 &&
+depends libglade &&
 depends librsvg
diff --git a/libs/libart_lgpl/DETAILS b/libs/libart_lgpl/DETAILS
index 9385181..ba83b38 100644
--- a/libs/libart_lgpl/DETAILS
+++ b/libs/libart_lgpl/DETAILS
@@ -1,11 +1,11 @@
           MODULE=libart_lgpl
-         VERSION=2.3.17
+         VERSION=2.3.20
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/2.3/
-      SOURCE_VFY=sha1:23ac4c3bad68e3d6222641363d4209e9702abc7d
+      SOURCE_VFY=sha1:40aa6c6c5fb27a8a45cd7aaa302a835ff374d13a
         WEB_SITE=http://www.gnome.org
          ENTERED=20020529
-         UPDATED=20071202
+         UPDATED=20080416
            SHORT="Art lib for Gnome2"
 
 cat << EOF
diff --git a/libs/libgsf/DEPENDS b/libs/libgsf/DEPENDS
index 86d588e..5e8414a 100644
--- a/libs/libgsf/DEPENDS
+++ b/libs/libgsf/DEPENDS
@@ -1,5 +1,5 @@
 depends  glib-2   &&
 depends  libxml2  &&
 
-optional_depends  "pygtk2"  ""  "--without-python"  \
+optional_depends  "pygtk"  ""  "--without-python"  \
                   "for Python gsf support"
diff --git a/libs/libgsf/DETAILS b/libs/libgsf/DETAILS
index 9d49bd2..240e873 100644
--- a/libs/libgsf/DETAILS
+++ b/libs/libgsf/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgsf
            MAJOR=1.14
-         VERSION=1.14.7
+         VERSION=1.14.8
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:9950e42db36007591af2d5783bdf68dc73f47d1b
+      SOURCE_VFY=sha1:780a411050b2168263f154d66a5ebb07141284e3
         WEB_SITE=http://www.gnome.org/
          ENTERED=20021118
-         UPDATED=20071104
+         UPDATED=20080311
            SHORT="Provides an API to access OLE2 streams"
 
 cat << EOF
diff --git a/libs/libmcs/DEPENDS b/libs/libmcs/DEPENDS
index 24fe859..5dcd5e4 100644
--- a/libs/libmcs/DEPENDS
+++ b/libs/libmcs/DEPENDS
@@ -1,6 +1,6 @@
 depends libmowgli
 
-optional_depends  "GConf2"               \
+optional_depends  "GConf"               \
                   "--enable-gconf"       \
                   "--disable-gconf"      \
                   "for GConf support"
diff --git a/libs/libsexymm/DEPENDS b/libs/libsexymm/DEPENDS
index c8bcb97..1f81574 100644
--- a/libs/libsexymm/DEPENDS
+++ b/libs/libsexymm/DEPENDS
@@ -1,2 +1,2 @@
 depends  libsexy
-depends  gtkmm2
+depends  gtkmm
diff --git a/libs/libsigc++2/DETAILS b/libs/libsigc++2/DETAILS
index 0f65a79..a374fa5 100644
--- a/libs/libsigc++2/DETAILS
+++ b/libs/libsigc++2/DETAILS
@@ -1,14 +1,15 @@
           MODULE=libsigc++2
              MOD=libsigc++
-         VERSION=2.0.18
+           MAJOR=2.2
+         VERSION=2.2.2
           SOURCE=$MOD-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-   SOURCE_URL[0]=$GNOME_URL/sources/$MOD/2.0/
-   SOURCE_URL[1]=http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/
-      SOURCE_VFY=sha1:75df46c977a3418bda4d5ae7e21c9ede28993835
+   SOURCE_URL[0]=$GNOME_URL/sources/$MOD/$MAJOR/
+   SOURCE_URL[1]=http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$MAJOR/
+      SOURCE_VFY=sha1:e1d6446222410bf8d707c6d371101a6eb36e9121
         WEB_SITE=http://libsigc.sourceforge.net
          ENTERED=20021225
-         UPDATED=20080105
+         UPDATED=20080311
            SHORT="library for type-safe callbacks in C++"
 
 cat << EOF
diff --git a/libs/libxml++/DETAILS b/libs/libxml++/DETAILS
index 16aa64e..ac40d94 100644
--- a/libs/libxml++/DETAILS
+++ b/libs/libxml++/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libxml++
-         VERSION=2.18.0
-           MAJOR=2.18
+         VERSION=2.22.0
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://ftp.gnome.org/pub/GNOME/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:cd335816f6a1ce669f9465ae069a1a45942e8d0d
+      SOURCE_VFY=sha1:8c69339e1b472bd5e541e30fdaa47b152bc186bc
         WEB_SITE=http://libxmlplusplus.sf.net
          ENTERED=20030923
-         UPDATED=20070307
+         UPDATED=20080416
            SHORT="A C++ interface for working with XML files"
 
 cat << EOF
diff --git a/libs/pango/DETAILS b/libs/pango/DETAILS
index e8fcc2e..b96cd5d 100644
--- a/libs/pango/DETAILS
+++ b/libs/pango/DETAILS
@@ -1,12 +1,12 @@
           MODULE=pango
-           MAJOR=1.18
-         VERSION=1.18.4
+           MAJOR=1.20
+         VERSION=1.20.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:6a72db90bf82b151e18bd83d25f0844129cc93d6
+      SOURCE_VFY=sha1:bc4b12dd9cc8a963d796098a3708357237f3101f
         WEB_SITE=http://www.pango.org/
          ENTERED=20020313
-         UPDATED=20080112
+         UPDATED=20080617
            SHORT="A library for text layout and rendering"
 
 cat << EOF
diff --git a/libs/pwlib/DETAILS b/libs/pwlib/DETAILS
index 782151b..0dd2824 100644
--- a/libs/pwlib/DETAILS
+++ b/libs/pwlib/DETAILS
@@ -1,11 +1,12 @@
           MODULE=pwlib
          VERSION=1.10.10
+           MAJOR=1.10
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.ekiga.org/admin/downloads/latest/sources/sources/
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
       SOURCE_VFY=sha1:ebadd7403695c73fae69488a50a34d15763fd245
         WEB_SITE=http://www.openh323.org
          ENTERED=20041217
-         UPDATED=20071019
+         UPDATED=20070920
            SHORT="A Portable Text and GUI C/C++ Class Libarary"
 
 cat << EOF
diff --git a/libs/swfdec/DEPENDS b/libs/swfdec/DEPENDS
index 3f3dca2..fca20c1 100644
--- a/libs/swfdec/DEPENDS
+++ b/libs/swfdec/DEPENDS
@@ -9,6 +9,6 @@ optional_depends "madplay"       "" "--disable-mad"        "use mad audio"
 optional_depends "gstreamer-10"  "" "--disable-gstreamer"  "use gstreamer audio"
 optional_depends "seamonkey"     "" ""                     "swfdec plugin for Mozilla"
 
-optional_depends "gnome-vfs2" "--enable-gnome-vfs"  \
+optional_depends "gnome-vfs" "--enable-gnome-vfs"  \
                               "--disable-gnome-vfs" \
                               "for vfs support"
diff --git a/mail/balsa/DEPENDS b/mail/balsa/DEPENDS
index cca30b3..3157300 100644
--- a/mail/balsa/DEPENDS
+++ b/mail/balsa/DEPENDS
@@ -18,4 +18,4 @@ optional_depends "gpgme" "--with-gpgme" "" "for gpgme support" &&
 
 optional_depends "sqlite" "--with-sqlite" "" "for SQLite GPE address books" &&
 
-optional_depends "gtksourceview2" "--with-gtksourceview" "" "for gtksourceview support"
+optional_depends "gtksourceview" "--with-gtksourceview" "" "for gtksourceview support"
diff --git a/mail/gmime/DETAILS b/mail/gmime/DETAILS
index 5c0a104..c1cb990 100644
--- a/mail/gmime/DETAILS
+++ b/mail/gmime/DETAILS
@@ -1,11 +1,12 @@
           MODULE=gmime
-         VERSION=2.2.14
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://spruce.sourceforge.net/gmime/sources/v2.2/
-      SOURCE_VFY=sha1:ab6295d093115cd1e89311e2bd1574fef3c57bad
+           MAJOR=2.2
+         VERSION=2.2.18
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:0615ab2c4c1511289fd0ae52b9d1a175de0da996
         WEB_SITE=http://spruce.sourceforge.net/gmime/
          ENTERED=20040721
-         UPDATED=20080101
+         UPDATED=20080328
            SHORT="MIME creation/parsing library and toolset"
 
 cat << EOF
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 8e749db..a1069f7 100644
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -4,6 +4,6 @@ depends unzip
 depends expat
 depends gtk+-2
 optional_depends "gnupg" "" "" "for encrypted email"
-optional_depends "gnome-vfs2" "" "--disable-gnome --disable-gnomevfs" "for Gnome VFS support"
+optional_depends "gnome-vfs" "" "--disable-gnome --disable-gnomevfs" "for Gnome VFS support"
 optional_depends heimdal "--with-gssapi=/usr/include/heimdal" "" "Heimdal GSSAPI Support"
 optional_depends openldap "--enable-ldap" "--disable-ldap" "for LDAP address book support"
diff --git a/net/avahi/DEPENDS b/net/avahi/DEPENDS
index 41920a7..f0e0ce1 100644
--- a/net/avahi/DEPENDS
+++ b/net/avahi/DEPENDS
@@ -15,7 +15,7 @@ optional_depends "gtk+-2" \
                  "--disable-gtk" \
                  "for the use of GTK+"
 
-optional_depends "pygtk2" \
+optional_depends "pygtk" \
                  "--enable-pygtk" \
                  "--disable-pygtk" \
                  "for the use of pyGTK"
diff --git a/net/gnaughty/DEPENDS b/net/gnaughty/DEPENDS
index 2a13e58..eade754 100644
--- a/net/gnaughty/DEPENDS
+++ b/net/gnaughty/DEPENDS
@@ -1,3 +1,3 @@
 depends curl &&
 depends gtk+-2 &&
-depends GConf2
+depends GConf
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 2d1ac94..e00c4a1 100644
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -1,5 +1,5 @@
 depends gtk+-2
-depends GConf2
+depends GConf
 depends libxml2
 
 optional_depends libgtkhtml "--enable-gtkhtml2" "--disable-gtkhtml2" "Enables the gtkhtml2 backend"
diff --git a/profiles/gnome2/DEPENDS b/profiles/gnome2/DEPENDS
index f89abfe..4ecf3b9 100644
--- a/profiles/gnome2/DEPENDS
+++ b/profiles/gnome2/DEPENDS
@@ -4,17 +4,15 @@ depends gtk+-2
 depends audiofile
 depends esound
 depends gtk-doc
-depends linc
-depends gnome-common2
+depends gnome-common
 depends ORBit2
-depends GConf2
+depends GConf
 depends libart_lgpl
-depends libzvt
 depends libbonobo
-depends gnome-mime-data2
+depends gnome-mime-data
 depends shared-mime-info
-depends gnome-vfs2
-depends libglade2
+depends gnome-vfs
+depends libglade
 depends libgnome
 depends zenity
 depends libbonoboui
@@ -25,7 +23,7 @@ depends gnome-icon-theme
 depends gnome-themes
 depends libgnomeprint
 depends libgnomeprintui
-depends libgtop2
+depends libgtop
 depends librsvg
 depends gail
 depends eel
@@ -35,16 +33,15 @@ depends gnome-panel
 depends gnome-session
 depends gnome-terminal
 depends gnome-utils
-depends gnome-applets2
-depends control-center2
+depends gnome-applets
+depends gnome-control-center
 depends bug-buddy
 depends eog
 depends nautilus
 depends gnome-system-monitor
-depends yelp
 depends gedit
 depends metacity
-depends gnome-media2
+depends gnome-media
 depends gdm
 depends at-spi
 depends libgail-gnome
@@ -53,3 +50,4 @@ depends gcalctool
 depends gucharmap
 depends file-roller
 depends gnome2-user-docs
+depends gnome-power-manager
diff --git a/profiles/gnome2/DETAILS b/profiles/gnome2/DETAILS
index 39bebfb..552b713 100644
--- a/profiles/gnome2/DETAILS
+++ b/profiles/gnome2/DETAILS
@@ -1,11 +1,10 @@
           MODULE=gnome2
-         VERSION=2.20.x
+         VERSION=2.22.x
         WEB_SITE=http://www.gnome.org
          ENTERED=20020729
-         UPDATED=20071118
+         UPDATED=20080621
          PROFILE=yes
-           SHORT="GNU Network Object Model Environment"
-
+           SHORT="GNU Network Object Model Environment."
 cat << EOF
 GNOME is the GNU Network Object Model Environment. 
 This project is building a complete, user-friendly 
diff --git a/python/gst-python/DEPENDS b/python/gst-python/DEPENDS
index ee073bb..a550af0 100644
--- a/python/gst-python/DEPENDS
+++ b/python/gst-python/DEPENDS
@@ -1,2 +1,2 @@
 depends  gstreamer-10
-depends  pygtk2
+depends  pygtk
diff --git a/python/pygtk/BUILD b/python/pygtk/BUILD
new file mode 100644
index 0000000..bdc08a5
--- /dev/null
+++ b/python/pygtk/BUILD
@@ -0,0 +1,7 @@
+(
+
+  OPTS="$OPTS  --enable-thread"
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/python/pygtk/CONFLICTS b/python/pygtk/CONFLICTS
deleted file mode 100644
index 7b92778..0000000
--- a/python/pygtk/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts pygtk2
diff --git a/python/pygtk/DEPENDS b/python/pygtk/DEPENDS
index 8c9b081..98b47d4 100644
--- a/python/pygtk/DEPENDS
+++ b/python/pygtk/DEPENDS
@@ -1,2 +1,5 @@
-depends  Python  &&
-depends  gtk+
+depends  pygobject
+depends  gtk+-2
+depends  pycairo
+optional_depends  "libglade"  ""  "" \
+                  "to build the libglade Python bindings (recommended)"
diff --git a/python/pygtk/DETAILS b/python/pygtk/DETAILS
index 533bfcc..6bd2feb 100644
--- a/python/pygtk/DETAILS
+++ b/python/pygtk/DETAILS
@@ -1,16 +1,17 @@
           MODULE=pygtk
-         VERSION=0.6.9
-          SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=ftp://ftp.gtk.org/pub/gtk/python/v1.2/
-        WEB_SITE=http://www.daa.com.au/~james/pygtk
-         ENTERED=20011108
-         UPDATED=20020106
-           SHORT="set of Python bindings for GTK."
-cat << EOF
-From the pygtk home page:
+         VERSION=2.12.1
+           MAJOR=2.12
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:7a7d095f53829895174640d693c4e4af16122d98
+        WEB_SITE=http://www.pygtk.org
+         ENTERED=20020726
+         UPDATED=20080703
+           SHORT="Python bindings for Gtk+-2"
 
-PyGTK is a set of bindings for the GTK widget set.  It provides an
-object oriented interface that is slightly higher level than the C one.
-It automatically does all the type lining  and reference counting that
-you would have to do normally with the C API.
+cat << EOF
+PyGTK is an extension module for python that gives you access to the GTK+
+widget set.  Just about anything you can write in C with GTK+ you can write
+in python with PyGTK (within reason), but with all the benefits of python.
 EOF
diff --git a/python/pygtk/PRE_BUILD b/python/pygtk/PRE_BUILD
new file mode 100644
index 0000000..68b0a87
--- /dev/null
+++ b/python/pygtk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+# declare pygobject.h rogue so it doesn't get removed!
+if [ -f $INSTALL_LOGS/pygtk2* ]; then
+  sedit "/\/usr\/include\/pygtk-2.0\/pygobject.h/d" $INSTALL_LOGS/pygtk2*
+fi
diff --git a/python/pygtk2/BUILD b/python/pygtk2/BUILD
deleted file mode 100644
index bdc08a5..0000000
--- a/python/pygtk2/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  OPTS="$OPTS  --enable-thread"
-
-  default_build
-
-) > $C_FIFO 2>&1
diff --git a/python/pygtk2/CONFLICTS b/python/pygtk2/CONFLICTS
deleted file mode 100644
index 15d152e..0000000
--- a/python/pygtk2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts pygtk
diff --git a/python/pygtk2/DEPENDS b/python/pygtk2/DEPENDS
deleted file mode 100644
index 6419684..0000000
--- a/python/pygtk2/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends  pygobject  &&
-depends  gtk+-2     &&
-depends  pycairo    &&
-optional_depends  "libglade2"  ""  "" \
-                  "to build the libglade Python bindings (recommended)"
diff --git a/python/pygtk2/DETAILS b/python/pygtk2/DETAILS
deleted file mode 100644
index 0dcd0cf..0000000
--- a/python/pygtk2/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=pygtk2
-             MOD=pygtk
-         VERSION=2.10.6
-           MAJOR=2.10
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:aaa22fce4cf4f1d22f0586975dced4cc6bc4881a
-        WEB_SITE=http://www.pygtk.org
-         ENTERED=20020726
-         UPDATED=20071029
-           SHORT="Python bindings for Gtk+-2"
-
-cat << EOF
-PyGTK is an extension module for python that gives you access to the GTK+ 
-widget set.  Just about anything you can write in C with GTK+ you can write 
-in python with PyGTK (within reason), but with all the benefits of python.
-EOF
diff --git a/python/pygtk2/PRE_BUILD b/python/pygtk2/PRE_BUILD
deleted file mode 100644
index 68b0a87..0000000
--- a/python/pygtk2/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-
-# declare pygobject.h rogue so it doesn't get removed!
-if [ -f $INSTALL_LOGS/pygtk2* ]; then
-  sedit "/\/usr\/include\/pygtk-2.0\/pygobject.h/d" $INSTALL_LOGS/pygtk2*
-fi
diff --git a/python/pypoppler/DEPENDS b/python/pypoppler/DEPENDS
index cbdf898..ff761eb 100644
--- a/python/pypoppler/DEPENDS
+++ b/python/pypoppler/DEPENDS
@@ -1,2 +1,2 @@
-depends  pygtk2
+depends  pygtk
 depends  poppler
diff --git a/python/sexy-python/DEPENDS b/python/sexy-python/DEPENDS
index 14d7d59..bd0a95c 100644
--- a/python/sexy-python/DEPENDS
+++ b/python/sexy-python/DEPENDS
@@ -1,2 +1,2 @@
-depends  pygtk2
+depends  pygtk
 depends  libsexy
diff --git a/python/winzig/DEPENDS b/python/winzig/DEPENDS
index 40618e7..8642e23 100644
--- a/python/winzig/DEPENDS
+++ b/python/winzig/DEPENDS
@@ -1 +1 @@
-depends pygtk2
+depends pygtk
diff --git a/science/galculator/DEPENDS b/science/galculator/DEPENDS
index 3feb459..097e91a 100644
--- a/science/galculator/DEPENDS
+++ b/science/galculator/DEPENDS
@@ -1 +1 @@
-depends libglade2
+depends libglade
diff --git a/science/qalculate-gtk/DEPENDS b/science/qalculate-gtk/DEPENDS
index e567c16..43455ab 100644
--- a/science/qalculate-gtk/DEPENDS
+++ b/science/qalculate-gtk/DEPENDS
@@ -1,5 +1,5 @@
 depends  libqalculate  &&
-depends  libglade2     &&
+depends  libglade     &&
 depends  scrollkeeper  &&
 
 optional_depends  "gnuplot"  ""  ""  "to enable plotting support"        &&
diff --git a/security/revelation/DEPENDS b/security/revelation/DEPENDS
index 09ecce2..7557127 100644
--- a/security/revelation/DEPENDS
+++ b/security/revelation/DEPENDS
@@ -1,4 +1,4 @@
 depends  gtk+-2               
-depends  gnome-python2-extras
+depends  gnome-python-extras
 depends  gnome-python-desktop
 depends  pycrypto
diff --git a/security/setools/DEPENDS b/security/setools/DEPENDS
index cf9e639..40071ee 100644
--- a/security/setools/DEPENDS
+++ b/security/setools/DEPENDS
@@ -1,2 +1,2 @@
 depends policycoreutils &&
-depends libglade2
+depends libglade
diff --git a/sql/mysql-administrator/DEPENDS b/sql/mysql-administrator/DEPENDS
index 54da22e..300655c 100644
--- a/sql/mysql-administrator/DEPENDS
+++ b/sql/mysql-administrator/DEPENDS
@@ -1,4 +1,4 @@
 depends mysql &&
-depends gtkmm2 &&
-depends libglade2 &&
+depends gtkmm &&
+depends libglade &&
 depends gtkhtml3
diff --git a/sql/mysql-gui-tools/DEPENDS b/sql/mysql-gui-tools/DEPENDS
index e84020d..d4ff761 100644
--- a/sql/mysql-gui-tools/DEPENDS
+++ b/sql/mysql-gui-tools/DEPENDS
@@ -1,6 +1,6 @@
 depends mysql
-depends gtkmm2
-depends libglade2
+depends gtkmm
+depends libglade
 depends libsigc++2
 depends glib-2
 optional_depends  "gtkhtml3"  ""  ""  "for the MySQL Query Browser"
diff --git a/sql/mysql-query-browser/DEPENDS b/sql/mysql-query-browser/DEPENDS
index 54da22e..300655c 100644
--- a/sql/mysql-query-browser/DEPENDS
+++ b/sql/mysql-query-browser/DEPENDS
@@ -1,4 +1,4 @@
 depends mysql &&
-depends gtkmm2 &&
-depends libglade2 &&
+depends gtkmm &&
+depends libglade &&
 depends gtkhtml3
diff --git a/video/kino/DEPENDS b/video/kino/DEPENDS
index 3e34f65..19208e1 100644
--- a/video/kino/DEPENDS
+++ b/video/kino/DEPENDS
@@ -2,7 +2,7 @@ depends  gtk+-2
 depends  libraw1394
 depends  libdv
 depends  libavc1394
-depends  libglade2
+depends  libglade
 depends  libsamplerate
 depends  libiec61883
 
diff --git a/video/miro/DEPENDS b/video/miro/DEPENDS
index b1ee3b3..bab5313 100644
--- a/video/miro/DEPENDS
+++ b/video/miro/DEPENDS
@@ -1,4 +1,4 @@
-depends gnome-python2-extras
+depends gnome-python-extras
 depends boost
 depends xine-lib
 depends Pyrex
diff --git a/video/subtitleeditor/DEPENDS b/video/subtitleeditor/DEPENDS
index 4dee23c..6b8a375 100644
--- a/video/subtitleeditor/DEPENDS
+++ b/video/subtitleeditor/DEPENDS
@@ -1,5 +1,5 @@
 depends gtk+-2       &&
-depends gtkmm2       &&
+depends gtkmm       &&
 depends libglademm   &&
 depends aspell       &&
 depends gstreamer-10
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 9a82e4d..935cd46 100644
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -19,11 +19,8 @@ optional_depends  "libmpcdec"    ""  ""  "for Musepack support"
 optional_depends  "libxml2"      ""  ""  "for XML support"
 optional_depends  "libpng"       ""  ""  "for PNG support"
 optional_depends  "gnutls"       ""  ""  "for TLS/SSL support"
-optional_depends  "libdvdnav"    "--enable-dvdnav"  ""  "for DVD navigation"
-optional_depends  "gnome-vfs2"   "--enable-gnomevfs"  ""  "for GNOME Vfs support"
-
-
-
+optional_depends  "libdvdnav"    ""  ""  "for DVD navigation"
+optional_depends  "gnome-vfs"   ""  ""  "for GNOME Vfs support"
 optional_depends  "ncurses"               \
                   "--enable-ncurses"      \
                   ""                      \
diff --git a/web/epiphany-extensions/DETAILS b/web/epiphany-extensions/DETAILS
index 2f4e994..0deb947 100644
--- a/web/epiphany-extensions/DETAILS
+++ b/web/epiphany-extensions/DETAILS
@@ -1,12 +1,12 @@
           MODULE=epiphany-extensions
-         VERSION=2.18.3
-           MAJOR=2.18
+         VERSION=2.22.2
+           MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_VFY=sha1:6d6ce16aea20980a9b2f49388e66d2dfa159c221
+      SOURCE_VFY=sha1:0dff50f48a14e01dc358fa484b218f6d6a7f5519
    SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/$MAJOR/
         WEB_SITE=http://www.gnome.org/projects/epiphany/
          ENTERED=20030413
-         UPDATED=20070823
+         UPDATED=20080601
            SHORT="set of extensions for Epiphany like mouse gestures and a popup blocker"
        LDD_CHECK=off
 
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index 204c8d3..f76dd01 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -10,7 +10,7 @@ optional_depends "sqlite" \
                  "--disable-system-sqlite" \
                  "use sqlite for firefox storage"
 optional_depends "flash-plugin-9" "" "" "to enable Shockwave Flash 9"
-optional_depends "gnome-vfs2" "" "--disable-gnomevfs" "for Gnome VFS support"
+optional_depends "gnome-vfs" "" "--disable-gnomevfs" "for Gnome VFS support"
 optional_depends "heimdal" \
                  "--with-gssapi=/usr/include/heimdal" \
                  "--without-gssapi" \
diff --git a/web/firefox2/DEPENDS b/web/firefox2/DEPENDS
index 2f0ea9e..81576b7 100644
--- a/web/firefox2/DEPENDS
+++ b/web/firefox2/DEPENDS
@@ -6,7 +6,7 @@ depends  gtk+-2  &&
 
 optional_depends  "flash-plugin-9"  ""  ""                    \
                   "to enable Shockwave Flash 9"               &&
-optional_depends  "gnome-vfs2"    ""  "--disable-gnomevfs"  \
+optional_depends  "gnome-vfs"    ""  "--disable-gnomevfs"  \
                   "for Gnome VFS support"                   &&
 optional_depends  "heimdal"                                 \
                   "--with-gssapi=/usr/include/heimdal"      \
diff --git a/x11-apps/dia/DEPENDS b/x11-apps/dia/DEPENDS
index 47ab00b..c12548c 100644
--- a/x11-apps/dia/DEPENDS
+++ b/x11-apps/dia/DEPENDS
@@ -2,6 +2,6 @@ depends PyXML
 depends libxml2
 depends gtk+-2
 depends libart_lgpl
-depends pygtk2
+depends pygtk
 
 optional_depends "libgnomeui" "--enable-gnome" "" "for GNOME support"
diff --git a/x11-apps/gnucash/DEPENDS b/x11-apps/gnucash/DEPENDS
index 34f7305..68fd227 100644
--- a/x11-apps/gnucash/DEPENDS
+++ b/x11-apps/gnucash/DEPENDS
@@ -1,4 +1,4 @@
-depends  libglade2
+depends  libglade
 depends  swig
 depends  gtkhtml3
 depends  libofx
diff --git a/x11-apps/gnucash/DETAILS b/x11-apps/gnucash/DETAILS
index 8f15b24..6ec167c 100644
--- a/x11-apps/gnucash/DETAILS
+++ b/x11-apps/gnucash/DETAILS
@@ -1,14 +1,14 @@
           MODULE=gnucash
-         VERSION=2.2.4
+         VERSION=2.2.5
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=$SFORGE_URL/$MODULE/
    SOURCE_URL[1]=http://ibiblio.org/pub/Linux/X11/gnome/sources/gnucash/
    SOURCE_URL[2]=http://www.gnucash.org/pub/gnucash/sources/stable/
-      SOURCE_VFY=sha1:80a586e56f460c22f7a903cce5b5993fbd9bf327
+      SOURCE_VFY=sha1:91fc316baf7d29a49d3f4be3b2e4aefb5403159c
         WEB_SITE=http://www.gnucash.org
       MAINTAINER=tchan at lunar-linux.org
          ENTERED=20011105
-         UPDATED=20080303
+         UPDATED=20080702
            SHORT="GNUCash a open source personal finance suite"
 cat << EOF
 GnuCash allows you to track bank accounts, stocks, income, and expenses.
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 16aa1ad..42dec55 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -46,7 +46,7 @@ optional_depends "evolution-data-server"            \
                  "--disable-evolution2"             \
                  "for Evolution addressbook support"
 
-optional_depends "gnome-vfs2"                             \
+optional_depends "gnome-vfs"                             \
                  "--enable-gnome-vfs --enable-lockdown"   \
                  "--disable-gnome-vfs --disable-lockdown" \
                  "for GNOME-vfs integration"
diff --git a/x11-utils/cairo-clock/DEPENDS b/x11-utils/cairo-clock/DEPENDS
index 51a357c..52a200a 100644
--- a/x11-utils/cairo-clock/DEPENDS
+++ b/x11-utils/cairo-clock/DEPENDS
@@ -1,2 +1,2 @@
-depends  libglade2
+depends  libglade
 depends  librsvg
diff --git a/x11-utils/devilspie/DEPENDS b/x11-utils/devilspie/DEPENDS
index 3feb459..097e91a 100644
--- a/x11-utils/devilspie/DEPENDS
+++ b/x11-utils/devilspie/DEPENDS
@@ -1 +1 @@
-depends libglade2
+depends libglade
diff --git a/x11-utils/gparted/DEPENDS b/x11-utils/gparted/DEPENDS
index 13e7471..473b31b 100644
--- a/x11-utils/gparted/DEPENDS
+++ b/x11-utils/gparted/DEPENDS
@@ -1,4 +1,4 @@
 depends  parted
-depends  gtkmm2
+depends  gtkmm
 
 optional_depends  "mtools"  ""  ""  "for fat32 volume label support"
diff --git a/x11-utils/notification-daemon/DEPENDS b/x11-utils/notification-daemon/DEPENDS
index 07757a6..9e9a67f 100644
--- a/x11-utils/notification-daemon/DEPENDS
+++ b/x11-utils/notification-daemon/DEPENDS
@@ -1,4 +1,4 @@
 depends  libsexy
 depends  dbus-glib
 depends  libwnck
-depends  GConf2
+depends  GConf
diff --git a/x11-utils/obconf/DEPENDS b/x11-utils/obconf/DEPENDS
index 447d427..b4e40da 100644
--- a/x11-utils/obconf/DEPENDS
+++ b/x11-utils/obconf/DEPENDS
@@ -1,5 +1,5 @@
 depends gtk+-2 &&
 depends openbox &&
-depends libglade2 &&
+depends libglade &&
 depends startup-notification &&
 depends pkgconfig
diff --git a/x11/driconf/DEPENDS b/x11/driconf/DEPENDS
index b967bac..6dea34c 100644
--- a/x11/driconf/DEPENDS
+++ b/x11/driconf/DEPENDS
@@ -1,2 +1,2 @@
-depends pygtk2
+depends pygtk
 depends xdriinfo
diff --git a/x11/libgksu/DEPENDS b/x11/libgksu/DEPENDS
index f9b0047..b920b82 100644
--- a/x11/libgksu/DEPENDS
+++ b/x11/libgksu/DEPENDS
@@ -1,5 +1,5 @@
 depends gtk+-2
-depends libgtop2
+depends libgtop
 depends startup-notification
 optional_depends  "gtk-doc"  ""  "--disable-gtk-doc"  \
                   "to install additional documentation"
diff --git a/x11/libxklavier/DETAILS b/x11/libxklavier/DETAILS
index b350519..d4c8f85 100644
--- a/x11/libxklavier/DETAILS
+++ b/x11/libxklavier/DETAILS
@@ -1,16 +1,17 @@
           MODULE=libxklavier
-         VERSION=3.3
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=$SFORGE_URL/gswitchit
-      SOURCE_VFY=sha1:19312997d5ec929f4057cb33c3806d494606c5cf
+           MAJOR=3.6
+         VERSION=3.6
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:a9c42970b807f2cbd69fa3ae853606c9b505fc0c
         WEB_SITE=http://www.freedesktop.org/wiki/Software/LibXklavier
          ENTERED=20031201
-         UPDATED=20070926
+         UPDATED=20080601
            SHORT="library providing high-level API for XKB"
 
 cat << EOF
-libxklavier is a library providing high-level API for X Keyboard 
-Extension known as XKB. This library is indended to support XFree86 
-and other commercial X servers. It is useful for creating XKB-related 
+libxklavier is a library providing high-level API for X Keyboard
+Extension known as XKB. This library is indended to support XFree86
+and other commercial X servers. It is useful for creating XKB-related
 software (layout indicators etc).
 EOF
diff --git a/xfce4/core/exo/DEPENDS b/xfce4/core/exo/DEPENDS
index 0f8ba8b..d00bcc3 100644
--- a/xfce4/core/exo/DEPENDS
+++ b/xfce4/core/exo/DEPENDS
@@ -1,7 +1,7 @@
 depends  libxfcegui4
 depends  URI
 
-optional_depends  "pygtk2"  "--enable-python"  "--disable-python"  \
+optional_depends  "pygtk"  "--enable-python"  "--disable-python"  \
                   "build python bindings"
 
 optional_depends  "hal" "" "" "enable hal bindings"                   
diff --git a/xfce4/xfc/DEPENDS b/xfce4/xfc/DEPENDS
index 949786a..443db3a 100644
--- a/xfce4/xfc/DEPENDS
+++ b/xfce4/xfc/DEPENDS
@@ -1,5 +1,5 @@
 depends libsigc++2
 depends gtk+-2
-optional_depends libglade2  ""  ""  "libglade support"
+optional_depends libglade  ""  ""  "libglade support"
 optional_depends doxygen    ""  ""  "to build documentation"
 
diff --git a/zbeta/brasero/DETAILS b/zbeta/brasero/DETAILS
index d131d6a..43cf4ab 100644
--- a/zbeta/brasero/DETAILS
+++ b/zbeta/brasero/DETAILS
@@ -1,17 +1,17 @@
           MODULE=brasero
-         VERSION=0.7.0
+         VERSION=0.7.90
            MAJOR=0.7
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:154948d4993b15e1cc919360b627d4621e52d234 
+      SOURCE_VFY=sha1:18db56ca467872cb89862948d028b252a304bdca
         WEB_SITE=http://developer.gnome.org/projects/gap/
          ENTERED=20080119
-         UPDATED=20080119
+         UPDATED=20080617
            SHORT="Brasero is a CD/DVD mastering tool for the gnome desktop"
 
 cat << EOF
 Brasero (aka Bonfire) is a CD/DVD mastering tool for the gnome desktop. It has been designed to be simple and easy to use.
- 
+
 Features:
 
 Supports multiple backends:
diff --git a/zbeta/compiz-fusion/compiz/DEPENDS b/zbeta/compiz-fusion/compiz/DEPENDS
index 9c38265..eb87c00 100644
--- a/zbeta/compiz-fusion/compiz/DEPENDS
+++ b/zbeta/compiz-fusion/compiz/DEPENDS
@@ -1,5 +1,5 @@
 depends  dbus-glib
-depends  GConf2
+depends  GConf
 
 optional_depends  "fuse"      ""  "--disable-fuse"      \
                   "for the fuse plugin"
diff --git a/zbeta/gcompris/DEPENDS b/zbeta/gcompris/DEPENDS
index f36f261..a7655e3 100644
--- a/zbeta/gcompris/DEPENDS
+++ b/zbeta/gcompris/DEPENDS
@@ -2,5 +2,5 @@ depends sqlite2
 depends gnuchess
 depends XML-Parser
 depends teTeX
-depends pygtk2
+depends pygtk
 depends libgnomecanvas
diff --git a/zbeta/pan-cvs/DEPENDS b/zbeta/pan-cvs/DEPENDS
index 3600ef1..940106f 100644
--- a/zbeta/pan-cvs/DEPENDS
+++ b/zbeta/pan-cvs/DEPENDS
@@ -2,4 +2,4 @@ depends  gnet    &&
 depends  gtk+-2  &&
 depends  libxml2 &&
 depends  pcre    &&
-depends  gnome-common2
+depends  gnome-common


More information about the Lunar-commits mailing list