| 1 |
commit: e8737693e78e84fcbf0d6e76dc13f390d51e72ef |
| 2 |
Author: Hummer12007 <hilobakho <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Oct 15 20:44:05 2016 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 20 13:11:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=e8737693 |
| 7 |
|
| 8 |
dev-util/mono-tools: fix EAPI 6 support |
| 9 |
|
| 10 |
remove extraneous patch |
| 11 |
|
| 12 |
remove gtkhtml from IUSE |
| 13 |
|
| 14 |
.../files/mono-tools-2.8-html-renderer-fixes.patch | 4 +- |
| 15 |
.../files/mono-tools-9999_make_build_use_2_0.patch | 214 --------------------- |
| 16 |
dev-util/mono-tools/mono-tools-9999.ebuild | 18 +- |
| 17 |
3 files changed, 8 insertions(+), 228 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index 1c079c1..e24fdbf 100644 |
| 21 |
--- a/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch |
| 22 |
+++ b/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch |
| 23 |
@@ -1,5 +1,5 @@ |
| 24 |
---- configure.in.old 2010-10-09 16:52:09.859675267 +0200 |
| 25 |
-+++ configure.in 2010-10-09 17:01:01.043434596 +0200 |
| 26 |
+--- a/configure.in 2010-10-09 16:52:09.859675267 +0200 |
| 27 |
++++ b/configure.in 2010-10-09 17:01:01.043434596 +0200 |
| 28 |
@@ -62,50 +62,80 @@ |
| 29 |
AC_SUBST(GNOME_SHARP_LIBS) |
| 30 |
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") |
| 31 |
|
| 32 |
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 |
| 33 |
deleted file mode 100644 |
| 34 |
index b8d5573..0000000 |
| 35 |
--- a/dev-util/mono-tools/files/mono-tools-9999_make_build_use_2_0.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,214 +0,0 @@ |
| 38 |
-From ac706edc87c9e03dc4ffbd6fb8cd363c91493def Mon Sep 17 00:00:00 2001 |
| 39 |
-From: Timotheus Pokorra <timotheus.pokorra@××××××××××××.com> |
| 40 |
-Date: Thu, 5 Dec 2013 22:13:54 +0100 |
| 41 |
-Subject: [PATCH] fix make install, files cannot be installed because they |
| 42 |
- don't exist |
| 43 |
- |
| 44 |
-use mcs instead of gmcs or dmcs |
| 45 |
---- |
| 46 |
- Mono.Profiler/Mono.Profiler.Widgets/Makefile.am | 2 +- |
| 47 |
- Mono.Profiler/heap-snapshot-explorer/Makefile.am | 2 +- |
| 48 |
- Mono.Profiler/heap-snapshot-viewer/Makefile.am | 2 +- |
| 49 |
- Mono.Profiler/mprof-gui/Makefile.am | 2 +- |
| 50 |
- Mono.Profiler/profiler-decoder-library/Makefile.am | 2 +- |
| 51 |
- Mono.Profiler/profiler-file-decoder/Makefile.am | 2 +- |
| 52 |
- create-native-map/src/Makefile.am | 2 +- |
| 53 |
- docbrowser/Makefile.am | 4 ++-- |
| 54 |
- gendarme/swf-wizard-runner/Makefile.am | 2 +- |
| 55 |
- ilcontrast/Makefile.am | 2 +- |
| 56 |
- minvoke/Makefile.am | 6 +++--- |
| 57 |
- mperfmon/Makefile.am | 2 +- |
| 58 |
- webdoc/Makefile.am | 6 +----- |
| 59 |
- 13 files changed, 16 insertions(+), 20 deletions(-) |
| 60 |
- |
| 61 |
-diff --git a/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am b/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am |
| 62 |
-index f0bf1ec..c4b1843 100644 |
| 63 |
---- a/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am |
| 64 |
-+++ b/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am |
| 65 |
-@@ -56,7 +56,7 @@ build_references = $(addprefix /r:, $(PROJECT_REFERENCES)) $(REFERENCES) |
| 66 |
- |
| 67 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) |
| 68 |
- mkdir -p $(BUILDDIR) |
| 69 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references) |
| 70 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references) |
| 71 |
- |
| 72 |
- EXTRA_DIST = Mono.Profiler.Widgets.csproj $(FILES) $(RESOURCES) |
| 73 |
- |
| 74 |
-diff --git a/Mono.Profiler/heap-snapshot-explorer/Makefile.am b/Mono.Profiler/heap-snapshot-explorer/Makefile.am |
| 75 |
-index a9f34a3..c679ec9 100644 |
| 76 |
---- a/Mono.Profiler/heap-snapshot-explorer/Makefile.am |
| 77 |
-+++ b/Mono.Profiler/heap-snapshot-explorer/Makefile.am |
| 78 |
-@@ -51,6 +51,6 @@ build_references = $(addprefix /r:,$(PROJECT_REFERENCES)) $(PACKAGE_REFERENCES) |
| 79 |
- |
| 80 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES) |
| 81 |
- mkdir -p $(BUILDDIR) |
| 82 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references) |
| 83 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references) |
| 84 |
- |
| 85 |
- EXTRA_DIST = heap-snapshot-explorer.csproj $(FILES) $(RESOURCES) |
| 86 |
-diff --git a/Mono.Profiler/heap-snapshot-viewer/Makefile.am b/Mono.Profiler/heap-snapshot-viewer/Makefile.am |
| 87 |
-index f7b0888..19b4f0b 100644 |
| 88 |
---- a/Mono.Profiler/heap-snapshot-viewer/Makefile.am |
| 89 |
-+++ b/Mono.Profiler/heap-snapshot-viewer/Makefile.am |
| 90 |
-@@ -48,7 +48,7 @@ build_references = $(addprefix -r:, $(PROJECT_REFERENCES)) $(REFERENCES) |
| 91 |
- |
| 92 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES) |
| 93 |
- mkdir -p $(shell dirname $(ASSEMBLY)) |
| 94 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references) |
| 95 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references) |
| 96 |
- |
| 97 |
- EXTRA_DIST = heap-snapshot-viewer.csproj $(FILES) $(RESOURCES) $(man_MANS) |
| 98 |
- |
| 99 |
-diff --git a/Mono.Profiler/mprof-gui/Makefile.am b/Mono.Profiler/mprof-gui/Makefile.am |
| 100 |
-index 0369c2c..13e2ead 100644 |
| 101 |
---- a/Mono.Profiler/mprof-gui/Makefile.am |
| 102 |
-+++ b/Mono.Profiler/mprof-gui/Makefile.am |
| 103 |
-@@ -41,7 +41,7 @@ build_references = $(addprefix -r:, $(PROJECT_REFERENCES)) $(REFERENCES) |
| 104 |
- |
| 105 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(PROJECT_REFERENCES) |
| 106 |
- mkdir -p $(shell dirname $(ASSEMBLY)) |
| 107 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references) |
| 108 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_resources_args) $(build_references) |
| 109 |
- |
| 110 |
- EXTRA_DIST = mprof-gui.csproj $(FILES) $(RESOURCES) |
| 111 |
- |
| 112 |
-diff --git a/Mono.Profiler/profiler-decoder-library/Makefile.am b/Mono.Profiler/profiler-decoder-library/Makefile.am |
| 113 |
-index 71d49ac..4780ff0 100644 |
| 114 |
---- a/Mono.Profiler/profiler-decoder-library/Makefile.am |
| 115 |
-+++ b/Mono.Profiler/profiler-decoder-library/Makefile.am |
| 116 |
-@@ -33,7 +33,7 @@ build_references = $(addprefix /r:, $(REFERENCES)) |
| 117 |
- |
| 118 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) |
| 119 |
- mkdir -p $(BUILDDIR) |
| 120 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_references) |
| 121 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_references) |
| 122 |
- |
| 123 |
- EXTRA_DIST = profiler-decoder-library.csproj $(FILES) $(RESOURCES) |
| 124 |
- |
| 125 |
-diff --git a/Mono.Profiler/profiler-file-decoder/Makefile.am b/Mono.Profiler/profiler-file-decoder/Makefile.am |
| 126 |
-index 2365dc7..2fd5338 100644 |
| 127 |
---- a/Mono.Profiler/profiler-file-decoder/Makefile.am |
| 128 |
-+++ b/Mono.Profiler/profiler-file-decoder/Makefile.am |
| 129 |
-@@ -32,7 +32,7 @@ build_references = $(addprefix /r:, $(PROJECT_REFERENCES)) |
| 130 |
- |
| 131 |
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(DLL_REFERENCES) $(PROJECT_REFERENCES) |
| 132 |
- mkdir -p $(shell dirname $(ASSEMBLY)) |
| 133 |
-- $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_references) |
| 134 |
-+ $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(build_sources) $(build_references) |
| 135 |
- |
| 136 |
- EXTRA_DIST = profiler-file-decoder.csproj $(FILES) $(RESOURCES) $(man_MANS) |
| 137 |
- |
| 138 |
-diff --git a/create-native-map/src/Makefile.am b/create-native-map/src/Makefile.am |
| 139 |
-index fd23943..6a9a998 100644 |
| 140 |
---- a/create-native-map/src/Makefile.am |
| 141 |
-+++ b/create-native-map/src/Makefile.am |
| 142 |
-@@ -17,7 +17,7 @@ REFS = -r:Mono.Posix.dll |
| 143 |
- all: $(EXE) |
| 144 |
- |
| 145 |
- $(EXE) : $(cnm_build_sources) |
| 146 |
-- $(GMCS) $(MCS_FLAGS) -d:TRACE -debug+ -out:$@ -target:exe $(REFS) $(cnm_build_sources) |
| 147 |
-+ $(MCS) $(MCS_FLAGS) -d:TRACE -debug+ -out:$@ -target:exe $(REFS) $(cnm_build_sources) |
| 148 |
- |
| 149 |
- assemblydir = $(prefix)/lib/create-native-map |
| 150 |
- assembly_DATA = $(EXE) MapAttribute.cs |
| 151 |
-diff --git a/docbrowser/Makefile.am b/docbrowser/Makefile.am |
| 152 |
-index 065c430..2f2ecf5 100644 |
| 153 |
---- a/docbrowser/Makefile.am |
| 154 |
-+++ b/docbrowser/Makefile.am |
| 155 |
-@@ -1,9 +1,9 @@ |
| 156 |
- monodocdir=$(prefix)/lib/monodoc |
| 157 |
- |
| 158 |
- if DMCS_PRESENT |
| 159 |
--COMPILER=$(DMCS) |
| 160 |
-+COMPILER=$(MCS) |
| 161 |
- else |
| 162 |
--COMPILER=$(GMCS) |
| 163 |
-+COMPILER=$(MCS) |
| 164 |
- endif |
| 165 |
- |
| 166 |
- SUBDIRS=theme-icons |
| 167 |
-diff --git a/gendarme/swf-wizard-runner/Makefile.am b/gendarme/swf-wizard-runner/Makefile.am |
| 168 |
-index ab54625..b797ddd 100644 |
| 169 |
---- a/gendarme/swf-wizard-runner/Makefile.am |
| 170 |
-+++ b/gendarme/swf-wizard-runner/Makefile.am |
| 171 |
-@@ -55,7 +55,7 @@ wizard_icon = Resources/gendarme.ico |
| 172 |
- wizard_build_icon = $(addprefix $(srcdir)/, $(wizard_icon)) |
| 173 |
- |
| 174 |
- ../bin/gendarme-wizard.exe: $(wizard_build_sources) $(wizard_resources) Wizard.resources Properties/Resources.resources $(wizard_build_xsl) $(wizard_build_icon) |
| 175 |
-- $(GMCS) -debug -target:winexe -r:$(CECIL_ASM) -r:../bin/Gendarme.Framework.dll \ |
| 176 |
-+ $(MCS) -debug -target:winexe -r:$(CECIL_ASM) -r:../bin/Gendarme.Framework.dll \ |
| 177 |
- -r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Windows.Forms.dll -r:System.Drawing.dll -r:System.Xml.dll \ |
| 178 |
- -resource:$(wizard_build_xsl) -resource:Wizard.resources,Gendarme.Wizard.resources \ |
| 179 |
- -resource:Properties/Resources.resources,Gendarme.Properties.Resources.resources \ |
| 180 |
-diff --git a/ilcontrast/Makefile.am b/ilcontrast/Makefile.am |
| 181 |
-index be7c20e..bcfe656 100644 |
| 182 |
---- a/ilcontrast/Makefile.am |
| 183 |
-+++ b/ilcontrast/Makefile.am |
| 184 |
-@@ -47,7 +47,7 @@ sources = \ |
| 185 |
- build_sources = Global.cs $(addprefix $(srcdir)/, $(sources)) |
| 186 |
- |
| 187 |
- ilcontrast.exe: $(build_sources) |
| 188 |
-- $(GMCS) -out:ilcontrast.exe $(references) $(resources) $(build_sources) |
| 189 |
-+ $(MCS) -out:ilcontrast.exe $(references) $(resources) $(build_sources) |
| 190 |
- |
| 191 |
- Global.cs: Global.cs.in |
| 192 |
- sed -e "s|\@VERSION\@|$(VERSION)|" $< > $@ |
| 193 |
-diff --git a/minvoke/Makefile.am b/minvoke/Makefile.am |
| 194 |
-index 49c60e1..87b6b86 100644 |
| 195 |
---- a/minvoke/Makefile.am |
| 196 |
-+++ b/minvoke/Makefile.am |
| 197 |
-@@ -18,13 +18,13 @@ retargetassembly_exe_sources = \ |
| 198 |
- EXTRA_DIST = $(minvoke_sources) $(mapassembly_dll_souorces) $(retargetassembly_exe_sources) minvoke.in |
| 199 |
- |
| 200 |
- MapAssembly.dll: $(mapassembly_dll_sources) |
| 201 |
-- $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:library -out:MapAssembly.dll $(mapassembly_dll_sources) |
| 202 |
-+ $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:library -out:MapAssembly.dll $(mapassembly_dll_sources) |
| 203 |
- |
| 204 |
- RetargetAssembly.exe: $(retargetassembly_exe_sources) |
| 205 |
-- $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:exe -out:RetargetAssembly.exe $(retargetassembly_exe_sources) |
| 206 |
-+ $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -target:exe -out:RetargetAssembly.exe $(retargetassembly_exe_sources) |
| 207 |
- |
| 208 |
- minvoke.exe: $(minvoke_sources); |
| 209 |
-- $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:minvoke.exe $(minvoke_sources) -r:System.Core -r:$(CECIL_ASM) |
| 210 |
-+ $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:minvoke.exe $(minvoke_sources) -r:System.Core -r:$(CECIL_ASM) |
| 211 |
- |
| 212 |
- |
| 213 |
- test: minvoke.exe MapAssembly.dll RetargetAssembly.exe |
| 214 |
-diff --git a/mperfmon/Makefile.am b/mperfmon/Makefile.am |
| 215 |
-index 08f3dff..17ad4be 100644 |
| 216 |
---- a/mperfmon/Makefile.am |
| 217 |
-+++ b/mperfmon/Makefile.am |
| 218 |
-@@ -29,5 +29,5 @@ assemblies = -r:System -r:System.Xml -r:Mono.Cairo -r:Mono.Posix |
| 219 |
- ress= $(foreach res,$(mperfmon_resources), $(addprefix -resource:,$(res)),$(notdir $(res))) |
| 220 |
- |
| 221 |
- mperfmon.exe: $(mperfmon_sources) $(mperfmon_resources) |
| 222 |
-- $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies) |
| 223 |
-+ $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies) |
| 224 |
- |
| 225 |
-diff --git a/webdoc/Makefile.am b/webdoc/Makefile.am |
| 226 |
-index 73d2517..2c613d0 100644 |
| 227 |
---- a/webdoc/Makefile.am |
| 228 |
-+++ b/webdoc/Makefile.am |
| 229 |
-@@ -117,18 +117,14 @@ install-data-hook: |
| 230 |
- $(INSTALL_DATA) $(srcdir)/App_Code/Plugins/*cs $(DESTDIR)$(webdir)/App_Code/Plugins |
| 231 |
- $(INSTALL_DATA) $(srcdir)/views/*css $(DESTDIR)$(webdir)/views |
| 232 |
- $(INSTALL_DATA) $(srcdir)/views/*js $(DESTDIR)$(webdir)/views |
| 233 |
-- $(INSTALL_DATA) $(srcdir)/views/*html $(DESTDIR)$(webdir)/views |
| 234 |
- $(INSTALL_DATA) $(srcdir)/views/images/*png $(DESTDIR)$(webdir)/views/images |
| 235 |
-- $(INSTALL_DATA) $(srcdir)/views/images/*gif $(DESTDIR)$(webdir)/views/images |
| 236 |
-+ $(INSTALL_DATA) $(srcdir)/views/images/*ico $(DESTDIR)$(webdir)/views/images |
| 237 |
- $(INSTALL_DATA) $(srcdir)/skins/mono-external/header* $(DESTDIR)$(webdir)/skins/mono-external |
| 238 |
- $(INSTALL_DATA) $(srcdir)/skins/mono-external/footer* $(DESTDIR)$(webdir)/skins/mono-external |
| 239 |
- $(INSTALL_DATA) $(srcdir)/skins/mono-external/*css $(DESTDIR)$(webdir)/skins/mono-external |
| 240 |
-- $(INSTALL_DATA) $(srcdir)/skins/mono-external/*js $(DESTDIR)$(webdir)/skins/mono-external |
| 241 |
- $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*png $(DESTDIR)$(webdir)/skins/mono-external/images |
| 242 |
- $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*gif $(DESTDIR)$(webdir)/skins/mono-external/images |
| 243 |
-- $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugins/*css $(DESTDIR)$(webdir)/plugins/iframe-plugin |
| 244 |
- $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*js $(DESTDIR)$(webdir)/plugins/iframe-plugin |
| 245 |
-- $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*html $(DESTDIR)$(webdir)/plugins/iframe-plugin |
| 246 |
- $(INSTALL_DATA) $(srcdir)/plugins/tooltip-plugin/*js $(DESTDIR)$(webdir)/plugins/tooltip-plugin |
| 247 |
- $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*css $(DESTDIR)$(webdir)/plugins/sidebar-plugin |
| 248 |
- $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*js $(DESTDIR)$(webdir)/plugins/sidebar-plugin |
| 249 |
--- |
| 250 |
-2.0.4 |
| 251 |
- |
| 252 |
|
| 253 |
diff --git a/dev-util/mono-tools/mono-tools-9999.ebuild b/dev-util/mono-tools/mono-tools-9999.ebuild |
| 254 |
index 16a64ac..627ddb8 100644 |
| 255 |
--- a/dev-util/mono-tools/mono-tools-9999.ebuild |
| 256 |
+++ b/dev-util/mono-tools/mono-tools-9999.ebuild |
| 257 |
@@ -14,27 +14,20 @@ EGIT_REPO_URI="git://github.com/mono/${PN}.git" |
| 258 |
LICENSE="GPL-2 MIT" |
| 259 |
SLOT="0" |
| 260 |
KEYWORDS="" |
| 261 |
-IUSE="+webkit" |
| 262 |
+IUSE="" |
| 263 |
|
| 264 |
RDEPEND=">=dev-dotnet/gtk-sharp-2.99 |
| 265 |
- webkit? ( dev-dotnet/webkit-sharp )" |
| 266 |
+ dev-dotnet/webkit-sharp" |
| 267 |
DEPEND="${RDEPEND} |
| 268 |
sys-devel/gettext |
| 269 |
virtual/pkgconfig" |
| 270 |
PATCHES=( |
| 271 |
"${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch" |
| 272 |
- "${FILESDIR}/${P}_make_build_use_2_0.patch" |
| 273 |
) |
| 274 |
MAKEOPTS="${MAKEOPTS} -j1" #nowarn |
| 275 |
-pkg_setup() { |
| 276 |
- if ! use webkit && ! use gtkhtml |
| 277 |
- then |
| 278 |
- die "You must USE either webkit or gtkhtml" |
| 279 |
- fi |
| 280 |
-} |
| 281 |
|
| 282 |
src_prepare() { |
| 283 |
- base_src_prepare |
| 284 |
+ default |
| 285 |
|
| 286 |
# Stop getting ACLOCAL_FLAGS command not found problem like bug #298813 |
| 287 |
sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am || die |
| 288 |
@@ -43,8 +36,9 @@ src_prepare() { |
| 289 |
} |
| 290 |
|
| 291 |
src_configure() { |
| 292 |
- econf --disable-dependency-tracking \ |
| 293 |
+ econf --disable-dependency-tracking \ |
| 294 |
--disable-gecko \ |
| 295 |
- $(use_enable webkit) \ |
| 296 |
+ --enable-webkit \ |
| 297 |
+ --disable-gtkhtml \ |
| 298 |
--disable-monowebbrowser || die |
| 299 |
} |
Archives