From: Saleem Abdulrasool <compnerd@gentoo.org>
Date: Sun, 27 Nov 2005 22:52:34 +0000 (+0000)
Subject: Fixing desktop entry file creation
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81eb1d40c41dfadfbdff8b5e495916b389c3203d;p=gentoo.git

Fixing desktop entry file creation
Package-Manager: portage-2.0.53_rc7
---

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 2f14267ea88f..5f4346338ad1 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.4 2005/11/21 04:01:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.5 2005/11/27 22:52:34 compnerd Exp $
+
+  27 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/mono-tools-1.1.10-fix-desktop-entry.patch,
+  mono-tools-1.1.10.ebuild:
+  Fixing desktop entry creation.
 
   21 Nov 2005; Joseph Jezak <josejx@gentoo.org> mono-tools-1.1.10.ebuild:
   Marked ~ppc for bug #109401.
diff --git a/dev-util/mono-tools/Manifest b/dev-util/mono-tools/Manifest
index 9dd5211b796c..85e5d1121916 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ade10577d0d113ce123ce17076608382 ChangeLog 808
+MD5 4ca8230aeea03c3b6d9d1cf8e08e27ef ChangeLog 980
 MD5 ef298aaced690df60aa4661092650a69 files/digest-mono-tools-1.1.10 69
 MD5 c4e9e26f2de9880b018d52913396a564 files/digest-mono-tools-1.1.9 68
+MD5 721dc80a14f215ca4491110855e0ab61 files/mono-tools-1.1.10-fix-desktop-entry.patch 1369
 MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
-MD5 e2c9bb6704a060c1707b07001cef5f59 mono-tools-1.1.10.ebuild 1250
+MD5 2027bc8cbafb411abd63e6f0e6a6325a mono-tools-1.1.10.ebuild 1397
 MD5 6c5a33d97f8fdd2b0b0b8c5e2bddedd0 mono-tools-1.1.9.ebuild 800
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDgUaecsIHjyDViGQRAguUAJ94ARBh850zVvCk3qGttafbJpx+NwCfUv+b
-VcKjcIMZnpCQny3S4necMgE=
-=kNPU
------END PGP SIGNATURE-----
diff --git a/dev-util/mono-tools/files/mono-tools-1.1.10-fix-desktop-entry.patch b/dev-util/mono-tools/files/mono-tools-1.1.10-fix-desktop-entry.patch
new file mode 100644
index 000000000000..00e2dd702ad5
--- /dev/null
+++ b/dev-util/mono-tools/files/mono-tools-1.1.10-fix-desktop-entry.patch
@@ -0,0 +1,32 @@
+diff -ur mono-tools-1.1.10/configure.in mono-tools-1.1.10/configure.in
+--- mono-tools-1.1.10/configure.in	2005-11-08 16:06:39.000000000 -0600
++++ mono-tools-1.1.10/configure.in	2005-11-27 16:32:58.000000000 -0600
+@@ -81,7 +81,6 @@
+ gnunit/src/AssemblyInfo.cs
+ gnunit/src/catalog.cs
+ docbrowser/Makefile
+-docbrowser/monodoc.desktop
+ docbrowser/monodoc
+ docbrowser/AssemblyInfo.cs
+ po/Makefile.in
+diff -ur mono-tools-1.1.10/docbrowser/Makefile.am mono-tools-1.1.10/docbrowser/Makefile.am
+--- mono-tools-1.1.10/docbrowser/Makefile.am	2005-11-08 19:40:22.000000000 -0600
++++ mono-tools-1.1.10/docbrowser/Makefile.am	2005-11-27 16:38:00.000000000 -0600
+@@ -11,7 +11,7 @@
+ GTKHTML_TARGET=GtkHtmlHtmlRender.dll
+ endif
+ 
+-CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb
++CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb monodoc.desktop
+ monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
+ 
+ DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc.in
+@@ -80,5 +80,8 @@
+ desktopdir = $(datadir)/applications
+ desktop_DATA = monodoc.desktop
+ 
++monodoc.desktop: monodoc.desktop.in
++	sed -e "s|\@bindir\@|$(bindir)|" $< > $@
++
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = monodoc.png
diff --git a/dev-util/mono-tools/mono-tools-1.1.10.ebuild b/dev-util/mono-tools/mono-tools-1.1.10.ebuild
index 972055671552..ddc2534394fb 100644
--- a/dev-util/mono-tools/mono-tools-1.1.10.ebuild
+++ b/dev-util/mono-tools/mono-tools-1.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.1.10.ebuild,v 1.3 2005/11/21 04:01:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.1.10.ebuild,v 1.4 2005/11/27 22:52:34 compnerd Exp $
 
-inherit mono multilib
+inherit eutils mono multilib
 
 DESCRIPTION="Set of useful Mono related utilities"
 HOMEPAGE="http://www.mono-project.com/"
@@ -21,11 +21,15 @@ DEPEND="dev-lang/mono
 	=dev-dotnet/gtkhtml-sharp-1.0*
 	=dev-dotnet/gconf-sharp-1.0*
 	<dev-dotnet/gecko-sharp-0.10"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# We want working desktop entries!
+	epatch ${FILESDIR}/${P}-fix-desktop-entry.patch
+
 	# Install all our .dlls under $(libdir), not $(prefix)/lib
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e 's:$(prefix)/lib:$(libdir):' \
@@ -33,10 +37,11 @@ src_unpack() {
 			|| die "sed failed"
 		sed -i -e 's:$prefix/lib:@libdir@:' \
 			${S}/docbrowser/monodoc.in || die "sed failed"
-
-		aclocal || die "aclocal failed"
-		automake || die "automake failed"
 	fi
+
+	aclocal || die "aclocal failed"
+	automake || die "automake failed"
+	autoconf || die "autconf failed"
 }
 
 src_compile() {