gentoo resync : 13.06.2020

4 files changed, 28 insertions, 11 deletions

diff --git a/www-apps/rocketwiki-lqfb/Manifest b/www-apps/rocketwiki-lqfb/Manifest
index 5c8151e69002..0282dcf09b91 100644
--- a/www-apps/rocketwiki-lqfb/Manifest
+++ b/www-apps/rocketwiki-lqfb/Manifest
@@ -1,4 +1,5 @@
-AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B ecbc3756cf6ca39d1f93578515e55591865b802a29847912d3590e44f477a2b3ccd2a39ba2c63c216fd8f5cb98490e3a0f0fa00ab98fb1c6b9b4d91b7391cefc SHA512 146a39a78e944f41d569f47ec39a53b192d4a5c127189cd3cb4e784e33a94761c0cc309f7edc08f73fab6eb6ceaf6545757e232c5a912f874c5bf4af80c9903b
+AUX rocketwiki-lqfb-0.4-parsec1.patch 508 BLAKE2B 50310abebefc331c0d430c17bd54001d31d1b15e45fa4352c870ed90c1f6dfa537ed6c4c1ab53950ade38ea69635f806af604c8b5f2ab52c6c99b27a854fbc46 SHA512 f8a71191b153551b4bcdaddc66ebec4be191b9ce125d79d2b02de2758ed96da96cf486e7f7f37bf7b1a7a51c9a95494ffa6d36fd1ff343525d913e1138a96531
+AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B e333d743d213fc84e20565c8ee3041c3293b4cdde85a13455fdb3f9c796a0499356386235cf2a170e485ceaa91a013ea81be8fc9a8eefb90ab767f1c4fb0eef2 SHA512 91a92b8c024ff593092f4e66d9b474c2e24d52ab0277945bc5a95a415f2e2cb23cfb05881cf665e091e9201beef9ac9d14da71138ca09e0db3c6551bd5b77c1b
 DIST rocketwiki-lqfb-v0.4.tar.gz 5274 BLAKE2B f26390e0c238a0c8453ca15417396d87e9a6c3da2bad9bd0d02061ccf083114e83713eed268541bb6f1d04587083cf8cc24454f4719700b34b1e046f8c42e006 SHA512 fa90b317007c42e2e6d36c79773948ab7ab68ee914bd20825e0d5acbb8bf0add2c0a48119440d8a5b4c991f2d1f59bc83a1835b02d9070ae67fca1d4ffb73caf
-EBUILD rocketwiki-lqfb-0.4.ebuild 648 BLAKE2B cf21d4efd2febe8c57c4292b81f9dfc9089dc6de6e3a4b1f83e14085072b3fde06a75ef12d0ff62108df0300f6c31b7d47a1de83f2d47aecd6a64d7b8b3f6607 SHA512 2f54c4fda9de1a7c3d635631b8ed5a80a54a7b776c3f679ba2c5113ad2e98ddc3bc2a1466e5ebfdd7f2f62cb19c2f7d0d3358d0edb7da16995651235ae40c6a6
+EBUILD rocketwiki-lqfb-0.4.ebuild 666 BLAKE2B d9da7a0cb3a5a16901524b605b53c832d692d3450fc4170606d36e3f8e171eaa1b0a36cbd5d7631eccc6cb21915aee52b49198525fbfcc16b39c5bc3ce689126 SHA512 95b8e0709b135ae44f7eda3dd8f995bc50d5ce33391be93c26d7f9d41ca878da09ff2f3c32119131fe6452240f385f147a6c4f503f00c384d0a1b93161681c2e
 MISC metadata.xml 502 BLAKE2B ad09da6f3f0555ed6c2ed1f578dbac8f85a6f7a7feba9864ee8d9a591ead254c00c141346085d4f3c71d49944c06a62e822daca11d384ff9a4b0799f1d1820b5 SHA512 f9c4da2ace81b5cf8ce45de2e923ae3ef67bb486c606f6ef2737bc733c27308bf11a653a2fe12f9036d4053eb10e514489aa7fdcc5db363ad043c607c45800d7
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 000000000000..d615aa86fcfb
--- /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 0156686ee29c..52c08ee49bf3 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 662933a4fb42..a36ffa354471 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}