gentoo auto-resync : 30:07:2022 - 09:09:33

5 files changed, 10 insertions, 18 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6a8c06fa7749..ac5acbd2c53a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
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)
 }
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2b557f214884..43f16f2f2265 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,7 +8,7 @@ DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de521
 DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
 EBUILD poppler-22.05.0.ebuild 3397 BLAKE2B 69946eb58b8b7844de29734e327cdc8c912fa535c3281f908739e68901fc99ac6ca92c437f771bc3e328fcd48fb76b522146941f76df9fe414fc8305d8b23c86 SHA512 e1130a9e67d32e1fe3052c8fa9dd0f43c96024c69cb6ec44c8a103c8fcd8b98d7e29e7f2ecf05384f6bf582f0efd8757d04801024ec8d284f752c5f1b0d873b8
-EBUILD poppler-22.06.0.ebuild 3622 BLAKE2B 37b92883fd3f411702d93367406e987bab8478c0b1c53adc228f33d019f383c1f3dbc2bc05a2d824afac79c6bd908556f68d1e3d4ab80120b6856c1e18d6f302 SHA512 ba14f515952d24441659f6394c5972832254a0469ea1b43377292626207d63a864819868aaa6fec430e4b7a534031f86a88b9cf1e9a2727508efeaf3d674583e
+EBUILD poppler-22.06.0.ebuild 3621 BLAKE2B 8dfd3ec8744b01a482b29b7583c609e5fd0bf7923b3a776316f0e0b87e73eba67b88f44507e8a5ef8a474c247172b360037c1a712a264e2471dffc939c695dd5 SHA512 8762203dd2a883850fdbad102bdd33a5749ec6cc67a45c328a48ddac62e87c67fb205f3cf9d3adc6eb5462611c1b7a7a2c0cab6e30cea9d6387890cc01c4f169
 EBUILD poppler-22.07.0.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
 EBUILD poppler-9999.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.06.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild
index dc6aeb1977aa..a45c4fcca60f 100644
--- a/app-text/poppler/poppler-22.06.0.ebuild
+++ b/app-text/poppler/poppler-22.06.0.ebuild
@@ -15,7 +15,7 @@ else
 
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi