New wash-2.0.6 release added. Removed wash-2.0.5 releases. Fixed path bug

(Portage version: 2.0.51.19)

8 files changed, 16 insertions, 107 deletions

diff --git a/dev-haskell/wash/ChangeLog b/dev-haskell/wash/ChangeLog
index adb26a0f8241..e6410d38829d 100644
--- a/dev-haskell/wash/ChangeLog
+++ b/dev-haskell/wash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/wash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.2 2005/01/01 18:05:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.3 2005/03/10 12:38:13 araujo Exp $
+
+*wash-2.0.5-r1 (10 Mar 2005)
+
+  10 Mar 2005; Luis F. Araujo <araujo@gentoo.org> metadata.xml,
+  -wash-2.0.5-r1.ebuild, -wash-2.0.5.ebuild, +wash-2.0.6.ebuild:
+  New WASH release added
 
 *WASH-2.0.5-r1 (18 Nov 2004)
 
diff --git a/dev-haskell/wash/Manifest b/dev-haskell/wash/Manifest
index b786e453bcbc..1af7f227b0bb 100644
--- a/dev-haskell/wash/Manifest
+++ b/dev-haskell/wash/Manifest
@@ -1,6 +1,4 @@
 MD5 7ac2aea36d44192547fc73435cff7760 ChangeLog 535
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 c060b83c3e91b3fa3861f5c632d457c3 wash-2.0.5-r1.ebuild 1349
-MD5 2e71fe9d310cb076e26fd9c3c4e7505c wash-2.0.5.ebuild 2732
-MD5 17b177468da822de7bb9ba89a644b9ce files/digest-wash-2.0.5 62
-MD5 17b177468da822de7bb9ba89a644b9ce files/digest-wash-2.0.5-r1 62
+MD5 e0ce59fd27b9382896cdb87d5fa48f89 metadata.xml 286
+MD5 e88c6f4920c6c03a8c5dd3478519e509 wash-2.0.6.ebuild 1370
+MD5 ce436420e114151be54e562439be9a55 files/digest-wash-2.0.6 62
diff --git a/dev-haskell/wash/files/digest-wash-2.0.5 b/dev-haskell/wash/files/digest-wash-2.0.5
deleted file mode 100644
index 479a2fa3a9d9..000000000000
--- a/dev-haskell/wash/files/digest-wash-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c438ae77c564310188700a962d922fec WashNGo-2.0.5.tgz 424676
diff --git a/dev-haskell/wash/files/digest-wash-2.0.5-r1 b/dev-haskell/wash/files/digest-wash-2.0.5-r1
deleted file mode 100644
index 479a2fa3a9d9..000000000000
--- a/dev-haskell/wash/files/digest-wash-2.0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c438ae77c564310188700a962d922fec WashNGo-2.0.5.tgz 424676
diff --git a/dev-haskell/wash/files/digest-wash-2.0.6 b/dev-haskell/wash/files/digest-wash-2.0.6
new file mode 100644
index 000000000000..ee643a666e4e
--- /dev/null
+++ b/dev-haskell/wash/files/digest-wash-2.0.6
@@ -0,0 +1 @@
+MD5 3022b799747ca01bf8262dee00d209ed WashNGo-2.0.6.tgz 425383
diff --git a/dev-haskell/wash/metadata.xml b/dev-haskell/wash/metadata.xml
index a53a18c06081..347541c13d52 100644
--- a/dev-haskell/wash/metadata.xml
+++ b/dev-haskell/wash/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>kosmikus@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>araujo@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/wash/wash-2.0.5.ebuild b/dev-haskell/wash/wash-2.0.5.ebuild
deleted file mode 100644
index d0bf45d5fedf..000000000000
--- a/dev-haskell/wash/wash-2.0.5.ebuild
+++ /dev/null
@@ -1,97 +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/wash/wash-2.0.5.ebuild,v 1.2 2005/01/01 18:05:58 eradicator Exp $
-
-# 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=">=virtual/ghc-6.2
-	postgres? ( dev-haskell/c2hs
-		>=dev-db/postgresql-7.4.3 )"
-
-# RDEPEND: c2hs needed?
-
-S=${WORKDIR}/${MY_PV}
-
-src_compile() {
-	local myopts
-	myopts="${myopts} `use_enable postgres dbconnect`"
-	myopts="${myopts} `use_enable doc build-docs`"
-	# determine ghc library directory
-	ghc_version=`best_version virtual/ghc | sed "s:.*/::"`
-	test -n ${ghc_version} && ghclibdir="/usr/lib/${ghc_version}"
-	test -n ${ghclibdir} || ghclibdir="/usr/lib"
-	test -n ${ghclibdir} && myopts="${myopts} --libdir=${D}${ghclibdir}"
-	./configure \
-		--prefix="${D}usr" \
-		--host=${CHOST} \
-		${myopts} \
-		--enable-register-package="${S}/${MY_PV}.conf" \
-			|| die "configure failed"
-	make depend || die "make depend failed"
-	make all || die "make all failed"
-}
-
-src_install() {
-	mkdir -p ${D}${ghclibdir}
-	echo "[]" > ${S}/${MY_PV}.conf
-	make install || die "make install failed"
-	# fix references to D in temporary package configuration file
-	cat ${S}/${MY_PV}.conf | sed "s:${D}::" \
-		> ${D}${ghclibdir}/${MY_PV}.conf
-
-	dodoc README
-	if use doc; then
-		cp -r Examples ${D}/usr/share/doc/${PF}
-		cd doc
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	# packages: WASH/WASHHTML cgi/WASH-CGI dbconnect/DBCONNECT
-	#    Utility/Utility Mail/WASHMail
-	register_ghc_package Utility
-	register_ghc_package WASHHTML
-	register_ghc_package WASHMail
-	register_ghc_package WASH-CGI
-	register_ghc_package WASH
-	use postgres && register_ghc_package DBCONNECT
-}
-
-pkg_postrm() {
-	# check if another version is still there
-	has_version "<${CATEGORY}/${PF}" \
-		|| has_version ">${CATEGORY}/${PF}" \
-		|| unregister_ghc_packages
-}
-
-register_ghc_package() {
-	einfo "Registering $1 package"
-	/usr/bin/ghc-pkg -f ${ghclibdir}/${MY_PV}.conf -s $1 \
-		| /usr/bin/ghc-pkg -u --auto-ghci-libs
-}
-
-unregister_ghc_packages() {
-	unregister_ghc_package DBCONNECT
-	unregister_ghc_package WASH
-	unregister_ghc_package WASH-CGI
-	unregister_ghc_package WASHMail
-	unregister_ghc_package WASHHTML
-	unregister_ghc_package Utility
-}
-
-unregister_ghc_package() {
-	einfo "Unregistering $1 package (warnings are safe to ignore)"
-	/usr/sbin/ghc-pkg -r $1
-}
diff --git a/dev-haskell/wash/wash-2.0.5-r1.ebuild b/dev-haskell/wash/wash-2.0.6.ebuild
index b3c663e85b61..5f3dfaff8109 100644
--- a/dev-haskell/wash/wash-2.0.5-r1.ebuild
+++ b/dev-haskell/wash/wash-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.0.5-r1.ebuild,v 1.2 2005/01/01 18:05:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.0.6.ebuild,v 1.1 2005/03/10 12:38:13 araujo Exp $
 
 inherit ghc-package
 
@@ -40,7 +40,7 @@ src_compile() {
 
 src_install() {
 	ghc-setup-pkg
-	make install || die "make install failed"
+	make exec_prefix=${D}/usr install || die "make install failed"
 	ghc-install-pkg
 	dodoc README
 	if use doc; then