Fix monodoc stuff.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 12 insertions, 52 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index f137c1fc7132..06fcf1d4071d 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.54 2006/01/19 06:59:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.55 2006/01/21 20:29:32 latexer Exp $
+
+  21 Jan 2006; Peter Johanson <latexer@gentoo.org> gtk-sharp-2.4.0.ebuild,
+  gtk-sharp-2.6.0.ebuild:
+  Fix monodoc stuff.
 
   19 Jan 2006; Peter Johanson <latexer@gentoo.org> gtk-sharp-2.4.0.ebuild,
   gtk-sharp-2.6.0.ebuild:
diff --git a/dev-dotnet/gtk-sharp/Manifest b/dev-dotnet/gtk-sharp/Manifest
index 5a9731cb8c5f..b93823c38a19 100644
--- a/dev-dotnet/gtk-sharp/Manifest
+++ b/dev-dotnet/gtk-sharp/Manifest
@@ -1,10 +1,10 @@
-MD5 be82032dc89a07aed24548aeed523666 ChangeLog 13694
+MD5 7c08e5f42423fa2eb56e6f27cd047702 ChangeLog 13817
 MD5 788553e6350716aa1b0d81e17519ba1a files/digest-gtk-sharp-1.0.10 149
 MD5 fef3bd202b3f48969673897302f3be4c files/digest-gtk-sharp-1.0.8-r1 147
 MD5 a1d68897943900a3597a99cc8d5edf11 files/digest-gtk-sharp-2.4.0 147
 MD5 75b16375b6fef2be7427c9bfd4cdda0d files/digest-gtk-sharp-2.6.0 147
 MD5 c679989ccfe59add3c35246d205c72f6 gtk-sharp-1.0.10.ebuild 1609
 MD5 224e9e58d006812e0fa5fe648b49bacc gtk-sharp-1.0.8-r1.ebuild 1486
-MD5 2087f52b496a0b2f72e3733326e886a7 gtk-sharp-2.4.0.ebuild 2346
-MD5 39b19c7628a8a50133280053de35dc64 gtk-sharp-2.6.0.ebuild 2750
+MD5 881970f79365091da1275e6bcda8d8b4 gtk-sharp-2.4.0.ebuild 1748
+MD5 649e6fcbf9761ea27ad20383dd9f116b gtk-sharp-2.6.0.ebuild 2171
 MD5 e06909c47712ae995f4879eefb22e38b metadata.xml 160
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild
index a01bd8a097e5..cdb4e684081f 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild,v 1.3 2006/01/19 06:59:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.4.0.ebuild,v 1.4 2006/01/21 20:29:32 latexer Exp $
 
 inherit eutils mono
 
@@ -20,6 +20,7 @@ RDEPEND=">=dev-lang/mono-1.1.9
 	>=gnome-base/orbit-2.8.3"
 
 DEPEND="${RDEPEND}
+	doc? ( >=dev-util/monodoc-1.1.8 )
 	>=sys-apps/sed-4.0
 	sys-devel/automake
 	sys-devel/autoconf
@@ -60,12 +61,6 @@ src_compile() {
 
 	econf ${myconf} || die "./configure failed"
 	LANG=C emake -j1 || die
-
-	#if use doc && has_version dev-util/monodoc
-	#then
-	#	cd ${S}/doc
-	#	emake -j1 assemble || die "Failed to generate docs"
-	#fi
 }
 
 src_install () {
@@ -73,22 +68,4 @@ src_install () {
 		DESTDIR=${D} install || die
 
 	dodoc README* ChangeLog
-
-	#if use doc && has_version dev-util/monodoc
-	#then
-	#	cd ${S}/doc
-	#	insinto $(monodoc --get-sourcesdir)
-	#	doins gtk-sharp-docs.{tree,zip}
-	#fi
-}
-
-pkg_postinst() {
-	if use doc && ! has_version dev-util/monodoc
-	then
-		ewarn
-		ewarn "Although 'doc' is in the USE flag list, gtk-sharp will"
-		ewarn "not install its monodoc documentation unless you have monodoc"
-		ewarn "installed. If you want the documentation to be available in"
-		ewarn "monodoc, please emerge monodoc then re-emerge gtk-sharp."
-	fi
 }
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild
index a0c127cdd48f..ed0f3122a0f3 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild,v 1.4 2006/01/19 06:59:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.6.0.ebuild,v 1.5 2006/01/21 20:29:32 latexer Exp $
 
 inherit eutils mono
 
@@ -20,6 +20,7 @@ RDEPEND=">=dev-lang/mono-1.1.9
 	>=gnome-base/orbit-2.8.3"
 
 DEPEND="${RDEPEND}
+	doc? ( >=dev-util/monodoc-1.1.8 )
 	>=sys-apps/sed-4.0
 	sys-devel/automake
 	sys-devel/autoconf
@@ -60,12 +61,6 @@ src_compile() {
 
 	econf ${myconf} || die "./configure failed"
 	LANG=C emake -j1 || die
-
-	#if use doc && has_version dev-util/monodoc
-	#then
-	#	cd ${S}/doc
-	#	emake -j1 assemble || die "Failed to generate docs"
-	#fi
 }
 
 src_install () {
@@ -73,25 +68,9 @@ src_install () {
 		DESTDIR=${D} install || die
 
 	dodoc README* ChangeLog
-
-	#if use doc && has_version dev-util/monodoc
-	#then
-	#	cd ${S}/doc
-	#	insinto $(monodoc --get-sourcesdir)
-	#	doins gtk-sharp-docs.{tree,zip}
-	#fi
 }
 
 pkg_postinst() {
-	if use doc && ! has_version dev-util/monodoc
-	then
-		ewarn
-		ewarn "Although 'doc' is in the USE flag list, gtk-sharp will"
-		ewarn "not install its monodoc documentation unless you have monodoc"
-		ewarn "installed. If you want the documentation to be available in"
-		ewarn "monodoc, please emerge monodoc then re-emerge gtk-sharp."
-	fi
-
 	echo
 	ewarn "gtk-sharp-2.6.x is completely, and utterly unsupported by upstream."
 	ewarn "If you experience any bugs related to using gtk-sharp-2.6.x, do"