dev-util/mono-tools: fix EAPI 6 support

remove extraneous patch

remove gtkhtml from IUSE

3 files changed, 8 insertions, 228 deletions

diff --git a/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch b/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch
index 1c079c1..e24fdbf 100644
--- a/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch
+++ b/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch
@@ -1,5 +1,5 @@
---- configure.in.old	2010-10-09 16:52:09.859675267 +0200
-+++ configure.in	2010-10-09 17:01:01.043434596 +0200
+--- a/configure.in	2010-10-09 16:52:09.859675267 +0200
++++ b/configure.in	2010-10-09 17:01:01.043434596 +0200
 @@ -62,50 +62,80 @@
  AC_SUBST(GNOME_SHARP_LIBS)
  AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
diff --git a/dev-util/mono-tools/files/mono-tools-9999_make_build_use_2_0.patch b/dev-util/mono-tools/files/mono-tools-9999_make_build_use_2_0.patch
deleted file mode 100644
index b8d5573..0000000
--- a/dev-util/mono-tools/files/mono-tools-9999_make_build_use_2_0.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From ac706edc87c9e03dc4ffbd6fb8cd363c91493def Mon Sep 17 00:00:00 2001
-From: Timotheus Pokorra <timotheus.pokorra@solidcharity.com>
-Date: Thu, 5 Dec 2013 22:13:54 +0100
-Subject: [PATCH] fix make install, files cannot be installed because they
- don't exist
-
-use mcs instead of gmcs or dmcs
----
- Mono.Profiler/Mono.Profiler.Widgets/Makefile.am    | 2 +-
- Mono.Profiler/heap-snapshot-explorer/Makefile.am   | 2 +-
- Mono.Profiler/heap-snapshot-viewer/Makefile.am     | 2 +-
- Mono.Profiler/mprof-gui/Makefile.am                | 2 +-
- Mono.Profiler/profiler-decoder-library/Makefile.am | 2 +-
- Mono.Profiler/profiler-file-decoder/Makefile.am    | 2 +-
- create-native-map/src/Makefile.am                  | 2 +-
- docbrowser/Makefile.am                             | 4 ++--
- gendarme/swf-wizard-runner/Makefile.am             | 2 +-
- ilcontrast/Makefile.am                             | 2 +-
- minvoke/Makefile.am                                | 6 +++---
- mperfmon/Makefile.am                               | 2 +-
- webdoc/Makefile.am                                 | 6 +-----
- 13 files changed, 16 insertions(+), 20 deletions(-)
-
-diff --git a/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am b/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
-index f0bf1ec..c4b1843 100644
---- a/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
-+++ b/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
-@@ -56,7 +56,7 @@ build_references = $(addprefix /r:, $(PROJECT_REFERENCES)) $(REFERENCES)
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources)
- 	mkdir -p $(BUILDDIR)
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
- 
- EXTRA_DIST = Mono.Profiler.Widgets.csproj $(FILES) $(RESOURCES)
- 
-diff --git a/Mono.Profiler/heap-snapshot-explorer/Makefile.am b/Mono.Profiler/heap-snapshot-explorer/Makefile.am
-index a9f34a3..c679ec9 100644
---- a/Mono.Profiler/heap-snapshot-explorer/Makefile.am
-+++ b/Mono.Profiler/heap-snapshot-explorer/Makefile.am
-@@ -51,6 +51,6 @@ build_references = $(addprefix /r:,$(PROJECT_REFERENCES)) $(PACKAGE_REFERENCES)
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES)
- 	mkdir -p $(BUILDDIR)
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
- 
- EXTRA_DIST = heap-snapshot-explorer.csproj $(FILES) $(RESOURCES)
-diff --git a/Mono.Profiler/heap-snapshot-viewer/Makefile.am b/Mono.Profiler/heap-snapshot-viewer/Makefile.am
-index f7b0888..19b4f0b 100644
---- a/Mono.Profiler/heap-snapshot-viewer/Makefile.am
-+++ b/Mono.Profiler/heap-snapshot-viewer/Makefile.am
-@@ -48,7 +48,7 @@ build_references = $(addprefix -r:, $(PROJECT_REFERENCES)) $(REFERENCES)
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES)
- 	mkdir -p $(shell dirname $(ASSEMBLY))
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references)
- 
- EXTRA_DIST = heap-snapshot-viewer.csproj $(FILES) $(RESOURCES) $(man_MANS)
- 
-diff --git a/Mono.Profiler/mprof-gui/Makefile.am b/Mono.Profiler/mprof-gui/Makefile.am
-index 0369c2c..13e2ead 100644
---- a/Mono.Profiler/mprof-gui/Makefile.am
-+++ b/Mono.Profiler/mprof-gui/Makefile.am
-@@ -41,7 +41,7 @@ build_references = $(addprefix -r:, $(PROJECT_REFERENCES)) $(REFERENCES)
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES)
- 	mkdir -p $(shell dirname $(ASSEMBLY))
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references)
- 
- EXTRA_DIST = mprof-gui.csproj $(FILES) $(RESOURCES)
- 
-diff --git a/Mono.Profiler/profiler-decoder-library/Makefile.am b/Mono.Profiler/profiler-decoder-library/Makefile.am
-index 71d49ac..4780ff0 100644
---- a/Mono.Profiler/profiler-decoder-library/Makefile.am
-+++ b/Mono.Profiler/profiler-decoder-library/Makefile.am
-@@ -33,7 +33,7 @@ build_references = $(addprefix /r:, $(REFERENCES))
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) 
- 	mkdir -p $(BUILDDIR)
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_references)
- 
- EXTRA_DIST = profiler-decoder-library.csproj $(FILES) $(RESOURCES)
- 
-diff --git a/Mono.Profiler/profiler-file-decoder/Makefile.am b/Mono.Profiler/profiler-file-decoder/Makefile.am
-index 2365dc7..2fd5338 100644
---- a/Mono.Profiler/profiler-file-decoder/Makefile.am
-+++ b/Mono.Profiler/profiler-file-decoder/Makefile.am
-@@ -32,7 +32,7 @@ build_references = $(addprefix /r:, $(PROJECT_REFERENCES))
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(DLL_REFERENCES) $(PROJECT_REFERENCES)
- 	mkdir -p $(shell dirname $(ASSEMBLY))
--	$(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_references)
-+	$(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_references)
- 
- EXTRA_DIST = profiler-file-decoder.csproj $(FILES) $(RESOURCES) $(man_MANS)
- 
-diff --git a/create-native-map/src/Makefile.am b/create-native-map/src/Makefile.am
-index fd23943..6a9a998 100644
---- a/create-native-map/src/Makefile.am
-+++ b/create-native-map/src/Makefile.am
-@@ -17,7 +17,7 @@ REFS = -r:Mono.Posix.dll
- all: $(EXE)
- 
- $(EXE) : $(cnm_build_sources)
--	$(GMCS) $(MCS_FLAGS) -d:TRACE -debug+ -out:$@ -target:exe $(REFS) $(cnm_build_sources)
-+	$(MCS) $(MCS_FLAGS) -d:TRACE -debug+ -out:$@ -target:exe $(REFS) $(cnm_build_sources)
- 
- assemblydir = $(prefix)/lib/create-native-map
- assembly_DATA = $(EXE) MapAttribute.cs
-diff --git a/docbrowser/Makefile.am b/docbrowser/Makefile.am
-index 065c430..2f2ecf5 100644
---- a/docbrowser/Makefile.am
-+++ b/docbrowser/Makefile.am
-@@ -1,9 +1,9 @@
- monodocdir=$(prefix)/lib/monodoc
- 
- if DMCS_PRESENT
--COMPILER=$(DMCS)
-+COMPILER=$(MCS)
- else
--COMPILER=$(GMCS)
-+COMPILER=$(MCS)
- endif
- 
- SUBDIRS=theme-icons
-diff --git a/gendarme/swf-wizard-runner/Makefile.am b/gendarme/swf-wizard-runner/Makefile.am
-index ab54625..b797ddd 100644
---- a/gendarme/swf-wizard-runner/Makefile.am
-+++ b/gendarme/swf-wizard-runner/Makefile.am
-@@ -55,7 +55,7 @@ wizard_icon = Resources/gendarme.ico
- wizard_build_icon = $(addprefix $(srcdir)/, $(wizard_icon))
- 
- ../bin/gendarme-wizard.exe: $(wizard_build_sources) $(wizard_resources) Wizard.resources Properties/Resources.resources $(wizard_build_xsl) $(wizard_build_icon)
--	$(GMCS) -debug -target:winexe -r:$(CECIL_ASM) -r:../bin/Gendarme.Framework.dll \
-+	$(MCS) -debug -target:winexe -r:$(CECIL_ASM) -r:../bin/Gendarme.Framework.dll \
- 		-r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Windows.Forms.dll -r:System.Drawing.dll -r:System.Xml.dll \
- 		-resource:$(wizard_build_xsl) -resource:Wizard.resources,Gendarme.Wizard.resources \
- 		-resource:Properties/Resources.resources,Gendarme.Properties.Resources.resources \
-diff --git a/ilcontrast/Makefile.am b/ilcontrast/Makefile.am
-index be7c20e..bcfe656 100644
---- a/ilcontrast/Makefile.am
-+++ b/ilcontrast/Makefile.am
-@@ -47,7 +47,7 @@ sources =				\
- build_sources = Global.cs $(addprefix $(srcdir)/, $(sources))
- 
- ilcontrast.exe: $(build_sources)
--	$(GMCS) -out:ilcontrast.exe $(references) $(resources) $(build_sources)
-+	$(MCS) -out:ilcontrast.exe $(references) $(resources) $(build_sources)
- 
- Global.cs: Global.cs.in
- 	sed -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-diff --git a/minvoke/Makefile.am b/minvoke/Makefile.am
-index 49c60e1..87b6b86 100644
---- a/minvoke/Makefile.am
-+++ b/minvoke/Makefile.am
-@@ -18,13 +18,13 @@ retargetassembly_exe_sources = \
- EXTRA_DIST = $(minvoke_sources) $(mapassembly_dll_souorces) $(retargetassembly_exe_sources) minvoke.in
- 
- MapAssembly.dll: $(mapassembly_dll_sources) 
--	$(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:library -out:MapAssembly.dll $(mapassembly_dll_sources)
-+	$(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:library -out:MapAssembly.dll $(mapassembly_dll_sources)
- 
- RetargetAssembly.exe: $(retargetassembly_exe_sources)
--	$(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:exe -out:RetargetAssembly.exe $(retargetassembly_exe_sources)
-+	$(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:exe -out:RetargetAssembly.exe $(retargetassembly_exe_sources)
- 
- minvoke.exe: $(minvoke_sources);
--	$(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:minvoke.exe $(minvoke_sources) -r:System.Core -r:$(CECIL_ASM)
-+	$(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:minvoke.exe $(minvoke_sources) -r:System.Core -r:$(CECIL_ASM)
- 
- 
- test: minvoke.exe MapAssembly.dll RetargetAssembly.exe
-diff --git a/mperfmon/Makefile.am b/mperfmon/Makefile.am
-index 08f3dff..17ad4be 100644
---- a/mperfmon/Makefile.am
-+++ b/mperfmon/Makefile.am
-@@ -29,5 +29,5 @@ assemblies = -r:System -r:System.Xml -r:Mono.Cairo -r:Mono.Posix
- ress= $(foreach res,$(mperfmon_resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
- 
- mperfmon.exe: $(mperfmon_sources) $(mperfmon_resources)
--	$(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies)
-+	$(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies)
- 
-diff --git a/webdoc/Makefile.am b/webdoc/Makefile.am
-index 73d2517..2c613d0 100644
---- a/webdoc/Makefile.am
-+++ b/webdoc/Makefile.am
-@@ -117,18 +117,14 @@ install-data-hook:
- 	 $(INSTALL_DATA) $(srcdir)/App_Code/Plugins/*cs                                         $(DESTDIR)$(webdir)/App_Code/Plugins
- 	 $(INSTALL_DATA) $(srcdir)/views/*css                                                   $(DESTDIR)$(webdir)/views
- 	 $(INSTALL_DATA) $(srcdir)/views/*js                                                    $(DESTDIR)$(webdir)/views
--	 $(INSTALL_DATA) $(srcdir)/views/*html                                                  $(DESTDIR)$(webdir)/views
- 	 $(INSTALL_DATA) $(srcdir)/views/images/*png                                            $(DESTDIR)$(webdir)/views/images
--	 $(INSTALL_DATA) $(srcdir)/views/images/*gif                                            $(DESTDIR)$(webdir)/views/images
-+	 $(INSTALL_DATA) $(srcdir)/views/images/*ico                                            $(DESTDIR)$(webdir)/views/images
- 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/header*                                  $(DESTDIR)$(webdir)/skins/mono-external
- 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/footer*                                  $(DESTDIR)$(webdir)/skins/mono-external
- 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/*css                                     $(DESTDIR)$(webdir)/skins/mono-external
--	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/*js                                      $(DESTDIR)$(webdir)/skins/mono-external
- 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*png                              $(DESTDIR)$(webdir)/skins/mono-external/images
- 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*gif                              $(DESTDIR)$(webdir)/skins/mono-external/images
--	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugins/*css                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
- 	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/iframe-plugin
--	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*html                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
- 	 $(INSTALL_DATA) $(srcdir)/plugins/tooltip-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/tooltip-plugin
- 	 $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*css                                  $(DESTDIR)$(webdir)/plugins/sidebar-plugin
- 	 $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*js                                   $(DESTDIR)$(webdir)/plugins/sidebar-plugin
--- 
-2.0.4
-
diff --git a/dev-util/mono-tools/mono-tools-9999.ebuild b/dev-util/mono-tools/mono-tools-9999.ebuild
index 16a64ac..627ddb8 100644
--- a/dev-util/mono-tools/mono-tools-9999.ebuild
+++ b/dev-util/mono-tools/mono-tools-9999.ebuild
@@ -14,27 +14,20 @@ EGIT_REPO_URI="git://github.com/mono/${PN}.git"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+webkit"
+IUSE=""
 
 RDEPEND=">=dev-dotnet/gtk-sharp-2.99
-	webkit? ( dev-dotnet/webkit-sharp )"
+	dev-dotnet/webkit-sharp"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch"
-	"${FILESDIR}/${P}_make_build_use_2_0.patch"
 )
 MAKEOPTS="${MAKEOPTS} -j1" #nowarn
-pkg_setup() {
-	if ! use webkit && ! use gtkhtml
-	then
-		die "You must USE either webkit or gtkhtml"
-	fi
-}
 
 src_prepare() {
-	base_src_prepare
+	default
 
 	# Stop getting ACLOCAL_FLAGS command not found problem like bug #298813
 	sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am || die
@@ -43,8 +36,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf	--disable-dependency-tracking \
+	econf --disable-dependency-tracking \
 		--disable-gecko \
-		$(use_enable webkit) \
+		--enable-webkit \
+		--disable-gtkhtml \
 		--disable-monowebbrowser || die
 }