Fixes to properly work with seamonkey, and make compile with -gtkhtml

(Portage version: 2.1.2_pre1-r4)

5 files changed, 156 insertions, 1 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 788818ecbd36..950d4ea83f22 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.13 2006/10/26 17:15:01 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.14 2006/10/29 04:58:50 latexer Exp $
+
+*mono-tools-1.1.17-r1 (28 Oct 2006)
+
+  28 Oct 2006; Peter Johanson <latexer@gentoo.org>
+  +files/mono-tools-1.1.17-html-renderer-fixes.diff,
+  +mono-tools-1.1.17-r1.ebuild:
+  Fixes to properly work with seamonkey, and make compile with -gtkhtml
 
   26 Oct 2006; Markus Ullmann <jokey@gentoo.org> mono-tools-1.1.17.ebuild:
   Fix typo
diff --git a/dev-util/mono-tools/files/digest-mono-tools-1.1.11 b/dev-util/mono-tools/files/digest-mono-tools-1.1.11
index 2e5f2a9c8554..7286a862366b 100644
--- a/dev-util/mono-tools/files/digest-mono-tools-1.1.11
+++ b/dev-util/mono-tools/files/digest-mono-tools-1.1.11
@@ -1 +1,3 @@
 MD5 9331316fcacb07a87a7ce1c8437ad2a9 mono-tools-1.1.11.tar.gz 254033
