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

Package-Manager: portage-2.1.2_pre1-r4

6 files changed, 175 insertions, 19 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/Manifest b/dev-util/mono-tools/Manifest
index 177994ddeeea..0bf40223be55 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -1,16 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mono-tools-1.1.10-fix-desktop-entry.patch 1369 RMD160 f55a1e8cdce1ec5d9676a2b0f081fab8cac99416 SHA1 c9ff0771bea706825e97dc70083e17019b3c9454 SHA256 62c270e5340b4b964ad65679a04f66f61ddaf554799c2d94e22e91292673da8b
 MD5 721dc80a14f215ca4491110855e0ab61 files/mono-tools-1.1.10-fix-desktop-entry.patch 1369
 RMD160 f55a1e8cdce1ec5d9676a2b0f081fab8cac99416 files/mono-tools-1.1.10-fix-desktop-entry.patch 1369
 SHA256 62c270e5340b4b964ad65679a04f66f61ddaf554799c2d94e22e91292673da8b files/mono-tools-1.1.10-fix-desktop-entry.patch 1369
+AUX mono-tools-1.1.17-html-renderer-fixes.diff 3364 RMD160 48f594c035d9cd395bf4f3c5a13f63c1a6370a7b SHA1 e18e00f23be5d31d920f5bbc47c8ff3568dc04d9 SHA256 ee10e369d7d5a21b3550647bba267983eeea7c15eebaefdc754edfa5168608c0
+MD5 95914831b6e1e1223c3665e36bdec5c7 files/mono-tools-1.1.17-html-renderer-fixes.diff 3364
+RMD160 48f594c035d9cd395bf4f3c5a13f63c1a6370a7b files/mono-tools-1.1.17-html-renderer-fixes.diff 3364
+SHA256 ee10e369d7d5a21b3550647bba267983eeea7c15eebaefdc754edfa5168608c0 files/mono-tools-1.1.17-html-renderer-fixes.diff 3364
 AUX mono-tools-1.1.17-optional-browser.patch 1451 RMD160 242ad7bb0f226c37b9889a89faf02f652bb4965d SHA1 c15c1ccfcb5051130bf97dfd46048a7f82f9dce4 SHA256 12499db1b9a10a635b157006ab49ba75fd13a094f955975127f8a2cb912c04c2
 MD5 ce3f309f5ebb4a1fce0de24287c74fd9 files/mono-tools-1.1.17-optional-browser.patch 1451
 RMD160 242ad7bb0f226c37b9889a89faf02f652bb4965d files/mono-tools-1.1.17-optional-browser.patch 1451
 SHA256 12499db1b9a10a635b157006ab49ba75fd13a094f955975127f8a2cb912c04c2 files/mono-tools-1.1.17-optional-browser.patch 1451
 DIST mono-tools-1.1.10.tar.gz 253798
-DIST mono-tools-1.1.11.tar.gz 254033
+DIST mono-tools-1.1.11.tar.gz 254033 RMD160 f6dba0dec5a321f9956b5473348e330b5e18e50f SHA1 31735e96d6e94313c5075a84d118766b51e7296b SHA256 78e6007e7763b8dee6426407dde16b189a2d78ed6d5372302610f5957b4f1cd3
 DIST mono-tools-1.1.17.tar.gz 254050 RMD160 b92f166ffd29622f55ab3915cd6a1b0cb3974e6e SHA1 0870c83854af99e5d876e208f6f1a6ca657ce3a2 SHA256 9f23ddbee7c132b2d798c2fd3d697af56ec2c9457a71d889100cc76d81ef9c1e
 DIST mono-tools-1.1.9.tar.gz 247124
 EBUILD mono-tools-1.1.10.ebuild 1397 RMD160 09f7667d718a2476d224c867eda90cf2aba8d910 SHA1 ec19e002902ef79c442213afc362c01bf11edc42 SHA256 7e0d8168b44918f6812d0615309bcc7f100c5a976e11ec3fa0d8e1486720631b
@@ -21,6 +22,10 @@ EBUILD mono-tools-1.1.11.ebuild 1397 RMD160 7ad9d292711cf998ff013c4363e6c98a80b3
 MD5 a1d751e244cc2bccef183357945d57cb mono-tools-1.1.11.ebuild 1397
 RMD160 7ad9d292711cf998ff013c4363e6c98a80b3882b mono-tools-1.1.11.ebuild 1397
 SHA256 fc24f391622db08efcb47a512719f540318352ada464efafb201a015fd57a4db mono-tools-1.1.11.ebuild 1397
+EBUILD mono-tools-1.1.17-r1.ebuild 1818 RMD160 ef44c11aa3a435469e70902493ec82f8a045cdd0 SHA1 62f180735bef39f6195eee974943a584de567250 SHA256 eb8922e622dee6496c1e7366b740c9a30d916715cdabfcd2c689843a3926c19c
+MD5 99fcf637baf30a3286013ef033f8ebaa mono-tools-1.1.17-r1.ebuild 1818
+RMD160 ef44c11aa3a435469e70902493ec82f8a045cdd0 mono-tools-1.1.17-r1.ebuild 1818
+SHA256 eb8922e622dee6496c1e7366b740c9a30d916715cdabfcd2c689843a3926c19c mono-tools-1.1.17-r1.ebuild 1818
 EBUILD mono-tools-1.1.17.ebuild 1811 RMD160 9aefdd7fcde1e45d79f928b23628cc5099089842 SHA1 2d315c3c0de9b4fee425f4c86791296d055ff978 SHA256 2c49d240988e748d77d2c9c63092ec8806e542f6c783938b5bb6cad42f025a41
 MD5 2a18faa68e67849f37212694bd526a04 mono-tools-1.1.17.ebuild 1811
 RMD160 9aefdd7fcde1e45d79f928b23628cc5099089842 mono-tools-1.1.17.ebuild 1811
