Undo previous two changes. Install desktop entry only for USE=X.

Package-Manager: portage-2.1.4_rc7

4 files changed, 36 insertions, 14 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index 1e0b28016d35..dcdf9e12fe5f 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/jasspa-microemacs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.31 2007/12/06 20:20:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.32 2007/12/06 23:38:51 ulm Exp $
+
+  06 Dec 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/jasspa-microemacs.desktop, jasspa-microemacs-20060909-r1.ebuild:
+  Undo previous two changes; the file name argument was missing from "Exec".
+  Install desktop entry only for USE=X, it doesn't work otherwise.
 
   06 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
   jasspa-microemacs-20060909-r1.ebuild:
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 22156c21d52b..0e05a287e949 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -5,18 +5,22 @@ AUX 20050505-ncurses.patch 773 RMD160 2d867abbf6f6a7ee94b01d7fd1edcd215d57bcd3 S
 MD5 4955d965589ead062220bc18ab724b60 files/20050505-ncurses.patch 773
 RMD160 2d867abbf6f6a7ee94b01d7fd1edcd215d57bcd3 files/20050505-ncurses.patch 773
 SHA256 ec1e6cb4370d3240607f87f11fe3f19090c47cd1356726929cb37f3b71055b80 files/20050505-ncurses.patch 773
+AUX jasspa-microemacs.desktop 219 RMD160 b53ea171fea8d175a807f61987464fe228ff55e3 SHA1 3d7ff9e2cd49f59509249ad326ca95a26c9af68c SHA256 ced4cd79b707213578d56f549ee72e72edb2f9d5001d77c53a9ade69425daa0c
+MD5 ab440bc2c34508c80accaa802a39fef1 files/jasspa-microemacs.desktop 219
+RMD160 b53ea171fea8d175a807f61987464fe228ff55e3 files/jasspa-microemacs.desktop 219
+SHA256 ced4cd79b707213578d56f549ee72e72edb2f9d5001d77c53a9ade69425daa0c files/jasspa-microemacs.desktop 219
 DIST jasspa-mehtml-20060909.tar.gz 617066 RMD160 84a31dba95839c41661f9907bee76e8c87a13c13 SHA1 867d492949a6f765963d059836edcf191ee3c6c1 SHA256 367a30cbd39856c3c4e64a18fda8fd33de8f07385bdfa680dce5f5ce91d0cdd2
 DIST jasspa-memacros-20060909-2.tar.gz 1074818 RMD160 363f4279e3a34975239aafc219c30e25a6abbfa7 SHA1 060d80dd0a4b19a2b16030abae09a9169a76a8d4 SHA256 b7bd93092ea5a48654a3b666ab11d243e080fe60de25504c03311ed2ec52ff17
 DIST jasspa-mesrc-20060909-2.tar.gz 797821 RMD160 6cac620803c84349850493c0250af7272b36af4e SHA1 e7c9cf3504c2bec4c074ecbe82f6a053560c4532 SHA256 2cb80e403a1c76c6a3405ccbf67e457e2f558e19f80c96baa608635f3e917299
 DIST meicons-extra.tar.gz 43345 RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 SHA1 5a196c1bcd3a6a3afaa619b719848f775a3a910b SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef
