[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: 564651cbf5e2c3f6c8e53cfa4632060179650b54 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jan 18 08:14:27 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jan 18 08:14:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564651cb dev-haskell/pandoc-citeproc: bump up to 0.17.0.2 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/pandoc-citeproc/Manifest| 2 +- ...doc-citeproc-0.17.0.1.ebuild => pandoc-citeproc-0.17.0.2.ebuild} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest index 004ecd9ac93..66930925f61 100644 --- a/dev-haskell/pandoc-citeproc/Manifest +++ b/dev-haskell/pandoc-citeproc/Manifest @@ -1 +1 @@ -DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96 +DIST pandoc-citeproc-0.17.0.2.tar.gz 344577 BLAKE2B f2b4687fe5de8cb8b76d1d8022ec9629c7834a3f3d3bc2735c52ec40ea0132caa8d7b9ad3c603d6120800e2c1f75e76cb13a3c45a4cbdd0e4bbba6d6fd54ed24 SHA512 5ce079a542b096c06d6e4e205625a993422a972f04787495ac9013dd3131df62733f30e4c3004335e3738b02bb22a7ad50a31c1eb3f67d2b4ef51605c7fcbf16 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild similarity index 92% rename from dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild rename to dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild index 7c28423ccd3..b5c9b3c6e24 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="+bibutils debug embed-data-files static unicode-collation" -RESTRICT=test # fails +RESTRICT=test # tests fail when system already has pandoc-citeproc installed RDEPEND=">=app-text/pandoc-2.8:=[profile?] =dev-haskell/aeson-0.7:=[profile?]
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/, dev-haskell/pandoc-citeproc/files/
commit: 956e7708f02e211e0cc03b58b16b82f4b853f6c2 Author: Jack Todaro posteo org> AuthorDate: Thu Aug 20 06:42:32 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Aug 20 07:03:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956e7708 dev-haskell/pandoc-citeproc: remove old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jack Todaro posteo.org> Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/pandoc-citeproc/Manifest | 8 -- .../files/pandoc-citeproc-0.6-ghc-7.10.patch | 115 - .../files/pandoc-citeproc-0.9-no-binutils.patch| 26 - dev-haskell/pandoc-citeproc/metadata.xml | 42 +++- .../pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild | 64 .../pandoc-citeproc-0.10.4.1.ebuild| 63 --- .../pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild | 63 --- .../pandoc-citeproc/pandoc-citeproc-0.2.ebuild | 62 --- .../pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild | 76 -- .../pandoc-citeproc/pandoc-citeproc-0.6.ebuild | 63 --- .../pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 63 --- .../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 65 12 files changed, 16 insertions(+), 694 deletions(-) diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest index 64d4910d697..004ecd9ac93 100644 --- a/dev-haskell/pandoc-citeproc/Manifest +++ b/dev-haskell/pandoc-citeproc/Manifest @@ -1,9 +1 @@ -DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 BLAKE2B 1d8080616fe8ed838a8b1d6f59b10fd5abf1c9eb0fe2b1d0fd183670e6db41dcb70258fdb5dbf70fbd053a2a8759eb3afade8573b87d35efcf67d77a0a4a5825 SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e -DIST pandoc-citeproc-0.10.4.1.tar.gz 252717 BLAKE2B 048c38cec654a07ac2f5fea21269eb234eba17f362ce4aa84b26d8bd09c6a7c14bc2c0258f3d9c1984dcb06f8db99eb34d832894cb4b959171e62376e9517b98 SHA512 afe0b81c4e58dc80cd0d05977d919bb1f1c8e7a77aba5ed960a04f3a6ff8ec398a62dc5e8497d01db7f67e9ce808a94d1b53c4cecb8b6a28893ec8076555c7ec -DIST pandoc-citeproc-0.10.4.tar.gz 252481 BLAKE2B 782de52be122a7cb94d816d6ba2438db036036167985244f6b8ab63b95f12077511ce9eb0d84a20a7a59834eb88159dd1953ec205c7403c614d9ad0dee8bf9cd SHA512 f188cf2d6642c0dddf2437d23096d488f5e6eb44b9931b004feb72c8adc1a5240d85f8ed48ced9f073733ee546818e3530962e2f2b2ce6cfa52979ec1fdd7cee DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96 -DIST pandoc-citeproc-0.2.tar.gz 249374 BLAKE2B 375ed1517d64d3bfd94fa7d7d66480e796a94e33c29eed7cb84019b6d77f77f6ae2c0b23a92596de890f6a70805ace0ba454e73d166c47819896e6b6ce977a0d SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4 -DIST pandoc-citeproc-0.3.1.tar.gz 258552 BLAKE2B 6206dc5739e61f9763fc52e591d3b3272744f0a70186ac068a3f6b91b3b61a624c38bf17bb2c050a05cc8629c67906c4919dea5b2ea52eede0346ec2fe6196e3 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a -DIST pandoc-citeproc-0.6.tar.gz 227239 BLAKE2B 3942af5577d69b08f22fa00f1174f61c63b886ed2a6c62758903cbe2b0f34d21466dec272b747a4bd80d8b879a048dce5a887c69d588e99c1de0b96eb67b470c SHA512 eb626e0d776b798757d6b8644d0f5642f07141d614f1a3afe6e265ca77cf17030cee3ff267870d3f0a226c7111d68746a5a88c4a9689e2103f329f1b8fc4bd58 -DIST pandoc-citeproc-0.7.2.tar.gz 246215 BLAKE2B 503335489085918de584fcb3b623a3b5b40255efaa80ac8e58f4e4b85073f238fd92e547e4dbbdc90c71ee050be015e37955fdf1a06bdfa4a95d345bcadd1e0b SHA512 857fe05cc1b427a5de36d61c568b1054ecc5517ef9b9e73ade768d886340f6092784c0cbcdc9f87e04a1820edfebc702b34776f664c4d427f484011993f4bec2 -DIST pandoc-citeproc-0.8.1.3.tar.gz 310914 BLAKE2B 1944971f25cc0d43908a25ebfa7fde19a53f3af880ead82ba2c278580ff74c37087086921eb9087dca60419a4bf59b49d543ad78aa61f358e98ebda5a875b2ad SHA512 f03e036b05e108e1720715d0f5020ef443491478230a3ebb5024e4cbc2dfa05765b4118e5fbe124514439f14b3a07a898df74a0c3b3bbeb138abbad6af2f473b diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch deleted file mode 100644 index cee2d93bc21..000 --- a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch +++ /dev/null @@ -1,115 +0,0 @@ pandoc-citeproc-0.6-orig/src/Text/CSL/Pandoc.hs2014-09-22 14:04:21.0 +1000 -+++ pandoc-citeproc-0.6/src/Text/CSL/Pandoc.hs 2015-01-10 11:57:26.900041860 +1100 -@@ -201,10 +201,10 @@ -
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: fca878ac5e5a1e073a74254568077d5b40f4a083 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Sep 30 07:30:23 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 30 07:31:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca878ac dev-haskell/pandoc-citeproc: convert IUSE underscore to dash Reported-by: Michał Górny Closes: https://bugs.gentoo.org/695034 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/pandoc-citeproc/metadata.xml | 6 +++--- .../pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild | 8 .../pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild | 16 .../pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild| 16 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild | 8 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild | 8 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild | 8 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 8 .../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 10 +- 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml index cc43b3deba9..44fca18984b 100644 --- a/dev-haskell/pandoc-citeproc/metadata.xml +++ b/dev-haskell/pandoc-citeproc/metadata.xml @@ -7,11 +7,11 @@ use Chris Putnam's app-text/bibutils - Embed locale files into the library (needed for windows packaging) + Embed locale files into the library (needed for windows packaging) use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing - Choose the new smaller, split-up base package. - Build the test-citeproc program + Choose the new smaller, split-up base package. + Build the test-citeproc program Use Haskell bindings to the dev-libs/icu diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild index ccaee0e55d7..f6d16965a96 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" -IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation" +IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode_collation" RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile RDEPEND=">=app-text/pandoc-1.12.0.2:=[profile?] @@ -56,9 +56,9 @@ src_configure() { haskell-cabal_src_configure \ $(cabal_flag bibutils bibutils) \ - $(cabal_flag embed_data_files embed_data_files) \ + $(cabal_flag embed-data-files embed_data_files) \ $(cabal_flag hexpat hexpat) \ $(cabal_flag network network) \ - $(cabal_flag small_base small_base) \ + $(cabal_flag small-base small_base) \ $(cabal_flag unicode_collation unicode_collation) } diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild index e2d63fc8aa1..533ce8a18a8 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 x86" -IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation" +IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation" RESTRICT=test # execs a process dropping environment (with LD_PRELOAD) @@ -40,24 +40,24 @@ RDEPEND=">=app-text/pandoc-1.16:=[profile?] =dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) - test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] + test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) - !test_citeproc? ( dev-haskell/vector:=[profile?] ) + !test-citeproc? (
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: 5c61a8559b75fe34047722352d501a25a108ee48 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 18 11:20:55 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 18 11:28:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c61a855 dev-haskell/pandoc-citeproc: bump up to 0.10.4.1 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-haskell/pandoc-citeproc/Manifest | 1 + .../pandoc-citeproc-0.10.4.1.ebuild| 64 ++ 2 files changed, 65 insertions(+) diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest index 4471c18c21..93b2c9a8a3 100644 --- a/dev-haskell/pandoc-citeproc/Manifest +++ b/dev-haskell/pandoc-citeproc/Manifest @@ -1,4 +1,5 @@ DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 SHA256 3b8ea95a02051ded8e097db85445f822d474ba3cebce7ab35e5ca7b62ed4248e SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e WHIRLPOOL 6585eb1d435a207fc7d94616d09602e9c602f33c7f5e1fdde124022e07c6bc671a62c84fa31838c541a139b0988ea67a3acba881d4e2bbfe439dd4724bd2c194 +DIST pandoc-citeproc-0.10.4.1.tar.gz 252717 SHA256 6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51 SHA512 afe0b81c4e58dc80cd0d05977d919bb1f1c8e7a77aba5ed960a04f3a6ff8ec398a62dc5e8497d01db7f67e9ce808a94d1b53c4cecb8b6a28893ec8076555c7ec WHIRLPOOL d6db9a5e141e3da03c9703f16f442b7cd8fddd5c9299c60e1a8b6417dd7ee246854100a996b79b0ce30b63486c16c7707cf379dd5b4ba6d11c20dbc59ab643bd DIST pandoc-citeproc-0.10.4.tar.gz 252481 SHA256 1dcfffe0dc26d0a1b5ef5688a09c1bb81231702169196e6faed8ddef360d848f SHA512 f188cf2d6642c0dddf2437d23096d488f5e6eb44b9931b004feb72c8adc1a5240d85f8ed48ced9f073733ee546818e3530962e2f2b2ce6cfa52979ec1fdd7cee WHIRLPOOL 744b27a4373378a5ba97c5c6ff80ff218f375ac95621c55e94db027441ac663981265a22fbf54dc23af682a2b239d2797908dddb5a5f3b3cd54f41f7947c0601 DIST pandoc-citeproc-0.2.tar.gz 249374 SHA256 4d54092a277e547e2d5f57aab12836a59f1060344a5fca83939b6541eb9f0d3e SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4 WHIRLPOOL a7db263793ba69b97e492e66a2185f9d141035aea50e686fe933f18031bd9a65417fa2cc76c85e873701ddf5a53285cd8ce7800e10325f4d80044d7c50be6a37 DIST pandoc-citeproc-0.3.1.tar.gz 258552 SHA256 46bc453ccaa6c9534970cb6ba7b78bb9f76655419acd8d59d58d7fa91c2e9319 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a WHIRLPOOL 9fcaf31b9876c598f5ff1eb587630399dd992a44cef9e186287aad9e0359b8ab5b09dd9cec1fefc560b82c98fb4efada9d7c53177febdcf8a0e46e8464ade45f diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild new file mode 100644 index 00..ffd3a97aae --- /dev/null +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# ebuild generated by hackport 0.5.1. +#hackport: flags: -small_base + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Supports using pandoc with citeproc" +HOMEPAGE="https://github.com/jgm/pandoc-citeproc; +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation" + +RESTRICT=test # execs a process dropping environment (with LD_PRELOAD) + +RDEPEND=">=app-text/pandoc-1.16:=[profile?] =dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-pretty-0.8:=[profile?] + dev-haskell/attoparsec:=[profile?] + dev-haskell/data-default:=[profile?] + dev-haskell/mtl:=[profile?] + dev-haskell/old-locale:=[profile?] + >=dev-haskell/pandoc-types-1.16:=[profile?] =dev-haskell/setenv-0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/xml-conduit-1.2:=[profile?] =dev-haskell/yaml-0.8.8.7:=[profile?] + >=dev-lang/ghc-7.4.1:= + bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) + debug? ( dev-haskell/pretty-show:=[profile?] ) + test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] + >=dev-haskell/vector-0.10:=[profile?] ) + !test_citeproc? ( dev-haskell/vector:=[profile?] ) + unicode_collation? ( dev-haskell/text-icu:=[profile?] ) + !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.12 + test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) ) + embed_data_files? ( dev-haskell/hsb2hs ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag bibutils bibutils) \ +
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/files/, dev-haskell/pandoc-citeproc/
commit: 1b0ef9a0800b86559169cab3e236dbb0c32d1db0 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Feb 24 09:00:27 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Feb 24 09:00:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0ef9a0 dev-haskell/pandoc-citeproc: fix USE=-bibutils build, #516640 Reported-by: Thomas Beutin Bug: https://bugs.gentoo.org/516640 Package-Manager: portage-2.2.27 .../files/pandoc-citeproc-0.9-no-binutils.patch| 26 ++ .../pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 4 .../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 4 3 files changed, 34 insertions(+) diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch new file mode 100644 index 000..c7c8655 --- /dev/null +++ b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch @@ -0,0 +1,26 @@ +Fails to build with -f-bibutils: +https://bugs.gentoo.org/516640 +diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs +index 7006e02..f72fa41 100644 +--- a/pandoc-citeproc.hs b/pandoc-citeproc.hs +@@ -1 +1,2 @@ ++{-# LANGUAGE CPP #-} + module Main where +@@ -75,2 +76,3 @@ readFormat = go . map toLower + go "bibtex" = Just Bibtex ++#ifdef USE_BIBUTILS + go "ris" = Just Ris +@@ -87,2 +89,3 @@ readFormat = go . map toLower + go "yaml" = Just Yaml ++#endif + go _ = Nothing +diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs +index 081fa91..49ddbd0 100644 +--- a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs +@@ -64,3 +64,3 @@ readBiblioFile f + #else +-_ -> error $ "citeproc: Bibliography format not supported.\n" ++ ++_ -> error $ "citeproc: Bibliography format not supported.\n" + #endif diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild index 7a9af87..d018636 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild @@ -49,6 +49,10 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.12 " +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag bibutils bibutils) \ diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild index 3299e18..1bfee4c 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild @@ -51,6 +51,10 @@ DEPEND="${RDEPEND} embed_data_files? ( dev-haskell/hsb2hs ) " +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag bibutils bibutils) \
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: 89adf06aa6dc0dd4c472e5e9856be18948f01b9d Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jan 19 22:05:30 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Jan 19 22:29:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89adf06a dev-haskell/pandoc-citeproc: bump up to 0.8.1.3 Package-Manager: portage-2.2.27 dev-haskell/pandoc-citeproc/Manifest | 1 + .../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 62 ++ 2 files changed, 63 insertions(+) diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest index fe0e207..ef49616 100644 --- a/dev-haskell/pandoc-citeproc/Manifest +++ b/dev-haskell/pandoc-citeproc/Manifest @@ -4,3 +4,4 @@ DIST pandoc-citeproc-0.3.0.1.tar.gz 255740 SHA256 9d6e5b8e0d22cba9b0277488ac7efb DIST pandoc-citeproc-0.3.1.tar.gz 258552 SHA256 46bc453ccaa6c9534970cb6ba7b78bb9f76655419acd8d59d58d7fa91c2e9319 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a WHIRLPOOL 9fcaf31b9876c598f5ff1eb587630399dd992a44cef9e186287aad9e0359b8ab5b09dd9cec1fefc560b82c98fb4efada9d7c53177febdcf8a0e46e8464ade45f DIST pandoc-citeproc-0.6.tar.gz 227239 SHA256 ab60459ead81420d1320314b194a40f6d91bd89b34c88547e6283ab8724511f2 SHA512 eb626e0d776b798757d6b8644d0f5642f07141d614f1a3afe6e265ca77cf17030cee3ff267870d3f0a226c7111d68746a5a88c4a9689e2103f329f1b8fc4bd58 WHIRLPOOL 0135301efa73fc01d8633472103b9c6d755afccf4a20231cd56927231c5584e6ce371d503e9e8c6b0edbfed9543e8fa0e23afec4224bc39ab5e4231b5c1de718 DIST pandoc-citeproc-0.7.2.tar.gz 246215 SHA256 3eddf364561a8f175493cdd32eb4c7994164d2c27625c07cf13bfd491539f936 SHA512 857fe05cc1b427a5de36d61c568b1054ecc5517ef9b9e73ade768d886340f6092784c0cbcdc9f87e04a1820edfebc702b34776f664c4d427f484011993f4bec2 WHIRLPOOL 0de656e61ee4bb9c440342d4505b6d5001fd5f07cf08bdb535ec8124734b0b90682c1263a13e2204e59a69de86d51eed5bb4b27c06240af4c246ca8ec185b531 +DIST pandoc-citeproc-0.8.1.3.tar.gz 310914 SHA256 aa15ff9cbb9c1cca504943c94cd891e23944cb0106172886821cb048a9726c7d SHA512 f03e036b05e108e1720715d0f5020ef443491478230a3ebb5024e4cbc2dfa05765b4118e5fbe124514439f14b3a07a898df74a0c3b3bbeb138abbad6af2f473b WHIRLPOOL 9324201a9848d99256a210a5569b52f69c903c7545a7656234b96b4d97524903b031aa92f8b01f41d5e781a29693ce2d02adceb1119030c901aa47f4a48b9c78 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild new file mode 100644 index 000..3299e18 --- /dev/null +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.6. +#hackport: flags: -small_base + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Supports using pandoc with citeproc" +HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc; +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation" + +RESTRICT=test # execs a process dropping environment (with LD_PRELOAD) + +RDEPEND=">=app-text/pandoc-1.13:=[profile?] + >=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/pandoc-types-1.12.3:=[profile?] + dev-haskell/parsec:=[profile?] + >=dev-haskell/setenv-0.1:=[profile?] =dev-haskell/temporary-1.1:=[profile?] + dev-haskell/text:=[profile?] + >=dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] + >=dev-haskell/xml-conduit-1.2:=[profile?] =dev-haskell/yaml-0.8.8.7:=[profile?] + >=dev-lang/ghc-7.4.1:= + bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) + debug? ( dev-haskell/pretty-show:=[profile?] ) + unicode_collation? ( dev-haskell/text-icu:=[profile?] ) + !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.12 + embed_data_files? ( dev-haskell/hsb2hs ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag bibutils bibutils) \ + $(cabal_flag debug debug) \ + $(cabal_flag embed_data_files embed_data_files) \ + --flag=-small_base \ + $(cabal_flag test_citeproc test_citeproc) \ + $(cabal_flag unicode_collation unicode_collation) +}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: 7005a419469ffd39b58ee0a746979d2371c45bd7 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Sep 20 14:49:59 2015 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 20 18:50:20 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7005a419 dev-haskell/pandoc-citeproc: amd64 x86 stable, bug #524790 Package-Manager: portage-2.2.20 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild index 9e5ed60..7a9af87 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation" RESTRICT=test # fd:8: hClose: resource vanished (Broken pipe)
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: deb15f5882ffededd1519797dfb0138bca5f115c Author: Mikle Kolyada gentoo org> AuthorDate: Sat Sep 5 18:40:30 2015 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Sep 5 18:41:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb15f58 dev-haskell/pandoc-citeproc: x86 stable wrt bug #546260 Package-Manager: portage-2.2.20.1 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild index 11a61e5..a2cce77 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation" RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
commit: eb3ae67a611fa9a4d490cf64c94afb57c0fa0748 Author: Mikle Kolyada zlogene AT gentoo DOT org AuthorDate: Sun Aug 16 22:31:13 2015 + Commit: Mikle Kolyada zlogene AT gentoo DOT org CommitDate: Sun Aug 16 22:33:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3ae67a dev-haskell/pandoc-citeproc: amd64 stable wrt bug #546260 Package-Manager: portage-2.2.20.1 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild index 6814161..11a61e5 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild @@ -16,7 +16,7 @@ SRC_URI=mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz LICENSE=BSD SLOT=0/${PV} -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 ~x86 IUSE=+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation RDEPEND==app-text/pandoc-1.12.1:=[profile?]