disable installing of emacs mode file (#60754)

6 files changed, 29 insertions, 37 deletions

diff --git a/dev-util/desktop-file-utils/ChangeLog b/dev-util/desktop-file-utils/ChangeLog
index bd2eabe18d43..e7ae12c50090 100644
--- a/dev-util/desktop-file-utils/ChangeLog
+++ b/dev-util/desktop-file-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/desktop-file-utils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.11 2004/09/16 15:38:36 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.12 2004/09/22 15:29:09 liquidx Exp $
+
+  22 Sep 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/desktop-file-utils-0.8-noemacs.patch, -desktop-file-utils-0.7.ebuild,
+  desktop-file-utils-0.8.ebuild:
+  disable installing of emacs mode file (#60754)
 
 *desktop-file-utils-0.8 (16 Sep 2004)
 
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index b60fa00874ee..38fe7bdb63ab 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,10 +1,9 @@
-MD5 c661816f56717e6294527a6ba835c407 ChangeLog 1649
 MD5 d304b02e23a640ad390b88bd85cec876 desktop-file-utils-0.3.ebuild 853
 MD5 5989d08b061650b07914c7e8375bd83b desktop-file-utils-0.5.ebuild 853
-MD5 6c7113eb89b448c9fec4de6d638fe2dc desktop-file-utils-0.7.ebuild 780
+MD5 aa2a260e4ddc7bcd72fbeec25c243b88 desktop-file-utils-0.8.ebuild 940
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 87fd6d622c8da6d1a67c948351c99e3c desktop-file-utils-0.8.ebuild 777
+MD5 f6474a980bbe4cd2bab1614c15195f59 ChangeLog 1862
 MD5 d5fb44d1f502de66b26adb38f8cb552e files/digest-desktop-file-utils-0.3 74
 MD5 3ec40b5b7c9a78f971f6208e41e847c0 files/digest-desktop-file-utils-0.5 74
-MD5 488de007c606dc22a0514b9a6fc650b5 files/digest-desktop-file-utils-0.7 74
 MD5 8b13236a7cbb85cbf2a4d9ba99adfacd files/digest-desktop-file-utils-0.8 74
+MD5 a5b7ad2bec794347c2aa4fd97ccb4228 files/desktop-file-utils-0.8-noemacs.patch 417
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.7.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.7.ebuild
deleted file mode 100644
index 39a800ddedd7..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.7.ebuild,v 1.5 2004/09/02 23:00:11 gustavoz Exp $
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-SRC_URI="http://www.freedesktop.org/software/desktop-file-utils/releases/${P}.tar.gz"
-HOMEPAGE="http://www.freedesktop.org/software/desktop-file-utils/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0.0
-		>=dev-libs/popt-1.6.3"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild
index 63ef27db9f3c..093f53ed8798 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild,v 1.1 2004/09/16 15:38:36 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.8.ebuild,v 1.2 2004/09/22 15:29:09 liquidx Exp $
+
+inherit eutils
 
 DESCRIPTION="Command line utilities to work with desktop menu entries"
 SRC_URI="http://www.freedesktop.org/software/desktop-file-utils/releases/${P}.tar.gz"
@@ -16,6 +18,11 @@ RDEPEND=">=dev-libs/glib-2.0.0
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	# patch that disables auto pre-compiling of emacs mode file.
+	cd ${S}; epatch ${FILESDIR}/${P}-noemacs.patch
+}			 
 
 src_compile() {
 	econf || die
@@ -24,6 +31,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-
+	
 	dodoc AUTHORS COPYING ChangeLog NEWS README
 }
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.8-noemacs.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.8-noemacs.patch
new file mode 100644
index 000000000000..3ee120124bcc
--- /dev/null
+++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.8-noemacs.patch
@@ -0,0 +1,11 @@
+--- desktop-file-utils-0.8/Makefile.in	2004-09-02 20:48:18.000000000 +0100
++++ desktop-file-utils-0.8/Makefile.in.new	2004-09-22 16:19:40.635143576 +0100
+@@ -143,7 +143,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = src test misc
++SUBDIRS = src test
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/dev-util/desktop-file-utils/files/digest-desktop-file-utils-0.7 b/dev-util/desktop-file-utils/files/digest-desktop-file-utils-0.7
deleted file mode 100644
index 3a1eade70062..000000000000
--- a/dev-util/desktop-file-utils/files/digest-desktop-file-utils-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32b948c2676170dc01ac4849c00bc5d6 desktop-file-utils-0.7.tar.gz 415348