-EBUILD jasspa-microemacs-20060909-r1.ebuild 2050 RMD160 b7455daab3ef7732be510c2f7d82e76e13517a8f SHA1 181921ba457c4a6877a1661b4c479628476d58eb SHA256 37154e357d3768594e37b8642863a1aa01e2df73999fd98702d49e3a7055979f
-MD5 2f4f49d84a29bcf463393307fb06c0fe jasspa-microemacs-20060909-r1.ebuild 2050
-RMD160 b7455daab3ef7732be510c2f7d82e76e13517a8f jasspa-microemacs-20060909-r1.ebuild 2050
-SHA256 37154e357d3768594e37b8642863a1aa01e2df73999fd98702d49e3a7055979f jasspa-microemacs-20060909-r1.ebuild 2050
-MISC ChangeLog 5837 RMD160 71e4290cea69fa2922bccec0ff0dd89dfe2688b1 SHA1 6904c1e1cbc0b70ba6709ab8925726735f1e94b2 SHA256 e609f77e7117ee6c86bc4a397eb47cf397f936b258599e4af319f3ed2599645c
-MD5 a710730f0c998068dd4d2b77c6dc4d9a ChangeLog 5837
-RMD160 71e4290cea69fa2922bccec0ff0dd89dfe2688b1 ChangeLog 5837
-SHA256 e609f77e7117ee6c86bc4a397eb47cf397f936b258599e4af319f3ed2599645c ChangeLog 5837
+EBUILD jasspa-microemacs-20060909-r1.ebuild 2040 RMD160 b7f93146cb7534091fae08c4ff5706045b302a8b SHA1 9f89cc89761b9a1f86451a645d36b8770207e30a SHA256 d91d72c754d01023bb201d408112cf6fbe6b77143a1b6429a668a5cce383c084
+MD5 8f114502e6f0181d2ede31ad0f08c184 jasspa-microemacs-20060909-r1.ebuild 2040
+RMD160 b7f93146cb7534091fae08c4ff5706045b302a8b jasspa-microemacs-20060909-r1.ebuild 2040
+SHA256 d91d72c754d01023bb201d408112cf6fbe6b77143a1b6429a668a5cce383c084 jasspa-microemacs-20060909-r1.ebuild 2040
+MISC ChangeLog 6101 RMD160 9ffcf13ef10420fb96eede29d66074c9dc4f2948 SHA1 0b55c15688422891ccef7dd1bf78c545a8421808 SHA256 50f1bc980e670971ef550e7f217b5120e3bfa3a9b0641011e1f99f5ac89ca565
+MD5 cc68ca6fcd0f36cc7c49c2d5a039f780 ChangeLog 6101
+RMD160 9ffcf13ef10420fb96eede29d66074c9dc4f2948 ChangeLog 6101
+SHA256 50f1bc980e670971ef550e7f217b5120e3bfa3a9b0641011e1f99f5ac89ca565 ChangeLog 6101
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -27,7 +31,7 @@ SHA256 aceb1a4db139bc654ccede43a10b55c14d88d1ef300795d7406141048a760cc5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHWFoTNQqtfCuFneMRAnP7AKCCr6M5Mm/SJ+dSqQ+0fR6SZt5Y5gCbBMVS
-owGVcvP/MFEKobut/0IQLA4=
-=WP/3
+iD8DBQFHWIgoOeoy/oIi7uwRAqI7AKDOI6FK+IPmZZ263FZAlFHhyvuauACggZaf
+i29du4vhAHA+X4wsp4ZNH5g=
+=37QV
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop b/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
new file mode 100644
index 000000000000..693dd2a8ec63
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Jasspa MicroEmacs
+GenericName=Text Editor
+Comment=Advanced Text Editor
+TryExec=me
+Exec=me %F
+Terminal=false
+Icon=/usr/share/jasspa/icons/32x32/me.png
+Type=Application
+Categories=Utility;TextEditor;
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild
index 7e95fd4a5e44..a78e2aa42afc 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild,v 1.7 2007/12/06 20:20:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20060909-r1.ebuild,v 1.8 2007/12/06 23:38:51 ulm Exp $
 
 inherit eutils toolchain-funcs
 
@@ -65,7 +65,10 @@ src_install() {
 		keepdir /usr/share/jasspa/site
 		insinto /usr/share
 		doins -r "${WORKDIR}/jasspa"
-		make_desktop_entry me "Jasspa MicroEmacs" /usr/share/jasspa/icons/32x32/me.png "Utility;TextEditor"
+		if use X; then
+			insinto /usr/share/applications
+			doins "${FILESDIR}/${PN}.desktop"
+		fi
 	fi
 
 	dodoc ../faq.txt ../readme.txt ../change.log || die "dodoc failed"