summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2011-08-02 09:50:03 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2011-08-02 09:50:03 +0000
commite6986ef57a5fb125423a30668ca458d1168faa02 (patch)
treee9d51d1c6c961a751accbe032c9ebbe94238d45b /dev-haskell/happy
parentVersion bump, drop old (diff)
downloadgentoo-2-e6986ef57a5fb125423a30668ca458d1168faa02.tar.gz
gentoo-2-e6986ef57a5fb125423a30668ca458d1168faa02.tar.bz2
gentoo-2-e6986ef57a5fb125423a30668ca458d1168faa02.zip
Removed stale patch.
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/happy')
-rw-r--r--dev-haskell/happy/ChangeLog6
-rw-r--r--dev-haskell/happy/files/happy-1.15-ghc66.patch41
2 files changed, 5 insertions, 42 deletions
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index a4323482dd7d..ac1071fca3eb 100644
--- 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/files/happy-1.15-ghc66.patch b/dev-haskell/happy/files/happy-1.15-ghc66.patch
deleted file mode 100644
index 7a40971a2b6a..000000000000
--- 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
-