+RMD160 f6dba0dec5a321f9956b5473348e330b5e18e50f mono-tools-1.1.11.tar.gz 254033
+SHA256 78e6007e7763b8dee6426407dde16b189a2d78ed6d5372302610f5957b4f1cd3 mono-tools-1.1.11.tar.gz 254033
diff --git a/dev-util/mono-tools/files/digest-mono-tools-1.1.17-r1 b/dev-util/mono-tools/files/digest-mono-tools-1.1.17-r1
new file mode 100644
index 000000000000..3704beb35664
--- /dev/null
+++ b/dev-util/mono-tools/files/digest-mono-tools-1.1.17-r1
@@ -0,0 +1,3 @@
+MD5 5480683e70806f5aa8f9d378ae6a094c mono-tools-1.1.17.tar.gz 254050
+RMD160 b92f166ffd29622f55ab3915cd6a1b0cb3974e6e mono-tools-1.1.17.tar.gz 254050
+SHA256 9f23ddbee7c132b2d798c2fd3d697af56ec2c9457a71d889100cc76d81ef9c1e mono-tools-1.1.17.tar.gz 254050
diff --git a/dev-util/mono-tools/files/mono-tools-1.1.17-html-renderer-fixes.diff b/dev-util/mono-tools/files/mono-tools-1.1.17-html-renderer-fixes.diff
new file mode 100644
index 000000000000..0b631a3e4e93
--- /dev/null
+++ b/dev-util/mono-tools/files/mono-tools-1.1.17-html-renderer-fixes.diff
@@ -0,0 +1,72 @@
+Only in mono-tools-1.1.17: autom4te.cache
+diff -aur --exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure mono-tools-1.1.17-orig/configure.in mono-tools-1.1.17/configure.in
+--- mono-tools-1.1.17-orig/configure.in	2006-10-04 00:13:30.000000000 -0700
++++ mono-tools-1.1.17/configure.in	2006-10-28 05:28:17.000000000 -0700
+@@ -42,21 +42,32 @@
+ AC_SUBST(GTK_SHARP_LIBS)
+ 
+ 
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
+-AC_SUBST(GTKHTML_SHARP_LIBS)
++AC_ARG_ENABLE(gtkhtml,
++              AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),
++              enable_gtkhtml="$enableval", enable_gtkhtml=yes)
++
++if test "x$enable_gtkhtml" = "xyes" ; then
++   PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0)
++   AC_SUBST(GTKHTML_SHARP_LIBS)
++fi
++
+ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
+ 
+ 
+-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no)
+-AC_SUBST(GECKO_SHARP_LIBS)
+-AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
++AC_ARG_ENABLE(mozilla,
++              AC_HELP_STRING([--enable-mozilla], [Use Gecko Browser]),
++              enable_gecko="$enableval", enable_gecko=yes)
++
++if test "x$enable_gecko" = "xyes" ; then
++   PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0)
++   AC_SUBST(GECKO_SHARP_LIBS)
+ 
+-if test "x$enable_gecko" = "xyes"; then
+-   # get the mozilla home directory
+    MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
+    AC_SUBST(MOZILLA_HOME)
+ fi
+ 
++AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
++
+ 
+ if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then
+    AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko])
+Only in mono-tools-1.1.17-orig/docbrowser: AssemblyInfo.cs
+diff -aur --exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure mono-tools-1.1.17-orig/docbrowser/Makefile.am mono-tools-1.1.17/docbrowser/Makefile.am
+--- mono-tools-1.1.17-orig/docbrowser/Makefile.am	2006-10-04 00:13:30.000000000 -0700
++++ mono-tools-1.1.17/docbrowser/Makefile.am	2006-10-28 04:32:22.000000000 -0700
+@@ -1,5 +1,7 @@
+ monodocdir=$(prefix)/lib/monodoc
++if ENABLE_GTKHTML
+ noinst_DATA = admin.exe
++endif
+ 
+ 
+ if ENABLE_GECKO
+diff -aur --exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure mono-tools-1.1.17-orig/docbrowser/monodoc.in mono-tools-1.1.17/docbrowser/monodoc.in
+--- mono-tools-1.1.17-orig/docbrowser/monodoc.in	2006-10-04 00:13:30.000000000 -0700
++++ mono-tools-1.1.17/docbrowser/monodoc.in	2006-10-28 07:50:20.000000000 -0700
+@@ -69,8 +69,10 @@
+         MOZILLA_HOME=@MOZILLA_HOME@
+ elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
+ 	MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
+-elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
+-	MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2)
++elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which firefox)" > /dev/null ; then
++	MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '=' -f 2)
++elif [ $(which seamonkey 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which seamonkey)" > /dev/null ; then
++	MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which seamonkey) | cut -d '=' -f 2)
+ fi
+ 
+ if [ -n $LD_LIBRARY_PATH ]; then
diff --git a/dev-util/mono-tools/mono-tools-1.1.17-r1.ebuild b/dev-util/mono-tools/mono-tools-1.1.17-r1.ebuild
new file mode 100644
index 000000000000..dadbaab4162f
--- /dev/null
+++ b/dev-util/mono-tools/mono-tools-1.1.17-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 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.17-r1.ebuild,v 1.1 2006/10/29 04:58:50 latexer Exp $
+
+inherit eutils mono multilib autotools
+
+DESCRIPTION="Set of useful Mono related utilities"
+HOMEPAGE="http://www.mono-project.com/"
+SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtkhtml seamonkey"
+
+RDEPEND="dev-lang/mono
+		 >=dev-util/monodoc-${PV}
+		 =dev-dotnet/gtk-sharp-2*
+		 =dev-dotnet/glade-sharp-2*
+		 =dev-dotnet/gconf-sharp-2*
+		 gtkhtml? ( =dev-dotnet/gtkhtml-sharp-2* )
+		 seamonkey? ( =dev-dotnet/gecko-sharp-0.11* )
+		 !seamonkey? ( =dev-dotnet/gtkhtml-sharp-2* )"
+DEPEND="${RDEPEND}
+		sys-devel/gettext"
+
+# Parallel build unfriendly
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	if ! use gtkhtml && ! use seamonkey ; then
+		einfo "No browser selected, defaulting to gtkhtml"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Make the browser optional
+	epatch ${FILESDIR}/${PN}-1.1.17-html-renderer-fixes.diff
+
+	# Install all our .dlls under $(libdir), not $(prefix)/lib
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:$(prefix)/lib:$(libdir):'                    \
+			${S}/{asn1view/gtk,docbrowser,gnunit/src}/Makefile.am \
+		|| die "sed failed"
+
+		sed -i -e 's:$prefix/lib:@libdir@:' \
+			${S}/docbrowser/monodoc.in      \
+		|| die "sed failed"
+	fi
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf="$(use_enable gtkhtml) $(use_enable seamonkey mozilla)"
+
+	if ! use gtktml && ! use seamonkey ; then
+		myconf="--enable-gtkhtml --disable-mozilla"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+}