| 1 |
commit: 1b0ef9a0800b86559169cab3e236dbb0c32d1db0 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 24 09:00:27 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 24 09:00:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0ef9a0 |
| 7 |
|
| 8 |
dev-haskell/pandoc-citeproc: fix USE=-bibutils build, #516640 |
| 9 |
|
| 10 |
Reported-by: Thomas Beutin |
| 11 |
Bug: https://bugs.gentoo.org/516640 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
|
| 15 |
.../files/pandoc-citeproc-0.9-no-binutils.patch | 26 ++++++++++++++++++++++ |
| 16 |
.../pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 4 ++++ |
| 17 |
.../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 4 ++++ |
| 18 |
3 files changed, 34 insertions(+) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..c7c8655 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch |
| 25 |
@@ -0,0 +1,26 @@ |
| 26 |
+Fails to build with -f-bibutils: |
| 27 |
+https://bugs.gentoo.org/516640 |
| 28 |
+diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs |
| 29 |
+index 7006e02..f72fa41 100644 |
| 30 |
+--- a/pandoc-citeproc.hs |
| 31 |
++++ b/pandoc-citeproc.hs |
| 32 |
+@@ -1 +1,2 @@ |
| 33 |
++{-# LANGUAGE CPP #-} |
| 34 |
+ module Main where |
| 35 |
+@@ -75,2 +76,3 @@ readFormat = go . map toLower |
| 36 |
+ go "bibtex" = Just Bibtex |
| 37 |
++#ifdef USE_BIBUTILS |
| 38 |
+ go "ris" = Just Ris |
| 39 |
+@@ -87,2 +89,3 @@ readFormat = go . map toLower |
| 40 |
+ go "yaml" = Just Yaml |
| 41 |
++#endif |
| 42 |
+ go _ = Nothing |
| 43 |
+diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs |
| 44 |
+index 081fa91..49ddbd0 100644 |
| 45 |
+--- a/src/Text/CSL/Input/Bibutils.hs |
| 46 |
++++ b/src/Text/CSL/Input/Bibutils.hs |
| 47 |
+@@ -64,3 +64,3 @@ readBiblioFile f |
| 48 |
+ #else |
| 49 |
+- _ -> error $ "citeproc: Bibliography format not supported.\n" ++ |
| 50 |
++ _ -> error $ "citeproc: Bibliography format not supported.\n" |
| 51 |
+ #endif |
| 52 |
|
| 53 |
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild |
| 54 |
index 7a9af87..d018636 100644 |
| 55 |
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild |
| 56 |
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild |
| 57 |
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND} |
| 58 |
>=dev-haskell/cabal-1.12 |
| 59 |
" |
| 60 |
|
| 61 |
+src_prepare() { |
| 62 |
+ epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch |
| 63 |
+} |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
haskell-cabal_src_configure \ |
| 67 |
$(cabal_flag bibutils bibutils) \ |
| 68 |
|
| 69 |
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 |
| 70 |
index 3299e18..1bfee4c 100644 |
| 71 |
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild |
| 72 |
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild |
| 73 |
@@ -51,6 +51,10 @@ DEPEND="${RDEPEND} |
| 74 |
embed_data_files? ( dev-haskell/hsb2hs ) |
| 75 |
" |
| 76 |
|
| 77 |
+src_prepare() { |
| 78 |
+ epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_configure() { |
| 82 |
haskell-cabal_src_configure \ |
| 83 |
$(cabal_flag bibutils bibutils) \ |
Archives