Bump to a real 3.4 release. Drop pre-release version.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

7 files changed, 25 insertions, 408 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 1aa5c405df3a..279153a76d2b 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.7 2012/05/14 00:07:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.8 2012/05/19 09:12:45 tetromino Exp $
+
+*gnome-tweak-tool-3.4.0.1 (19 May 2012)
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-tweak-tool-3.3.4-r1.ebuild,
+  -files/gnome-tweak-tool-3.3.4-missing-schemas.patch,
+  -files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch,
+  -files/gnome-tweak-tool-3.3.4-static-workspaces.patch,
+  -files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch,
+  +gnome-tweak-tool-3.4.0.1.ebuild:
+  Bump to a real 3.4 release. Drop pre-release version.
 
 *gnome-tweak-tool-3.3.4-r1 (14 May 2012)
 
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index d87f2076795c..5a16207faef4 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -5,24 +5,20 @@ AUX gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch 1030 RMD160 cea6d3a71966ee
 AUX gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch 1910 RMD160 da211ede6c8f614d204bb5eea0741506a531f139 SHA1 650bb4df2e33ae342281b9bef28ee21b23578719 SHA256 6ebeaad2fb388b661bb6f3db9fc1c7751758e0a3c187d5d0c69121249a00f920
 AUX gnome-tweak-tool-3.2.2-missing-schemas-error.patch 881 RMD160 ba1ad55a1780d33cfd8fb5efcfea47011710a26b SHA1 5971a7546576074690bdf1bd9aa7c61290b02037 SHA256 bc42caa2e89da1e8198165ab9cdf12a6a9a5d640d5dcff469d5334cc84195c32
 AUX gnome-tweak-tool-3.2.2-user-theme-ext-id.patch 1192 RMD160 cb82e49ad51747eb733762dd08bbec577b78bd3a SHA1 a74379378a7b0d017622877675096b76e2919e5b SHA256 11a4819917b46c6f8f13f49905e03a3477a00123ea7beb6a57b89e9d8c45626c
-AUX gnome-tweak-tool-3.3.4-missing-schemas.patch 6893 RMD160 41a5e368ab4b2c4cd3a91fea6586ca39f59bd8d9 SHA1 ac379ff2d29d0a3cc22089fc480e5df8879381e2 SHA256 4f0f60978931acbf7e2b988a6f06483c7434453f84395f16aa52a4a6e6cd4434
-AUX gnome-tweak-tool-3.3.4-shell-theme-schema.patch 3736 RMD160 e4b517b7469882bdf24dfa679ea885418e0a3b0e SHA1 264ce7b0b9ef55193218634655a3aef0bfca545b SHA256 c8861d3c1d8367bbe6489e80fc992df8a31df58ffe1873541cb303114fe31c93
-AUX gnome-tweak-tool-3.3.4-static-workspaces.patch 3118 RMD160 2c551c076d47478665655b7e98410499fedbe004 SHA1 03d034b913e5004f2c7a71c39830bbaf5075ecdc SHA256 8d9c8e6c38913b5bc7b3a2df9b1c8b2be262e60dd1f756265f4f6d7f1478a7c7
-AUX gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch 2807 RMD160 91a3dc6b4ed00272d65556bac1ecd2e6d2fd2bea SHA1 3f92299c68cb25f20aa23de64753e13b02e07387 SHA256 f2ef6479a204cebdedd22c4e6a5cacae0b63ac5b51ad31445f0492873214b8d7
 DIST gnome-tweak-tool-3.2.2.tar.xz 198904 RMD160 1354a1c0bfb355757cb67f7ca614df40eb907ad5 SHA1 dace7d9b4bc17a3574030215d34349a977808aed SHA256 57ad08b813ca2f5ea2e131b22cb365d33788d051b80f3f6decc04e3a5404f8f5
