7 files changed, 25 insertions, 47 deletions
diff --git a/dev-haskell/frown/ChangeLog b/dev-haskell/frown/ChangeLog
index 86112e5b168d..7faf83c0e5a3 100644
--- a/dev-haskell/frown/ChangeLog
+++ b/dev-haskell/frown/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/frown
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/ChangeLog,v 1.3 2006/01/04 13:05:35 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/ChangeLog,v 1.4 2006/02/16 12:57:55 dcoutts Exp $
+
+  16 Feb 2006; <duncan@gentoo.org> metadata.xml, -frown-0.6.1.ebuild,
+  frown-0.6.1-r1.ebuild:
+  Marked ~amd64 and remove old revision which didn't use optimisation.
 
 *frown-0.6.1-r1 (04 Jan 2006)
 
diff --git a/dev-haskell/frown/Manifest b/dev-haskell/frown/Manifest
index 9a34c14d268a..2e763e496723 100644
--- a/dev-haskell/frown/Manifest
+++ b/dev-haskell/frown/Manifest
@@ -1,16 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 99d1ef18f5ce91834a35f73f81b05554 ChangeLog 603
-MD5 b0e7375971360e922527eab25f43c575 files/digest-frown-0.6.1 64
-MD5 b0e7375971360e922527eab25f43c575 files/digest-frown-0.6.1-r1 64
-MD5 2488882d587bc6214017bbcf36807cc0 frown-0.6.1-r1.ebuild 771
-MD5 21d08db40343e899174b75b9002b2527 frown-0.6.1.ebuild 644
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDu8mhOKSBj1ObwosRAhU4AJ9pzvrms+tt4mz3ZOom/Xjyk8oVIgCdGhbz
-kaZclfcEr9kD724kGFQP6UA=
-=ypOI
------END PGP SIGNATURE-----
+MD5 3316ba26cc0600d5b1a9be3bffa08363 ChangeLog 739
+RMD160 457f733c3b318398417f180d6416b4ce4eb65014 ChangeLog 739
+SHA256 347ebb709e339537f6498532a9b3aed9c32ab5f516323e77d82e22018c055961 ChangeLog 739
+MD5 d382ade2ea4d45840fa3dc6eb91d23cc files/digest-frown-0.6.1-r1 238
+RMD160 8caa51bcab47bccd62fe019d4954a60370834ecc files/digest-frown-0.6.1-r1 238
+SHA256 7d4e554364b91a2e15a2773b36311026181043a1066237af63cbbc61371d1d66 files/digest-frown-0.6.1-r1 238
+MD5 ff57a7b9938eade0364d92cef6e36f13 frown-0.6.1-r1.ebuild 791
+RMD160 20ebb14fb01e82b27fab3c8418169a82ee7afbba frown-0.6.1-r1.ebuild 791
+SHA256 0599d5f40338bd485591d9b6eef1b1f6db2d06983bae956b1113800a18feb940 frown-0.6.1-r1.ebuild 791
+MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
+RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
+SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
diff --git a/dev-haskell/frown/files/digest-frown-0.6.1 b/dev-haskell/frown/files/digest-frown-0.6.1
deleted file mode 100644
index 8a1bc3b28588..000000000000
--- a/dev-haskell/frown/files/digest-frown-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6fe9a8bf029c2a7c31b574be05816cf frown-0.6.1.tar.gz 1291807
diff --git a/dev-haskell/frown/files/digest-frown-0.6.1-r1 b/dev-haskell/frown/files/digest-frown-0.6.1-r1
index 8a1bc3b28588..8866e733f6b8 100644
--- a/dev-haskell/frown/files/digest-frown-0.6.1-r1
+++ b/dev-haskell/frown/files/digest-frown-0.6.1-r1
@@ -1 +1,3 @@
 MD5 b6fe9a8bf029c2a7c31b574be05816cf frown-0.6.1.tar.gz 1291807
+RMD160 7835af5095bc16c7ff459259fa91d1c08c35ca85 frown-0.6.1.tar.gz 1291807
+SHA256 bfb5a7a84527624a605342cf739ebbef078a25721ca5af4fb7998590d76a9c05 frown-0.6.1.tar.gz 1291807
diff --git a/dev-haskell/frown/frown-0.6.1-r1.ebuild b/dev-haskell/frown/frown-0.6.1-r1.ebuild
index 715f5c382041..c5bb12faf75a 100644
--- a/dev-haskell/frown/frown-0.6.1-r1.ebuild
+++ b/dev-haskell/frown/frown-0.6.1-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1-r1.ebuild,v 1.1 2006/01/04 13:05:35 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1-r1.ebuild,v 1.2 2006/02/16 12:57:55 dcoutts Exp $
 
+CABAL_FEATURES="bin"
 inherit haskell-cabal
 
 DESCRIPTION="A parser generator for Haskell"
@@ -9,7 +10,7 @@ HOMEPAGE="http://www.informatik.uni-bonn.de/~ralf/frown/"
 SRC_URI="http://www.informatik.uni-bonn.de/~ralf/frown/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=virtual/ghc-6.2.2"
@@ -24,7 +25,7 @@ src_unpack() {
 }
 
 src_install() {
-	haskell-cabal_src_install
+	cabal_src_install
 	dohtml -r Manual/html
-	dodoc COPYING COPYRIGHT Manual/Manual.ps
+	dodoc COPYRIGHT Manual/Manual.ps
 }
diff --git a/dev-haskell/frown/frown-0.6.1.ebuild b/dev-haskell/frown/frown-0.6.1.ebuild
deleted file mode 100644
index 553c15b7edf9..000000000000
--- a/dev-haskell/frown/frown-0.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1.ebuild,v 1.1 2006/01/03 11:35:28 kosmikus Exp $
-
-inherit haskell-cabal
-
-DESCRIPTION="A parser generator for Haskell"
-HOMEPAGE="http://www.informatik.uni-bonn.de/~ralf/frown/"
-SRC_URI="http://www.informatik.uni-bonn.de/~ralf/frown/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=virtual/ghc-6.2.2"
-RDEPEND=""
-
-S="${WORKDIR}/Frown-${PV}"
-
-src_install() {
-	haskell-cabal_src_install
-	dohtml -r Manual/html
-	dodoc COPYING COPYRIGHT Manual/Manual.ps
-}
diff --git a/dev-haskell/frown/metadata.xml b/dev-haskell/frown/metadata.xml
index a53a18c06081..8c66906af531 100644
--- a/dev-haskell/frown/metadata.xml
+++ b/dev-haskell/frown/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>haskell</herd>
 <maintainer>
-  <email>kosmikus@gentoo.org</email>
+  <email>haskell@gentoo.org</email>
 </maintainer>
 </pkgmetadata>