gentoo resync : 28.04.2021

3 files changed, 47 insertions, 1 deletions

diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
index 0f64b51de11d..fafa42c19085 100644
--- a/www-apps/gitit/Manifest
+++ b/www-apps/gitit/Manifest
@@ -1,3 +1,4 @@
+AUX gitit-0.13.0.0-pandoc-2.12.patch 1732 BLAKE2B 46c5c87a9100c4d11ca265e48490c46f1a76dfb22df14dfe92b8d1a0ba1ef33a9598099973469f98654f02ba8248be9b08ff6b3d39aca2b9b4adfe72d1c9ad02 SHA512 38bf99b60d4cbc06f8fb47054531e75120951757e63bd995b1d71d016683ee1523dd2a1bb2fcca35be71362113ff3e52af36b71da9216c94bd467ddce64ace17
 DIST gitit-0.13.0.0.tar.gz 274691 BLAKE2B 74ef7d4a73356a2be7531fa22faf6ebd2f5a2edf9ce40909cff31756d93e1bea8e563d953b6c3fe0ea30fa98d13dee21aa7331bbb281fcfd476b2de90cd0accb SHA512 dce06c73813a71df4e9896e62f611906de708a5186ace2ba4679bd53bae48495ced5b888febb65a395cef3b11ecb595dfca079b1c3ed24fb464aa997e710ab1e
-EBUILD gitit-0.13.0.0-r1.ebuild 3374 BLAKE2B 8d49f97d86f0c3e25ff0f4a4ac991a48c03e401ada4f5ef4146c4334b91ec421eb687db5a18923d0c3eba0051be0fedf024352c5a2ec930920185c24ffa01f77 SHA512 2cbcde220e6b772e593a45a7cbbf9252612be83c0cc6259e95b38f61c02d54be3617ce7d67ae89ebe67ad82caeae91474fd7943062fbc8eb5ba551865ea6b199
+EBUILD gitit-0.13.0.0-r1.ebuild 3424 BLAKE2B 57398fbbba7481ed01173d2c2a22eab9acf006530523d1b779230d95823b89014dae6321dbd4282ec55e563555ca44fc17cae5258fdf7445e7528898cbe39416 SHA512 f988b2dcea65a739ad27508a393a2b456d5d41315c52657997a27dca5d2e4394515bcf5271dafda1a2b00eb0f73d59bce34053272aec48105c59f21ad34484d2
 MISC metadata.xml 1345 BLAKE2B 0647bf06da38617360a67c71cecde3b5337073b6dcf0413d3f962dc0e69625c4b0e2a0919c1cbc93ad88d5e38748a8c96d16704aaf76bb547da8c503f18ddb36 SHA512 fc120ee0cecb42984179def72c1d91bba405a7c91357ffa934e9f98edb224fb9a147be0a5beab49c90bc47e0adfcd1c01dbc16998da9c151b348d8c78ab6b0ef
diff --git a/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch b/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch
new file mode 100644
index 000000000000..abe73ed17c9e
--- /dev/null
+++ b/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch
@@ -0,0 +1,43 @@
+diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs
+index 4c240e7..b41d87d 100644
+--- a/src/Network/Gitit/Authentication.hs
++++ b/src/Network/Gitit/Authentication.hs
+@@ -44,8 +44,8 @@ import System.Exit
+ import System.Log.Logger (logM, Priority(..))
+ import Data.Char (isAlphaNum, isAlpha)
+ import qualified Data.Map as M
+-import Text.Pandoc.Shared (substitute)
+ import Data.Maybe (isJust, fromJust, isNothing, fromMaybe)
++import Data.List (stripPrefix)
+ import Network.URL (exportURL, add_param, importURL)
+ import Network.BSD (getHostName)
+ import qualified Text.StringTemplate as T
+@@ -54,6 +54,15 @@ import Codec.Binary.UTF8.String (encodeString)
+ import Data.ByteString.UTF8 (toString)
+ import Network.Gitit.Rpxnow as R
+ 
++-- Taken from Pandoc-2.11.4, no longer exported since 2.12:
++substitute :: (Eq a) => [a] -> [a] -> [a] -> [a]
++substitute _ _ [] = []
++substitute [] _ xs = xs
++substitute target replacement lst@(x:xs) =
++    case stripPrefix target lst of
++      Just lst' -> replacement ++ substitute target replacement lst'
++      Nothing   -> x : substitute target replacement xs
++
+ data ValidationType = Register
+                     | ResetPassword
+                     deriving (Show,Read)
+diff --git a/src/Network/Gitit/Util.hs b/src/Network/Gitit/Util.hs
+index c5e9fe5..9588b3a 100644
+--- a/src/Network/Gitit/Util.hs
++++ b/src/Network/Gitit/Util.hs
+@@ -45,7 +45,7 @@ import Network.URL (encString)
+ 
+ -- | Read file as UTF-8 string.  Encode filename as UTF-8.
+ readFileUTF8 :: FilePath -> IO Text
+-readFileUTF8 = fmap T.pack . UTF8.readFile
++readFileUTF8 = UTF8.readFile
+ 
+ -- | Perform a function a directory and return to working directory.
+ inDir :: FilePath -> IO a -> IO a
diff --git a/www-apps/gitit/gitit-0.13.0.0-r1.ebuild b/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
index e24c23a2a38e..b2dc02d39686 100644
--- a/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
+++ b/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
@@ -68,6 +68,8 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.0
 "
 
+PATCHES=( "${FILESDIR}"/${P}-pandoc-2.12.patch )
+
 src_prepare() {
 	default