diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-08-04 06:39:39 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-08-04 06:39:39 +0000 |
| commit | faec8ae20a9dfed9664f29b68b0aba7e54bbdb1e (patch) | |
| tree | 7b8e0bdf1f9aa998f85485471925c5a1ff3885de /games-roguelike | |
| parent | Bump (diff) | |
| download | gentoo-2-faec8ae20a9dfed9664f29b68b0aba7e54bbdb1e.tar.gz gentoo-2-faec8ae20a9dfed9664f29b68b0aba7e54bbdb1e.tar.bz2 gentoo-2-faec8ae20a9dfed9664f29b68b0aba7e54bbdb1e.zip | |
Ported to time-1.5 (comes with ghc-7.10), bug #556622 by Toralf Förster.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'games-roguelike')
3 files changed, 36 insertions, 4 deletions
diff --git a/games-roguelike/mazesofmonad/ChangeLog b/games-roguelike/mazesofmonad/ChangeLog index 78c997dca39b..326e35531315 100644 --- a/games-roguelike/mazesofmonad/ChangeLog +++ b/games-roguelike/mazesofmonad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/mazesofmonad # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/mazesofmonad/ChangeLog,v 1.7 2015/02/07 06:23:14 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/mazesofmonad/ChangeLog,v 1.8 2015/08/04 06:39:39 slyfox Exp $ + + 04 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> + +files/mazesofmonad-1.0.9-time-1.5.patch, mazesofmonad-1.0.9-r2.ebuild: + Ported to time-1.5 (comes with ghc-7.10), bug #556622 by Toralf Förster. 07 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> mazesofmonad-1.0.9-r2.ebuild: diff --git a/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch b/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch new file mode 100644 index 000000000000..11ef34ef45f9 --- /dev/null +++ b/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch @@ -0,0 +1,22 @@ +diff --git a/MazesOfMonad.cabal b/MazesOfMonad.cabal +index db5e5bf..c3b427b 100644 +--- a/MazesOfMonad.cabal ++++ b/MazesOfMonad.cabal +@@ -34,3 +34,3 @@ Executable mazesofmonad + regex-posix, containers, filepath, directory, pretty,
+- array, mtl, old-locale, time
++ array, mtl, old-locale, time, time-locale-compat
+
+diff --git a/src/MoresmauJP/Rpg/Save.hs b/src/MoresmauJP/Rpg/Save.hs +index 12965b7..238b9b9 100644 +--- a/src/MoresmauJP/Rpg/Save.hs ++++ b/src/MoresmauJP/Rpg/Save.hs +@@ -10,2 +10,3 @@ import Data.Maybe + import Data.Time
++import qualified Data.Time.Locale.Compat as DTLC
+
+@@ -112,3 +113,3 @@ listGames rs name= do + if isJust $ bckGame bs
+- then return $ Just (dropExtension x,formatTime defaultTimeLocale (iso8601DateFormat $ Just "%R") $ bckDate bs)
++ then return $ Just (dropExtension x,formatTime DTLC.defaultTimeLocale (DTLC.iso8601DateFormat $ Just "%R") $ bckDate bs)
+ else return Nothing
diff --git a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild index 87cb1a767efc..f0950df6921c 100644 --- a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild +++ b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild,v 1.3 2015/02/07 06:23:14 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild,v 1.4 2015/08/04 06:39:39 slyfox Exp $ EAPI=5 CABAL_FEATURES="bin" -inherit haskell-cabal games +inherit eutils haskell-cabal games MY_PN=MazesOfMonad MY_P=${MY_PN}-${PV} @@ -27,7 +27,9 @@ DEPEND="${RDEPEND} dev-haskell/hunit dev-haskell/mtl dev-haskell/random - dev-haskell/regex-posix" + dev-haskell/regex-posix + dev-haskell/time-locale-compat +" S=${WORKDIR}/${MY_P} @@ -36,6 +38,10 @@ pkg_setup() { haskell-cabal_pkg_setup } +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0.9-time-1.5.patch +} + src_configure() { haskell-cabal_src_configure \ --prefix="${GAMES_PREFIX}" |