Some cosmetics to desktop file, thanks to betelgeuse in bug #196832

Package-Manager: portage-2.1.4_rc7

4 files changed, 33 insertions, 30 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index c106c848c03f..2627a3887e0a 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.29 2007/11/03 15:08:51 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.30 2007/12/05 22:52:44 jokey Exp $
+
+  05 Dec 2007; Markus Ullmann <jokey@gentoo.org> files/virtualbox.desktop,
+  virtualbox-1.5.2-r1.ebuild:
+  Some cosmetics to desktop file, thanks to betelgeuse in bug #196832
 
 *virtualbox-1.5.2-r1 (03 Nov 2007)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 5065f17b2104..a51d5ab87150 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -29,23 +29,23 @@ AUX virtualbox-wrapper 3712 RMD160 c749a252c21b4709b0553255e84e1e36f28c20e1 SHA1
 MD5 2d0f3d2c80a7da5c2a4661c60cb6be59 files/virtualbox-wrapper 3712
 RMD160 c749a252c21b4709b0553255e84e1e36f28c20e1 files/virtualbox-wrapper 3712
 SHA256 7f3ccf41c445d02db230ca9a9c982ae64b732d97a8e306e02f22139885bfd548 files/virtualbox-wrapper 3712
-AUX virtualbox.desktop 244 RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a SHA1 0a1d0d934ceabefde69e20d0fb913811e0b71fcb SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd
-MD5 51d18d34fc1d53bee67b9c124265b599 files/virtualbox.desktop 244
-RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a files/virtualbox.desktop 244
-SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd files/virtualbox.desktop 244
+AUX virtualbox.desktop 198 RMD160 01b0abb36ce82508acbc3b99f3a999bb5d2eed65 SHA1 fd79617d2fdfe5e2fbbb304eac2a8cf076eb4808 SHA256 0e65e53250960a39fbaaaf42d44e49464d9a949cd0015bf2e3cb5abbe633c63a
+MD5 1a8cbcde414324aced66cf31f9c1fdda files/virtualbox.desktop 198
+RMD160 01b0abb36ce82508acbc3b99f3a999bb5d2eed65 files/virtualbox.desktop 198
+SHA256 0e65e53250960a39fbaaaf42d44e49464d9a949cd0015bf2e3cb5abbe633c63a files/virtualbox.desktop 198
 DIST VirtualBox-1.5.2_OSE.tar.bz2 24227070 RMD160 ca9ae0ad715109835800a2258124101ada679ede SHA1 1b34ec0bd838f2b6e0c5b91b944a7b2c977f0875 SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd
-EBUILD virtualbox-1.5.2-r1.ebuild 4136 RMD160 3d12cd5998e627c938b587a8fb93ab8aa3273f78 SHA1 c440848417b7ed5b5983f30abfb9c6163222243b SHA256 79336c25ae92110c013892d7b5ffe56128f99ec0092a27659b9f8c2ff9a532e9
-MD5 126fce1d75794cf4f099c259273cd61e virtualbox-1.5.2-r1.ebuild 4136
-RMD160 3d12cd5998e627c938b587a8fb93ab8aa3273f78 virtualbox-1.5.2-r1.ebuild 4136
-SHA256 79336c25ae92110c013892d7b5ffe56128f99ec0092a27659b9f8c2ff9a532e9 virtualbox-1.5.2-r1.ebuild 4136
+EBUILD virtualbox-1.5.2-r1.ebuild 4096 RMD160 50142eaa2da700cf134defd0018e9ab14bac4326 SHA1 303eb2a2dbb108ade3c46474246c6a9db5fe5cb2 SHA256 3d28a0c6da55a0acf04b5c880b9d6b2b8622b15f45c6ad52f8e48c1321196933
+MD5 08ae12a404ad8d887c8e3a49d80079f4 virtualbox-1.5.2-r1.ebuild 4096
+RMD160 50142eaa2da700cf134defd0018e9ab14bac4326 virtualbox-1.5.2-r1.ebuild 4096
+SHA256 3d28a0c6da55a0acf04b5c880b9d6b2b8622b15f45c6ad52f8e48c1321196933 virtualbox-1.5.2-r1.ebuild 4096
 EBUILD virtualbox-9999.ebuild 4304 RMD160 c54d2e548d88564d30331eb1a6242a909484ceb6 SHA1 ed0bc52e01745e388fc603b0f32aa985c3aac431 SHA256 437ad18498a058b679bf7c1eac18916611a5f9ad6d058acf08990bf8acff9af7
 MD5 be482be8b35e54affa6ce95b54980829 virtualbox-9999.ebuild 4304
 RMD160 c54d2e548d88564d30331eb1a6242a909484ceb6 virtualbox-9999.ebuild 4304
 SHA256 437ad18498a058b679bf7c1eac18916611a5f9ad6d058acf08990bf8acff9af7 virtualbox-9999.ebuild 4304
