summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2015-01-29 04:15:39 +0000
committerMark Wright <gienah@gentoo.org>2015-01-29 04:15:39 +0000
commit303baab90aaa0c51581eb815acd3d8f181d39cd1 (patch)
tree79fc14090af0a4ce9e98d40073ae65f8dcabb37d /sci-mathematics/agda
parentDrop old with now unsatisfied dep on dev-haskell/hashtables (diff)
downloadgentoo-2-303baab90aaa0c51581eb815acd3d8f181d39cd1.tar.gz
gentoo-2-303baab90aaa0c51581eb815acd3d8f181d39cd1.tar.bz2
gentoo-2-303baab90aaa0c51581eb815acd3d8f181d39cd1.zip
Drop old patches
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'sci-mathematics/agda')
-rw-r--r--sci-mathematics/agda/ChangeLog8
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0-emacs.patch27
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch27
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch26
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch11
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0.1-quickcheck-2.5.patch30
6 files changed, 7 insertions, 122 deletions
diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 72f1f1ef1334..f43f80508717 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-mathematics/agda
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.29 2015/01/29 03:38:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.30 2015/01/29 04:15:39 gienah Exp $
+
+ 29 Jan 2015; Mark Wright <gienah@gentoo.org> -files/agda-2.3.0-emacs.patch,
+ -files/agda-2.3.0.1-emacs.patch,
+ -files/agda-2.3.0.1-haskell-src-exts-1.13.patch,
+ -files/agda-2.3.0.1-mtl-2.1.patch, -files/agda-2.3.0.1-quickcheck-2.5.patch:
+ Drop old patches
29 Jan 2015; Patrick Lauer <patrick@gentoo.org> -agda-2.3.0.1-r1.ebuild,
-agda-2.3.0.1.ebuild, -agda-2.3.2-r2.ebuild, -agda-2.3.2.ebuild:
diff --git a/sci-mathematics/agda/files/agda-2.3.0-emacs.patch b/sci-mathematics/agda/files/agda-2.3.0-emacs.patch
deleted file mode 100644
index bfe89a34f29a..000000000000
--- a/sci-mathematics/agda/files/agda-2.3.0-emacs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- agda-9999-orig/Agda.cabal 2011-11-26 00:25:45.382153242 +1100
-+++ agda-9999/Agda.cabal 2011-11-26 17:43:50.076056097 +1100
-@@ -40,7 +40,6 @@
- doc/release-notes/*.txt
- data-dir: src/data
- data-files: Agda.css
-- emacs-mode/*.el
- EpicInclude/AgdaPrelude.e
- EpicInclude/stdagda.c
- EpicInclude/stdagda.h
-@@ -323,16 +322,3 @@
- if impl(ghc >= 7.2)
- ghc-options: -fwarn-identities
- ghc-prof-options: -auto-all
--
--executable agda-mode
-- hs-source-dirs: src/agda-mode
-- main-is: Main.hs
-- other-modules: Paths_Agda
-- if flag(use-locale)
-- build-depends: base >= 4.2 && < 4.5
-- else
-- build-depends: base == 4.1.*,
-- utf8-string == 0.3.*
-- build-depends: filepath >= 1.1 && < 1.3,
-- process >= 1.0.1.0 && < 1.2,
-- directory >= 1.0 && < 1.2
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch b/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch
deleted file mode 100644
index e08dc988986b..000000000000
--- a/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Agda-2.3.0.1-orig/Agda.cabal 2012-03-12 21:09:34.000000000 +1100
-+++ Agda-2.3.0.1/Agda.cabal 2012-03-26 00:07:55.476482395 +1100
-@@ -40,7 +40,6 @@
- doc/release-notes/*.txt
- data-dir: src/data
- data-files: Agda.css
-- emacs-mode/*.el
- EpicInclude/AgdaPrelude.e
- EpicInclude/stdagda.c
- EpicInclude/stdagda.h
-@@ -326,16 +325,3 @@
- if impl(ghc >= 7.2)
- ghc-options: -fwarn-identities
- ghc-prof-options: -auto-all
--
--executable agda-mode
-- hs-source-dirs: src/agda-mode
-- main-is: Main.hs
-- other-modules: Paths_Agda
-- if flag(use-locale)
-- build-depends: base >= 4.2 && < 4.6
-- else
-- build-depends: base == 4.1.*,
-- utf8-string == 0.3.*
-- build-depends: filepath >= 1.1 && < 1.4,
-- process >= 1.0.1.0 && < 1.2,
-- directory >= 1.0 && < 1.2
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch b/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch
deleted file mode 100644
index 06e3c702e864..000000000000
--- a/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Agda-2.3.0.1-orig/Agda.cabal 2012-03-12 21:09:34.000000000 +1100
-+++ Agda-2.3.0.1/Agda.cabal 2012-04-01 11:54:47.565833931 +1000
-@@ -77,7 +77,7 @@
- build-depends: epic >= 0.1.13 && < 0.10
- build-depends: mtl == 2.0.*,
- QuickCheck >= 2.3 && < 2.5,
-- haskell-src-exts >= 1.9.6 && < 1.12,
-+ haskell-src-exts >= 1.9.6 && < 1.14,
- containers >= 0.1 && < 0.5,
- pretty >= 1.0 && < 1.2,
- directory >= 1.0 && < 1.2,
---- Agda-2.3.0.1-orig/src/full/Agda/Compiler/MAlonzo/Compiler.hs 2012-04-01 11:27:52.058688415 +1000
-+++ Agda-2.3.0.1/src/full/Agda/Compiler/MAlonzo/Compiler.hs 2012-04-01 11:30:42.732658634 +1000
-@@ -466,8 +466,11 @@
- ]
- where
- parse = HS.parseWithMode
-+#if MIN_VERSION_haskell_src_exts(1,13,0)
-+ HS.defaultParseMode{HS.extensions = [HS.ExplicitForAll]}
-+#else
- HS.defaultParseMode{HS.extensions = [HS.ExplicitForall]}
--
-+#endif
- ok (HS.ParseOk d) = d
- ok HS.ParseFailed{} = __IMPOSSIBLE__
-
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch b/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch
deleted file mode 100644
index 7f592a3d5608..000000000000
--- a/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Agda-2.3.0.1-orig/Agda.cabal 2012-04-01 11:54:47.565833931 +1000
-+++ Agda-2.3.0.1/Agda.cabal 2012-04-12 01:24:54.004394444 +1000
-@@ -75,7 +75,7 @@
- utf8-string == 0.3.*
- if flag(epic)
- build-depends: epic >= 0.1.13 && < 0.10
-- build-depends: mtl == 2.0.*,
-+ build-depends: mtl >= 2.0 && < 2.2,
- QuickCheck >= 2.3 && < 2.5,
- haskell-src-exts >= 1.9.6 && < 1.14,
- containers >= 0.1 && < 0.5,
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-quickcheck-2.5.patch b/sci-mathematics/agda/files/agda-2.3.0.1-quickcheck-2.5.patch
deleted file mode 100644
index 51d5f8b0038f..000000000000
--- a/sci-mathematics/agda/files/agda-2.3.0.1-quickcheck-2.5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Agda-2.3.0.1-orig/Agda.cabal 2012-04-12 01:24:54.004394444 +1000
-+++ Agda-2.3.0.1/Agda.cabal 2012-07-08 12:59:51.280014442 +1000
-@@ -76,7 +76,7 @@
- if flag(epic)
- build-depends: epic >= 0.1.13 && < 0.10
- build-depends: mtl >= 2.0 && < 2.2,
-- QuickCheck >= 2.3 && < 2.5,
-+ QuickCheck >= 2.3 && < 2.6,
- haskell-src-exts >= 1.9.6 && < 1.14,
- containers >= 0.1 && < 0.5,
- pretty >= 1.0 && < 1.2,
---- Agda-2.3.0.1-orig/src/full/Agda/Termination/Lexicographic.hs 2012-11-09 03:23:20.938830800 +0900
-+++ Agda-2.3.0.1/src/full/Agda/Termination/Lexicographic.hs 2012-11-09 03:22:25.918728273 +0900
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -- | Lexicographic order search, more or less as defined in
- -- \"A Predicative Analysis of Structural Recursion\" by
- -- Andreas Abel and Thorsten Altenkirch.
-@@ -230,7 +231,11 @@
- , quickCheck' prop_fromDiagonals
- , quickCheck' prop_newBehaviour
- , quickCheckWith' stdArgs{ maxSuccess = 50
-+#if MIN_VERSION_QuickCheck(2,5,0)
-+ , maxDiscardRatio = 4
-+#else
- , maxDiscard = 200
-+#endif
- , maxSize = 20
- }
- prop_lexOrder