Fix build with new automake, bug #398971 by Juergen Rose and Rolf S. Arvidson. Default to webkit instead of xulrunner as latest one is deprecated.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

4 files changed, 99 insertions, 15 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index fea3ecf2013a..05626666b819 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/mono-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.84 2011/07/08 10:02:58 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.85 2012/02/16 12:15:32 pacho Exp $
+
+  16 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/mono-tools-2.10-autoconf.patch, mono-tools-2.10.ebuild:
+  Fix build with new automake, bug #398971 by Juergen Rose and Rolf S. Arvidson.
+  Default to webkit instead of xulrunner as latest one is deprecated.
 
   08 Jul 2011; Pacho Ramos <pacho@gentoo.org>
   -files/mono-tools-2.4-html-renderer-fixes.patch, -mono-tools-2.8.ebuild:
diff --git a/dev-util/mono-tools/Manifest b/dev-util/mono-tools/Manifest
index dd8626baa7b6..1c2bbb5c63f6 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mono-tools-2.10-autoconf.patch 3049 RMD160 e87cb51b8b5ab4db7738f2b6a36afa1580a19be2 SHA1 7eaf703593bced90d22f8700109e816960f33a95 SHA256 5a99199198576c055da5d99530dc5f1406c84bc289ce7727be8ba686b0f5cf36
 AUX mono-tools-2.8-html-renderer-fixes.patch 3682 RMD160 b3b989eb7ab600ab499936e4f612398cc29fc100 SHA1 3d304f1eb24438488b095023c5431da37d45e9f9 SHA256 867b998b638fbea65974fa93d91d689f124fc20010b8f8c551748edb0c91b04c
 DIST mono-tools-2.10.tar.bz2 1776518 RMD160 599a942b1b1db7d99193516288a9a08f4ceea641 SHA1 111dccd490fedd42618cb712c66a1d92261e9920 SHA256 7e76c9872231332432edc2060e5e0ffef337c81993d4fef7ad98f64531b96dfa
-EBUILD mono-tools-2.10.ebuild 1419 RMD160 0b4e30d5c9503dc8567de518f061883f0b0f9c99 SHA1 3d7adea5b78c7edf5f4c3814b5eebaa6ce981335 SHA256 bf8fb979abd1500bd2ed1c37d2aec0f69774be22cd0be99939cff49026038351
-MISC ChangeLog 13194 RMD160 ba1641047d00f035da5a10e6e2e6eaf7027ba992 SHA1 c30794e847bc820d6b055ccb2e569353b10f7e63 SHA256 8d6c5367665eb09ffbd8171d0002e0cd6be1d3ae42aa8fc4df33c2aea8bcc41e
+EBUILD mono-tools-2.10.ebuild 1438 RMD160 60cf78b401e4ee7674c64307175b6760c692dfa2 SHA1 d0b6810fdf14eff59c86820cc2f850a2d074f77d SHA256 56f40520dc813abdd0b82f66ab41ca86f725e813b7a3233a1f06316be51ec634
+MISC ChangeLog 13457 RMD160 fb1fb2a80afdf7ad5af6eebd959b3649a37d2656 SHA1 32e3a72b2f9842d5bec2eab9d5e38b2cf205fa7e SHA256 addf26cda3c87417eb4d5cb2fb8b40ffa16582f2e71b2866d01801a3c351d627
 MISC metadata.xml 254 RMD160 68c02b69bcd19311b207476b2cf5d474c74db77c SHA1 bd0905a26b1c03706221e75bd46fe88e9dc6a6c6 SHA256 edb26c541b69f6e45042fcfe097ad7b6103f69b5d7c03e90c434f8f6f019a04f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4W1dgACgkQCaWpQKGI+9RAxACfeJ8MTZhBbPCyqOx1Dds6dTZM
