Prevent problems setting WM preferences, upstream bug #706834

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 93 insertions, 1 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 099075037f3a..c5e38c30229b 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.23 2013/10/26 18:56:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.24 2013/11/17 10:39:01 pacho Exp $
+
+*gnome-tweak-tool-3.8.1-r1 (17 Nov 2013)
+
+  17 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-tweak-tool-3.8.1-wm-preferences.patch,
+  +gnome-tweak-tool-3.8.1-r1.ebuild:
+  Prevent problems setting WM preferences, upstream bug #706834
 
   26 Oct 2013; Pacho Ramos <pacho@gentoo.org>
   -files/gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch,
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.8.1-wm-preferences.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.8.1-wm-preferences.patch
new file mode 100644
index 000000000000..4283b51f5717
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.8.1-wm-preferences.patch
@@ -0,0 +1,11 @@
+--- gtweak/gsettings.py.old	2013-11-16 09:00:44.863767301 +0100
++++ gtweak/gsettings.py	2013-11-16 09:01:18.873393932 +0100
+@@ -34,6 +34,8 @@
+     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+         if not schema_dir:
+             schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++        if schema_name == "org.gnome.desktop.wm.preferences":
++            schema_filename = schema_name + ".gschema.xml"
+         if not schema_filename:
+             schema_filename = schema_name + ".gschema.xml"
+ 
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..0547c561a88d
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 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.8.1-r1.ebuild,v 1.1 2013/11/17 10:39:01 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="Tool to customize GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/GnomeTweakTool"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	>=dev-python/pygobject-3.2.1:3[${PYTHON_USEDEP}]
+	gnome-base/gconf:2
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[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
+"
+
+src_prepare() {
+	# Add contents of Gentoo's cursor theme directory to cursor theme list
+	epatch "${FILESDIR}/${PN}-3.7.4-gentoo-cursor-themes.patch"
+
+	# Prevent problems setting WM preferences, upstream bug #706834
+	epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch"
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	install_python() {
+		gnome2_src_install
+		python_doscript gnome-tweak-tool || die
+	}
+	python_foreach_impl run_in_build_dir install_python
+}