Apply Debian patch to not migrate metacity theme for consistency with the rest of Gnome 3 theming (as other themes are not migrated), upstream bug #700154, drop old.

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

5 files changed, 46 insertions, 55 deletions

diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index 336b09c4b33a..36df84bdaef5 100644
--- a/gnome-base/gsettings-desktop-schemas/ChangeLog
+++ b/gnome-base/gsettings-desktop-schemas/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gsettings-desktop-schemas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.54 2013/04/09 16:43:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.55 2013/05/12 10:03:44 pacho Exp $
+
+*gsettings-desktop-schemas-3.8.0-r1 (12 May 2013)
+
+  12 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch,
+  +gsettings-desktop-schemas-3.8.0-r1.ebuild,
+  -gsettings-desktop-schemas-3.4.2.ebuild,
+  -gsettings-desktop-schemas-3.8.0.ebuild:
+  Apply Debian patch to not migrate metacity theme for consistency with the rest
+  of Gnome 3 theming (as other themes are not migrated), upstream bug #700154,
+  drop old.
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   gsettings-desktop-schemas-3.6.1.ebuild:
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 5347b0846ffd..5b2c364169f0 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,28 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST gsettings-desktop-schemas-3.4.2.tar.xz 198476 SHA256 ce0a460128d52710b6842ca663690e38374ac921e2f6c1bdf5d54f46aa6eba4f SHA512 09201a0178ebf8644ec9737808751b44d34d454fd580dac97dfc603d2e703acb96583fcaf8f08a39362f56e6c3da2e5aedfc1971462692098453054dd2697ca2 WHIRLPOOL c8c6a7fec2db978dc803df9e79fa70b1cbe87b189bd907aa507c229585675bf21e159077d0236fbfb11c40ca95a1e6255ab3197b928a31ba051dc650fff1c2ca
+AUX gsettings-desktop-schemas-3.8.0-metacity-theme.patch 812 SHA256 bd824f23bcc5e43e797ce9b4c641b7fa02c0a7d22e5fbaceba44ae8900b47fc9 SHA512 c173fb35b1e112aaefc5c10bc027080fc250102c57bcad8507f318d9f5a7b7cd2017234b076e5f98d658fe13efedfb69ab6153dd87681ed95325e7926183a9b4 WHIRLPOOL 1f61507a43de082cf0c1fff4d63d4bbd4436d20a06dd4833b14edd5c6d6089b0b4f76d57bc11d991e3c1deeb341808fa8078ba767a9c45a083a6ab0c8c94e12f
 DIST gsettings-desktop-schemas-3.6.1.tar.xz 384248 SHA256 d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 SHA512 dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4 WHIRLPOOL 87b756c86fd03ca665ec79819a92d7426190feb8ab07304ca7b7895e2de7fc98ed410bcfa494c18b0b162bd11cafa3929a83d71034dcae6025be1c84c8280788
 DIST gsettings-desktop-schemas-3.8.0.tar.xz 439508 SHA256 9583384299c3b8cc21f99327a84527d3e7e55a26ada35ea81522dc4c05a5ae0c SHA512 a05d2c105418f6bdc84ed11594ba38f9057c8307999122a6adb04b4499e450ae3443c3777d8b2dc58fb08021f5488dd0cf4fdf541e7940808d2212f72cfb510c WHIRLPOOL 030ef6105aeb670484bda90af253126694542935baac84cc12ea3bb469a76a304ae8ce864d51eccc2befe1022dd1fe57ed1bdd751fbc70bad7de89ab815925c2
-EBUILD gsettings-desktop-schemas-3.4.2.ebuild 897 SHA256 7790e741225035865441ba23e43ce6cd8efff9fc0530d58264ba21dc7f5bc236 SHA512 35d36796be579b1004ff13ffad4cadd3f0246b11f6b8717cf8e02338d99d0377a586140dc8635167a4c579ffcc73eeeadadd7dd00162396f3277d5170945ff87 WHIRLPOOL 209cf2505720c8aa965e0dba49c4bc42f14b8dbd50d4c06fe51e4e97793b728e3ca21ff4eaf28dfb41a9779985302cb7bb0c78e26a9895042225a11fd97aab6e
 EBUILD gsettings-desktop-schemas-3.6.1.ebuild 930 SHA256 347d4ce7a5a42096b3f742fe4e56676a7f486d3df807a2572396b9ba143afc67 SHA512 c49d7681aaadeb5618d29d4747e21e2cdcd782478cd907ba570fb1ab5a2858e78f16c43d50e644338ee938a7261d8ad6e31af69fae362c7042934c7657fd21c6 WHIRLPOOL 040b8f508c64bd50a8f3a762777ac6ac4fd1605a753beb99311c33c612ff1da4b6ce342cb4345fda5859f25d93718775fe36f1132083d1dda0f259ac3eb62435
