Added more verbose output if failing, and removed the pre-Beta1 stuff.

8 files changed, 13 insertions, 85 deletions

diff --git a/dev-util/monodoc/ChangeLog b/dev-util/monodoc/ChangeLog
index 846fe71a67e9..2d567ffb041d 100644
--- a/dev-util/monodoc/ChangeLog
+++ b/dev-util/monodoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/monodoc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.12 2004/06/02 16:07:48 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.13 2004/06/03 02:01:55 latexer Exp $
+
+  02 Jun 2004; Peter Johanson <latexer@gentoo.org> monodoc-0.10.ebuild,
+  monodoc-0.11.ebuild, monodoc-0.13.ebuild, monodoc-0.16.ebuild:
+  Added more verbose output if failing, and remove the pre-Beta1 stuff.
 
 *monodoc-0.16 (02 Jun 2004)
 
diff --git a/dev-util/monodoc/files/digest-monodoc-0.10 b/dev-util/monodoc/files/digest-monodoc-0.10
deleted file mode 100644
index 1a8d2f0cf32a..000000000000
--- a/dev-util/monodoc/files/digest-monodoc-0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 417e683bd336c3d74a3e5c07b1dd4a86 monodoc-0.10.tar.gz 4028825
diff --git a/dev-util/monodoc/files/digest-monodoc-0.11 b/dev-util/monodoc/files/digest-monodoc-0.11
deleted file mode 100644
index 24d2537b5bb4..000000000000
--- a/dev-util/monodoc/files/digest-monodoc-0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56683fef5ddc2677433ee35e2d356204 monodoc-0.11.tar.gz 4023979
diff --git a/dev-util/monodoc/files/digest-monodoc-0.13 b/dev-util/monodoc/files/digest-monodoc-0.13
deleted file mode 100644
index 68315e7216a1..000000000000
--- a/dev-util/monodoc/files/digest-monodoc-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0caa3508b38d89cd14a6391e83731fe2 monodoc-0.13.tar.gz 4037076
diff --git a/dev-util/monodoc/monodoc-0.10.ebuild b/dev-util/monodoc/monodoc-0.10.ebuild
deleted file mode 100644
index de1f64539883..000000000000
--- a/dev-util/monodoc/monodoc-0.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.10.ebuild,v 1.1 2004/02/13 20:21:19 tberman Exp $
-
-inherit mono
-
-DESCRIPTION="Documentation for mono's .Net class library"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-dotnet/mono-0.30
-		>=x11-libs/gtk-sharp-0.16"
-
-src_compile() {
-	econf || die
-	MAKEOPTS="-j1"
-	make || die
-	ewarn "If for some reason, this fails, try: USE='gtkhtml' emerge gtk-sharp\n"
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/dev-util/monodoc/monodoc-0.11.ebuild b/dev-util/monodoc/monodoc-0.11.ebuild
deleted file mode 100644
index 8603822c33ce..000000000000
--- a/dev-util/monodoc/monodoc-0.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.11.ebuild,v 1.1 2004/03/25 23:38:39 tberman Exp $
-
-inherit mono
-
-DESCRIPTION="Documentation for mono's .Net class library"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-dotnet/mono-0.31
-		>=x11-libs/gtk-sharp-0.17"
-
-src_compile() {
-	econf || die
-	MAKEOPTS="-j1"
-	make || die
-	ewarn "If for some reason this failed, try: USE='gtkhtml' emerge gtk-sharp\n"
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/dev-util/monodoc/monodoc-0.13.ebuild b/dev-util/monodoc/monodoc-0.13.ebuild
deleted file mode 100644
index 8aa1084b3caa..000000000000
--- a/dev-util/monodoc/monodoc-0.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.13.ebuild,v 1.2 2004/04/01 21:40:29 latexer Exp $
-
-inherit mono
-
-DESCRIPTION="Documentation for mono's .Net class library"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-dotnet/mono-0.31
-		>=x11-libs/gtk-sharp-0.18"
-
-src_compile() {
-	econf || die
-	MAKEOPTS="-j1"
-	make || die
-	ewarn "If for some reason this failed, try: USE='gtkhtml' emerge gtk-sharp\n"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-util/monodoc/monodoc-0.16.ebuild b/dev-util/monodoc/monodoc-0.16.ebuild
index b0abcb51de33..4b5d376b672d 100644
--- a/dev-util/monodoc/monodoc-0.16.ebuild
+++ b/dev-util/monodoc/monodoc-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.16.ebuild,v 1.1 2004/06/02 16:07:48 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.16.ebuild,v 1.2 2004/06/03 02:01:55 latexer Exp $
 
 inherit mono
 
@@ -17,8 +17,13 @@ DEPEND=">=dev-dotnet/mono-0.95
 src_compile() {
 	econf || die
 	MAKEOPTS="-j1"
-	make || die
-	ewarn "If for some reason this failed, try: USE='gtkhtml' emerge gtk-sharp\n"
+	make || {
+		echo
+		eerror "If you already have monodoc installed and this upgrade failed,"
+		eerror "unmerge and then re-emerge monodoc."
+		ewarn "If for some reason this fails, try adding 'gtkhtml' to your USE variables, re-emerge gtk-sharp, then emerge monodoc"
+		die "make failed"
+	}
 }
 
 src_install() {