commit: a804bde0bb48480dafc9b5c8cdd690aad566aafb Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Wed Jun 10 08:45:13 2020 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Wed Jun 10 08:45:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a804bde0
www-apps/rocketwiki-lqfb: do not use parsec1 Closes: https://bugs.gentoo.org/726174 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../files/rocketwiki-lqfb-0.4-parsec1.patch | 15 +++++++++++++++ .../rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch | 8 ++++---- www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild | 11 ++++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch new file mode 100644 index 00000000000..d615aa86fcf --- /dev/null +++ b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch @@ -0,0 +1,15 @@ +--- a/Makefile 2020-06-10 10:37:53.992504952 +0200 ++++ b/Makefile 2020-06-10 10:38:37.419801522 +0200 +@@ -1,10 +1,10 @@ + all:: rocketwiki-lqfb rocketwiki-lqfb-compat + + rocketwiki-lqfb: rocketwiki-lqfb.hs +- ghc --make rocketwiki-lqfb ++ ghc -ignore-package=parsec1 --make rocketwiki-lqfb + + rocketwiki-lqfb-compat: rocketwiki-lqfb-compat.hs +- ghc --make rocketwiki-lqfb-compat ++ ghc -ignore-package=parsec1 --make rocketwiki-lqfb-compat + + clean:: + rm -f rocketwiki-lqfb rocketwiki-lqfb.hi rocketwiki-lqfb.o diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch index 0156686ee29..52c08ee49bf 100644 --- a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch +++ b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch @@ -1,5 +1,5 @@ ---- rocketwiki-lqfb.hs.old 2013-04-25 21:41:34.044588280 +0200 -+++ rocketwiki-lqfb.hs 2013-04-25 21:42:33.108020316 +0200 +--- a/rocketwiki-lqfb.hs 2013-04-25 21:41:34.044588280 +0200 ++++ b/rocketwiki-lqfb.hs 2013-04-25 21:42:33.108020316 +0200 @@ -2,6 +2,7 @@ import Text.ParserCombinators.Parsec import Control.Applicative ((<$>), (<*>)) @@ -20,8 +20,8 @@ wikiParse str | success parseResult = html ---- rocketwiki-lqfb-compat.hs.old 2013-04-25 21:41:41.340518231 +0200 -+++ rocketwiki-lqfb-compat.hs 2013-04-25 21:43:21.299557312 +0200 +--- a/rocketwiki-lqfb-compat.hs 2013-04-25 21:41:41.340518231 +0200 ++++ b/rocketwiki-lqfb-compat.hs 2013-04-25 21:43:21.299557312 +0200 @@ -2,6 +2,7 @@ import Text.ParserCombinators.Parsec import Control.Applicative ((<$>), (<*>)) diff --git a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild index 662933a4fb4..a36ffa35447 100644 --- a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild +++ b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit eutils MY_P=${PN}-v${PV} @@ -22,9 +22,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -src_prepare() { - epatch "${FILESDIR}"/${P}-utf8.patch -} +PATCHES=( + "${FILESDIR}"/${P}-utf8.patch + "${FILESDIR}"/${P}-parsec1.patch +) src_install() { dobin ${PN}{,-compat}
