Update for new user theme extension ID in gnome-shell-extensions-3.2.2 (bug #395733, thanks to Stefan Zwanenburg for reporting).

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

4 files changed, 116 insertions, 12 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 49830e644006..6f800d32916c 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.2 2011/11/20 19:47:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.3 2011/12/26 04:16:32 tetromino Exp $
+
+*gnome-tweak-tool-3.2.2-r1 (26 Dec 2011)
+
+  26 Dec 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  +gnome-tweak-tool-3.2.2-r1.ebuild,
+  +files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch:
+  Update for new user theme extension ID in gnome-shell-extensions-3.2.2 (bug
+  #395733, thanks to Stefan Zwanenburg for reporting).
 
 *gnome-tweak-tool-3.2.2 (20 Nov 2011)
 
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index 352ade697f2a..a797e8c3ebb1 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch 1030 RMD160 cea6d3a71966ee6aaf8a85784c2cd1e979141e10 SHA1 c542ba80eec0369ad3566c6e4561218610964a0d SHA256 d6a9c50a41f5bb8ac6dcb97f646f9ce7be3f09ec6537cfbceef8bc91b0ac2fc5
+AUX gnome-tweak-tool-3.2.2-user-theme-ext-id.patch 1192 RMD160 cb82e49ad51747eb733762dd08bbec577b78bd3a SHA1 a74379378a7b0d017622877675096b76e2919e5b SHA256 11a4819917b46c6f8f13f49905e03a3477a00123ea7beb6a57b89e9d8c45626c
 DIST gnome-tweak-tool-3.2.1.tar.xz 198452 RMD160 1f2577628a62036477faae9beeeb4d422db51374 SHA1 07c1bdf5889066b98fdb15fef29871fa5051df7a SHA256 a91cd214e1c1638110e83745394ebd80937e3e4bcebe96cd3042ec99d7e4e044
 DIST gnome-tweak-tool-3.2.2.tar.xz 198904 RMD160 1354a1c0bfb355757cb67f7ca614df40eb907ad5 SHA1 dace7d9b4bc17a3574030215d34349a977808aed SHA256 57ad08b813ca2f5ea2e131b22cb365d33788d051b80f3f6decc04e3a5404f8f5
 EBUILD gnome-tweak-tool-3.2.1.ebuild 1623 RMD160 6baab9175720f8400e3418eb6a30e5d17414fe42 SHA1 8650b5ff778989e8a64dfe43eed4eec2894083d4 SHA256 a9538741fffc7b5b539cd5c380d708eb3a63a855f5561e2dd4eadef21f2e2480
+EBUILD gnome-tweak-tool-3.2.2-r1.ebuild 1757 RMD160 019714f9fd8d4629da878b9427fb8ac3bd50653c SHA1 07e990ea337d11a96c114e8e4f68d59e626cd91e SHA256 e7b4851209ebb2e39f1a3c62acf98e7dbaf4a2338acf2b722881ab3d0ac0b05a
 EBUILD gnome-tweak-tool-3.2.2.ebuild 1613 RMD160 a20e205c9030324db4c3f5c62fdeb94564bf6763 SHA1 758c0e93cc2c95d2666c0ca72f76542ab504e039 SHA256 3443a276611e3c884bc210249ebd25bb28c7e625ab6c9d8b2b93204a6f1cb07e
-MISC ChangeLog 675 RMD160 587d72e582dbdd80dca0ecf8505b63d58c130e15 SHA1 2755f46187fd62af65e77e029b58225e77dd55f4 SHA256 f744737ca0e655c8a7839e0720102868b8cabf60f50d7429e4860a7b79e42dae
+MISC ChangeLog 1021 RMD160 289a08e77e7258befd2be7c2c51f2d02d6f84025 SHA1 6cf099ebb30dc786466dc0372891fdbbcd673be3 SHA256 37ccacfd54ef1d62706f600ca226c6849a2cc54a0efa92c8fdc4e1dd0f30bb75
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7JWUAACgkQ1fmVwcYIWAYH2QCcDI1RkB9ykxfESj0FMvpwOmqS
-IjoAn1Qj1AEgHwZrrQWYZpz7LNO9DXpw
-=W0JB
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..f62a54c74487
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-user-theme-ext-id.patch
@@ -0,0 +1,32 @@
+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.2.2-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..4872909f7b96
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 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.2.2-r1.ebuild,v 1.1 2011/12/26 04:16:32 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
+	>=dev-python/pygobject-2.90.0: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
+	>=dev-util/pkgconfig-0.9
+	>=sys-devel/gettext-0.17"
+
+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"
+
+	# Patch from upstream git master; user theme extension ID changed in 3.2.2
+	epatch "${FILESDIR}/${PN}-3.2.2-user-theme-ext-id.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	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
+}