diff options
| -rw-r--r-- | dev-util/monodoc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/monodoc/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/monodoc/monodoc-0.16.ebuild | 16 |
3 files changed, 20 insertions, 6 deletions
diff --git a/dev-util/monodoc/ChangeLog b/dev-util/monodoc/ChangeLog index 2d567ffb041d..43bae1879774 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.13 2004/06/03 02:01:55 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.14 2004/06/03 12:44:32 latexer Exp $ + + 03 Jun 2004; Peter Johanson <latexer@gentoo.org> monodoc-0.16.ebuild: + Moved details of upgrading to pkg_setup and a has_version check, as comment #6 + on bug #52818 points out that the problem produces a hang, not a failure. 02 Jun 2004; Peter Johanson <latexer@gentoo.org> monodoc-0.10.ebuild, monodoc-0.11.ebuild, monodoc-0.13.ebuild, monodoc-0.16.ebuild: diff --git a/dev-util/monodoc/Manifest b/dev-util/monodoc/Manifest index 1220e46017bc..a4a81f3bd066 100644 --- a/dev-util/monodoc/Manifest +++ b/dev-util/monodoc/Manifest @@ -1,6 +1,6 @@ MD5 77b30f38724e473b452dea2b2e99e53b monodoc-0.15.ebuild 702 -MD5 ede4e05e1f961e08181cc261d22c4f3c monodoc-0.16.ebuild 898 -MD5 ecd670d4c46c40fff53f7d753f3985cd ChangeLog 1859 +MD5 3293a2b56b9fb3bfa7348a4e7d997d9d monodoc-0.16.ebuild 1168 +MD5 fe7acb7ee4dff45ffb3a4351e8b4f8ad ChangeLog 2089 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159 MD5 ca7492fcf43d853a24d1225718eb8764 files/digest-monodoc-0.15 65 MD5 4a8860add2e7265d690e292d1daeaf54 files/digest-monodoc-0.16 65 diff --git a/dev-util/monodoc/monodoc-0.16.ebuild b/dev-util/monodoc/monodoc-0.16.ebuild index 4b5d376b672d..b634ad7f0e68 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.2 2004/06/03 02:01:55 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-0.16.ebuild,v 1.3 2004/06/03 12:44:32 latexer Exp $ inherit mono @@ -14,13 +14,23 @@ IUSE="" DEPEND=">=dev-dotnet/mono-0.95 >=x11-libs/gtk-sharp-0.93" +pkg_setup() { + # This is needed as monodoc emerges just hang if previous versions are around + if has_version "<dev-util/monodoc-${PV}" + then + echo + eerror "Currently, monodoc fails if attempting to upgrade from a" + eerror "previous installation. Please unmerge monodoc, and then" + eerror "re-emerge it. See bug #52818 for details." + die "Previous monodoc installation detected." + fi +} + src_compile() { econf || die MAKEOPTS="-j1" 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" } |