Prevent problems setting WM preferences, upstream bug #706834

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 99 insertions, 5 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/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index d69555614610..057ba55ce59d 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch 1005 SHA256 1291e7bf318e0153626fcbaa9197ac3300b443ea72fa6e23c81d7f1df059e54b SHA512 e7e6a37d8b66376e83c59aa75eb18833e83bb3065f8b83c2af45caede001c7b561cf5cd7b96d34143c3e6d5d0048b733fa6cb58b80345646a6063607ec5cdbed WHIRLPOOL 4bc004b4a9ea5c55cffd004f88acb0c748a0a23edd83a04a470f86ec345d70ea0135b77cced74e77eb82dea1b2c2c460d9262b0d1e116c4bdebb0bab8bd92567
+AUX gnome-tweak-tool-3.8.1-wm-preferences.patch 530 SHA256 45772fb874fe64e22512e0ea990bfc75b3f54597b3f2bc8367e49e4ddadcf4de SHA512 220dc027eecc94f2139397896d7d1cd49d52b49172fe6ae9a0c9caa2ad14a7a3cb53dafcf70cc2a9681342efcffb8ed1315bdedcd08d42c1f2df20a45c65f7e2 WHIRLPOOL e3be4411b462d2a1abae68cb33be3f7906ea2d83bb8f27dc3e9f65a3941e009fdb2fe835a4a0d6a352433a05b0461b266bae51e44a650dac92f9e669f9a16e6b
 DIST gnome-tweak-tool-3.8.1.tar.xz 230128 SHA256 283e3174ce85aeb9187de31a09b59866e84debd31dcdddedc1615a5097ea54c1 SHA512 d70e69dbdb0c05353a56cbdc9f495a7c27afe2f7af6533326cd3c28e9b729e25d0c77a4bb10cf091fd1920048a678b210b5e9d0f424a51189b1e58d75d210ee3 WHIRLPOOL fd0233b09f8996956f808a518d5d071a5fb3263053903132c3bc0bfeefbcbce7c0c77b1eac484c205080787805d61103bcde50db85b6ca221e85ad7e0f406641
+EBUILD gnome-tweak-tool-3.8.1-r1.ebuild 1866 SHA256 6ef47eb612c1acc9494a1fb243af1da5b49271a2d4e1e4a99439f0819a01d43b SHA512 d08ee173db858685b7ef612f3c390020277dd1d6ea5826dc764f487b8b2b074b779f23f9486471bcf19ecd4a439cce187d5e933e5ad1ebe926d372dbdcb8951f WHIRLPOOL 931c43adfaf07ec341ededfdabaded50be31d621361a229b348f77a9fb79eccf25a2312f1819f79de42ed18faa37091abe6037d7da42bef43e18c21ab86014e5
 EBUILD gnome-tweak-tool-3.8.1.ebuild 1742 SHA256 f77078234ee31311dc22d919f0ee529be85520b914a332f9c8594b960fad9595 SHA512 23d656aaf3c2e92c1b20872fee1882d0625eafe7dc0acb6e22c35a9a8bd2a6005549c5f617c851f15f29da95671a0d38b7a4a66939f892196db9320e64a0feb5 WHIRLPOOL e59dd165ec37eb872d09e674ad1ee928e46699151bf55a375227e4a187fec213877a3f5f5985a6afd9d4cb09db161e95be3b821880d21d7f2bcd602a6762f6a9
-MISC ChangeLog 5073 SHA256 dfffaacd060618ebcf0ee4c3bc429e1ec52544df8a09056748a5d33142a53369 SHA512 5939f751e0a1880af8af51ac0ed599c2af29174711535753eebdc1c098754fa9736ad88c62274c6b0211e60fb62233b8809c4f727467f23e5a7fd6e99084e83a WHIRLPOOL ca33c397a619f2f6c751b659162a015b00d8728e772e9114e962207904521d8e8c453f22df92f30aa776418bc5dc52e4c9d15c8a92928281f5a1761bc5db7687
+MISC ChangeLog 5317 SHA256 288de2c62c0fd87efb04f8471249ef1d40fdf87b726c14b024eb0f21c2ac352d SHA512 473a95795de14a450523236d954bcf5a6460f1e12e0519c0984430be1b91699907e519f72308603d1326a8dd91312b0e32c31c9ea3d48449aebfd1738983e5f4 WHIRLPOOL a76a08969346e99e181fb0e9e56636a557ccd00189c0bfd79f1e3e3b0c5b4f1251d98b8cbf232f201196cf96b4db08a4e80d6086bd6326c1f5e68a60c88803e3
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJsEFEACgkQCaWpQKGI+9QCDACfSpnlKD87dlE4N50L3/GEuoca
-e9cAoIeQbB0DKpVctVpWZaugHoDdE1TB
-=SSlU
+iEYEAREIAAYFAlKInMcACgkQCaWpQKGI+9QZxQCcDfBpttLDfP5Z/3Zj6L1zgBHi
+B1cAn0afwyEFwaREhqaGzU2UcEZ/WtvX
+=WAWB
 -----END PGP SIGNATURE-----
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
+}