fix a renaming issue with marco, bug #525512, enable epatch_user

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 41 insertions, 18 deletions

diff --git a/mate-base/mate-panel/ChangeLog b/mate-base/mate-panel/ChangeLog
index 1e8a82855268..1565e29e12a8 100644
--- a/mate-base/mate-panel/ChangeLog
+++ b/mate-base/mate-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mate-base/mate-panel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.14 2014/12/09 00:54:59 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.15 2014/12/09 21:39:06 tamiko Exp $
+
+*mate-panel-1.8.1-r1 (09 Dec 2014)
+
+  09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/mate-panel-1.8.1-update_marco_wm_name.patch,
+  +mate-panel-1.8.1-r1.ebuild, -mate-panel-1.8.1.ebuild:
+  fix a renaming issue with marco, bug #525512, enable epatch_user
 
 *mate-panel-1.8.1 (09 Dec 2014)
 
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index d2215360b286..0dfa31e1b1fa 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mate-panel-1.8.1-update_marco_wm_name.patch 357 SHA256 998659a98f8ebfae8a8fec28fc3ca66081e19ab3224bd3373f4f2ace15311c10 SHA512 80ac08bd4c8ba9f4534e7192c7e0822d745fe91cb60b31b26b0691d9099282e4848aae0173d1963dc9aa35b261c3680aaa772ba6ac1b0971155b26fe5b4b684f WHIRLPOOL fbc68f65f3004a99546f1ba1de3f6757bae18b066671592a4d5368a3c3edbd08bcd2edde1c1a2c0079a3b4fb60491ca68e2189a628e482768e17ef8c4ced5de6
 DIST mate-panel-1.6.1.tar.xz 1938144 SHA256 88bf0620e1eba7e2e165060ac6fa21896b8e24d1ac742ff6f8c884c5408dd53b SHA512 bd2f7c2433dabcae5dd596e81125d70a08e6d6a3beffee97078c0b8c53527271dd1eed6650d39a7e2a24a579821300e4fb2160b1eeebea3b925a996d7add8dd2 WHIRLPOOL da092bccb5830209fc6e51aaed0a8d9484f668f1499b85e034a4f10bb61637b6519d28a3db817764763dbf93ad1b0f6eda7af6c7760fc4cafa143937b0a37252
 DIST mate-panel-1.8.0.tar.xz 1930348 SHA256 ac20c42d1b2ae7bf08e4e701e12165e63753f80648c1ea4ff5297f3381481056 SHA512 bdac2baa567cb52cdb6ddf3ed1d20e9de496e22734538fbca8e9efa6c2d4263ea6c13800ff21cffa8e5383cc5ee875ae7982b0d6e0d0a704abcbd97e3c07c53a WHIRLPOOL 73090851f4410689f184beaafca8c587e8ecf633bffd1356212a8c145c60187de50f7c498e363ebd5f54ae51333e2a6dd6ab1d47c7f04c1318a76d6932fae3ba
 DIST mate-panel-1.8.1.tar.xz 1953156 SHA256 d53d1546577db3e45ce6b46b4a40b2edc066781cc1e864eef47ad07b0fdb3f19 SHA512 925189eedf604117b4b4033b77a6ec4096f5c663218ca6736d549cdfd69c5476eebed56688632a6a20d0e2de49bc09ebd8373ecf45f486161b012346bb2eff8b WHIRLPOOL bb298e1b4b4078409e3a6b7858e2abf1667339c8581ee728f95f8ab0ea63288598e9c205b63baed40a57b19268c062a099fc98600502fd3723675ccfc19baade
 EBUILD mate-panel-1.6.1.ebuild 1978 SHA256 077223051f229aec1d5a2c6b60da265d0ae92663a178a2547577172acae19bff SHA512 36e6cef3b8b6d6b6729a7ae77522b3035bd793c7deebaebd28fa4776c0e1061b9dc3131b15286553f2e2661ce23fbc52206127479218d4ca20087f44bc9df9c0 WHIRLPOOL ef05dae9f40a0423e45c309334e0f90ff8943debd1ddfad15e14ca7e6147d156d6aa7df4ab6e423d02b32ae5c4894df808c54c29bcc4b49a2c62ec10b3cec67b
 EBUILD mate-panel-1.8.0.ebuild 1950 SHA256 bc4202ad5b91318cd3ab793a121bd7c978e63f7d49bb6c1c7d67d453a223d8f2 SHA512 c04de97d20e138cb9ca582f9fb18baf8c6900255c4c73789a80565ca3e76809773d946831649fac9006cf5f68397503a6a89778dfb873b005a6060d603e490a5 WHIRLPOOL 072f89ff38d1f3cc3c3104bdc271feb61e3c621911518a56192adcf64f7f3c9ba3914c4f6aa7944d78541303bb558b2841c8a2aee55a5863875d8f9014dbee34
