Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 8 insertions, 176 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index ce9130e44133..ee95a6c08b92 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.17 2013/03/28 22:40:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.18 2013/03/29 22:41:07 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch,
+  -files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch,
+  -files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch,
+  -gnome-tweak-tool-3.4.0.1.ebuild:
+  Clean up old revision.
 
 *gnome-tweak-tool-3.7.4 (28 Mar 2013)
 
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch
deleted file mode 100644
index 21e3db02534b..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 92b3fbafb7a4f43761dfc3469f20c7fad0cf99d0 Mon Sep 17 00:00:00 2001
-From: John Stowers <john.stowers@gmail.com>
-Date: Sun, 20 Nov 2011 22:54:58 +1300
-Subject: [PATCH] Fix compatibility with gnome-shell master
-
----
- gtweak/gshellwrapper.py                 |    4 +++-
- gtweak/tweaks/tweak_shell_extensions.py |    6 +++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gtweak/gshellwrapper.py b/gtweak/gshellwrapper.py
-index 4c4ef81..254d246 100644
---- a/gtweak/gshellwrapper.py
-+++ b/gtweak/gshellwrapper.py
-@@ -51,7 +51,9 @@ class GnomeShell:
-         "ENABLED"       :   1,
-         "DISABLED"      :   2,
-         "ERROR"         :   3,
--        "OUT_OF_DATE"   :   4
-+        "OUT_OF_DATE"   :   4,
-+        "DOWNLOADING"   :   5,
-+        "INITIALIZED"   :   6,
-     }
- 
-     EXTENSION_TYPE = {
-diff --git a/gtweak/tweaks/tweak_shell_extensions.py b/gtweak/tweaks/tweak_shell_extensions.py
-index a453f33..7f883bc 100644
---- a/gtweak/tweaks/tweak_shell_extensions.py
-+++ b/gtweak/tweaks/tweak_shell_extensions.py
-@@ -24,11 +24,15 @@ class _ShellExtensionTweak(Tweak):
-         sw.set_active(self._shell.extension_is_active(state, ext["uuid"]))
-         sw.connect('notify::active', self._on_extension_toggled, ext["uuid"])
- 
-+        info = None
-         warning = None
-         sensitive = False
-         if state == GnomeShell.EXTENSION_STATE["ENABLED"] or \
--           state == GnomeShell.EXTENSION_STATE["DISABLED"]:
-+           state == GnomeShell.EXTENSION_STATE["DISABLED"] or \
-+           state == GnomeShell.EXTENSION_STATE["INITIALIZED"]:
-             sensitive = True
-+        elif state == GnomeShell.EXTENSION_STATE["DOWNLOADING"]:
-+            info = _("Extension downloading")
-         elif state == GnomeShell.EXTENSION_STATE["ERROR"]:
-             warning = _("Error loading extension")
-         elif state == GnomeShell.EXTENSION_STATE["OUT_OF_DATE"]:
--- 
-1.7.8.3
-
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch
deleted file mode 100644
index 03bd049e4971..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 96ca58e9034c0a4ae6d84ca53e37bc1d50ec0923 Mon Sep 17 00:00:00 2001
-From: John Stowers <john.stowers@gmail.com>
-Date: Thu, 24 Nov 2011 09:55:38 +1300
-Subject: [PATCH] Print more useful error for missing schemas
-
----
- gtweak/gsettings.py |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index ca7020f..9ab8749 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -31,7 +31,9 @@ class _GSettingsSchema:
-             schema_filename = schema_name + ".gschema.xml"
- 
-         schema_path = os.path.join(schema_dir, schema_filename)
--        assert(os.path.exists(schema_path))
-+        if not os.path.exists(schema_path):
-+            logging.critical("Could not find schema %s" % schema_path)
-+            assert(False)
- 
-         self._schema_name = schema_name
-         self._schema = {}
--- 
-1.7.8.3
-
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch
deleted file mode 100644
index f62a54c74487..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From af33b09d1f21eb3698c4977a4345b6badbefccc2 Mon Sep 17 00:00:00 2001
-From: Nuno Araujo <nuno.araujo@russo79.com>
-Date: Wed, 23 Nov 2011 18:30:28 +0100
-Subject: [PATCH] Fix user-theme extension UUID
-
-Since version 3.2.1, gnome-shell extensions changed their UUID to another value.
-According to the changelog, this was made because gnome.org is temporarily
-forbidden in UUIDS.
-
-As a consequence, gnome-tweak-tool didn't detect the user-theme extension.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664655
----
- gtweak/tweaks/tweak_shell.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
-index 4de335a..75dc5d8 100644
---- a/gtweak/tweaks/tweak_shell.py
-+++ b/gtweak/tweaks/tweak_shell.py
-@@ -43,7 +43,7 @@ class ShowWindowButtons(GConfComboTweak):
- 
- class ShellThemeTweak(Tweak):
- 
--    THEME_EXT_NAME = "user-theme@gnome-shell-extensions.gnome.org"
-+    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_DIR = os.path.join(GLib.get_home_dir(), ".themes")
--- 
-1.7.8.1
-
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild
deleted file mode 100644
index f60e07148f5a..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.4.0.1.ebuild,v 1.1 2012/05/19 09:12:45 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=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}
-	gnome-base/gconf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-	x11-wm/metacity"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF} --disable-schemas-compile"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
-
-	python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"/usr/bin/gnome-tweak-tool
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize gtweak
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup gtweak
-}