summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2008-01-26 20:17:17 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2008-01-26 20:17:17 +0000
commitbe44cdac9368053da2e1735396ca930f668cdab0 (patch)
tree158fe86526ca271e07ba5bb388b1ccaa247ecde3 /dev-haskell/wash
parentRemove old version fixing bug #207435. Also add dev-util/pkgconfig dep, fixin... (diff)
downloadhistorical-be44cdac9368053da2e1735396ca930f668cdab0.tar.gz
historical-be44cdac9368053da2e1735396ca930f668cdab0.tar.bz2
historical-be44cdac9368053da2e1735396ca930f668cdab0.zip
Remove old versions, fixing bug #207436.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-haskell/wash')
-rw-r--r--dev-haskell/wash/ChangeLog9
-rw-r--r--dev-haskell/wash/files/digest-wash-2.0.63
-rw-r--r--dev-haskell/wash/files/digest-wash-2.3.13
-rw-r--r--dev-haskell/wash/files/digest-wash-2.5.63
-rw-r--r--dev-haskell/wash/files/wash-2.5.6-ghc66.patch244
-rw-r--r--dev-haskell/wash/wash-2.0.6.ebuild52
-rw-r--r--dev-haskell/wash/wash-2.3.1.ebuild52
-rw-r--r--dev-haskell/wash/wash-2.5.6.ebuild83
8 files changed, 7 insertions, 442 deletions
diff --git a/dev-haskell/wash/ChangeLog b/dev-haskell/wash/ChangeLog
index d739fae903d2..ebd8adc55874 100644
--- a/dev-haskell/wash/ChangeLog
+++ b/dev-haskell/wash/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/wash
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.13 2007/12/13 17:33:09 dcoutts Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.14 2008/01/26 20:17:16 dcoutts Exp $
+
+ 26 Jan 2008; Duncan Coutts <dcoutts@gentoo.org>
+ -files/wash-2.5.6-ghc66.patch, -wash-2.0.6.ebuild, -wash-2.3.1.ebuild,
+ -wash-2.5.6.ebuild:
+ Remove old versions, fixing bug #207436.
*wash-2.12 (13 Dec 2007)
diff --git a/dev-haskell/wash/files/digest-wash-2.0.6 b/dev-haskell/wash/files/digest-wash-2.0.6
deleted file mode 100644
index f7b07260ec52..000000000000
--- a/dev-haskell/wash/files/digest-wash-2.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3022b799747ca01bf8262dee00d209ed WashNGo-2.0.6.tgz 425383
-RMD160 0b11684dc1eab0c49475a2df7752f693d555b665 WashNGo-2.0.6.tgz 425383
-SHA256 7f14b9b36a4457a4b6052dd2cd1f55a94b0add0387b54c5fae834d6c3b354aef WashNGo-2.0.6.tgz 425383
diff --git a/dev-haskell/wash/files/digest-wash-2.3.1 b/dev-haskell/wash/files/digest-wash-2.3.1
deleted file mode 100644
index 2e74e3c7b395..000000000000
--- a/dev-haskell/wash/files/digest-wash-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3825a6e68ea1cd2212e421412b670732 WashNGo-2.3.1.tgz 442770
-RMD160 ed4dd10cc76dad54fa28c92750ef72f2a04a9a4f WashNGo-2.3.1.tgz 442770
-SHA256 a99078ec9187d82792976d3764942adecb2d201f0237df51292122490f78a3ec WashNGo-2.3.1.tgz 442770
diff --git a/dev-haskell/wash/files/digest-wash-2.5.6 b/dev-haskell/wash/files/digest-wash-2.5.6
deleted file mode 100644
index d04feee7c064..000000000000
--- a/dev-haskell/wash/files/digest-wash-2.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e71b67eebef7369479aeb3b5bcc5dfc1 WashNGo-2.5.6.tgz 582358
-RMD160 b9ce662cc05f09238de0aa34d3b0bbb627fe84eb WashNGo-2.5.6.tgz 582358
-SHA256 69759637489fa187c875f8f100c98132d9e329fe004b7ddf37626df41fb03e30 WashNGo-2.5.6.tgz 582358
diff --git a/dev-haskell/wash/files/wash-2.5.6-ghc66.patch b/dev-haskell/wash/files/wash-2.5.6-ghc66.patch
deleted file mode 100644
index 2c61d5ddfcdf..000000000000
--- a/dev-haskell/wash/files/wash-2.5.6-ghc66.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -urwpN WashNGo-2.5.6.orig/configure.in WashNGo-2.5.6/configure.in
---- WashNGo-2.5.6.orig/configure.in 2005-11-10 15:24:31.000000000 +0000
-+++ WashNGo-2.5.6/configure.in 2006-09-12 17:02:15.000000000 +0100
-@@ -110,17 +110,17 @@ GHCPKG_UPDATE="$GHCPKG $GHCPKG_OPT__UPDA
-
- if test "$ENABLE_DBCONNECT" = "yes"; then
- AC_PATH_PROG(C2HS,c2hs,[no])
-- AC_PATH_PROG(PG_CONFIG,pg_config,[no],[$PATH:$PG_BINDIR])
-+# AC_PATH_PROG(PG_CONFIG,pg_config,[no],[$PATH:$PG_BINDIR])
- if test "$C2HS" = "no" ; then
- ENABLE_DBCONNECT="no"
- C2HS=""
- AC_MSG_WARN([--enable-dbconnect turned off because program c2hs was not found])
- fi
-- if test "$PG_CONFIG" = "no" ; then
-- ENABLE_DBCONNECT="no"
-- PG_CONFIG=""
-- AC_MSG_WARN([--enable-dbconnect turned off because program pg_config was not found])
-- fi
-+# if test "$PG_CONFIG" = "no" ; then
-+# ENABLE_DBCONNECT="no"
-+# PG_CONFIG=""
-+# AC_MSG_WARN([--enable-dbconnect turned off because program pg_config was not found])
-+# fi
- else
- C2HS=""
- PG_CONFIG=""
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile WashNGo-2.5.6/lib/Makefile
---- WashNGo-2.5.6.orig/lib/Makefile 2005-09-26 12:54:31.000000000 +0100
-+++ WashNGo-2.5.6/lib/Makefile 2006-09-12 16:48:48.000000000 +0100
-@@ -27,7 +27,7 @@ HIDDEN_MODULES= \
- $(addprefix WASH.Dbconnect.,$(DBCONNECT_HIDDEN))
-
- ifeq ($(ENABLE_DBCONNECT),yes)
--PACKAGE_DEPENDENCIES= rts haskell98 text c2hs
-+PACKAGE_DEPENDENCIES= base haskell98 parsec
- PGLIB=`$(PG_CONFIG) --libdir`
-
- ## lib directory on target machine
-@@ -39,9 +39,9 @@ EXTRA_LD_OPTS= -B dynamic \
- -Wl,-rpath,$(PGLIB_TARGET)
-
- EXTRA_LIBRARIES= pq
--LD_OPTIONS= $(EXTRA_LD_OPTS)
-+LD_OPTIONS=
- else
--PACKAGE_DEPENDENCIES= text haskell98
-+PACKAGE_DEPENDENCIES= base haskell98 parsec
- endif
-
- DOCSOURCES= $(addsuffix .hs,$(subst .,/,$(EXPOSED_MODULES)))
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile.CGI WashNGo-2.5.6/lib/Makefile.CGI
---- WashNGo-2.5.6.orig/lib/Makefile.CGI 2005-11-11 15:43:03.000000000 +0000
-+++ WashNGo-2.5.6/lib/Makefile.CGI 2006-09-12 16:06:43.000000000 +0100
-@@ -16,7 +16,7 @@ all: libWashNGo.a
- ######################################################################
- # WASH-CGI
-
--PACKAGE_DEPENDENCIES= haskell98 text
-+PACKAGE_DEPENDENCIES= base haskell98 parsec
-
- FILES= $(OTHER_FILES) $(HS_SOURCES)
- OTHER_FILES= $(addprefix WASH/CGI/,Makefile README INSTALL LICENSE)
-@@ -31,11 +31,11 @@ libWashNGo.a: libWashNGo.a($(HS_SOURCES:
- ######################################################################
- # generic stuff
-
--HC_SPEC_FLAGS= -package-name $(PACKAGE)
-+HC_SPEC_FLAGS= -package-name $(PACKAGE) $(addprefix -package , $(PACKAGE_DEPENDENCIES))
- HCINCLUDES=
- HCLOADFLAGS=
-
--OPT= -O2
-+OPT= -O
-
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile.Dbconnect WashNGo-2.5.6/lib/Makefile.Dbconnect
---- WashNGo-2.5.6.orig/lib/Makefile.Dbconnect 2005-11-11 15:43:03.000000000 +0000
-+++ WashNGo-2.5.6/lib/Makefile.Dbconnect 2006-09-12 17:32:06.000000000 +0100
-@@ -34,7 +34,7 @@ OTHER_FILES= $(addprefix WASH/Dbconnect/
- EXAMPLE_FILES=examples/Makefile examples/Main.hs examples/Mystylesheet.hs \
- examples/ducktales.sql examples/removeDucktales.sql
- MODULES= $(EXPOSED_MODULES) $(HIDDEN_MODULES)
--PACKAGE_DEPENDENCIES= haskell98
-+PACKAGE_DEPENDENCIES= base haskell98
- HIDDEN_MODULES= $(DBCONNECT_HIDDEN)
- EXPOSED_MODULES= $(DBCONNECT_EXPOSED)
- HS_SOURCES= $(addprefix WASH/Dbconnect/,$(MODULES:=.hs))
-@@ -44,16 +44,16 @@ libWashNGo.a: libWashNGo.a($(HS_SOURCES:
- $(RANLIB) $@
-
- WASH/Dbconnect/Libpqfe.hs : WASH/Dbconnect/Libpqfe.chs
-- $(C2HS) $(PGINCLUDE)/libpq-fe.h WASH/Dbconnect/Libpqfe.chs
-+ $(C2HS) libpq-fe.h WASH/Dbconnect/Libpqfe.chs
-
- ######################################################################
- # generic stuff
-
--HC_SPEC_FLAGS= -package-name $(PACKAGE)
--HCINCLUDES= -fglasgow-exts -package c2hs -I.
-+HC_SPEC_FLAGS= -package-name $(PACKAGE) $(addprefix -package , $(PACKAGE_DEPENDENCIES))
-+HCINCLUDES= -fglasgow-exts -I.
- HCLOADFLAGS=
-
--OPT= -O2 -ffi
-+OPT= -O -ffi
-
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile.HTML WashNGo-2.5.6/lib/Makefile.HTML
---- WashNGo-2.5.6.orig/lib/Makefile.HTML 2005-11-11 15:43:03.000000000 +0000
-+++ WashNGo-2.5.6/lib/Makefile.HTML 2006-09-12 16:07:11.000000000 +0100
-@@ -19,7 +19,7 @@ FILES= $(OTHER_FILES) $(HS_SOURCES)
- OTHER_FILES= $(addprefix WASH/HTML/,Makefile LICENSE)
-
- MODULES= $(EXPOSED_MODULES)$(HIDDEN_MODULES)
--PACKAGE_DEPENDENCIES= haskell98 text
-+PACKAGE_DEPENDENCIES= base haskell98
- HIDDEN_MODULES= $(HTML_HIDDEN)
- EXPOSED_MODULES= $(HTML_EXPOSED)
- HS_SOURCES= $(addprefix WASH/HTML/,$(MODULES:=.hs))
-@@ -30,11 +30,11 @@ libWashNGo.a: libWashNGo.a($(HS_SOURCES:
- ######################################################################
- # generic stuff
-
--HC_SPEC_FLAGS= -package-name $(PACKAGE)
-+HC_SPEC_FLAGS= -package-name $(PACKAGE) $(addprefix -package , $(PACKAGE_DEPENDENCIES))
- HCINCLUDES=
- HCLOADFLAGS=
-
--OPT= -O2
-+OPT= -O
-
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile.Mail WashNGo-2.5.6/lib/Makefile.Mail
---- WashNGo-2.5.6.orig/lib/Makefile.Mail 2005-11-11 15:43:02.000000000 +0000
-+++ WashNGo-2.5.6/lib/Makefile.Mail 2006-09-12 16:07:42.000000000 +0100
-@@ -18,7 +18,7 @@ all: libWashNGo.a
- FILES= $(OTHER_FILES) $(HS_SOURCES)
- OTHER_FILES= $(addprefix WASH/Mail/,Makefile LICENSE)
- MODULES= $(EXPOSED_MODULES)$(HIDDEN_MODULES)
--PACKAGE_DEPENDENCIES= text
-+PACKAGE_DEPENDENCIES= base haskell98 parsec
- HIDDEN_MODULES= $(Mail_HIDDEN)
- EXPOSED_MODULES= $(Mail_EXPOSED)
- HS_SOURCES= $(addprefix WASH/Mail/,$(MODULES:=.hs))
-@@ -29,11 +29,11 @@ libWashNGo.a: libWashNGo.a($(HS_SOURCES:
- ######################################################################
- # generic stuff
-
--HC_SPEC_FLAGS= -package-name $(PACKAGE)
-+HC_SPEC_FLAGS= -package-name $(PACKAGE) $(addprefix -package , $(PACKAGE_DEPENDENCIES))
- HCINCLUDES=
- HCLOADFLAGS=
-
--OPT= -O2
-+OPT= -O
-
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-diff -urwpN WashNGo-2.5.6.orig/lib/Makefile.Utility WashNGo-2.5.6/lib/Makefile.Utility
---- WashNGo-2.5.6.orig/lib/Makefile.Utility 2005-11-11 15:43:02.000000000 +0000
-+++ WashNGo-2.5.6/lib/Makefile.Utility 2006-09-12 15:50:36.000000000 +0100
-@@ -18,7 +18,7 @@ all: libWashNGo.a
- FILES= $(OTHER_FILES) $(HS_SOURCES) $(C_SOURCES) $(H_SOURCES)
- OTHER_FILES= $(addprefix WASH/Utility/,Makefile LICENSE)
- MODULES= $(EXPOSED_MODULES)$(HIDDEN_MODULES)
--PACKAGE_DEPENDENCIES= haskell98 text
-+PACKAGE_DEPENDENCIES= base haskell98 parsec
- HIDDEN_MODULES= $(Utility_HIDDEN)
- EXPOSED_MODULES= $(Utility_EXPOSED)
- HS_SOURCES= $(addprefix WASH/Utility/,$(MODULES:=.hs))
-@@ -40,11 +40,11 @@ WASH/Utility/SHA1.o: WASH/Utility/SHA1-p
- ######################################################################
- # generic stuff
-
--HC_SPEC_FLAGS= -package-name $(PACKAGE)
-+HC_SPEC_FLAGS= -package-name $(PACKAGE) $(addprefix -package , $(PACKAGE_DEPENDENCIES))
- HCINCLUDES=
- HCLOADFLAGS=
-
--OPT= -O2 -ffi
-+OPT= -O -ffi
-
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-diff -urwpN WashNGo-2.5.6.orig/lib/WASH/CGI/GuaranteedCGI.hs WashNGo-2.5.6/lib/WASH/CGI/GuaranteedCGI.hs
---- WashNGo-2.5.6.orig/lib/WASH/CGI/GuaranteedCGI.hs 2005-09-18 20:41:10.000000000 +0100
-+++ WashNGo-2.5.6/lib/WASH/CGI/GuaranteedCGI.hs 2006-09-12 14:51:41.000000000 +0100
-@@ -73,7 +73,7 @@ import WASH.CGI.CGI (
- , EmailAddress(..), CreditCardNumber(..), CreditCardExp(..)
- , CGIOption(..), CGIOptions
- , makeServlet, makeServletWithHook
-- , FrameSet, FrameLayout(..), FrameSpacing(..),
-+ , FrameSet, FrameLayout(..), FrameSpacing(..)
- , makeFrameset, framesetPage
- , Style(..)
- )
-diff -urwpN WashNGo-2.5.6.orig/lib/WASH/CGI/SubmitXX.hs WashNGo-2.5.6/lib/WASH/CGI/SubmitXX.hs
---- WashNGo-2.5.6.orig/lib/WASH/CGI/SubmitXX.hs 2005-09-14 14:27:09.000000000 +0100
-+++ WashNGo-2.5.6/lib/WASH/CGI/SubmitXX.hs 2006-09-12 15:24:00.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# OPTIONS -fglasgow-exts #-}
-+{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-}
- -- © 2002-2005 Peter Thiemann
- -- |Extended-Haskell version of the submission functions.
- module WASH.CGI.SubmitXX where
-diff -urwpN WashNGo-2.5.6.orig/lib/WASH/Dbconnect/Libpqfe.chs WashNGo-2.5.6/lib/WASH/Dbconnect/Libpqfe.chs
---- WashNGo-2.5.6.orig/lib/WASH/Dbconnect/Libpqfe.chs 2005-09-14 14:27:09.000000000 +0100
-+++ WashNGo-2.5.6/lib/WASH/Dbconnect/Libpqfe.chs 2006-09-12 17:22:19.000000000 +0100
-@@ -2,7 +2,8 @@ module WASH.Dbconnect.Libpqfe where
- -- c2hs /usr/include/postgresql/libpq-fe.h Libpq-fe.chs
- -- ghc
-
--import C2HS
-+import Foreign
-+import Foreign.C
-
-
- {#enum ConnStatusType as ConnStatusType {underscoreToCase} deriving (Show, Eq)#}
-@@ -26,6 +27,9 @@ mExecStatusTypeToCInt = (toEnum . fromE
- mCIntToBool :: CInt -> Bool
- mCIntToBool = (toEnum . fromEnum)
-
-+cIntConv :: (Integral a, Integral b) => a -> b
-+cIntConv = fromIntegral
-+
- data X_PGconn = X_PGconn
- data X_PQresult = X_PQresult
- data X_PGresult = X_PGresult
-diff -urwpN WashNGo-2.5.6.orig/washparser/hs/Makefile WashNGo-2.5.6/washparser/hs/Makefile
---- WashNGo-2.5.6.orig/washparser/hs/Makefile 2005-11-11 15:43:02.000000000 +0000
-+++ WashNGo-2.5.6/washparser/hs/Makefile 2006-09-12 15:50:36.000000000 +0100
-@@ -9,7 +9,7 @@ OPT=
- HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HINCLUDES)
-
- HINCLUDES= $(HCPACKAGEFLAGS)
--HCPACKAGEFLAGS= -package text
-+HCPACKAGEFLAGS= -package base -package haskell98 -package parsec
-
-
- LINK.o= $(HC) $(HCLOADFLAGS)
diff --git a/dev-haskell/wash/wash-2.0.6.ebuild b/dev-haskell/wash/wash-2.0.6.ebuild
deleted file mode 100644
index 442555083c87..000000000000
--- a/dev-haskell/wash/wash-2.0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.0.6.ebuild,v 1.4 2007/12/13 17:33:09 dcoutts Exp $
-
-inherit ghc-package
-
-# the installation bundle is called WashNGo
-MY_P="WashNGo"
-MY_PV=${MY_P}-${PV}
-
-DESCRIPTION="WASH is a family of embedded domain-specific languages for programming Web applications"
-HOMEPAGE="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/"
-SRC_URI="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/${MY_PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc postgres"
-
-DEPEND=">=dev-lang/ghc-6.2
- !>=dev-lang/ghc-6.4
- postgres? ( dev-haskell/c2hs
- >=dev-db/postgresql-7.4.3 )"
-
-S=${WORKDIR}/${MY_PV}
-
-src_compile() {
- local myopts
- myopts="${myopts} `use_enable postgres dbconnect`"
- myopts="${myopts} `use_enable doc build-docs`"
- ./configure \
- --prefix="${D}usr" \
- --host=${CHOST} \
- --libdir="${D}/$(ghc-libdir)" \
- ${myopts} \
- --enable-register-package="${S}/$(ghc-localpkgconf)" \
- || die "configure failed"
- make depend || die "make depend failed"
- make all || die "make all failed"
-}
-
-src_install() {
- ghc-setup-pkg
- make exec_prefix="${D}/usr" install || die "make install failed"
- ghc-install-pkg
- dodoc README
- if use doc; then
- cp -r Examples "${D}/usr/share/doc/${PF}"
- cd doc
- dohtml -r *
- fi
-}
diff --git a/dev-haskell/wash/wash-2.3.1.ebuild b/dev-haskell/wash/wash-2.3.1.ebuild
deleted file mode 100644
index 53464874502f..000000000000
--- a/dev-haskell/wash/wash-2.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.3.1.ebuild,v 1.4 2007/12/13 17:33:09 dcoutts Exp $
-
-inherit ghc-package
-
-# the installation bundle is called WashNGo
-MY_PN="WashNGo"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WASH is a family of embedded domain-specific languages for programming Web applications"
-HOMEPAGE="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/"
-SRC_URI="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc postgres"
-
-DEPEND=">=dev-lang/ghc-6.2
- !>=dev-lang/ghc-6.4
- postgres? ( dev-haskell/c2hs
- >=dev-db/postgresql-7.4.3 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- local myopts
- myopts="${myopts} `use_enable postgres dbconnect`"
- myopts="${myopts} `use_enable doc build-docs`"
- ./configure \
- --prefix="${D}usr" \
- --host=${CHOST} \
- --libdir="${D}/$(ghc-libdir)" \
- ${myopts} \
- --enable-register-package="${S}/$(ghc-localpkgconf)" \
- || die "configure failed"
- make depend || die "make depend failed"
- make all || die "make all failed"
-}
-
-src_install() {
- ghc-setup-pkg
- make exec_prefix="${D}/usr" install || die "make install failed"
- ghc-install-pkg
- dodoc README
- if use doc; then
- cp -r Examples "${D}/usr/share/doc/${PF}"
- cd doc
- dohtml -r *
- fi
-}
diff --git a/dev-haskell/wash/wash-2.5.6.ebuild b/dev-haskell/wash/wash-2.5.6.ebuild
deleted file mode 100644
index 5c7ea6cb418c..000000000000
--- a/dev-haskell/wash/wash-2.5.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.5.6.ebuild,v 1.6 2007/12/13 17:33:09 dcoutts Exp $
-
-inherit base eutils ghc-package check-reqs autotools
-
-# the installation bundle is called WashNGo
-MY_PN="WashNGo"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WASH is a family of embedded domain-specific languages for programming Web applications"
-HOMEPAGE="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/"
-SRC_URI="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
-IUSE="doc postgres"
-
-RDEPEND=">=dev-lang/ghc-6.4.1
- postgres? ( >=dev-db/libpq-7.4.3 )"
-
-DEPEND="${RDEPEND}
- postgres? ( >=dev-haskell/c2hs-0.14.0 )
- doc? ( dev-haskell/haddock )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # There are a couple Wash modules which take forever to compile and
- # cause ghc take loads of memory. We try and limit ghc's heap size
- # but it still takes a lot.
- einfo "Some Wash modules take a lot of RAM and a very long time to compile."
- einfo "Please be patient."
- # We need aproximately this much memory: (does *not* check swap)
- case "${ARCH}" in
- alpha|*64) CHECKREQS_MEMORY="400" ;;
- *) CHECKREQS_MEMORY="200" ;;
- esac
- check_reqs
-}
-
-src_unpack() {
- base_src_unpack
-
- cd "${S}"
- epatch "${FILESDIR}/${P}-ghc66.patch"
-}
-
-src_compile() {
- # We've patched some build files
- eautoreconf
-
- ./configure \
- --prefix="/usr" \
- --libdir="/usr/$(get_libdir)/${P}" \
- $(use_enable postgres dbconnect) \
- $(use_enable doc build-docs) \
- --with-hcflags="+RTS -M${CHECKREQS_MEMORY}m -RTS" \
- --enable-register-package="${S}/$(ghc-localpkgconf)" \
- || die "configure failed"
- make all || die "make all failed"
-}
-
-src_install() {
- ghc-setup-pkg
- make prefix="${D}/usr" \
- PACKAGELIBDIR="${D}/usr/$(get_libdir)/${P}/ghc-$(ghc-version)" \
- install \
- || die "make install failed"
- ghc-install-pkg
-
- # We really don't need the GenPKG program, it's an internal Wash thing.
- # I see no reason for it to be installed.
- rm -f "${D}/usr/bin/GenPKG"
-
- dodoc README
- if use doc; then
- cp -r Examples "${D}/usr/share/doc/${PF}"
- cd doc
- dohtml -r *
- fi
-}