Correctly load custom menus from 'applications-merged' directories when XDG_MENU_PREFIX is set.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 443 insertions, 29 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index b4d7f640093d..3596e5f0fdbe 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.179 2012/05/20 09:47:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.180 2012/11/24 23:43:39 tetromino Exp $
+
+*gnome-menus-3.4.2-r1 (24 Nov 2012)
+*gnome-menus-3.0.1-r2 (24 Nov 2012)
+*gnome-menus-2.30.5-r1 (24 Nov 2012)
+
+  24 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-menus-2.30.5-r1.ebuild, +gnome-menus-3.0.1-r2.ebuild,
+  +files/gnome-menus-3.0.1-applications-merged.patch,
+  -gnome-menus-3.4.0.ebuild, +gnome-menus-3.4.2-r1.ebuild,
+  +files/gnome-menus-3.6.1-applications-merged.patch:
+  Correctly load custom menus from 'applications-merged' directories when
+  XDG_MENU_PREFIX is set.
 
 *gnome-menus-3.4.2 (20 May 2012)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 5fcb4ae227b3..c6eeeb2616cb 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,33 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
-AUX 10-xdg-menu-gnome-r1 159 RMD160 a0e1372c398b06fb6d6590acaf8e6155f2858a4b SHA1 86b702d6926a5c3588a457f2c8c40532b1255210 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378
-AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
-AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 RMD160 39b97747a5b87c8bc217082268fa825e767cf528 SHA1 0d9cf9fae2224a3a42ef93ca51105fa8b33f0a42 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe
-AUX gnome-menus-3.0.2-library-only.patch 641 RMD160 246256080f229f9e0f57a62c9a76d1bf762529ea SHA1 799fbdaf3a0b7aeb9ed89e5fca9ee449b6d4cb82 SHA256 ec729f28aafceeb1a8b61142ce511190ab762bf432356aa7bddf814ee1b556e9
-AUX gnome-menus-3.2.0.1-ignore-invalid-entries.patch 1240 RMD160 b2e8e7498b9b866eeea18654e343b5ea8430ebf3 SHA1 b17d77ccd261579e2071bb5c391aaf6ee64cd5da SHA256 5c5b729828215468a8a7624497bbde20bd9210aab987accd94bfb52f35c20f20
-DIST gnome-menus-2.30.5.tar.bz2 471327 RMD160 f3fafb467a7d9aaf0168236dab46f8bf82f71c26 SHA1 dcf7af8507d5678d6bb1bf705d2c4ac2238c6da5 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
-DIST gnome-menus-3.0.1.tar.bz2 474839 RMD160 de916d4887df9a433eb858aaabf1ef91af2cd32d SHA1 e20d2b4c6ed3a19324114a5bff7ef89e058c707d SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0
-DIST gnome-menus-3.2.0.1.tar.xz 402080 RMD160 98cdb483c0f1a16a1aa6f589a2d130484c970a42 SHA1 8b4bba2f1bb5d8533f7cd241016719ef42cb0ebf SHA256 17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b
-DIST gnome-menus-3.4.0.tar.xz 405964 RMD160 7959492e62876232910777446061efe8bda85ece SHA1 51954c515fd2424ce1e8f88cac40bbde255a3c11 SHA256 199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86
-DIST gnome-menus-3.4.2.tar.xz 406316 RMD160 71fc8ec7077f397bfc7c1e91246ea23c968b2e26 SHA1 93edd01ce24fc68eec5fe16b95d9e34ba9688e38 SHA256 fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63
-DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
-EBUILD gnome-menus-2.30.5.ebuild 2553 RMD160 c2fc9ec79dc50d75e975be98b92dd0e8103c2a9b SHA1 bb2174cd2ede54fbd64c50e907ea06455fdf1990 SHA256 a55a419f5cd3b188934e4b297685200876953e10a87c5dfb81c9e91df15d7f34
-EBUILD gnome-menus-3.0.1-r1.ebuild 2195 RMD160 6893fa004122c569024805e619650c98206c3754 SHA1 f4bda6870e89f118442779eef1789f0bdfa74d5c SHA256 eb6580d171069bd254dfa96d152d6269e6e56932ce3b4522f7780b3d3a126d93
-EBUILD gnome-menus-3.2.0.1-r1.ebuild 2883 RMD160 7fce01554eecb699f61d796e0e7bc49b5a6a0da3 SHA1 93cd882bdba8468eaa776c9a55d49c726998a350 SHA256 5a731b6881526c107ebde21735ce27e6dc582703a087fe4368cb39ac071cd183
-EBUILD gnome-menus-3.4.0.ebuild 3066 RMD160 1719db934e0b1218053e36fafbbff3c203f6b93e SHA1 1dec88b1553b731f819e7f843bf53ac2cc2190e1 SHA256 3698dbd7a8ff2b3f60e187ad3fe19cd0dcb06e8d02dc132df59fbfa4d3132d22
-EBUILD gnome-menus-3.4.2.ebuild 3066 RMD160 8387c4e013c30f64ee622ba4be01e41135a527b1 SHA1 a9ffbafd0fac3fe9e68d94a30c761513a6a92e96 SHA256 118e67c8146a8d21e8c1d2728b9d26bd502a6e9733d0b437fc6cff3e93c5799f
-MISC ChangeLog 25595 RMD160 31c995e26ce4c5d1be7528d7bcefbbf9e0bc5566 SHA1 be6d42dd6712541e3d81130955c925e36d0bc49c SHA256 901c576bb3d2fd66078d49d5109e5158d9786865d3c2f5b5ce8b14d6df9fb5a9
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+AUX 10-xdg-menu-gnome 115 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b SHA512 b975bd56983597569b06eaefb356bcdbe85414e21b17f1f5349c7cdfc5f30c9385a92230aa00a369c79a4156ed34256132e96463c308e82300e414df1df8c586 WHIRLPOOL 7eedbb2b33960516115dee8d42a7ebbdcac1d81e1a3ec28f6900f1e063f75039871fbee87bdcd02a6887c269c4366b726819fc91bc9e919bf6f977c22f98e9bd
+AUX 10-xdg-menu-gnome-r1 159 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378 SHA512 144cdcf8210e0225fd39c4ea48960e2400b2b23aaa83e385965e229ae30c1ee0ebc750c693ad1ad8599ecd60f38354b8752a08ba7ed04ceaba670c1416648f58 WHIRLPOOL 8de8a1a1332bfe554e079306ca9896c7833a0e58a3dd76cb8feb851a61dabdc0872d93d3c8b7413f1d4d0173497bcc82c7dc82fcb05f5d7ad9c87a819ade16ad
+AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8 SHA512 0544bface504a9431ca8343be035f567146f05478a0ee9ea33ff4a74efe176962f735f15d08e5559585d654729e75fd3a5f92ae3a98900a8e7466d5ad1580bcc WHIRLPOOL 1ef2214533e6a108e026ec91e493cf3de009f1bfae38e8711068160b7f817f60f276c9548207b95ee6295cb8b6b64d5ab4fbd78b772939954db5355690d05711
+AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe SHA512 3880e4d288c77bba24be30e5cf7f3297458c9fdc5125b7d1837f7ceb1eec95cf6d3475b94f14c8ae476ad77740cf6300a6e84132d382fbf4620faf01eb51dcd5 WHIRLPOOL 0b68c591c02fd9ec34376fb170ea14a11d2a35bf2527d31d64925886fb07d35598a0d4ab6e4fefe02bfdaf33c7cbb6725126b8eb08eba80ce8ed4a50f0cdeb94
+AUX gnome-menus-3.0.1-applications-merged.patch 3376 SHA256 a42786fa1b3631c649a58c3680ecb102ba450e5bb165cbb11a5d5f27b7e82ca1 SHA512 ca7c17ff68412195d52b7d82351f319403a1d02f0a4a93388bac4034bc0f93ba09fd4d30515d0b05f089a8fd2ea2df3d10ecf51ce340092ec5389d5b1f048444 WHIRLPOOL f157f2e8c78dd3351dee360854e3139927aa274019b0d695242aa54bd353f5ed68a2833db4309a682ad2eea9b0373c50850523d6399e392e0509eb9fdce3adac
+AUX gnome-menus-3.0.2-library-only.patch 641 SHA256 ec729f28aafceeb1a8b61142ce511190ab762bf432356aa7bddf814ee1b556e9 SHA512 2133d3c638f0a7cfddbba17e726c7dc647e469ec716331de95be36c017c3aec86af3d47246836da58743e181fc0d32c869ac80e24a73403970a0d6e16406e1f9 WHIRLPOOL cd5c8694ab3c5f6ec10f573ff22af244185722be86482f45f1182223e4914182fd5143e0f27b0b33abd9e3610ca617f17d90ce6334b77c81d7c36f0f73af177d
+AUX gnome-menus-3.2.0.1-ignore-invalid-entries.patch 1240 SHA256 5c5b729828215468a8a7624497bbde20bd9210aab987accd94bfb52f35c20f20 SHA512 b7ecd6d17542385b8e31d50c1836c0cf6a36468d527030f562547c0beeca9404fc92ad4d59962e0289eaf98c42e3eb7c75d5aa0c2dfc31df84958d04c2a89bda WHIRLPOOL 6d9fc9dd038ae8409a549d4428b7effcd80a89829b5806ebf5ae9545a0b9f9291445ecbd33c6a3213f33c5fee58cee3c940fd82a94c0415df8c155b1fbcffb3d
+AUX gnome-menus-3.6.1-applications-merged.patch 3535 SHA256 bdd8181b1639a27b5a3967764b15e556ad6d9604f81b6810ddf94e545041b27c SHA512 c8fedf4d747d62ac4543d6e59c2fe701e4b62aa03afda78b61691fc3ea05356080a514edb03ce861187f4f0356ea73a2917e139c3f69d82a98394956569be2ab WHIRLPOOL ba8cee6dc8b4014bbc448a9ab6d9a7e8978681ee98c48de87d6ab322e803e67551551f1da54180784334f066768971169e00a62c5e70d1e49c063a5070e24806
+DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf
+DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
+DIST gnome-menus-3.2.0.1.tar.xz 402080 SHA256 17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b SHA512 8c6a531b4612efbf0b39b9f8205e3a5f5d1042bdb61630bb9d6ba77b52af2898a6118d18a21a95468743e48395476feeba5f0a7be04df324a52e942c505ce7d8 WHIRLPOOL 2c60ef483bd1f28a7e625a81253891b37e168067f439b3005ea11e137c51ad6d33711940236b6f089a788551a207f7d932e428253dfaa0b8806ce59c989f7c81
+DIST gnome-menus-3.4.2.tar.xz 406316 SHA256 fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63 SHA512 a2710df76e375c3e99ac671a4ea222944b391a731f09fd1615579e89cf847e0eaa837e48a2f56b643e1bb0a2b1da1e952231265661aa71b4f7c2bb31c9e064fd WHIRLPOOL f043295d7f21e14555e72e75d79f228ece0eb6b1953d0fef3c107e841880de39232a5e5fc1ff35a2d152d3a54322074b56d2c5a94b9b15ac3a44a80329e1ee55
+DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
+EBUILD gnome-menus-2.30.5-r1.ebuild 2680 SHA256 a36ed0a342c48aa6b1589394fe0f5e79c7f9795d345aec7357fe8aa7d00e9698 SHA512 3926f8d20b9fbf8fe5fb55ae4920fc974b215339d3caa301d2cc30f95d1cc47c75329d9c46065c1a51144d78dc3440f567b30139d2296de66b5fdb48e2fac4ed WHIRLPOOL 528f9c2de0b989de3b0fcce3dbc9e6f45b773090085997ccee865912207688f67a82bfed5df64a78608a02c7063a0f8f8a42951865a38c80b1a8d9de820dc85d
+EBUILD gnome-menus-2.30.5.ebuild 2553 SHA256 a55a419f5cd3b188934e4b297685200876953e10a87c5dfb81c9e91df15d7f34 SHA512 c1b8e9cf71293145c6c7960967858da33cf716b75a97a42e9d18ed0fcd4f5edefa4ad8dbf8e703862451b0a538ee23bc396f33ae6d23287740c955d0fad4fd79 WHIRLPOOL 68e7126f662f88d97b6fc0b62d0c8577293e64783c20ee241f9305d033fd4e0da9e545b759f70e89b4a3604a6bd5a80ae2a4871b06085bf0daaa707845b4e18e
+EBUILD gnome-menus-3.0.1-r1.ebuild 2195 SHA256 eb6580d171069bd254dfa96d152d6269e6e56932ce3b4522f7780b3d3a126d93 SHA512 020abd83196d73cac32419542653f06c91497796f9b8db0d09cd19f2fc4d6f41f2f58751c61d7aa9ebfeec59be94860ec4ccc24db0603c175da2e8ad746d51dd WHIRLPOOL aea27b0c06629ece053d1f8dc6752e862867cccb572c46bef27f813b10d8480e4bb82c0a828b315a707e30d143d050953a3cf7badb7e41dcdf76c7733957c4ac
+EBUILD gnome-menus-3.0.1-r2.ebuild 2204 SHA256 63192c9f3ad6a01caa89a659ad8031f8ff6bc675ad8adb56b65da8975ec9f2fe SHA512 7ce5ceedcaee6981e786da641fe6169ec220ae58d2a847fdcf55944e395266ad95fa835a82f870d8f292aad98f0af19c328f975ce9e0def6b5db5be454f0a6f8 WHIRLPOOL 3e0b1445cb97ea2251f283c0d93fc1b02fd498f409afe024114b5b0cb75331b75dfb0ac79638d3c055198180ff9a4439a9f6b399d2a2f57efc030bd8efa41331
+EBUILD gnome-menus-3.2.0.1-r1.ebuild 2883 SHA256 5a731b6881526c107ebde21735ce27e6dc582703a087fe4368cb39ac071cd183 SHA512 bd8cc8d8d422810489beb71588f3921c1034ea40c8dc70a4ac9fd1f3194bc3763402757855c116fb0c247efff9115dfe569e6999818829ed351804d163354d85 WHIRLPOOL 2d9e60b5633bbbaa8d9a33a77e9cd209f6130c55b37243dd37cd3f0b79da4a02390f6e9974611243d01389c078edb46c9ee2c263a587f337b095e6c832b552f6
+EBUILD gnome-menus-3.4.2-r1.ebuild 3183 SHA256 331dda597c2410a59f53d9dffbeb5f0adae93d55433a83031039f30a10e1363f SHA512 4832b3ae93441768a64e26895d7397540fd13772a5d63c78e089d8e8079576d112f488e9a78ead2d32661c7a8e6f072e67965426655c16b6662463604b88e2bb WHIRLPOOL bfb47d38bf5750fb43a655796d88b36432f0b92713793c67c4595f32c1c0f860c51019e82a21d4e475b986ac35a4c4d2babe3cf9a6fffd79eb2d1544c60c86b2
+EBUILD gnome-menus-3.4.2.ebuild 3066 SHA256 118e67c8146a8d21e8c1d2728b9d26bd502a6e9733d0b437fc6cff3e93c5799f SHA512 ab450cd4a61ba00bb999d7ef45049d30a59daba3d428743a9eb873808806cad9c30355b5f7ea3b70a0b1295f94438e12aaed141db5c48a12b7dc02091a9aa909 WHIRLPOOL c27f1b3039bd0e5fe1968d20e9d19c3bee0c0694a0795edd84b3ba01241a1d55f0c486163e0dd13b62423f3a20f30cf15546f487c73572504bc81195ea0d11c8
+MISC ChangeLog 26095 SHA256 32e7b188fd76dcd412ebc1c4841395230be03c42b8d68cba2d822aeb95622e0a SHA512 c0b091657aae94f341710cc83145907b7378429fa8945044611e32272367274e020bc127c7f73b9dae2828c392bdd92db3a1dd92b56b488877c74ded32de868c WHIRLPOOL c4bba241701ca3956b976873929f378c13c66adac7f4bd3d5f269f15f4a948f6e8a4c5f6f136af8eb1aca545a673995aabefb50f7cf34c8098ab15aca49e567b
+MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuL2pAAoJEJ0WA1zPCt1h9g4H/jDOE+H/B0r85uh17AndZrMP
-ySmaKciCl5eNe9LVM7tmIJGPXkU84GYKP04CWEgwRl1bpqtOF/6fZzuM9kTJpgJO
-4GZt6LDKbavzzxKM/GOH8sbn8GoPQaJCCX3KMuNhVWGRNIYLMNrcc6F5JNl3CXLB
-7LB/ypqlPxy/V3LZjn11bZucYOLzpOim2IivTT2uEsAPi+76xAsagIPs0/gjnryz
-AU18cydYgAywoXKLP1iwWkfMMlUIhhuhnCTsbvTkNd2SqOPe6xgtbnBh4vhSiv9H
-GJvlsLTfgeB8OamR7Ovb2eak05QLng0CpKD7DWh0Iiv6OSH+jRK8tFTB5Xn1Ba0=
-=J4eL
+iQEcBAEBCAAGBQJQsVusAAoJEJ0WA1zPCt1hCQsH/0PsPNF0aAdBGGjAgEY8szpU
+R+T67DXiZLHiGiVdsw4Y+OMMueW09fab1YQ7WBSqMVZ2wMucve4aVDFkuPvmWrNu
+FQSGT6a0q9SD9PX5Q94BJv/69PG+VwTtRWqy6KyQm4KcNwN2tfqiliIS0eZbisiO
+w3pM6wx/shjKakbeU1mwx9uBWX56O103AuFHmT38Vyr0PdWkAbUrGC76HJXV2rpI
+TMu753a69GThwyYUg3LLLIVN5cMUu99UmCaGMR/+NN1jYskySuIsFUE0+H8TtKwN
+jPW1sG1b2TcfJU322GPHQtBMrtuGObaXXtlmj1w2heEmQKzghOGrH+sSSamzUwo=
+=XsbW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
new file mode 100644
index 000000000000..f5255cc5466e
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
@@ -0,0 +1,100 @@
+From 15baddac6c5343eaa103ecd27c625f5a415d24f3 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 24 Nov 2012 15:24:50 -0500
+Subject: [PATCH] libmenu: always call menu_layout_load() with
+ non_prefixed_name parameter
+
+We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
+the root layout node's name is set to "applications", not
+"${XDG_MENU_PREFIX}applications", because the menu spec states that the
+default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
+"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688972
+---
+ libmenu/gmenu-tree.c | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 0cb9645..a0d85d6 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -47,6 +47,7 @@ struct GMenuTree
+   guint         refcount;
+ 
+   char *basename;
++  char *non_prefixed_basename;
+   char *absolute_path;
+   char *canonical_path;
+ 
+@@ -630,6 +631,24 @@ gmenu_tree_lookup (const char     *menu_file,
+   return retval;
+ }
+ 
++static void
++gmenu_tree_update_non_prefixed_basename (GMenuTree   *tree,
++                                         const gchar *filename)
++{
++  gchar *s, *basename;
++
++  g_free (tree->non_prefixed_basename);
++  tree->non_prefixed_basename = NULL;
++  if (filename == NULL)
++    return;
++  s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
++  basename = g_path_get_basename (filename);
++  if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
++    tree->non_prefixed_basename = g_strdup ("applications.menu");
++  g_free (s);
++  g_free (basename);
++}
++
+ static GMenuTree *
+ gmenu_tree_new (GMenuTreeType   type,
+ 		const char     *menu_file,
+@@ -650,11 +669,13 @@ gmenu_tree_new (GMenuTreeType   type,
+     {
+       g_assert (canonical == FALSE);
+       tree->basename = g_strdup (menu_file);
++      gmenu_tree_update_non_prefixed_basename (tree, tree->basename);
+     }
+   else
+     {
+       tree->canonical     = canonical != FALSE;
+       tree->absolute_path = g_strdup (menu_file);
++      gmenu_tree_update_non_prefixed_basename (tree, tree->absolute_path);
+ 
+       if (tree->canonical)
+ 	{
+@@ -709,6 +730,9 @@ gmenu_tree_unref (GMenuTree *tree)
+     g_free (tree->basename);
+   tree->basename = NULL;
+ 
++  g_free (tree->non_prefixed_basename);
++  tree->non_prefixed_basename = NULL;
++
+   if (tree->absolute_path != NULL)
+     g_free (tree->absolute_path);
+   tree->absolute_path = NULL;
+@@ -1768,7 +1792,7 @@ load_merge_file (GMenuTree      *tree,
+ 
+   menu_verbose ("Merging file \"%s\"\n", canonical);
+ 
+-  to_merge = menu_layout_load (canonical, NULL, NULL);
++  to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
+   if (to_merge == NULL)
+     {
+       menu_verbose ("No menu for file \"%s\" found when merging\n",
+@@ -2926,8 +2950,7 @@ gmenu_tree_load_layout (GMenuTree *tree)
+ 
+   error = NULL;
+   tree->layout = menu_layout_load (tree->canonical_path,
+-                                   tree->type == GMENU_TREE_BASENAME ?
+-                                        tree->basename : NULL,
++                                   tree->non_prefixed_basename,
+                                    &error);
+   if (tree->layout == NULL)
+     {
+-- 
+1.8.0
+
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
new file mode 100644
index 000000000000..ada08df02491
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
@@ -0,0 +1,102 @@
+From e047041a49ad9e857b97c534203a98aac80de8d8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 24 Nov 2012 15:24:50 -0500
+Subject: [PATCH] libmenu: always call menu_layout_load() with
+ non_prefixed_name parameter
+
+We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
+the root layout node's name is set to "applications", not
+"${XDG_MENU_PREFIX}applications", because the menu spec states that the
+default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
+"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688972
+---
+ libmenu/gmenu-tree.c | 31 +++++++++++++++++++++++++++++--
+ 1 file changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 3e59c2c..dd6c670 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -60,6 +60,7 @@ struct _GMenuTree
+   GObject       parent_instance;
+ 
+   char *basename;
++  char *non_prefixed_basename;
+   char *path;
+   char *canonical_path;
+ 
+@@ -524,6 +525,24 @@ gmenu_tree_constructor (GType                  type,
+ }
+ 
+ static void
++gmenu_tree_update_non_prefixed_basename (GMenuTree   *tree,
++                                         const gchar *filename)
++{
++  gchar *s, *basename;
++
++  g_free (tree->non_prefixed_basename);
++  tree->non_prefixed_basename = NULL;
++  if (filename == NULL)
++    return;
++  s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
++  basename = g_path_get_basename (filename);
++  if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
++    tree->non_prefixed_basename = g_strdup ("applications.menu");
++  g_free (s);
++  g_free (basename);
++}
++
++static void
+ gmenu_tree_set_property (GObject         *object,
+                          guint            prop_id,
+                          const GValue    *value,
+@@ -534,10 +553,14 @@ gmenu_tree_set_property (GObject         *object,
+   switch (prop_id)
+     {
+     case PROP_MENU_BASENAME:
++      if (g_strcmp0 (self->basename, g_value_get_string (value)))
++        gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
+       self->basename = g_value_dup_string (value);
+       break;
+ 
+     case PROP_MENU_PATH:
++      if (g_strcmp0 (self->path, g_value_get_string (value)))
++        gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
+       self->path = g_value_dup_string (value);
+       break;
+ 
+@@ -587,6 +610,9 @@ gmenu_tree_finalize (GObject *object)
+     g_free (tree->basename);
+   tree->basename = NULL;
+ 
++  g_free (tree->non_prefixed_basename);
++  tree->non_prefixed_basename = NULL;
++
+   if (tree->path != NULL)
+     g_free (tree->path);
+   tree->path = NULL;
+@@ -1896,7 +1922,7 @@ load_merge_file (GMenuTree      *tree,
+ 
+   menu_verbose ("Merging file \"%s\"\n", canonical);
+ 
+-  to_merge = menu_layout_load (canonical, NULL, NULL);
++  to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
+   if (to_merge == NULL)
+     {
+       menu_verbose ("No menu for file \"%s\" found when merging\n",
+@@ -3053,8 +3079,9 @@ gmenu_tree_load_layout (GMenuTree  *tree,
+                 tree->canonical_path);
+ 
+   error = NULL;
++
+   tree->layout = menu_layout_load (tree->canonical_path,
+-                                   tree->path ? NULL : tree->basename,
++                                   tree->non_prefixed_basename,
+                                    error);
+   if (!tree->layout)
+     return FALSE;
+-- 
+1.8.0
+
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
new file mode 100644
index 000000000000..7b7ebb4bee78
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug +introspection python"
+
+RDEPEND=">=dev-libs/glib-2.18
+	python? ( dev-python/pygtk )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	if ! use debug ; then
+		G2CONF="${G2CONF} --enable-debug=minimum"
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable python)
+		$(use_enable introspection)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
+	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
+
+	# disable pyc compiling
+	python_clean_py-compile_files
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -s gnome2_src_compile
+}
+
+src_test() {
+	python_execute_function -s -d
+}
+
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
+
+	# Prefix menu, bug #256614
+	mv "${ED}"/etc/xdg/menus/applications.menu \
+		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
+
+	use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_mod_optimize GMenuSimpleEditor
+	fi
+
+	ewarn "Due to bug #256614, you might lose icons in applications menus."
+	ewarn "If you use a login manager, please re-select your session."
+	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
+	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_mod_cleanup GMenuSimpleEditor
+	fi
+}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..949604acf88c
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit autotools eutils gnome2 python
+
+DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="debug python +introspection"
+
+RDEPEND=">=dev-libs/glib-2.18
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+
+	gnome-base/gnome-common
+	dev-libs/gobject-introspection-common"
+# eautoreconf requires gnome-common
+# The actual menus are provided by slot 3
+PDEPEND="gnome-base/gnome-menus:3"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	if ! use debug ; then
+		G2CONF="${G2CONF} --enable-debug=minimum"
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable python)
+		$(use_enable introspection)"
+
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Only build the library (everything else is coming from slot 3)
+	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
+	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
+	eautoreconf
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	python_clean_py-compile_files
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -s gnome2_src_compile
+}
+
+src_test() {
+	python_execute_function -s -d
+}
+
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.4.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
index 6c8418e902a8..f9f4280c8161 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.4.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.0.ebuild,v 1.1 2012/05/13 18:43:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -64,6 +64,9 @@ src_prepare() {
 	# Don't show KDE standalone settings desktop files in GNOME others menu
 	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
+	epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
+
 	if use python; then
 		python_clean_py-compile_files
 		python_copy_sources