Add blockers for newer mono, which absorbed monodoc.

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

4 files changed, 14 insertions, 57 deletions

diff --git a/dev-util/monodoc/ChangeLog b/dev-util/monodoc/ChangeLog
index 167ce825656d..0be9880705f1 100644
--- a/dev-util/monodoc/ChangeLog
+++ b/dev-util/monodoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/monodoc
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.74 2008/11/19 22:37:14 loki_val Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.75 2009/01/18 19:24:10 loki_val Exp $
+
+  18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> monodoc-1.2.4.ebuild,
+  -monodoc-1.9.ebuild, monodoc-2.0.ebuild:
+  Add blockers for newer mono, which absorbed monodoc.
 
 *monodoc-2.0 (19 Nov 2008)
 
diff --git a/dev-util/monodoc/monodoc-1.2.4.ebuild b/dev-util/monodoc/monodoc-1.2.4.ebuild
index 954e68ad83e3..3f5368b007fc 100644
--- a/dev-util/monodoc/monodoc-1.2.4.ebuild
+++ b/dev-util/monodoc/monodoc-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-1.2.4.ebuild,v 1.7 2008/10/04 18:08:17 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-1.2.4.ebuild,v 1.8 2009/01/18 19:24:10 loki_val Exp $
 
 inherit mono multilib
 
@@ -14,7 +14,8 @@ KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
 IUSE="X"
 
 RDEPEND=">=dev-lang/mono-1.1
-		www-client/lynx"
+	www-client/lynx
+	!>=dev-lang/mono-2.2"
 DEPEND="${RDEPEND}
 		app-arch/unzip"
 PDEPEND="X? ( >=dev-util/mono-tools-1.1.17 )"
diff --git a/dev-util/monodoc/monodoc-1.9.ebuild b/dev-util/monodoc/monodoc-1.9.ebuild
deleted file mode 100644
index eddd2b50c958..000000000000
--- a/dev-util/monodoc/monodoc-1.9.ebuild
+++ /dev/null
@@ -1,49 +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/monodoc/monodoc-1.9.ebuild,v 1.3 2008/10/04 18:08:17 mabi Exp $
-
-inherit autotools mono multilib
-
-DESCRIPTION="Documentation for mono's .Net class library"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=dev-lang/mono-1.1
-		www-client/lynx"
-DEPEND="${RDEPEND}
-		app-arch/unzip"
-PDEPEND="X? ( >=dev-util/mono-tools-1.1.17 )"
-
-RESTRICT="test"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Install all our .dlls under $(libdir), not $(prefix)/lib
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:$(prefix)/lib:$(libdir):'             \
-			"${S}"/engine/Makefile.am                        \
-		|| die "sed failed"
-
-		sed -i -e 's:libdir=@prefix@/lib:libdir=@libdir@:' \
-			-i -e 's:${prefix}/lib:${libdir}:'             \
-			"${S}"/monodoc.pc.in                             \
-		|| die "sed failed"
-
-		eautoreconf
-	fi
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/dev-util/monodoc/monodoc-2.0.ebuild b/dev-util/monodoc/monodoc-2.0.ebuild
index ae80612b0226..eee219167c52 100644
--- a/dev-util/monodoc/monodoc-2.0.ebuild
+++ b/dev-util/monodoc/monodoc-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-2.0.ebuild,v 1.1 2008/11/19 22:37:14 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-2.0.ebuild,v 1.2 2009/01/18 19:24:10 loki_val Exp $
 
 inherit autotools mono multilib
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="X"
 
 RDEPEND=">=dev-lang/mono-2.0
-		www-client/lynx"
+	www-client/lynx
+	!>=dev-lang/mono-2.2"
 DEPEND="${RDEPEND}
 		app-arch/unzip"
 PDEPEND="X? ( >=dev-util/mono-tools-2 )"