[gentoo-commits] gentoo-x86 commit in dev-util/mono-tools: ChangeLog mono-tools-9999.ebuild mono-tools-2.4.2-r1.ebuild mono-tools-2.4.9999.ebuild mono-tools-2.4.2.ebuild

[Peter Alfredsen (loki_val)]

loki_val    09/09/02 14:05:05

  Modified:             ChangeLog mono-tools-9999.ebuild
                        mono-tools-2.4.9999.ebuild
  Added:                mono-tools-2.4.2-r1.ebuild
  Removed:              mono-tools-2.4.2.ebuild
  Log:
  Fix html-renderer-fixes patch to make Mono.Webbrowser engine optional. Xulrunner use-flag now pulls in gluezilla for Mono.Webbrowser. Drop gecko-sharp usage, since it's broken. Update 9999 ebuilds with same fixes.
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.62                 dev-util/mono-tools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/ChangeLog?r1=1.61&r2=1.62

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog	30 Jun 2009 06:02:08 -0000	1.61
+++ ChangeLog	2 Sep 2009 14:05:04 -0000	1.62
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.61 2009/06/30 06:02:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.62 2009/09/02 14:05:04 loki_val Exp $
+
+*mono-tools-2.4.2-r1 (02 Sep 2009)
+
+  02 Sep 2009; Peter Alfredsen <loki_val@g.o>
+  -mono-tools-2.4.2.ebuild, +mono-tools-2.4.2-r1.ebuild,
+  mono-tools-2.4.9999.ebuild,
+  +files/mono-tools-2.4-html-renderer-fixes.patch, mono-tools-9999.ebuild:
+  Fix html-renderer-fixes patch to make Mono.Webbrowser engine optional.
+  Xulrunner use-flag now pulls in gluezilla for Mono.Webbrowser. Drop
+  gecko-sharp usage, since it's broken. Update 9999 ebuilds with same fixes.
 
 *mono-tools-2.4.2 (30 Jun 2009)
 



1.4                  dev-util/mono-tools/mono-tools-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild?r1=1.3&r2=1.4

Index: mono-tools-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mono-tools-9999.ebuild	9 Jun 2009 21:19:35 -0000	1.3
+++ mono-tools-9999.ebuild	2 Sep 2009 14:05:04 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild,v 1.3 2009/06/09 21:19:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild,v 1.4 2009/09/02 14:05:04 loki_val Exp $
 
 EAPI=2
 
@@ -12,27 +12,32 @@
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="webkit xulrunner"
+IUSE="webkit gtkhtml +xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gconf-sharp-2
-	>=dev-dotnet/gtkhtml-sharp-2
-	webkit? ( dev-dotnet/webkit-sharp )
-	xulrunner? (
-		>=dev-dotnet/gecko-sharp-0.13
-		=dev-dotnet/gluezilla-${PV}
-	)"
+	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
+	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
+	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if ! use webkit && ! use gtkhtml && ! use xulrunner
+	then
+		die "You must USE either webkit, gtkhtml or xulrunner"
+	fi
+}
+
 src_prepare() {
 	glib-gettextize --force --copy || die "glib-gettextize --force --copy failed"
 	go-mono_src_prepare
@@ -40,9 +45,10 @@
 
 src_configure() {
 	econf	--disable-dependency-tracking \
-		--enable-gtkhtml \
-		$(use_enable xulrunner mozilla) \
+		--disable-gecko \
+		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
+		$(use_enable xulrunner monowebbrowser) \
 		|| die "configure failed"
 }
 



1.4                  dev-util/mono-tools/mono-tools-2.4.9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild?r1=1.3&r2=1.4

Index: mono-tools-2.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mono-tools-2.4.9999.ebuild	9 Jun 2009 21:19:35 -0000	1.3
+++ mono-tools-2.4.9999.ebuild	2 Sep 2009 14:05:04 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.4.9999.ebuild,v 1.3 2009/06/09 21:19:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild,v 1.4 2009/09/02 14:05:04 loki_val Exp $
 
 EAPI=2
 
@@ -12,27 +12,32 @@
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="webkit xulrunner"
+IUSE="webkit gtkhtml +xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gconf-sharp-2
-	>=dev-dotnet/gtkhtml-sharp-2
-	webkit? ( dev-dotnet/webkit-sharp )
-	xulrunner? (
-		>=dev-dotnet/gecko-sharp-0.13
-		=dev-dotnet/gluezilla-${PV}
-	)"
+	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
+	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
+	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if ! use webkit && ! use gtkhtml && ! use xulrunner
+	then
+		die "You must USE either webkit, gtkhtml or xulrunner"
+	fi
+}
+
 src_prepare() {
 	glib-gettextize --force --copy || die "glib-gettextize --force --copy failed"
 	go-mono_src_prepare
@@ -40,9 +45,10 @@
 
 src_configure() {
 	econf	--disable-dependency-tracking \
-		--enable-gtkhtml \
-		$(use_enable xulrunner mozilla) \
+		--disable-gecko \
+		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
+		$(use_enable xulrunner monowebbrowser) \
 		|| die "configure failed"
 }
 



1.1                  dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: mono-tools-2.4.2-r1.ebuild
===================================================================
# Copyright 1999-2009 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.4.2-r1.ebuild,v 1.1 2009/09/02 14:05:04 loki_val Exp $

EAPI=2

inherit go-mono mono autotools

DESCRIPTION="Set of useful Mono related utilities"
HOMEPAGE="http://www.mono-project.com/"

LICENSE="GPL-2 MIT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="webkit gtkhtml +xulrunner"

RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
	>=dev-dotnet/gtk-sharp-2.12.6
	>=dev-dotnet/glade-sharp-2.12.6
	>=dev-dotnet/gconf-sharp-2
	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
	"
DEPEND="${RDEPEND}
	sys-devel/gettext
	>=dev-util/pkgconfig-0.19"

PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )

#Fails parallel make.
MAKEOPTS="${MAKEOPTS} -j1"

pkg_setup() {
	if ! use webkit && ! use gtkhtml && ! use xulrunner
	then
		die "You must USE either webkit, gtkhtml or xulrunner"
	fi
}

src_prepare() {
	go-mono_src_prepare
	eautoreconf
}

src_configure() {
	econf	--disable-dependency-tracking \
		--disable-gecko \
		$(use_enable gtkhtml) \
		$(use_enable webkit) \
		$(use_enable xulrunner monowebbrowser) \
		|| die "configure failed"
}

src_install() {
	go-mono_src_install
	# Defunct .desktop file, see bug 266694
	find "${D}" -type f -name 'mprof-heap-viewer.desktop' -exec rm -f '{}' '+' || die "removal of mprof-heap-viewer.desktop failed"
}