Install desktop entry to /usr/share/applications, under Categories=Appliation;Development;. Thanks to Akos Ladanyi <ladanyi@tmit.bme.hu>; bug #89757. Use giflib instead of libungif; bug #85720.

(Portage version: 2.0.51.19)

6 files changed, 21 insertions, 14 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 80f2bed7de44..0cd217327215 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.34 2005/03/05 14:21:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.35 2005/05/03 10:02:09 usata Exp $
+
+  03 May 2005; Mamoru KOMACHI <usata@gentoo.org>
+  files/emacs-22.0.50.desktop, files/emacs-23.0.0.desktop,
+  -files/emacs.desktop, emacs-cvs-22.0.50.ebuild, emacs-cvs-23.0.0.ebuild:
+  Install desktop entry to /usr/share/applications, under
+  Categories=Appliation;Development;. Thanks to Akos Ladanyi
+  <ladanyi@tmit.bme.hu>; bug #89757. Use giflib instead of libungif;
+  bug #85720.
 
   05 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -emacs-cvs-21.3.50.ebuild,
   emacs-cvs-22.0.50.ebuild, emacs-cvs-23.0.0.ebuild:
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
index a8ad5f15a147..542c175f2d44 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50.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-cvs/emacs-cvs-22.0.50.ebuild,v 1.7 2005/03/05 14:21:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild,v 1.8 2005/05/03 10:02:09 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -28,7 +28,7 @@ RESTRICT="$RESTRICT nostrip"
 DEPEND=">=sys-libs/ncurses-5.3
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	X? ( virtual/x11
-		gif? ( >=media-libs/libungif-4.1.0.1b )
+		gif? ( >=media-libs/giflib-4.1.0.1b )
 		jpeg? ( >=media-libs/jpeg-6b )
 		tiff? ( >=media-libs/tiff-3.5.7 )
 		png? ( >=media-libs/libpng-1.2.5 )
@@ -56,6 +56,8 @@ src_compile() {
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
 
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
 	local myconf
 
 	use nls || myconf="${myconf} --disable-nls"
@@ -137,7 +139,7 @@ src_install () {
 	dodoc BUGS ChangeLog README
 
 	if use gnome; then
-		insinto /usr/share/gnome/apps/Application
+		insinto /usr/share/applications
 		doins ${FILESDIR}/${DFILE} || die "install desktop file failed"
 	fi
 }
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index a2ae118354b7..fac6c44ab5c9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.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-cvs/emacs-cvs-23.0.0.ebuild,v 1.3 2005/03/05 14:21:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.4 2005/05/03 10:02:09 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -28,7 +28,7 @@ RESTRICT="$RESTRICT nostrip"
 DEPEND=">=sys-libs/ncurses-5.3
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	X? ( virtual/x11
-		gif? ( >=media-libs/libungif-4.1.0.1b )
+		gif? ( >=media-libs/giflib-4.1.0.1b )
 		jpeg? ( >=media-libs/jpeg-6b )
 		tiff? ( >=media-libs/tiff-3.5.7 )
 		png? ( >=media-libs/libpng-1.2.5 )
@@ -56,6 +56,8 @@ src_compile() {
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
 
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
 	local myconf
 
 	use nls || myconf="${myconf} --disable-nls"
@@ -137,7 +139,7 @@ src_install () {
 	dodoc BUGS ChangeLog README
 
 	if use gnome; then
-		insinto /usr/share/gnome/apps/Application
+		insinto /usr/share/applications
 		doins ${FILESDIR}/${DFILE} || die "install desktop file failed"
 	fi
 }
diff --git a/app-editors/emacs-cvs/files/emacs-22.0.50.desktop b/app-editors/emacs-cvs/files/emacs-22.0.50.desktop
index 9450a26f6e95..67952082f00a 100644
--- a/app-editors/emacs-cvs/files/emacs-22.0.50.desktop
+++ b/app-editors/emacs-cvs/files/emacs-22.0.50.desktop
@@ -4,4 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa
 Icon=gnome-emacs.png
 Terminal=0
 Type=Application
+Categories=Application;Development;
 Exec=/usr/bin/emacs-22.0.50
diff --git a/app-editors/emacs-cvs/files/emacs-23.0.0.desktop b/app-editors/emacs-cvs/files/emacs-23.0.0.desktop
index f7617c49cf5f..54da1ba9ba20 100644
--- a/app-editors/emacs-cvs/files/emacs-23.0.0.desktop
+++ b/app-editors/emacs-cvs/files/emacs-23.0.0.desktop
@@ -4,4 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa
 Icon=gnome-emacs.png
 Terminal=0
 Type=Application
+Categories=Application;Development;
 Exec=/usr/bin/emacs-23.0.0
diff --git a/app-editors/emacs-cvs/files/emacs.desktop b/app-editors/emacs-cvs/files/emacs.desktop
deleted file mode 100644
index da88f2fbe4f2..000000000000
--- a/app-editors/emacs-cvs/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