Removed stale patch.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index a4323482dd7d44b53d03c6f9c051fc1ce203db36..ac1071fca3ebaebb6d61d7fe79c4beea4ba42cbb 100644 (file)
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/happy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.49 2011/02/28 04:59:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.50 2011/08/02 09:50:03 slyfox Exp $
+
+  02 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/happy-1.15-ghc66.patch:
+  Removed stale patch.
 
   28 Feb 2011; Sergei Trofimovich <slyfox@gentoo.org> -happy-1.15.ebuild,
   -happy-1.16.ebuild, -happy-1.17.ebuild:

diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 4250d180c57a62318af96013f92624faf2b5ec7c..14acbcb32f9eb92ece42dfac60f677e773a74a3b 100644 (file)
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,8 +1,17 @@
-AUX happy-1.15-ghc66.patch 1347 RMD160 d99f02830dc4af87828d4602e13404394ccae6c8 SHA1 a3b6ef1164ecae7b7f19718194f9e4b00954267e SHA256 06e18354fe372ce7c37a9a10a400e04a4dcb29edc9aed569edc42fc52e1390db
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST happy-1.18.2.tar.gz 158782 RMD160 9d42d701c51936d705646f32ac2facbfa305ac70 SHA1 1fe37e97f410dd4b4344d0b01e6a5f7cfeec7cf3 SHA256 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae
 DIST happy-1.18.4.tar.gz 157585 RMD160 846d90e2962c6053acae03ace90de3656ce271b5 SHA1 86c6a61ed8b3909c476c27343f41cb12971d52bd SHA256 909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832
 DIST mtl-1.1.0.2.tar.gz 18901 RMD160 e7032fc069c8b24b97725b259d2e6fb05ace208b SHA1 883deca3cdf8052173c995b741bdedccc3c91440 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36
 EBUILD happy-1.18.2.ebuild 967 RMD160 0f4c3cdc3834e3189a3d4696060ac1d8605dd7d8 SHA1 f7b325a57fb576c0934b5ef1dc7abc1e36b462ab SHA256 0c3a84a5f9f7580540f894351a8d295311d98c64bceb625521d1ddfa999edde4
 EBUILD happy-1.18.4.ebuild 1727 RMD160 b8ecabdd63c36e7ec8e4920de262d12b2f6e59e1 SHA1 30513c7cfa307bbd5c80418c4a7d2ba44da954e0 SHA256 8e001a1c4ef7e1d28b03d88013982999ba2ed7aae7c62d06a799cbfc5bd26a89
-MISC ChangeLog 5986 RMD160 a3e7476e419357213b4d575ff82d533c02788199 SHA1 1457b39a0eceb4b719054b1c6132a9c40127ea31 SHA256 32913aa5f2b5e0d5c50bedd8d1931472d6e9e21589722b74cc8a5e1e9a994092
+MISC ChangeLog 6097 RMD160 4b39c9f6766efb762d4c5f381d515408899ad6c7 SHA1 2d84d07d37ca511a5ea04c97b3cce7a68af17d2e SHA256 60bea2890ce4399fa491bc90376009a0faef8d54e1d18c0b8077db9e0832fcdc
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk43yRsACgkQcaHudmEf86riqQCfdiE694zCfkc8seA0qI5JoQS1
+M0wAnivBQjdZwIuXqJ6vlG+GtdWLDfFx
+=8pyT
+-----END PGP SIGNATURE-----

diff --git a/dev-haskell/happy/files/happy-1.15-ghc66.patch b/dev-haskell/happy/files/happy-1.15-ghc66.patch
deleted file mode 100644 (file)
index 7a40971..0000000
--- a/dev-haskell/happy/files/happy-1.15-ghc66.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urwpN happy-1.15.orig/happy/src/LALR.lhs happy-1.15/happy/src/LALR.lhs
---- happy-1.15.orig/happy/src/LALR.lhs 2005-01-14 14:57:54.000000000 +0000
-+++ happy-1.15/happy/src/LALR.lhs      2006-09-12 10:02:19.000000000 +0100
-@@ -21,14 +21,14 @@ Generation of LALR parsing tables.
- 
- > import Control.Monad.ST
- > import Data.Array.ST
--> import Data.Array hiding (bounds)
-+> import Data.Array as Array
- > import Data.List (nub)
- 
- #elif defined(__GLASGOW_HASKELL__)
- 
- > import ST
- > import MArray
--> import Array        hiding (bounds)
-+> import Array as Array
- > import List (nub)
- 
- #endif
-@@ -623,7 +623,7 @@ Count the conflicts
- >   
- >   where
- >        
-->     conflictArray = listArray (bounds action) conflictList
-+>     conflictArray = listArray (Array.bounds action) conflictList
- >     conflictList  = map countConflictsState (assocs action)
- >
- >     countConflictsState (state, actions) 
-diff -urwpN happy-1.15.orig/happy/src/ProduceCode.lhs happy-1.15/happy/src/ProduceCode.lhs
---- happy-1.15.orig/happy/src/ProduceCode.lhs  2005-01-18 10:18:19.000000000 +0000
-+++ happy-1.15/happy/src/ProduceCode.lhs       2006-09-12 09:51:32.000000000 +0100
-@@ -27,8 +27,6 @@ The code generator.
- > import Data.Array.Unboxed ( UArray )
- > import Data.Array.MArray
- > import Data.Array.IArray 
--> 
--> marray_indices a = Data.Array.MArray.indices a
- 
- #elif __GLASGOW_HASKELL__ > 408
-