Use domenu instead insinto + doins to install .desktop files

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

4 files changed, 11 insertions, 10 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 2fb84cd96d8b..0ec2519f3bfb 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.171 2012/08/08 03:05:52 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.172 2012/09/05 07:40:56 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild,
+  wxpython-2.9.3.1.ebuild, wxpython-2.9.4.1.ebuild:
+  Use domenu instead insinto + doins to install .desktop files
 
   08 Aug 2012; Ryan Hill <dirtyepic@gentoo.org>
   +files/wxpython-2.8.11-drop-editra.patch:
diff --git a/dev-python/wxpython/wxpython-2.8.12.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
index c3009d281b38..fdf30e454caa 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1.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/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.15 2012/05/29 14:46:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.16 2012/09/05 07:40:56 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -104,8 +104,7 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
-	doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
+	domenu "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
 	insinto /usr/share/pixmaps
 	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
 	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
diff --git a/dev-python/wxpython/wxpython-2.9.3.1.ebuild b/dev-python/wxpython/wxpython-2.9.3.1.ebuild
index 090609337efa..699c07de1ec9 100644
--- a/dev-python/wxpython/wxpython-2.9.3.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.3.1.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/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.3 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.4 2012/09/05 07:40:56 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -98,9 +98,8 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
 	for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do
-		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
+		newmenu "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
 	done
 	insinto /usr/share/pixmaps
 	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
diff --git a/dev-python/wxpython/wxpython-2.9.4.1.ebuild b/dev-python/wxpython/wxpython-2.9.4.1.ebuild
index dc9445c53341..f679abfd568c 100644
--- a/dev-python/wxpython/wxpython-2.9.4.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.4.1.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/dev-python/wxpython/wxpython-2.9.4.1.ebuild,v 1.1 2012/07/28 22:56:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1.ebuild,v 1.2 2012/09/05 07:40:56 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -97,9 +97,8 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
 	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
+		newmenu "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
 	done
 	insinto /usr/share/pixmaps
 	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png