-DIST gnome-tweak-tool-3.3.4.tar.xz 201984 RMD160 7c63a42458b2de82724e8dc366e7f98b71d99563 SHA1 6234a57fd277a414e8cacd5b32b8f459bc7963dd SHA256 de18bf67e44af1b6757cf8e3a78c480b84286658be3d5d9ba7c13f5c49763dc6
+DIST gnome-tweak-tool-3.4.0.1.tar.xz 205164 RMD160 f326f04ea0d314d773cbaa521fd28f3b56f4fa51 SHA1 f36134505d7f2a734fee80980c3384247aa2e994 SHA256 b060840fdf1e97c943e20e390acd25186fa3ce4ec5cddf044d1944e148d4ebd6
 EBUILD gnome-tweak-tool-3.2.2-r2.ebuild 1967 RMD160 0153bb41238e664e9ee1bbdc6de07ace79ee9001 SHA1 a5250a1b84cf2479b01798c2292d8b0a1d93af5b SHA256 324ecb928570f49f2ff9f65e1b3fcb2501e07c6a3cd9ed175cb3357504f598c3
-EBUILD gnome-tweak-tool-3.3.4-r1.ebuild 1800 RMD160 ba486a032dfe6875e1489a89695b573f5e622ed7 SHA1 710d51f2f525e1f812e3c5c654084d2d680e5baf SHA256 69916f12e4b44b7bb9a8e0e39bfef31d1ea8a41d71cda80b37c317bd44e9cb0f
-MISC ChangeLog 2143 RMD160 4f074a5dfc9f0ffb78df485f098b075a9854c8f1 SHA1 64c39925c01910d1fe5aed5e694cb4edee42a49a SHA256 b64e78cd834e1fe8c36511be4ee3d0a27b2991dca5699b6b97de6e5ba47c5b48
+EBUILD gnome-tweak-tool-3.4.0.1.ebuild 1556 RMD160 18113961c8a1a38ab18cd414a501a5d1a0a4e973 SHA1 660462d9f22d14cb172b34ac721336aca73d7b4c SHA256 512cb4fe3fa67f34efc648d426b90494de1e05058bba1db38a56d7a1dbbf08c1
+MISC ChangeLog 2609 RMD160 9f091cac00a9a0d3f5028ae3b69c4f449efc566b SHA1 c78e4a926537d5dc9be56109e61ba4e29cba574c SHA256 f82a233949a4e70515e8e9e8a39c2d139bc02db80f20bcaa7f6657991c3d174c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsEzSAAoJEJ0WA1zPCt1h9cwH/iE6vcWFfpaQ89IOvfHwhs58
-xAfqPtsCf88FP13LOxYOolynDZaaVhNlye4XZygVMHA2quZJHtY0IxAgOXR3HwgE
-nTkg6QfNmwsfoqS7Ib5fEX1RfPeHrjxBhq1LNWR48N/GxUUa9jcuuRSY2/QCWmI3
-Tscha9bbUo8+4JTJXFZYvPPlTEV3p3JcYRkEEQA33EWADeMuk49VLVN0XrVyPyOx
-Dx6FTPihQzq4OXGa5RZBGugeoexWoIwGYYdR+MNwTbSDwHr2mu2LSTM81wpAshtD
-OocfCp9Gp1FuIdCn0qsinNNP5hYiioLzszkScW6Lk16L82QsShchcXgdxzxo0Ms=
-=vegJ
+iQEcBAEBAgAGBQJPt2QTAAoJEJ0WA1zPCt1hHYsH/iKtmmVItBwl4VU30b8s5H8s
+JPAWdy82XvwucQMeLi9qxdgNXVpii8lzGnrI5wXoDYtoDzQsLcl4dmTK4r90Pgvb
+8KXs9gdFmEcdnCyY1mPf2heY9KT9tZdecB5qAtye/vIwQWMbwj4tPl9nwEsNEgid
+stmpAy+CQXqycLsahELEPgxnYpluU6uU8Pmv1wrTguZbPHj1xFSo0xvSxTaPn2XU
+cSDWQGiGsQqMgjPtO16Q5IGa9iszbH5yhsvKQgKvZKEfdjjctaYulkxSkuWKCcKx
+2eGWCOHiGh7P/uvzepA/HHghYUfEyux4CYAPls7L0RrtU8zeI2TbiIpgq4G3+68=
+=yTCB
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch
deleted file mode 100644
index 33ea00ab4453..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 81ee17f1b0352347b1bf5f2bdad25e0fc2c7c3eb Mon Sep 17 00:00:00 2001
-From: John Stowers <john.stowers@gmail.com>
-Date: Wed, 18 Jan 2012 21:10:45 +1300
-Subject: [PATCH] Dont crash on missing schemas
-
----
- gtweak/gsettings.py  |   23 ++++++++++++++++++++++-
- gtweak/tweakmodel.py |    3 +++
- gtweak/widgets.py    |   32 ++++++++++++++++++++------------
- 3 files changed, 45 insertions(+), 13 deletions(-)
-
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index 9ab8749..e334637 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -23,6 +23,12 @@ import gtweak
- 
- from gi.repository import Gio, GLib
- 
-+_SCHEMA_CACHE = {}
-+_GSETTINGS_SCHEMAS = set(Gio.Settings.list_schemas())
-+
-+class GSettingsMissingError(Exception):
-+    pass
-+
- class _GSettingsSchema:
-     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
-         if not schema_dir:
-@@ -64,10 +70,25 @@ class _GSettingsSchema:
-     def __repr__(self):
-         return "<gtweak.gsettings._GSettingsSchema: %s>" % self._schema_name
- 
--_SCHEMA_CACHE = {}
-+class GSettingsFakeSetting:
-+    def __init__(self):
-+        pass
-+
-+    def get_range(self, *args, **kwargs):
-+        return False, []
-+
-+    def get_string(self, *args, **kwargs):
-+        return ""
-+
-+    def __getattr__(self, name):
-+        def noop(*args, **kwargs):
-+            pass
-+        return noop
- 
- class GSettingsSetting(Gio.Settings):
-     def __init__(self, schema_name, **options):
-+        if schema_name not in _GSETTINGS_SCHEMAS:
-+            raise GSettingsMissingError(schema_name)
-         Gio.Settings.__init__(self, schema_name)
-         if schema_name not in _SCHEMA_CACHE:
-             _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options)
-diff --git a/gtweak/tweakmodel.py b/gtweak/tweakmodel.py
-index d67ce5a..558a329 100644
---- a/gtweak/tweakmodel.py
-+++ b/gtweak/tweakmodel.py
-@@ -35,6 +35,7 @@ class Tweak:
-         self.name = name
-         self.description = description
-         self.group_name = options.get("group_name",_("Miscellaneous"))
-+        self.loaded = True
- 
-         self._search_cache = None
- 
-@@ -148,6 +149,8 @@ class TweakModel(Gtk.ListStore):
-         self._tweak_group_names[tweakgroup.name] = tweakgroup
- 
-     def add_tweak_auto_to_group(self, tweak):
-+        if not tweak.loaded:
-+            return
-         name = tweak.group_name
-         try:
-             group = self._tweak_group_names[name]
-diff --git a/gtweak/widgets.py b/gtweak/widgets.py
-index 4a7646f..c915a17 100644
---- a/gtweak/widgets.py
-+++ b/gtweak/widgets.py
-@@ -15,10 +15,12 @@
- # You should have received a copy of the GNU General Public License
- # along with gnome-tweak-tool.  If not, see <http://www.gnu.org/licenses/>.
- 
-+import logging
-+
- from gi.repository import Gtk, Gdk, Gio, Pango
- 
- from gtweak.tweakmodel import Tweak
--from gtweak.gsettings import GSettingsSetting
-+from gtweak.gsettings import GSettingsSetting, GSettingsFakeSetting, GSettingsMissingError
- from gtweak.gconf import GConfSetting
- 
- def build_label_beside_widget(txt, *widget, **kwargs):
-@@ -97,11 +99,17 @@ class _GSettingsTweak(Tweak):
-     def __init__(self, schema_name, key_name, **options):
-         self.schema_name = schema_name
-         self.key_name = key_name
--        self.settings = GSettingsSetting(schema_name, **options)
--        Tweak.__init__(self,
--            options.get("summary",self.settings.schema_get_summary(key_name)),
--            options.get("description",self.settings.schema_get_description(key_name)),
--            **options)
-+        try:
-+            self.settings = GSettingsSetting(schema_name, **options)
-+            Tweak.__init__(self,
-+                options.get("summary",self.settings.schema_get_summary(key_name)),
-+                options.get("description",self.settings.schema_get_description(key_name)),
-+                **options)
-+        except GSettingsMissingError, e:
-+            self.settings = GSettingsFakeSetting()
-+            Tweak.__init__(self,"","")
-+            self.loaded = False
-+            logging.info("Missing gsettings %s (key %s)" % (e.message, key_name))
- 
- class GSettingsSwitchTweak(_GSettingsTweak):
-     def __init__(self, schema_name, key_name, **options):
-@@ -109,7 +117,7 @@ class GSettingsSwitchTweak(_GSettingsTweak):
- 
-         w = Gtk.Switch()
-         self.settings.bind(key_name, w, "active", Gio.SettingsBindFlags.DEFAULT)
--        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         # never change the size of a switch
-         self.widget_for_size_group = None
- 
-@@ -119,7 +127,7 @@ class GSettingsFontButtonTweak(_GSettingsTweak):
- 
-         w = Gtk.FontButton()
-         self.settings.bind(key_name, w, "font-name", Gio.SettingsBindFlags.DEFAULT)
--        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         self.widget_for_size_group = w
- 
- class GSettingsRangeTweak(_GSettingsTweak):
-@@ -131,7 +139,7 @@ class GSettingsRangeTweak(_GSettingsTweak):
- 
-         w = Gtk.HScale.new_with_range(_min, _max, options.get('adjustment_step', 1))
-         self.settings.bind(key_name, w.get_adjustment(), "value", Gio.SettingsBindFlags.DEFAULT)
--        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         self.widget_for_size_group = w
- 
- class GSettingsSpinButtonTweak(_GSettingsTweak):
-@@ -146,7 +154,7 @@ class GSettingsSpinButtonTweak(_GSettingsTweak):
-         w.set_adjustment(adjustment)
-         w.set_digits(options.get('digits', 0))
-         self.settings.bind(key_name, adjustment, "value", Gio.SettingsBindFlags.DEFAULT)
--        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         self.widget_for_size_group = w
- 
- class GSettingsComboEnumTweak(_GSettingsTweak):
-@@ -161,7 +169,7 @@ class GSettingsComboEnumTweak(_GSettingsTweak):
-         w.connect('changed', self._on_combo_changed)
-         self.combo = w
- 
--        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         self.widget_for_size_group = w
- 
- 
-@@ -246,7 +254,7 @@ class GConfFontButtonTweak(_GConfTweak):
-         w = Gtk.FontButton()
-         w.props.font_name = self.gconf.get_value()
-         w.connect("notify::font-name", self._on_fontbutton_changed)
--        self.widget = build_label_beside_widget(self.gconf.schema_get_summary(), w)
-+        self.widget = build_label_beside_widget(self.name, w)
-         self.widget_for_size_group = w
- 
-     def _on_fontbutton_changed(self, btn, param):
--- 
-1.7.8.6
-
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch
deleted file mode 100644
index eb9fd14c0a93..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 6fbecd5f847fceff3942dc6b1370fb5514e7c293 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Sun, 29 Apr 2012 23:58:20 +0200
-Subject: [PATCH] Shell Theme: load settings schema from user directory
-
-Recent versions of the user-theme extension install the GSettings
-schema in the extension directory, to comply with extensions.gnome.org
-rules.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675106
----
- gtweak/gsettings.py          |   20 ++++++++++++++++----
- gtweak/tweaks/tweak_shell.py |    8 +++++++-
- 2 files changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index e334637..2739d6a 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -86,12 +86,24 @@ class GSettingsFakeSetting:
-         return noop
- 
- class GSettingsSetting(Gio.Settings):
--    def __init__(self, schema_name, **options):
--        if schema_name not in _GSETTINGS_SCHEMAS:
-+    def __init__(self, schema_name, schema_dir=None, **options):
-+        if schema_dir is None and schema_name not in _GSETTINGS_SCHEMAS:
-             raise GSettingsMissingError(schema_name)
--        Gio.Settings.__init__(self, schema_name)
-+        if schema_dir is None:
-+            Gio.Settings.__init__(self, schema_name)
-+        else:
-+            GioSSS = Gio.SettingsSchemaSource
-+            schema_source = GioSSS.new_from_directory(schema_dir,
-+                                                      GioSSS.get_default(),
-+                                                      False)
-+            schema_obj = schema_source.lookup(schema_name, True)
-+            if not schema_obj:
-+                raise GSettingsMissingError(schema_name)
-+
-+            Gio.Settings.__init__(self, None, settings_schema=schema_obj)
-+
-         if schema_name not in _SCHEMA_CACHE:
--            _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options)
-+            _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, schema_dir=schema_dir, **options)
-             logging.debug("Caching gsettings: %s" % _SCHEMA_CACHE[schema_name])
- 
-         self._schema = _SCHEMA_CACHE[schema_name]
-diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
-index 1d5a91d..5bb664f 100644
---- a/gtweak/tweaks/tweak_shell.py
-+++ b/gtweak/tweaks/tweak_shell.py
-@@ -46,6 +46,8 @@ class ShellThemeTweak(Tweak):
-     THEME_EXT_NAME = "user-theme@gnome-shell-extensions.gcampax.github.com"
-     THEME_GSETTINGS_SCHEMA = "org.gnome.shell.extensions.user-theme"
-     THEME_GSETTINGS_NAME = "name"
-+    THEME_GSETTINGS_DIR = os.path.join(GLib.get_user_data_dir(), "gnome-shell", "extensions",
-+                                       THEME_EXT_NAME, "schemas")
-     THEME_DIR = os.path.join(GLib.get_home_dir(), ".themes")
- 
-     def __init__(self, **options):
-@@ -63,7 +65,11 @@ class ShellThemeTweak(Tweak):
-             if ShellThemeTweak.THEME_EXT_NAME in extensions and extensions[ShellThemeTweak.THEME_EXT_NAME]["state"] == 1:
-                 #check the correct gsettings key is present
-                 try:
--                    self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA)
-+                    if os.path.exists(ShellThemeTweak.THEME_GSETTINGS_DIR):
-+                        self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA,
-+                                                          schema_dir=ShellThemeTweak.THEME_GSETTINGS_DIR)
-+                    else:
-+                        self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA)
-                     name = self._settings.get_string(ShellThemeTweak.THEME_GSETTINGS_NAME)
- 
-                     ext = extensions[ShellThemeTweak.THEME_EXT_NAME]
--- 
-1.7.8.6
-
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch
deleted file mode 100644
index 757d77c2281e..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From c8410742023ff973c05bd1e30f65e4e1574a0367 Mon Sep 17 00:00:00 2001
-From: John Stowers <john.stowers@gmail.com>
-Date: Wed, 9 May 2012 13:38:22 +0200
-Subject: [PATCH] Support dynamic/static workspaces
-
----
- gtweak/tweaks/tweak_shell.py |   37 ++++++++++++++++++++++++++++++++++---
- 1 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
-index b4552ea..8c21de5 100644
---- a/gtweak/tweaks/tweak_shell.py
-+++ b/gtweak/tweaks/tweak_shell.py
-@@ -22,8 +22,7 @@ import logging
- import json
- import pprint
- 
--from gi.repository import Gtk
--from gi.repository import GLib
-+from gi.repository import Gtk, GLib, GObject, Gio
- 
- from gtweak.utils import walk_directories, extract_zip_file, make_combo_list_with_default
- from gtweak.gsettings import GSettingsSetting
-@@ -184,6 +183,37 @@ class ShellThemeTweak(Tweak):
-         val = combo.get_model().get_value(combo.get_active_iter(), 0)
-         self._settings.set_string(ShellThemeTweak.THEME_GSETTINGS_NAME, val)
- 
-+class StaticWorkspaceTweak(Tweak):
-+
-+    NUM_WORKSPACES_SCHEMA = "org.gnome.desktop.wm.preferences"
-+    NUM_WORKSPACES_KEY = "num-workspaces"
-+
-+    DYNAMIC_SCHEMA = "org.gnome.shell.overrides"
-+    DYNAMIC_KEY = "dynamic-workspaces"
-+
-+    def __init__(self, **options):
-+        Tweak.__init__(self, "Dynamic workspaces", "Disable gnome-shell dynamic workspace management, use static workspaces", **options)
-+
-+        settings = GSettingsSetting(self.NUM_WORKSPACES_SCHEMA, **options)
-+        adj = Gtk.Adjustment(1, 1, 99, 1)
-+        sb = Gtk.SpinButton(adjustment=adj, digits=0)
-+        settings.bind(self.NUM_WORKSPACES_KEY, adj, "value", Gio.SettingsBindFlags.DEFAULT)
-+
-+        settings = GSettingsSetting(self.DYNAMIC_SCHEMA, **options)
-+        sw = Gtk.Switch()
-+        settings.bind(self.DYNAMIC_KEY, sw, "active", Gio.SettingsBindFlags.DEFAULT)
-+
-+        #sw.bind_property ("active", sb, "sensitive", GObject.BindingFlags.SYNC_CREATE)
-+        sb.set_sensitive(not settings[self.DYNAMIC_KEY])
-+        sw.connect('notify::active', lambda _sw,_param,_sb: _sb.set_sensitive(not _sw.get_active()), sb)
-+
-+        hb = Gtk.HBox(spacing = 4)
-+        hb.pack_start(sw, False, False, 0)
-+        hb.pack_start(sb, True, True, 0)
-+
-+        self.widget = build_label_beside_widget(self.name, hb)
-+        self.widget_for_size_group = hb
-+
- sg = build_horizontal_sizegroup()
- 
- TWEAKS = (
-@@ -198,5 +228,6 @@ TWEAK_GROUPS = (
-             GSettingsSwitchTweak("org.gnome.shell.calendar", "show-weekdate", schema_filename="org.gnome.shell.gschema.xml"),
-             ShowWindowButtons(schema_filename="org.gnome.shell.gschema.xml", size_group=sg),
-             GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-battery-action", size_group=sg),
--            GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg)),
-+            GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg),
-+            StaticWorkspaceTweak(size_group=sg)),
- )
--- 
-1.7.8.6
-
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch
deleted file mode 100644
index 61a01833871f..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 89c320bbb9ec6cf1542c75e5c35c79e6604301b6 Mon Sep 17 00:00:00 2001
-From: Robin Stocker <robin@nibor.org>
-Date: Tue, 17 Jan 2012 13:24:04 +0100
-Subject: [PATCH] Change widget for text-scaling-factor to SpinButton
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650660
-
-Conflicts:
-
-	gtweak/tweaks/tweak_font.py
----
- gtweak/tweaks/tweak_font.py |    4 ++--
- gtweak/widgets.py           |   15 +++++++++++++++
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_font.py b/gtweak/tweaks/tweak_font.py
-index 7f4b92a..1ace035 100644
---- a/gtweak/tweaks/tweak_font.py
-+++ b/gtweak/tweaks/tweak_font.py
-@@ -18,10 +18,10 @@
- from gi.repository import Gtk
- 
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_FONTS
--from gtweak.widgets import GSettingsRangeTweak, GSettingsFontButtonTweak, GSettingsComboTweak
-+from gtweak.widgets import GSettingsSpinButtonTweak, GSettingsFontButtonTweak, GSettingsComboTweak
- 
- TWEAKS = (
--    GSettingsRangeTweak("org.gnome.desktop.interface", "text-scaling-factor", adjustment_step=0.1, group_name=TWEAK_GROUP_FONTS),
-+    GSettingsSpinButtonTweak("org.gnome.desktop.interface", "text-scaling-factor", adjustment_step=0.1, digits=1, group_name=TWEAK_GROUP_FONTS),
-     GSettingsFontButtonTweak("org.gnome.desktop.interface", "font-name", group_name=TWEAK_GROUP_FONTS),
-     GSettingsFontButtonTweak("org.gnome.desktop.interface", "document-font-name", group_name=TWEAK_GROUP_FONTS),
-     GSettingsFontButtonTweak("org.gnome.desktop.interface", "monospace-font-name", group_name=TWEAK_GROUP_FONTS),
-diff --git a/gtweak/widgets.py b/gtweak/widgets.py
-index 9aa0cd2..4a7646f 100644
---- a/gtweak/widgets.py
-+++ b/gtweak/widgets.py
-@@ -134,6 +134,21 @@ class GSettingsRangeTweak(_GSettingsTweak):
-         self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-         self.widget_for_size_group = w
- 
-+class GSettingsSpinButtonTweak(_GSettingsTweak):
-+    def __init__(self, schema_name, key_name, **options):
-+        _GSettingsTweak.__init__(self, schema_name, key_name, **options)
-+
-+        #returned variant is range:(min, max)
-+        _min, _max = self.settings.get_range(key_name)[1]
-+
-+        adjustment = Gtk.Adjustment(0, _min, _max, options.get('adjustment_step', 1))
-+        w = Gtk.SpinButton()
-+        w.set_adjustment(adjustment)
-+        w.set_digits(options.get('digits', 0))
-+        self.settings.bind(key_name, adjustment, "value", Gio.SettingsBindFlags.DEFAULT)
-+        self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w)
-+        self.widget_for_size_group = w
-+
- class GSettingsComboEnumTweak(_GSettingsTweak):
-     def __init__(self, schema_name, key_name, **options):
-         _GSettingsTweak.__init__(self, schema_name, key_name, **options)
--- 
-1.7.8.6
-
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild
index 4fa0e7bbc9ce..f60e07148f5a 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild,v 1.1 2012/05/14 00:07:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild,v 1.1 2012/05/19 09:12:45 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -18,8 +18,8 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.3.2
-	>=dev-python/pygobject-2.90.0:3
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	>=dev-python/pygobject-3.2.1:3
 	gnome-base/gconf:2"
 # g-s-d, gnome-shell etc. needed at runtime for the gsettings schemas
 RDEPEND="${COMMON_DEPEND}
@@ -46,12 +46,6 @@ src_prepare() {
 	# Add contents of Gentoo's cursor theme directory to cursor theme list
 	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
 
-	# Useful upstream patches
-	epatch "${FILESDIR}/${P}-text-scaling-factor-button.patch"
-	epatch "${FILESDIR}/${P}-missing-schemas.patch"
-	epatch "${FILESDIR}/${P}-static-workspaces.patch"
-	epatch "${FILESDIR}/${P}-shell-theme-schema.patch"
-
 	python_clean_py-compile_files
 
 	gnome2_src_prepare