-MISC ChangeLog 6220 RMD160 a462b5fac06699c50457813af8ef2058d885be71 SHA1 06af89ff6dbd94bbc0cdc5ed6ae18b0947b89133 SHA256 96977e446843ab991313b16b6bcc296cf51c2fac7a2b31f65d3d9659a62ec6cf
-MD5 21b341fec5bbac0458fb77908e16eed8 ChangeLog 6220
-RMD160 a462b5fac06699c50457813af8ef2058d885be71 ChangeLog 6220
-SHA256 96977e446843ab991313b16b6bcc296cf51c2fac7a2b31f65d3d9659a62ec6cf ChangeLog 6220
+MISC ChangeLog 6396 RMD160 c55df1668858c5abac85102b7f3eaf9cfdfff996 SHA1 04f2d9bec5939006304a938d698483843a9e898f SHA256 3841875154ad31f77720f1305bbe5c19bb519df9bc652b6415a65dfda9538d48
+MD5 b22a4ace095b9b6252e063ef5c59dd8b ChangeLog 6396
+RMD160 c55df1668858c5abac85102b7f3eaf9cfdfff996 ChangeLog 6396
+SHA256 3841875154ad31f77720f1305bbe5c19bb519df9bc652b6415a65dfda9538d48 ChangeLog 6396
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -59,7 +59,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLI8Nz974XjDVpbkRApz5AKCTsKb0zW/is3yON6XdF6cnj8XM8wCgoIR0
-D/b2xbI2NvDraQ76WLwbQPs=
-=Ukyq
+iD8DBQFHVyvIz974XjDVpbkRAkzeAJ9V2iMEp+oWIPsskO0rvmhNu6+/kACfUm8C
+QSoqE2gJLV0Oow97bkgDXFs=
+=NSF+
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/files/virtualbox.desktop b/app-emulation/virtualbox/files/virtualbox.desktop
index 902b45d7ec16..1f009e95530d 100644
--- a/app-emulation/virtualbox/files/virtualbox.desktop
+++ b/app-emulation/virtualbox/files/virtualbox.desktop
@@ -1,11 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=
 Name=Innotek VirtualBox
 Type=Application
 Comment=Run several virtual systems on a single host computer
-Exec=virtualbox
-TryExec=virtualbox
-Path=
-Icon=virtualbox.png
-Categories=Application;Emulator;System;
+Exec=VirtualBox
+TryExec=VirtualBox
+Icon=virtualbox
+Categories=System;Emulator;
diff --git a/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild
index 45ee4ec338fc..8063801de066 100644
--- a/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild,v 1.1 2007/11/03 15:08:51 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild,v 1.2 2007/12/05 22:52:44 jokey Exp $
 
-inherit eutils flag-o-matic qt3 toolchain-funcs
+inherit eutils flag-o-matic qt3 toolchain-funcs fdo-mime
 
 MY_P=VirtualBox-${PV}_OSE
 DESCRIPTION="Softwarefamily of powerful x86 virtualization"
@@ -115,14 +115,12 @@ src_install() {
 	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
 
 	# desktop entry
-	insinto /usr/share/pixmaps
-	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-	dosed -e "s/Version=/Version=${PV}/" /usr/share/applications/${PN}.desktop
+	newicon "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {
+	fdo-mime_desktop_database_update
 	elog ""
 	elog "To launch VirtualBox just type: \"VirtualBox\""
 	elog "You must be in the vboxusers group to use VirtualBox,"
@@ -131,3 +129,7 @@ pkg_postinst() {
 	elog "http://www.virtualbox.org/download/UserManual.pdf"
 	elog ""
 }
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}