@@ -29,10 +34,10 @@ EBUILD mono-tools-1.1.9.ebuild 800 RMD160 d66374e6f274a0f3a861458898e7b0931c28de
 MD5 6c5a33d97f8fdd2b0b0b8c5e2bddedd0 mono-tools-1.1.9.ebuild 800
 RMD160 d66374e6f274a0f3a861458898e7b0931c28dea7 mono-tools-1.1.9.ebuild 800
 SHA256 bc8ea583518e0027552bb91d7aecd8c6850711e5487d7fc0be650a50c5422e7a mono-tools-1.1.9.ebuild 800
-MISC ChangeLog 1926 RMD160 b14f7d4b4f92cd253ec99df106f6d75b808376be SHA1 dcd4109e96b726ba340a67b0aa4675d245ad8cfc SHA256 58ea8f1cd5ed82b7ed6e1227f1dbf12d1bd76110df748f7663297996a38b90b0
-MD5 fc4508aaccebd05fd399d19d050ddade ChangeLog 1926
-RMD160 b14f7d4b4f92cd253ec99df106f6d75b808376be ChangeLog 1926
-SHA256 58ea8f1cd5ed82b7ed6e1227f1dbf12d1bd76110df748f7663297996a38b90b0 ChangeLog 1926
+MISC ChangeLog 2174 RMD160 94353bd6bd8ac4b6cc791ba8bf427df2c4d9d43b SHA1 c5f8f85bcb13216a9afeddedf0753f5f5975e61d SHA256 109ac5f2ab4d291ba762996052e003f7c4459ef3010e1d685625ab091e6234d0
+MD5 e2ec96f7a89cab59b9657b8c86b16da1 ChangeLog 2174
+RMD160 94353bd6bd8ac4b6cc791ba8bf427df2c4d9d43b ChangeLog 2174
+SHA256 109ac5f2ab4d291ba762996052e003f7c4459ef3010e1d685625ab091e6234d0 ChangeLog 2174
 MISC metadata.xml 256 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 SHA1 00c387ede4fbb9e5419d2c09b551635800512439 SHA256 c213280db6f2ba60c0bdfdcd476b3082ad6aab28cfb51143ae486c67b158b695
 MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 metadata.xml 256
@@ -40,19 +45,15 @@ SHA256 c213280db6f2ba60c0bdfdcd476b3082ad6aab28cfb51143ae486c67b158b695 metadata
 MD5 ef298aaced690df60aa4661092650a69 files/digest-mono-tools-1.1.10 69
 RMD160 e7ae7e5a36ce6c8922ff4b6a7cfd667a6394bc1b files/digest-mono-tools-1.1.10 69
 SHA256 7eeb8b66aa6c9441236531ac84ac92b7a958a50768a9b6056697a01b1d5c55d7 files/digest-mono-tools-1.1.10 69
-MD5 8b94db22dc3d9364e76bc1f98f399508 files/digest-mono-tools-1.1.11 69
-RMD160 3cc30ca6ba435836625a2be942d3f748c90d8686 files/digest-mono-tools-1.1.11 69
-SHA256 a143ac146d7eccc38ffbbaf175b645ec07bc0a2d8b7f5af6053586aee8f85101 files/digest-mono-tools-1.1.11 69
+MD5 b659ba55708a184fe05c23e4b2a8cb7b files/digest-mono-tools-1.1.11 253
+RMD160 b1415fd9342ae3c46a4fbd604d40e7a5c9614cfb files/digest-mono-tools-1.1.11 253
+SHA256 1c47783bed372d29101f18221121846e1d83fafd745ddf74c6e073a547d791b2 files/digest-mono-tools-1.1.11 253
 MD5 c6b41392e5a492fa07134c4c2d93423b files/digest-mono-tools-1.1.17 253
 RMD160 a3becdbfbab27d0dadaaedb7f5e0247f372e8405 files/digest-mono-tools-1.1.17 253
 SHA256 0652a4797621fc38a24ed8f3d28a8a91b096eb1b041228c2d6e58162ce7f03e0 files/digest-mono-tools-1.1.17 253
+MD5 c6b41392e5a492fa07134c4c2d93423b files/digest-mono-tools-1.1.17-r1 253
+RMD160 a3becdbfbab27d0dadaaedb7f5e0247f372e8405 files/digest-mono-tools-1.1.17-r1 253
+SHA256 0652a4797621fc38a24ed8f3d28a8a91b096eb1b041228c2d6e58162ce7f03e0 files/digest-mono-tools-1.1.17-r1 253
 MD5 c4e9e26f2de9880b018d52913396a564 files/digest-mono-tools-1.1.9 68
 RMD160 446ce1f5d296766c47e6a5f07932f0d884c1ba0f files/digest-mono-tools-1.1.9 68
 SHA256 aa97f7359f6ea1632b4e907447df4d82835e71fff0c9cec96eb84271a7bd412d files/digest-mono-tools-1.1.9 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFQO0bz974XjDVpbkRAht9AJ9WvISLFL3sFJPjSksWDi/Q4ePuQwCdGMi/
-RBq5kG3iv9/Q9We9vv+s/AY=
-=o8b1
------END PGP SIGNATURE-----
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
+}