[gentoo-commits] repo/gentoo:master commit in: app-text/pandoc/, app-text/pandoc/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pandoc/, app-text/pandoc/files/
Date: Fri, 22 Jul 2022 22:16:42 +0000 (UTC)	[thread overview]
Message-ID: <1658528167.16f85eb7df10c24a4d02f4d22690d285dfc1c5ff.sam@gentoo> (raw)

commit:     16f85eb7df10c24a4d02f4d22690d285dfc1c5ff
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jul 21 21:46:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 22:16:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f85eb7

app-text/pandoc: add 2.18

Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26392
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/pandoc/Manifest                      |   1 +
 app-text/pandoc/files/pandoc-2.18-tests.patch |  79 ++++++++++++++++++
 app-text/pandoc/pandoc-2.18.ebuild            | 113 ++++++++++++++++++++++++++
 3 files changed, 193 insertions(+)

diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 6062b60a8056..e1f03537e6ed 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,3 +1,4 @@
 DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
 DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
+DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
 DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2

diff --git a/app-text/pandoc/files/pandoc-2.18-tests.patch b/app-text/pandoc/files/pandoc-2.18-tests.patch
new file mode 100644
index 000000000000..6cf30a7c9bc6
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-2.18-tests.patch
@@ -0,0 +1,79 @@
+From 9aff86143e12e22cec152fd08ec8b68ee75ccafa Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm@berkeley.edu>
+Date: Tue, 31 May 2022 19:49:27 -0700
+Subject: [PATCH] Require skylighting 0.12.3.1 and update tests.
+
+---
+ pandoc.cabal           | 4 ++--
+ stack.yaml             | 4 ++--
+ test/lhs-test.html     | 4 ++--
+ test/lhs-test.html+lhs | 4 ++--
+ test/lhs-test.latex    | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/lhs-test.html b/test/lhs-test.html
+index 754b25e1f570..85e5d785d14a 100644
+--- a/test/lhs-test.html
++++ b/test/lhs-test.html
+@@ -190,7 +190,7 @@
+     code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+     code span.at { color: #7d9029; } /* Attribute */
+     code span.bn { color: #40a070; } /* BaseN */
+-    code span.bu { } /* BuiltIn */
++    code span.bu { color: #008000; } /* BuiltIn */
+     code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+     code span.ch { color: #4070a0; } /* Char */
+     code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+     code span.ex { } /* Extension */
+     code span.fl { color: #40a070; } /* Float */
+     code span.fu { color: #06287e; } /* Function */
+-    code span.im { } /* Import */
++    code span.im { color: #008000; font-weight: bold; } /* Import */
+     code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+     code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+     code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
+index 7198397d8f45..32e0baf4d7e2 100644
+--- a/test/lhs-test.html+lhs
++++ b/test/lhs-test.html+lhs
+@@ -190,7 +190,7 @@
+     code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+     code span.at { color: #7d9029; } /* Attribute */
+     code span.bn { color: #40a070; } /* BaseN */
+-    code span.bu { } /* BuiltIn */
++    code span.bu { color: #008000; } /* BuiltIn */
+     code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+     code span.ch { color: #4070a0; } /* Char */
+     code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+     code span.ex { } /* Extension */
+     code span.fl { color: #40a070; } /* Float */
+     code span.fu { color: #06287e; } /* Function */
+-    code span.im { } /* Import */
++    code span.im { color: #008000; font-weight: bold; } /* Import */
+     code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+     code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+     code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.latex b/test/lhs-test.latex
+index 49521d3c1522..435d1dfefb07 100644
+--- a/test/lhs-test.latex
++++ b/test/lhs-test.latex
+@@ -44,7 +44,7 @@
+ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
+ \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+-\newcommand{\BuiltInTok}[1]{#1}
++\newcommand{\BuiltInTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{#1}}
+ \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+ \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
+ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+@@ -57,7 +57,7 @@
+ \newcommand{\ExtensionTok}[1]{#1}
+ \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+ \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
+-\newcommand{\ImportTok}[1]{#1}
++\newcommand{\ImportTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{\textbf{#1}}}
+ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
+ \newcommand{\NormalTok}[1]{#1}

diff --git a/app-text/pandoc/pandoc-2.18.ebuild b/app-text/pandoc/pandoc-2.18.ebuild
new file mode 100644
index 000000000000..5e4604cd6f1d
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.18.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -static
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+LUA_COMPAT=( "lua5-3" )
+inherit haskell-cabal lua-single
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="embed-data-files lua trypandoc"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?]
+	>=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+	>=dev-haskell/connection-0.3.1:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+	>=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?]
+	>=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?]
+	>=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?]
+	>=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?]
+	>=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?]
+	>=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?]
+	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?]
+	>=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	>=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?]
+	>=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?]
+	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+	>=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	lua? ( >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.2:=[profile?]
+			>=dev-haskell/hslua-aeson-2.1:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] )
+	!lua? ( >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			>=dev-haskell/wai-extra-3.0.24:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch ) # backport from upstream, remove on next release
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed_data_files) \
+		$(cabal_flag lua lua53) \
+		--flag=-static \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+	doman "${S}/man/${PN}.1"
+}

next             reply	other threads:[~2022-07-22 22:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-22 22:16 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-20  7:03 [gentoo-commits] repo/gentoo:master commit in: app-text/pandoc/, app-text/pandoc/files/ Sergei Trofimovich

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6062b60a805 dfblob:e1f03537e6e dfblob:6cf30a7c9bc
dfblob:5e4604cd6f1 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-text/pandoc/, app-text/pandoc/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658528167.16f85eb7df10c24a4d02f4d22690d285dfc1c5ff.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox