Remove a couple old versions and fix ghc deps

(Portage version: 2.1.2.2)

7 files changed, 11 insertions, 104 deletions

diff --git a/dev-haskell/hs-plugins/ChangeLog b/dev-haskell/hs-plugins/ChangeLog
index 0786fb579c7c..1077f7331c1e 100644
--- a/dev-haskell/hs-plugins/ChangeLog
+++ b/dev-haskell/hs-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hs-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.14 2007/02/21 23:18:47 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.15 2007/04/30 07:34:42 dcoutts Exp $
+
+  30 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> -hs-plugins-0.9.6.ebuild,
+  -hs-plugins-0.9.8.ebuild, hs-plugins-0.9.10-r1.ebuild:
+  Remove a couple old versions and fix ghc deps
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.6 b/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.6
deleted file mode 100644
index e705ad222c2f..000000000000
--- a/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3ebb494776c7465061c0df68ec95eea3 hs-plugins-0.9.6.tar.gz 238890
-RMD160 1a23fa80a23e95eb07152ef38caf6429c3752a22 hs-plugins-0.9.6.tar.gz 238890
-SHA256 c471e24dcdd53f42dc4ab4eae682860426d351021e2a08de4995d28ccabb5a6e hs-plugins-0.9.6.tar.gz 238890
-MD5 2ba9b743f45c294bd32bd9e5ad44352b hs-plugins.html.tar.gz 24643
-RMD160 6fc4df5b4308cfd45dd9ebe311fd4c7805be8f28 hs-plugins.html.tar.gz 24643
-SHA256 a46d7695589fcb5231bf676619b4c498bb56edd76f8215671485af6423e533d9 hs-plugins.html.tar.gz 24643
diff --git a/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.8 b/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.8
deleted file mode 100644
index 7c70c55cbb2b..000000000000
--- a/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.8
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2a809ef92f3ec5970b99aeb22078fb3e hs-plugins-0.9.8.tar.gz 250712
-RMD160 3e80f60911354874a23d60d30683822772447076 hs-plugins-0.9.8.tar.gz 250712
-SHA256 2a02cf9376d8d1524e26b0e48c64d7abc5774a768eb3d21ec264bf69aacb1dfa hs-plugins-0.9.8.tar.gz 250712
-MD5 2ba9b743f45c294bd32bd9e5ad44352b hs-plugins.html.tar.gz 24643
-RMD160 6fc4df5b4308cfd45dd9ebe311fd4c7805be8f28 hs-plugins.html.tar.gz 24643
-SHA256 a46d7695589fcb5231bf676619b4c498bb56edd76f8215671485af6423e533d9 hs-plugins.html.tar.gz 24643
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
index 941663e4c9bc..53314993b7fa 100644
--- a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
+++ b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.5 2006/10/14 14:11:32 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.6 2007/04/30 07:34:42 dcoutts Exp $
 
 inherit ghc-package
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="-amd64 ~ppc ~sparc ~x86" # currently broken on amd64
 IUSE="doc"
 
-DEPEND="virtual/ghc
+DEPEND="<virtual/ghc-6.6
 	!>=virtual/ghc-6.6
 	>=dev-haskell/haskell-src-exts-0.2
 	dev-haskell/cabal"
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.6.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.6.ebuild
deleted file mode 100644
index f0829507ac6f..000000000000
--- a/dev-haskell/hs-plugins/hs-plugins-0.9.6.ebuild
+++ /dev/null
@@ -1,37 +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/hs-plugins/hs-plugins-0.9.6.ebuild,v 1.5 2005/05/02 15:00:27 kosmikus Exp $
-
-inherit base
-
-IUSE="doc"
-
-DESCRIPTION="Dynamically Loaded Haskell Plugins"
-HOMEPAGE="http://www.cse.unsw.edu.au/~dons/hs-plugins/"
-SRC_URI="ftp://ftp.cse.unsw.edu.au/pub/users/dons/${PN}/${P}.tar.gz
-doc? ( http://www.cse.unsw.edu.au/~dons/${PN}/${PN}.html.tar.gz )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="as-is"
-
-DEPEND=">=virtual/ghc-6.2
-	!>=virtual/ghc-6.4"
-
-RDEPEND=""
-
-src_compile() {
-	econf
-	emake -j1
-}
-
-src_install() {
-	emake PREFIX=${D}/usr install
-
-	dodoc AUTHORS README TODO VERSION
-
-	if use doc; then
-		dohtml ${WORKDIR}/${PN}/*
-	fi
-}
-
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.8.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.8.ebuild
deleted file mode 100644
index 9227d8532b2e..000000000000
--- a/dev-haskell/hs-plugins/hs-plugins-0.9.8.ebuild
+++ /dev/null
@@ -1,48 +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/hs-plugins/hs-plugins-0.9.8.ebuild,v 1.2 2005/05/02 15:00:27 kosmikus Exp $
-
-inherit base ghc-package
-
-IUSE="doc"
-
-DESCRIPTION="Dynamically Loaded Haskell Plugins"
-HOMEPAGE="http://www.cse.unsw.edu.au/~dons/hs-plugins/"
-SRC_URI="ftp://ftp.cse.unsw.edu.au/pub/users/dons/${PN}/${P}.tar.gz
-doc? ( http://www.cse.unsw.edu.au/~dons/${PN}/${PN}.html.tar.gz )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="as-is"
-
-DEPEND=">=virtual/ghc-6.2
-	!>=virtual/ghc-6.4"
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	# for package management
-	sed -i 's:ghc-pkg -u:\${GHC_PKGF} -u:' ${S}/Makefile
-}
-
-src_compile() {
-	econf
-	# for package management
-	echo 'GHC_PKGF = ${GHC_PKG} -f '"${S}/$(ghc-localpkgconf)" >> config.mk
-	emake -j1
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	ghc-setup-pkg
-	emake PREFIX="${D}/usr" register # then we don't need --force in ghc-pkg
-	ghc-install-pkg
-
-	dodoc AUTHORS README TODO VERSION
-
-	if use doc; then
-		dohtml ${WORKDIR}/${PN}/*
-	fi
-}
-
diff --git a/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild b/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild
index 54c637f2e274..6de4c4e56c5c 100644
--- a/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild
+++ b/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild,v 1.3 2006/10/14 14:11:32 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild,v 1.4 2007/04/30 07:34:42 dcoutts Exp $
 
 CABAL_FEATURES="lib"
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
-DEPEND="virtual/ghc
+DEPEND="<virtual/ghc-6.6
 	!>=virtual/ghc-6.6
 	>=dev-haskell/haskell-src-exts-0.2
 	dev-haskell/cabal"