-EBUILD mate-panel-1.8.1.ebuild 1923 SHA256 f92f8fe1713b11a43870946064794629dccf03f0e1a1775bcbb381939278b292 SHA512 3337c73ed7afceee091f381cfbbdbd9a7b5013aaca9c9e33bb307991d27e5a42fa2c3928e6e4f9621827e07f9141e8d4396bd0dbfe7c94dfe3ac9889b00f1b17 WHIRLPOOL 7d2e50a530e57ac9a5ce50582f8ee8390b58aafd5a3b5da435d4a6f1bab7e01f5ebeab756485e7b95024bf5fe449d2b324fcc4969a85dcec60edef95b539a8f2
-MISC ChangeLog 2270 SHA256 fe9409b72a23ea582a06856e38bd100d0299e3b3dfadae255dfdd0f4ed3ba99e SHA512 7b12b149baf7978d605d52def47d120d39810cd1c981441169336bac2e48c616f013b4548c4738b7836fa7c3974c81810ba14052a7b0b1c54534f609971b0203 WHIRLPOOL f97d2eb6882489ac970aa1bef8dbac126c6e3d19286db825987e99bd94410c846238bf4964cbeccf7d63c3e02201530e48affa677ce4aac6266b42701669eeb5
+EBUILD mate-panel-1.8.1-r1.ebuild 2002 SHA256 0dd7b274e92b7f0d213e0694a12e7e28887c2c7c6387899ce78456ba603be08d SHA512 2e5b5292c0c06a71add0493a3292624e5be02f6a22a95e3fa44fbf8045d71669a63a045266b1f3fa16ace6e9a15ecdc5d4d0208f3f51ee9753835ef7352458ae WHIRLPOOL 7c95e2ea566308c786f259792599177a7e59b4d4870900408583f0abc2cd9a28019612ed14866e50ff27c2bfeebc5b03713da6775680767ca81cc008dd8619f6
+MISC ChangeLog 2535 SHA256 0bca67651671f89cf3b07ef09bc55b89448e86af33e2831c14d80d9d8b4b51b5 SHA512 615676c8459ba1262fc4a9dfbdfdec405f5e4f6107a49abd2500bc4b7898ec55746cd756a73777db35b9370551e0fdcfdc30f7928706d6eecf89d5eea49dcf94 WHIRLPOOL 8ba094190d65ca7085d3f191a37401a4eae89d38d515ef4e38e80d073d03131f7a2b450ebf5f1a840e8b5c0b23f8e36d6ddf6d3be7e0df4cf30cbf3069164fb1
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUhkhkAAoJELhOzYlK7nn/qIMP/i8XtzZPiL8YQw8Ai8XXp5iv
-ePGoSnPKs1ah8KpKIvYz7gDKXylCf1sBg6tPKbL5TyAzGkCCSkTFviNYG7Y6iS1W
-LSiXRNx/Hk9YfG9Q1vusqupPNl1Vdt0xJ/2uBH0HN05jE2DtWEvOaCDoMy3iy1zf
-jo0gvkGPXt4N1vYcW1zgkhG9BZCPnK2hqQiQ+vEzwo3G3FATeqAIHa/07SCOYWrg
-nHdlPaWWNak5By+DTeM0Lz5ONGhuLzt2pLwT2/tvp0GiP9WuMhJ8Fown8VwBkSqm
-MMGvlNs6JWNiyYn9elhM0wnS3ac64KtdMh/mTh9GeRbmQkQne1u1IjI9+DmwCYQT
-u9tqKAVSrEcFpOouzgQJpcNTCayZW1LLToGd0TDXrnhyZLS62y3/8vAIV0rdpARp
-p4tTqgrpYRK6kme0xRuX1kZco738b6BMcVPsBykrAG9pL+T/2yrdwgYjDBswjqUe
-ThRTVSFD6ZNFjfH8RSI+JZ41pBanvvR+jVaspRwCWWE2DlKq/Zek3iW/CKf8fSTH
-cUgkBxl7HMX5IyLjrf/b1j9K5exx1yvXSnuh4bXg2SZO8qDVTmM36JPf/mCiU7Hu
-6HtZpXl6s2Tc0UoO1ki0xPW4LIi42TPzopzp7bpttdhjGaDgOplIpf70XJFO8kQU
-G/7gp4mA6hvSSnpaQcov
-=yusc
+iQIcBAEBCAAGBQJUh2v6AAoJELhOzYlK7nn/fykQAJKukZLhySDR7hL3Rm0S7J/0
+1uGrvW1q9nwVEJ6WggDZohU7619RGbpgW+ip/ik0eL9c4D8EdGpPIvL/1bST4EZT
+upcB2TiKhc9GES555sw2WjfMEMcmnqJMomD4R9PXdbcmXXMsMJsEZvSI+LnJpkeK
+KLvBo+j1qhUx5ggkwGGBVrC8emP1P8CnpJThb+VBap6n61L/77ws0agPvKW8i/Jh
+E0QyvjiKSwVnpa7sOhz+2UFLIiGyj3LRIm7YdVIXkbgXtM+ULxozt5GDKuSvisfM
+7qfID/wNmV3Lv7T7eqSo2ushAiRytLpborbBsZf+9CemPpFreL/vDAOZsos+x0TF
+vkiPb5fJVuKSXmfn0TQbRZTzRJ0crODj1AWyzSK0Hy5kYjgLyuGVr5qrbuR77QFt
+uNTxMCwYZg2sNuFSCC+VcdCDCiA9Z6bBjleTrlDKOExmmF7tn1yKsWNly013Ad5M
+GGvwvDrrQ2ufXM8heFiV2KATZk5EAHzmyEGT+WS9KK6x46zTuPj9zqQ8ffri4rFA
+Ui2p8MidIZyuDq/JzLurAI6RuQNhsZuvLTPbg7h8nx9MEyjKj8V0rc0U65g/1cEr
+usLaxdMAXQnnkJWWaS1PX7BDPKRdo54WB9H3sioL/OWnheTyNa+HSpXhaZVxNBZ6
+ROmZCcslRgN4oWgaapsh
+=6Pvs
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
new file mode 100644
index 000000000000..f57bf983bef9
--- /dev/null
+++ b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
@@ -0,0 +1,11 @@
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -143,6 +143,8 @@
+ 
+ 	if (!wm_name)
+ 		pager->wm = PAGER_WM_UNKNOWN;
++	else if (strcmp(wm_name, "Metacity (Marco)") == 0)
++		pager->wm = PAGER_WM_MARCO;
+ 	else if (strcmp(wm_name, "Marco") == 0)
+ 		pager->wm = PAGER_WM_MARCO;
+ 	else if (strcmp(wm_name, "Compiz") == 0)
diff --git a/mate-base/mate-panel/mate-panel-1.8.1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
index 5c570e9691ba..f83d8cf459cb 100644
--- a/mate-base/mate-panel/mate-panel-1.8.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.8.1.ebuild,v 1.1 2014/12/09 00:54:59 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild,v 1.1 2014/12/09 21:39:06 tamiko Exp $
 
 EAPI="5"
 
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2 versionator
+inherit eutils autotools gnome2 versionator
 
 MATE_BRANCH="$(get_version_component_range 1-2)"
 
@@ -60,6 +60,10 @@ src_prepare() {
 	# Disable python check.
 	sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
 
+	epatch "${FILESDIR}/${P}-update_marco_wm_name.patch"
+
+	epatch_user
+
 	eautoreconf
 
 	gnome2_src_prepare