-EBUILD gsettings-desktop-schemas-3.8.0.ebuild 941 SHA256 324880adc31c325900055cac12e7c675f42653cbfd7325f94a759f2c696459bc SHA512 c28a7f48ca37257e07bfdb6469fc8109301c07ffbe0806ac09462d6ed3bcc2396cd293057f282665c45ee8c56f520cacca92aebf4fed62c6ad1cc73008cc09e8 WHIRLPOOL 0801aa4e17e33fe797b24fb10426697af1de77c852de2a88942b5dfb6a1a6c37dcc641ac59e923e54cfeae53cb98dafbb8812e0b19c94a6d7e71984256c53011
-MISC ChangeLog 8707 SHA256 ba8c145f95d5832835bd88abc58fa11ff4226d5b7226daca8fb01a85b0fc7d94 SHA512 44055e249ad2e13f5db6d995ba37503339ca58bad40f6f9607518fe42e3e34befe91be4cc7583d3bafc610e20116413ddc9eac35124267b3252a7a1e2c58cc37 WHIRLPOOL 929963de94b7bcfcb1b16012a6d4acd928821436ab52a70209e79df36ab292fc691c31d86be3a60d2d115e42e02d7673ce6178cea3bc97622538dd1d543ee30a
+EBUILD gsettings-desktop-schemas-3.8.0-r1.ebuild 1161 SHA256 022cfb294e5c9c7700024737efd8ce5ad2a0beed75ddc3f99e7ae3152f0e1b25 SHA512 4d0b7bcff75e6b2a348c41f4f3150ec0c5af31408ea84aae82973250dccbe6f147172a2fe5cfedd7bf09dedb7231d69bb01385d12337956f78d8d07b897a5966 WHIRLPOOL 3b8b08ae220a1b9a6588b2836d331d2b82f67affb5de9cc104f38ee98377730dd030ba36efaef9e4f6632fecffba3afaf3575bd16dc5436cb22379c9f6266367
+MISC ChangeLog 9174 SHA256 4551c3245527bab2bcf431605ef28318bbb858d426d461c2c6a5fef78f3c82c7 SHA512 eba95e6c1ff6eda1788e249964427a8e44c4d06bb82e4cca19f72b42c39576569e78a84ef57c54a0c4648617853702ddcef5576ca2e4041be6e6303c329e0d5f WHIRLPOOL 1f82309e67081a6d20f0785b6d7737c12ed85292e77bbb1a2befc4485895a82664949e73bce4d1b1db98b8bb078f8a2e7c9e839a384c45f5b270852abc83398f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZESHAAoJELp701BxlEWfzv8QAKyH2e4DFb02lJqmxxUaj0VY
-JOOY6/o/y4PBPjKKYXNhwgWbm6G9qIMSPbNznxzWtDFgkSohCdrqf/MUGPLvMYpW
-Fa/q3qovI93YsJL6sdJsxecmIGDlkTs8pLW9Gl0BjZNeFOF5SnvVvJFqsHtMXOBZ
-oeX0b8TeEdcBEFT0ILGffd+qMwMkZGmYxX4XupkcBMmdhlU5SQuYOs/xf8G1RQw+
-zMhjj2pcxrBChzxSFnuSnbbMhJBeh4EN2/Jg0XQifbNEslqF4BNElfm2H/J3kgdX
-OL/CKXhbK8GmHoLfF7p5CwhADEcJwVBOZ1MKpVtF3hjhK1gRj5eLOlvnWjansZuU
-0X3Ofebf/x+j1E+WsS1QEWz+z6rkMWtP7a31911kjB+ShnXpSFXN18iNtlWf7TX6
-PiiZU+o5WV+U6376M5wTyo8Yz/2SJNzkL3NLMn8xqVM1npyF+yDKVhzBUey+11Eu
-rmbbyoEi3pB5DaauR84P4XBq/H1zxMS0Y1rps0f8z9Al6MQyB8cJ4bGLc1fkuCXO
-Y+EE6wLrQu2/tSm0ODCWZK+AJKLq304ObWlzuFiRZ3m5Us9QPiM9w4Cb744PS6SE
-EHnmznyiX1dSNWarbN3gUYREOl6f1eGygEntikXoYlXuG7TIHSdxhG4mYlkSakrv
-SN8xmto4hZr2tJjXrxpR
-=tkdt
+iEYEAREIAAYFAlGPaQEACgkQCaWpQKGI+9SDOACcDm+rv6z2hQWwhDJCKZ5PqYNm
+gMAAn30eu7eJcny/4AxutW3QbcCJPCMs
+=irvA
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch
new file mode 100644
index 000000000000..86f97b2cb6fa
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch
@@ -0,0 +1,12 @@
+Index: gsettings-desktop-schemas-3.4.2/schemas/wm-schemas.convert
+===================================================================
+--- gsettings-desktop-schemas-3.4.2.orig/schemas/wm-schemas.convert	2012-03-05 18:29:05.000000000 +0100
++++ gsettings-desktop-schemas-3.4.2/schemas/wm-schemas.convert	2012-11-01 15:29:43.159883408 +0100
+@@ -11,7 +11,6 @@ action-middle-click-titlebar = /apps/met
+ action-right-click-titlebar = /apps/metacity/general/action_right_click_titlebar
+ auto-raise = /apps/metacity/general/auto_raise
+ auto-raise-delay = /apps/metacity/general/auto_raise_delay
+-theme = /apps/metacity/general/theme
+ titlebar-uses-system-font = /apps/metacity/general/titlebar_uses_system_font
+ titlebar-font = /apps/metacity/general/titlebar_font
+ num-workspaces = /apps/metacity/general/num_workspaces
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild
deleted file mode 100644
index 7e0da81106b5..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.12 2012/10/28 15:51:03 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	DOCS="AUTHORS HACKING NEWS README"
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild
index 30a571424752..6a38e56e4d3c 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild,v 1.1 2013/03/28 17:12:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild,v 1.1 2013/05/12 10:03:44 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,16 +15,24 @@ SLOT="0"
 IUSE="+introspection"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
-RDEPEND=">=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Don't migrate metacity theme for consistency with the rest of
+	# Gnome 3 theming (as other themes are not migrated), upstream bug #700154
+	epatch "${FILESDIR}/${PN}-3.8.0-metacity-theme.patch"
+	gnome2_src_prepare
+}
 
 src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
 	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_configure
+	gnome2_src_configure $(use_enable introspection)
 }