Use domenu instead insinto + doins to install .desktop files

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 16 insertions, 23 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 1d1916eaea11..e1cf53cbfa60 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.143 2012/08/04 16:25:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.144 2012/09/05 07:52:07 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> xbmc-11.0.ebuild,
+  xbmc-9999.ebuild:
+  Use domenu instead insinto + doins to install .desktop files
 
   04 Aug 2012; Mike Frysinger <vapier@gentoo.org>
   files/xbmc-9999-nomythtv.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 33645822b612..1baa00fffcc8 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -10,24 +10,15 @@ AUX xbmc-11.0-nomythtv.patch 6190 SHA256 ffb1eb49f94b4ae41e5d79172499671915122a5
 AUX xbmc-9999-no-arm-flags.patch 457 SHA256 db13f604ac5901e84dd96b65e9a1318956b60d73c7b5918e0040eb14321aab92 SHA512 4aa8d5e82d22a8de6fa42be3fdeba71da1dee2722f8ae95b38e7b0c908dfea419db251254113fade0dcb9bd36a18b408d1ee2fd2de9fd339b4694da837ce3add WHIRLPOOL ac87f031a875a37c1a700607659060937a97df740f693a76cb55c28097adbf421622b7f4689ad2ac9ac4798d3e4a785da102cbd17bcfbdcf90a1f5c5b4afb00f
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
-EBUILD xbmc-11.0.ebuild 6264 SHA256 09fdd157fd65f206910b8e2b18536c77d5a738f4d9e78d81a4b965ed5ddb47b2 SHA512 f9c701fa4c17d80ddb5bc20a9b092d789cb0f3640cf6627412189f20b642d57b3ac516ea17286271c1f44d44c072b418e110b43bc715076bc9fe8bc4a933e964 WHIRLPOOL 3f23073b0a3281235e106fbd39a5322e4ac198290f556cf3ea72f498f396ca2d0b0a1f9d8230211b2ca9217740417c5b35b2428bd72ac63bec432b42141f6be9
-EBUILD xbmc-9999.ebuild 5935 SHA256 b8b1b1f426669a0366dc0e4c285d14c021fd103bd6a4b0a35762711645f4cdfb SHA512 a85b4577f437479c78a9aa7709910d169ad5d578dab75d9862be83d282a90ad6d1c867e135c2872207d08b65ce8b697ce9e313eb516ab99b0ba75768ba353d92 WHIRLPOOL 4f0da0baa58288694ac1c9b2e0de12ff7ed78f3dbf5f4606135676ce697e9f9fc7ebb8d473975fddc5b9207ce5961a374b9b6d2cfd9b2afbd2fde1ad27c77838
-MISC ChangeLog 22954 SHA256 c4e15153de5d7ea4bcc0a2dcee92f6d9ebd15fc12ae36966b99f6546b4f77056 SHA512 b1638cc5598e71fa325dffe124f825b9fac39491636d202e08ae3e3b089058e84fd12b28ba4f0b5200d03149a2e18e0f56c9f0684d5aae8736822c115da29d71 WHIRLPOOL 6999100bc99f9a682381b962a183a4847c0c75dcbea85851355f2fcb50b1978e3c7951b521f0b07c2f6688e4aaaf54e9fda8d6de7f8eeba160d5f6066f6a525c
+EBUILD xbmc-11.0.ebuild 6230 SHA256 cc9c8e0f4cbc99f6b02b8385f8ef08c9d7fe128a619eb650d4a627f8f7bbd391 SHA512 8a08020a237c0147163c5a8c57f1d23c5a3c0fdc1571ab640b3096eff49d28da60efbf86d42fa8139c88b6e073a9f689715b366cad9092d71ee2646165e91bc0 WHIRLPOOL 7a64f09945fc96f319b7869450eb4c1e7f74646c6f89d3a51f7908d3f56c99f9b185863b992f6fca8c929d7a53d6fea465f9ec9cfc977d113b83f8378f9957fb
+EBUILD xbmc-9999.ebuild 5901 SHA256 fd9c340f8c2b11bca97aef6ccd238e8a579d6d1cd161c7d9587f5002e7ad10d8 SHA512 3e7e68af02ff78c8a6a23c4185739ae9c9ec3261f683c702c732f0dae17f3ab51f7c27d5f9caf61a373653ee86348c1ae6596dad093ec17c0a07c77c2b724335 WHIRLPOOL b95b8335b85dc19534ac5dc7f29fc734ae181e6a8e188b972bba24ec328ad1e53adea951ffad0603bfc3acaba8d5938fc2afe7a8557b22199ef3d945a5dd13f1
+MISC ChangeLog 23101 SHA256 370448496e177fd9b8fb1b1a10007705a2dadb61d642d6e5f6f4ef6a02b0b73f SHA512 136774cdf70d7e6ca02fb0ab2ae3b4b4127a3dd35c12128766fe95e84cfc5cff95b9a15eee4951e86699669478b18223f9524fcf45e9e0fb982b328d7c910f98 WHIRLPOOL a2578356e899481775a75d1c612529425deae1899ad72bad313427c670a52cc44c6a409666a5d23ed03d452721909b995767b3b5a80d51598052e90831265019
 MISC metadata.xml 1004 SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e SHA512 f13daa4939dda43a19384a0295171430cdcff2dab90882a2d98c053c45da53732453108edbcdfa93f5a1af061acaa2b5bc973909aafb8359606951e8e70d21dc WHIRLPOOL b307c432b5e1d46e7462d25bd9d4b5ba705fe4c4fbd71701d7a7591daf21a1a152df44fb3bce9cc51703f28cb1a37105630bc9a070d5dd3cb7772585a0c6c517
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJQHU27AAoJELEHsLL7fEFW6O4P/RMKWeLjD9zBeNEFEVbQnITq
-BDH28ps05blPF3XY8dqLP4E5gmeH+KAYa93e5yvGWRz72yJv9mvJEi6G3lMmOcg1
-WFW90zgm9opBeVAryAQqvRD5PyLtTdKelNMnrfMzFrkkncPoZ0g016eToDxy+CYB
-UIxQRdfRjdsFpAbsfB6HUixo1FSsX8oFU64WnCRMYrXCipsYJioZaA0XgI0VQ7i9
-T9V22M/sL0FOOeklpkUWhd4hig0R4oBDgTDLSMJ8WUWUI2vBpRDBgBCy4KGN3q7K
-30jBT2ZP8rX9MnIpe0Ca5yny/CMooG/BO6DLaWqR50Tse6UmM5+46Z4sefvnUpJC
-LZvUBqm/q7FmAFotxxprXFaD8vkLgqcy4saDtUO8Hs1xWGV0cvIhl1Ts7+h+mfIJ
-oB2NdYj/XpSVWdBVP3b+lSTqZ+6Oa3NQYM5uhH4QAq+5MC6u5YBgYeTZK0/p2g2O
-4msjgsrH8mXL+lTSqAOmdbPIFQB0Us4mMqtUfBw9ixr3bFJL3dLlBmeJ1LTTf0Ja
-V1cUR+gAjCxADRei+GhANVFQAdxVVOt1OCvZ9a8+DfPaACtKnzU90cbJWboqyWTe
-wCprC3i8FtvR1r/whyTdHaAnkK1fsKTEjcJKrz+pI+uYxXMhlB0RCssTr9fJ0vx8
-OFPwpZaggC1YwaFiBv5A
-=IRr2
+iEYEAREIAAYFAlBHBK0ACgkQgAnW8HDreRbM5QCfV4/U9JVQSqIIj0U1GgvFet/R
+kTcAn1fDVuT0UI67GyCLiQA710oIq98S
+=7vK7
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index b06e297a484c..0440eca93c53 100644
--- a/media-tv/xbmc/xbmc-11.0.ebuild
+++ b/media-tv/xbmc/xbmc-11.0.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/media-tv/xbmc/xbmc-11.0.ebuild,v 1.13 2012/07/15 23:10:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.14 2012/09/05 07:52:07 jlec Exp $
 
 EAPI="4"
 
@@ -221,8 +221,7 @@ src_install() {
 	default
 	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
 
-	insinto /usr/share/applications
-	doins tools/Linux/xbmc.desktop
+	domenu tools/Linux/xbmc.desktop
 	newicon tools/Linux/xbmc-48x48.png xbmc.png
 
 	insinto "$(python_get_sitedir)" #309885
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 71af86c61e58..ba20ba010eac 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.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/media-tv/xbmc/xbmc-9999.ebuild,v 1.115 2012/06/08 04:49:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.116 2012/09/05 07:52:07 jlec Exp $
 
 EAPI="4"
 
@@ -213,8 +213,7 @@ src_install() {
 	default
 	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
 
-	insinto /usr/share/applications
-	doins tools/Linux/xbmc.desktop
+	domenu tools/Linux/xbmc.desktop
 	newicon tools/Linux/xbmc-48x48.png xbmc.png
 
 	insinto "$(python_get_sitedir)" #309885