summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2005-05-03 10:54:12 +0000
committerMamoru Komachi <usata@gentoo.org>2005-05-03 10:54:12 +0000
commitf0f755a3f791252881ccafba72dfab70c05b3867 (patch)
tree2e57cf37cb3fcfad3e1cce3508cd0f582f6ad7f3 /app-editors
parentNew snapshot. Fix find syntax, as we fixed the xfs init script a while ago. P... (diff)
downloadgentoo-2-f0f755a3f791252881ccafba72dfab70c05b3867.tar.gz
gentoo-2-f0f755a3f791252881ccafba72dfab70c05b3867.tar.bz2
gentoo-2-f0f755a3f791252881ccafba72dfab70c05b3867.zip
Make desktop entry consistent between emacs and emacs-cvs; bug #89757.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-21.4-r1.ebuild5
-rw-r--r--app-editors/emacs/files/emacs-21.desktop2
-rw-r--r--app-editors/emacs/files/emacs-22.0.50.desktop2
-rw-r--r--app-editors/emacs/files/emacs.desktop7
5 files changed, 11 insertions, 11 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 151fe7b8d80f..82aa83132ca2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.61 2005/04/12 21:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.62 2005/05/03 10:54:12 usata Exp $
+
+ 03 May 2005; Mamoru KOMACHI <usata@gentoo.org> files/emacs-21.desktop,
+ files/emacs-22.0.50.desktop, -files/emacs.desktop, emacs-21.4-r1.ebuild:
+ Make desktop entry consistent between emacs and emacs-cvs; bug #89757.
12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
emacs-21.4-r1.ebuild, emacs-22.0.50_pre20050225.ebuild:
diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild
index f5770853a130..602383f5085e 100644
--- a/app-editors/emacs/emacs-21.4-r1.ebuild
+++ b/app-editors/emacs/emacs-21.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.3 2005/04/12 21:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.4 2005/05/03 10:54:12 usata Exp $
inherit flag-o-matic eutils alternatives toolchain-funcs
@@ -73,6 +73,9 @@ src_compile() {
replace-flags -O[3-9] -O2
fi
+ # -march is known to cause signal 6 on some environment
+ filter-flags "-march=*"
+
export WANT_AUTOCONF=2.1
autoconf
diff --git a/app-editors/emacs/files/emacs-21.desktop b/app-editors/emacs/files/emacs-21.desktop
index ffd8a10643c9..1eec16af6d77 100644
--- a/app-editors/emacs/files/emacs-21.desktop
+++ b/app-editors/emacs/files/emacs-21.desktop
@@ -4,5 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa
Icon=gnome-emacs.png
Terminal=0
Type=Application
-Categories=Application;Utility;TextEditor;
+Categories=Application;Development;
Exec=/usr/bin/emacs.emacs-21
diff --git a/app-editors/emacs/files/emacs-22.0.50.desktop b/app-editors/emacs/files/emacs-22.0.50.desktop
index 04dca1597b81..67952082f00a 100644
--- a/app-editors/emacs/files/emacs-22.0.50.desktop
+++ b/app-editors/emacs/files/emacs-22.0.50.desktop
@@ -4,5 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa
Icon=gnome-emacs.png
Terminal=0
Type=Application
-Categories=Application;Utility;TextEditor;
+Categories=Application;Development;
Exec=/usr/bin/emacs-22.0.50
diff --git a/app-editors/emacs/files/emacs.desktop b/app-editors/emacs/files/emacs.desktop
deleted file mode 100644
index da88f2fbe4f2..000000000000
--- a/app-editors/emacs/files/emacs.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=GNU Emacs
-Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
-Icon=gnome-emacs.png
-Terminal=0
-Type=Application
-Exec=/usr/bin/emacs