Marked ~alpha. Removed old haddock-0.6-r2 revision.

(Portage version: 2.0.54)

4 files changed, 8 insertions, 104 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 1665e71aef1d..e56e43eaae2b 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.29 2005/12/12 22:29:10 araujo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.30 2006/02/10 12:04:41 dcoutts Exp $
+
+  10 Feb 2006; <duncan@gentoo.org> -haddock-0.6-r2.ebuild, haddock-0.7.ebuild:
+  Marked ~alpha. Removed old haddock-0.6-r2 revision.
 
   12 Dec 2005; Luis f. Araujo <araujo@gentoo.org> haddock-0.7.ebuild:
   Removing java use flag, bug #107019
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6-r2 b/dev-haskell/haddock/files/digest-haddock-0.6-r2
deleted file mode 100644
index fc424528e86b..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f15d15a3e4352f77f003fb133b1d9b2 haddock-0.6-src.tar.gz 429708
diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild
deleted file mode 100644
index 4595afff83ff..000000000000
--- a/dev-haskell/haddock/haddock-0.6-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.13 2005/09/15 10:39:17 kosmikus Exp $
-#
-# USE variable summary:
-#   doc    - Build extra documenation from DocBook sources,
-#               in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
-
-
-inherit base
-IUSE="doc tetex"
-
-DESCRIPTION="A documentation tool for Haskell"
-SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/haddock"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="as-is"
-
-DEPEND="virtual/ghc
-	!>=virtual/ghc-6.4
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		tetex? ( virtual/tetex
-		>=app-text/jadetex-3.12 ) )"
-
-RDEPEND=""
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-pkg_setup() {
-	if ! has_version virtual/ghc; then
-		eerror "Due to a bug in the portage dependency resolution, emerge"
-		eerror "sometimes tries to merge haddock before a version of ghc"
-		eerror "is available on the system. This is usually triggered when"
-		eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
-		eerror "the command"
-		eerror
-		eerror "   emerge ghc"
-		eerror
-		eerror "To resolve this problem, proceed in two steps. First, emerge"
-		eerror "haddock (which should first pull in ghc-bin). Second, emerge"
-		eerror "ghc again:"
-		eerror
-		eerror "   emerge haddock"
-		eerror "   emerge ghc"
-		die "portage dependency problem"
-	fi
-}
-
-src_compile() {
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
-	# using make because emake behaved strangely on my machine
-	make || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		cd ${S}/haddock/doc
-		emake html \
-			datadir="/usr/share/doc/${PF}" \
-			|| die "emake html failed"
-		if use tetex; then
-			emake ps \
-				datadir="/usr/share/doc/${PF}" \
-				|| die "emake ps failed"
-		fi
-	fi
-}
-
-src_install() {
-	local mydoc
-
-	make install \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/${P}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die "make install failed"
-
-	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	if use doc; then
-		cd ${S}/haddock/doc
-		dohtml -r haddock/* || die
-		dosym haddock.html /usr/share/doc/${PF}/html/index.html
-		if use tetex; then
-			docinto ps
-			dodoc haddock.ps || die
-		fi
-	fi
-}
diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild
index 1294088d8cd6..6f20d19d66c1 100644
--- a/dev-haskell/haddock/haddock-0.7.ebuild
+++ b/dev-haskell/haddock/haddock-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.4 2005/12/12 22:29:10 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.5 2006/02/10 12:04:41 dcoutts Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -17,7 +17,7 @@ SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
 HOMEPAGE="http://www.haskell.org/haddock"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
 LICENSE="as-is"
 
 DEPEND="virtual/ghc