-wn4An1vCkNuksHB2r0RMA8hHItnHF/TO
-=wkmb
+iEYEARECAAYFAk8882oACgkQCaWpQKGI+9T3KwCdH0/5we6V7iIRrgnlQ6tlALya
+nRQAn0CLL/XoZS2y4VKgK8Ikvov3bCqI
+=M/MH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mono-tools/files/mono-tools-2.10-autoconf.patch b/dev-util/mono-tools/files/mono-tools-2.10-autoconf.patch
new file mode 100644
index 000000000000..4e2c167f35c9
--- /dev/null
+++ b/dev-util/mono-tools/files/mono-tools-2.10-autoconf.patch
@@ -0,0 +1,78 @@
+diff -urN 1/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am 2/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
+--- 1/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am	2012-02-14 23:45:06.048330154 -0600
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+diff -urN 1/Mono.Profiler/heap-snapshot-explorer/Makefile.am 2/Mono.Profiler/heap-snapshot-explorer/Makefile.am
+--- 1/Mono.Profiler/heap-snapshot-explorer/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/heap-snapshot-explorer/Makefile.am	2012-02-14 23:46:21.117195189 -0600
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+diff -urN 1/Mono.Profiler/heap-snapshot-viewer/Makefile.am 2/Mono.Profiler/heap-snapshot-viewer/Makefile.am
+--- 1/Mono.Profiler/heap-snapshot-viewer/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/heap-snapshot-viewer/Makefile.am	2012-02-14 23:47:14.819383799 -0600
+@@ -8,7 +8,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = mprof-heap-viewer
+ man_MANS=man/man1/mprof-heap-viewer.1
+ 
+diff -urN 1/Mono.Profiler/mprof-gui/Makefile.am 2/Mono.Profiler/mprof-gui/Makefile.am
+--- 1/Mono.Profiler/mprof-gui/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/mprof-gui/Makefile.am	2012-02-14 23:48:03.341651249 -0600
+@@ -8,7 +8,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = emveepee
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+diff -urN 1/Mono.Profiler/profiler-decoder-library/Makefile.am 2/Mono.Profiler/profiler-decoder-library/Makefile.am
+--- 1/Mono.Profiler/profiler-decoder-library/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/profiler-decoder-library/Makefile.am	2012-02-14 23:48:48.164974430 -0600
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+diff -urN 1/Mono.Profiler/profiler-file-decoder/Makefile.am 2/Mono.Profiler/profiler-file-decoder/Makefile.am
+--- 1/Mono.Profiler/profiler-file-decoder/Makefile.am	2011-02-12 10:32:47.000000000 -0600
++++ 2/Mono.Profiler/profiler-file-decoder/Makefile.am	2012-02-14 23:49:37.892224361 -0600
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = mprof-decoder
+ man_MANS = man/man1/mprof-decoder.1 
+ 
diff --git a/dev-util/mono-tools/mono-tools-2.10.ebuild b/dev-util/mono-tools/mono-tools-2.10.ebuild
index 092926bb4adb..2dbbd331b9c5 100644
--- a/dev-util/mono-tools/mono-tools-2.10.ebuild
+++ b/dev-util/mono-tools/mono-tools-2.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10.ebuild,v 1.4 2011/05/11 19:30:27 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.10.ebuild,v 1.5 2012/02/16 12:15:32 pacho Exp $
 
-EAPI=2
+EAPI="4"
 
 inherit go-mono mono autotools
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.mono-project.com/"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="webkit gtkhtml +xulrunner"
+IUSE="+webkit gtkhtml xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6:2
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch"
+		"${FILESDIR}/${PN}-2.10-autoconf.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -42,7 +43,7 @@ src_prepare() {
 	go-mono_src_prepare
 
 	# Stop getting ACLOCAL_FLAGS command not found problem like bug #298813
-	sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am
+	sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am || die
 
 	eautoreconf
 }
@@ -52,6 +53,5 @@ src_configure() {
 		--disable-gecko \
 		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
-		$(use_enable xulrunner monowebbrowser) \
-		|| die "configure failed"
+		$(use_enable xulrunner monowebbrowser)
 }