Use domenu instead insinto + doins to install .desktop files

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

7 files changed, 23 insertions, 21 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 205f263378a7..d62ae1a8a4c7 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.236 2012/08/08 01:20:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.237 2012/09/05 07:51:31 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> blender-2.49b-r2.ebuild,
+  blender-2.63a-r2.ebuild:
+  Use domenu instead insinto + doins to install .desktop files
 
   08 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r2.ebuild:
   Fix another crash.
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
index 7837a4b3ba0a..948781f573cf 100644
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ b/media-gfx/blender/blender-2.49b-r2.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-gfx/blender/blender-2.49b-r2.ebuild,v 1.16 2012/07/17 06:33:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.17 2012/09/05 07:51:31 jlec Exp $
 
 EAPI=2
 
@@ -156,9 +156,8 @@ src_install() {
 
 	insinto /usr/share/pixmaps
 	doins "${WORKDIR}"/install/linux2/icons/scalable/blender.svg
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop || die
-	doins "${FILESDIR}"/${P}-insecure.desktop || die
+	domenu "${FILESDIR}"/${PN}.desktop || die
+	domenu "${FILESDIR}"/${P}-insecure.desktop || die
 
 	dodoc INSTALL README
 	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
diff --git a/media-gfx/blender/blender-2.63a-r2.ebuild b/media-gfx/blender/blender-2.63a-r2.ebuild
index f520de4cd07e..a04f8fae081f 100644
--- a/media-gfx/blender/blender-2.63a-r2.ebuild
+++ b/media-gfx/blender/blender-2.63a-r2.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-gfx/blender/blender-2.63a-r2.ebuild,v 1.5 2012/08/08 01:20:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r2.ebuild,v 1.6 2012/09/05 07:51:31 jlec Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
@@ -251,8 +251,7 @@ src_install() {
 	doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
 
 	# install desktop file
-	insinto /usr/share/applications
-	doins release/freedesktop/blender.desktop
+	domenu release/freedesktop/blender.desktop
 
 	# install docs
 	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index e3fe0a559ecb..2c6952957c75 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.148 2012/05/09 02:09:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.149 2012/09/05 07:52:11 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> fontforge-20100501.ebuild,
+  fontforge-20110222-r1.ebuild, fontforge-20110222.ebuild:
+  Use domenu instead insinto + doins to install .desktop files
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org>
   fontforge-20110222-r1.ebuild:
@@ -680,4 +684,3 @@
   <Maarten.Wisse@urz.uni-heidelberg.de>, Martin Diers <martin@diers.us>,
   Akos Maroy <darkeye@tyrell.hu> and Stefan Illner <stillner@gmx.de>.
   Closing bug #46686
-
diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild
index 7da9c4337fba..665f76333695 100644
--- a/media-gfx/fontforge/fontforge-20100501.ebuild
+++ b/media-gfx/fontforge/fontforge-20100501.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.10 2011/06/20 05:04:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.11 2012/09/05 07:52:11 jlec Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -94,8 +94,7 @@ src_install() {
 	fi
 
 	doicon Packaging/fontforge.png
-	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop
+	domenu Packaging/fontforge.desktop
 	insinto /usr/share/mime/application
 	doins Packaging/fontforge.xml
 
diff --git a/media-gfx/fontforge/fontforge-20110222-r1.ebuild b/media-gfx/fontforge/fontforge-20110222-r1.ebuild
index 7f2122337622..88f77af7653c 100644
--- a/media-gfx/fontforge/fontforge-20110222-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20110222-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/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.7 2012/05/09 02:09:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -103,8 +103,7 @@ src_install() {
 	fi
 
 	doicon Packaging/fontforge.png || die
-	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop || die
+	domenu Packaging/fontforge.desktop || die
 	insinto /usr/share/mime/application
 	doins Packaging/fontforge.xml || die
 
diff --git a/media-gfx/fontforge/fontforge-20110222.ebuild b/media-gfx/fontforge/fontforge-20110222.ebuild
index 2d3d05606c87..a1678780da4d 100644
--- a/media-gfx/fontforge/fontforge-20110222.ebuild
+++ b/media-gfx/fontforge/fontforge-20110222.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.7 2011/09/09 12:14:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -102,8 +102,7 @@ src_install() {
 	fi
 
 	doicon Packaging/fontforge.png || die
-	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop || die
+	domenu Packaging/fontforge.desktop || die
 	insinto /usr/share/mime/application
 	doins Packaging/fontforge.xml || die