Bump for mono-2, remove crufty slag.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64

8 files changed, 138 insertions, 288 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 5881bb84b999..2f1dbe326c7b 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.40 2008/11/19 10:03:42 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.41 2008/11/19 22:36:38 loki_val Exp $
+
+*mono-tools-2.0 (19 Nov 2008)
+
+  19 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/mono-tools-1.1.10-fix-desktop-entry.patch,
+  -files/mono-tools-1.1.17-optional-browser.patch,
+  +files/mono-tools-2.0-html-renderer-fixes.patch,
+  -mono-tools-1.1.17.ebuild, -mono-tools-1.1.17-r1.ebuild,
+  -mono-tools-1.2.3.ebuild, +mono-tools-2.0.ebuild:
+  Bump for mono-2, remove crufty slag.
 
   19 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> mono-tools-1.9.ebuild:
   fix dep wrt bug 169897
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
deleted file mode 100644
index 00e2dd702ad5..000000000000
--- a/dev-util/mono-tools/files/mono-tools-1.1.10-fix-desktop-entry.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/files/mono-tools-1.1.17-optional-browser.patch b/dev-util/mono-tools/files/mono-tools-1.1.17-optional-browser.patch
deleted file mode 100644
index b79d50c4df91..000000000000
--- a/dev-util/mono-tools/files/mono-tools-1.1.17-optional-browser.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in.orig	2006-10-16 12:42:26.000000000 -0500
-+++ configure.in	2006-10-16 12:46:13.000000000 -0500
-@@ -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=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=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])
diff --git a/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch b/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch
new file mode 100644
index 000000000000..283f9326e347
--- /dev/null
+++ b/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch
@@ -0,0 +1,75 @@
+diff -urN mono-tools-2.0.old/configure.in mono-tools-2.0/configure.in
+--- mono-tools-2.0.old/configure.in	2008-10-15 11:48:22.000000000 +0200
++++ mono-tools-2.0/configure.in	2008-10-15 12:09:00.000000000 +0200
+@@ -46,26 +46,40 @@
+ AC_SUBST(GTK_SHARP_LIBS)
+ 
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no)
+-if test "x$enable_gtkhtml" = "xyes"; then
+-CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
+-else
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
+-CSHARP_FLAGS=
++dnl PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enabl   e_gtkhtml=no)
++dnl if test "x$enable_gtkhtml" = "xyes"; then
++dnl CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
++dnl else
++AC_ARG_ENABLE(gtkhtml,
++             AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),,
++             enable_gtkhtml=yes)
++
++if test "x$enable_gtkhtml" = "xyes" ; then
++       PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0)
++
++       AC_SUBST(GTKHTML_SHARP_LIBS)
++       AC_SUBST(CSHARP_FLAGS)
+ fi
+-AC_SUBST(GTKHTML_SHARP_LIBS)
+-AC_SUBST(CSHARP_FLAGS)
+-AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
++dnl fi
+ 
+-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")
++AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
+ 
+-if test "x$enable_gecko" = "xyes"; then
+-   # get the mozilla home directory
+-   MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
+-   AC_SUBST(MOZILLA_HOME)
++AC_ARG_ENABLE(mozilla,
++             AC_HELP_STRING([--enable-mozilla], [Use Gecko Browser]),,
++             enable_gecko=yes)
++
++if test "x$enable_gecko"= "xyes" ; then
++       PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0)
++
++       AC_SUBST(GECKO_SHARP_LIBS)
++
++       # 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")
++
+ PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
+ AC_SUBST(WEBKIT_SHARP_LIBS)
+ AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
+diff -urN mono-tools-2.0.old/docbrowser/monodoc.in mono-tools-2.0/docbrowser/monodoc.in
+--- mono-tools-2.0.old/docbrowser/monodoc.in	2008-10-15 12:09:36.000000000 +0200
++++ mono-tools-2.0/docbrowser/monodoc.in	2008-10-15 12:12:33.000000000 +0200
+@@ -86,8 +86,10 @@
+     MOZILLA_HOME=$MOZILLA_FIVE_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 seamonke   y)" > /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
deleted file mode 100644
index 9d4223e24b7f..000000000000
--- a/dev-util/mono-tools/mono-tools-1.1.17-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 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.6 2007/12/30 06:23:08 compnerd 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
-		elog "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 gtkhtml && ! 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
-}
diff --git a/dev-util/mono-tools/mono-tools-1.1.17.ebuild b/dev-util/mono-tools/mono-tools-1.1.17.ebuild
deleted file mode 100644
index fe52c219123a..000000000000
--- a/dev-util/mono-tools/mono-tools-1.1.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.4 2007/12/30 06:23:08 compnerd 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
-		elog "No browser selected, defaulting to gtkhtml"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Make the browser optional
-	epatch "${FILESDIR}/${PN}-1.1.17-optional-browser.patch"
-
-	# 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
-}
diff --git a/dev-util/mono-tools/mono-tools-1.2.3.ebuild b/dev-util/mono-tools/mono-tools-1.2.3.ebuild
deleted file mode 100644
index 6f27f0420cd1..000000000000
--- a/dev-util/mono-tools/mono-tools-1.2.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 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.2.3.ebuild,v 1.4 2007/12/30 06:23:08 compnerd 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 ~sparc ~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
-		elog "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
-}
diff --git a/dev-util/mono-tools/mono-tools-2.0.ebuild b/dev-util/mono-tools/mono-tools-2.0.ebuild
new file mode 100644
index 000000000000..88c0b28f23a5
--- /dev/null
+++ b/dev-util/mono-tools/mono-tools-2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.0.ebuild,v 1.1 2008/11/19 22:36:38 loki_val Exp $
+
+inherit mono multilib eutils
+
+DESCRIPTION="Set of useful Mono related utilities"
+HOMEPAGE="http://www.mono-project.com/"
+SRC_URI="http://ftp.novell.com/pub/mono/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-2.0
+		>=dev-util/monodoc-${PV}
+		=dev-dotnet/gtk-sharp-2*
+		=dev-dotnet/glade-sharp-2*
+		=dev-dotnet/gconf-sharp-2*
+		=dev-dotnet/gtkhtml-sharp-2*"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/pkgconfig-0.19"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Install all our .dlls under $(libdir), not $(prefix)/lib
+	find "${S}" -name 'Makefile*' -exec \
+		sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):g" \
+			   -e "s:\${prefix}/lib:\${prefix}/$(get_libdir):g" \
+		{} \; \
+	|| die "libdir fixup failed"
+
+	sed -i -e 's:$prefix/lib:@libdir@:' \
+		"${S}"/docbrowser/monodoc.in    \
+	|| die "sed failed"
+
+	epatch "${FILESDIR}/${P}-html-renderer-fixes.patch"
+}
+
+src_compile() {
+	econf --enable-gtkhtml --disable-gecko || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+}