Bump to 2.2, bug 254929

(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)

3 files changed, 51 insertions, 67 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 28a17e93fead..7b07f1552265 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2009/01/05 17:23:38 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.48 2009/01/18 17:46:30 loki_val Exp $
+
+*mono-tools-2.2 (18 Jan 2009)
+
+  18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> -mono-tools-1.9.ebuild,
+  +mono-tools-2.2.ebuild:
+  Bump to 2.2, bug 254929.
 
   05 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> mono-tools-2.0.ebuild:
   Fix for new gtk-sharp-module eclass
diff --git a/dev-util/mono-tools/mono-tools-1.9.ebuild b/dev-util/mono-tools/mono-tools-1.9.ebuild
deleted file mode 100644
index d44f20066c58..000000000000
--- a/dev-util/mono-tools/mono-tools-1.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-1.9.ebuild,v 1.3 2008/12/14 15:05:16 loki_val Exp $
-
-inherit mono multilib eutils
-
-DESCRIPTION="Set of useful Mono related utilities"
-HOMEPAGE="http://www.mono-project.com/"
-SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="gtkhtml seamonkey"
-
-RDEPEND=">=dev-lang/mono-1.0
-		 >=virtual/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
-		>=dev-util/pkgconfig-0.19"
-
-pkg_setup() {
-	if ! use gtkhtml && ! use seamonkey ; then
-		elog "No browser selected, defaulting to gtkhtml"
-	fi
-}
-
-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() {
-	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.2.ebuild b/dev-util/mono-tools/mono-tools-2.2.ebuild
new file mode 100644
index 000000000000..479420bf3921
--- /dev/null
+++ b/dev-util/mono-tools/mono-tools-2.2.ebuild
@@ -0,0 +1,44 @@
+# 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.2.ebuild,v 1.1 2009/01/18 17:46:30 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="~x86 ~amd64"
+IUSE="webkit 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 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.19"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+
+#Fails parallel make.
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	go-mono_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf	--disable-dependency-tracking \
+		--enable-gtkhtml \
+		$(use_enable xulrunner mozilla) \
+		$(use_enable webkit) \
+		|| die "configure failed"
+}