diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-30 09:09:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-30 09:09:34 +0100 |
commit | ad0412d0cafb8c04ce98024155cf99a4cc27db44 (patch) | |
tree | c34688ab389c18775a322de6cd4cfd957cbe8014 /app-text/pandoc | |
parent | cdb747b791914a30c287a3a8e33d1b635e431707 (diff) |
gentoo auto-resync : 30:07:2022 - 09:09:33
Diffstat (limited to 'app-text/pandoc')
-rw-r--r-- | app-text/pandoc/Manifest | 2 | ||||
-rw-r--r-- | app-text/pandoc/pandoc-2.18-r2.ebuild (renamed from app-text/pandoc/pandoc-2.18.ebuild) | 22 |
2 files changed, 8 insertions, 16 deletions
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest index 51c0e347af4f..7ce50a78cbbc 100644 --- a/app-text/pandoc/Manifest +++ b/app-text/pandoc/Manifest @@ -1,4 +1,4 @@ AUX pandoc-2.18-tests.patch 3868 BLAKE2B 16bbe9fba3e4e18c4ec37911ba462d7ca9773e6c0f7e19d9b75d8cf507c141d5a983de2ef4eee4149a1a9877afbb279b021ff691ae15183c102f9903ee938665 SHA512 9ef5dde4e854f20d55f6266cf24ad8bcd9e696b9efe9d1fda8901be7c00c25103849cb2d2cfc200b31f02cf6142180270d398f8d28b957ffb1fda3d4c3327385 DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212 -EBUILD pandoc-2.18.ebuild 6495 BLAKE2B 137d67e155fe3ec562fea77c329858b138e64214845a078e86b944b8ab0047d05657e0431419ad5818ca76ac2e5fdaa2ae4394821ed73477092044cdac1cc908 SHA512 731dbb39b8e674db58dda6852577902e06b197a737987a3807d08a6655570d2637a360c93892b52b97c135156ec917058e189030ee385184fc0991d55e2ea5a7 +EBUILD pandoc-2.18-r2.ebuild 6125 BLAKE2B 35ae467d09e819337315726cea44fdd19b36b29df8e18821dcdebee86341b24b5508ec5dfd4e3cb62073a64067f061b0f9eca4125e10a18969de2a8ffbc4b89c SHA512 16e8e0a93c61aea84440c17fc253a998389a9d061b22bc78760333be0d6486ed3c0158c2a1cf1fc68fc11fcc63246e998417c480bc05b252b40fb22c0cdfc0ee MISC metadata.xml 861 BLAKE2B edac13880204a325ec7f8755aa34fe63a9b90c7afbe7cb9eae87b3f820e5808e2be18d7b609410da6c2a4a136685b689f391745a6a491c91a49a45356957dfe9 SHA512 15f941b83736276d38eb6597611f63abf6b3a38cc019dd0a7339b7f88212f108acdd7ec7c2ee631d7d3d2860593f6139dc3eef5454376776979434ad27c75257 diff --git a/app-text/pandoc/pandoc-2.18.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild index 5e4604cd6f1d..1e73bcd0c280 100644 --- a/app-text/pandoc/pandoc-2.18.ebuild +++ b/app-text/pandoc/pandoc-2.18-r2.ebuild @@ -4,11 +4,10 @@ EAPI=8 # ebuild generated by hackport 0.7.1.1.9999 -#hackport: flags: -static +#hackport: flags: -static,-lua53 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -LUA_COMPAT=( "lua5-3" ) -inherit haskell-cabal lua-single +inherit haskell-cabal DESCRIPTION="Conversion between markup formats" HOMEPAGE="https://pandoc.org" @@ -16,9 +15,8 @@ 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} )" +KEYWORDS="~amd64 ~x86" +IUSE="embed-data-files trypandoc" 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?] @@ -77,9 +75,7 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[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?] ) + >=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?] ) " @@ -93,16 +89,12 @@ DEPEND="${RDEPEND} >=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 -} +PATCHES=("${FILESDIR}"/${P}-tests.patch ) src_configure() { haskell-cabal_src_configure \ $(cabal_flag embed-data-files embed_data_files) \ - $(cabal_flag lua lua53) \ + --flag=-lua53 \ --flag=-static \ $(cabal_flag trypandoc trypandoc) } |