gentoo resync : 07.05.2021

6 files changed, 129 insertions, 0 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index b87768eaa7a2..7e07ab88ba1b 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 2e1cf91596d5..83d63713a1dd 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,3 +1,5 @@
 DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9
+DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
 EBUILD c2hs-0.28.6.ebuild 977 BLAKE2B f912543b5b0411143f1f1534f1c2e1ee0fdb64d50ee4ed468849eba2fa635c58df0fe1872e5d7c4ee384acaaab4b47f90dddb57d6527a3e24308f72704f51048 SHA512 93b43e383b763d9acae9fbf5f3762f0012b3007dcf4e81c705a10bb7a84b336d2dc1e5275994dda95565c71d5e0e21e0bd8ac6bdc0d01b0111f62921eca4ac12
+EBUILD c2hs-0.28.7.ebuild 1113 BLAKE2B 89b6071b686da6f0116d04be90ffcf797ee06fe8f687a8d15c441fe4095dc96ed90883d0f01880be5bedb2baea4ab0a99fe10a7f9fb886436018f89cffb166b4 SHA512 c3ba90614f7e15a8911e250ed61ceebc4c456c6d7bdac83c661858e9e3457173a876d1ebbd67a24fc9931a51e020b9645b13c8d8e795830328297160db40e098
 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05
diff --git a/dev-haskell/c2hs/c2hs-0.28.7.ebuild b/dev-haskell/c2hs/c2hs-0.28.7.ebuild
new file mode 100644
index 000000000000..99e58a64012a
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="regression"
+
+RESTRICT=test # needs unprefixed 'cpp'
+
+RDEPEND="dev-haskell/dlist:=
+	dev-haskell/fail:=
+	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
+	>=dev-lang/ghc-7.4.1:=
+	regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:=
+			dev-haskell/text:=
+			>=dev-haskell/yaml-0.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/transformers
+		!regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0
+				dev-haskell/text ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag regression regression)
+}
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index b50a8e788541..0335cb3559af 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,7 +1,9 @@
+AUX language-c-0.8.3-gcc-11.patch 1458 BLAKE2B 7d9adf32532e7fabb65bc7f71389f2d85b1ed053d1934ed8d1af023fd295ab06fbc62731b820dd72dce50e744d64134ea14e5d11959ce0aae3af45ce6afdf7ae SHA512 8c83c4ee53c168fb3147ea30855579c4f59a20eca6845dd44194d127df02880810480d1d7cfb8e9cd8cdb9ee33de42c67dd6915ba0ad3c45c3a73e9073669466
 DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
 DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
 DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
 EBUILD language-c-0.4.7.ebuild 775 BLAKE2B f7e191f462ff6c1757f10669310c439a0b03a56fe9ed5927551d65b93e64bfb5ee5526c9ce004a0716ef9c392a9b3c40858b784ad5a999fbad3d66bcb1f71860 SHA512 ef7bf4a3d66ab6f0a136f7a9b5366763b0c7841d25991d731e69ce2e46e936faa946f4292f013463b087fa25e35f3cb0d34158ba91d61bdd21bb27363ed4cb2b
 EBUILD language-c-0.7.1.ebuild 755 BLAKE2B 7f003b4d9cd81e358f13441b0cd5b7b30e0ab1183dfef8e3236bb8316e6b48b86b1543dfc5ce61a0c2bf2319243185f0c44eb8b39b03deb940c9a42d656be8c8 SHA512 e54d69d98c3db00a002c9e07768231ad76b334344c2e8f5e73be2b55229b45b91be3a785426812ef37171574055902c25e5f8e6c1f12e3b131a5309a97bb7397
+EBUILD language-c-0.8.3-r1.ebuild 921 BLAKE2B 10dc3c8b25c32a5728e988758e7a6273bd174dbf9561faca9278379cbc1f09dbaadcc032c38e455212db8cd986382577ff8024b0eb64d4c556f65a5cc7a295a8 SHA512 bc34c71bf52eb795082742d232ea642ae43f2588fd0294afa28731d21383c5fbd1ceb96aea36ef8fd4650f21b823cdefd0c0731e4041717abeab19ae1d59951d
 EBUILD language-c-0.8.3.ebuild 868 BLAKE2B fb1d114064d06c436cd149ad60bc9f14c0a680ed87a70dd73e31e3c67901c979ec866330a0fa1172e87ea6a860807ef05a4f47781723d05606a20b3cd9a4cfbd SHA512 db22e8e5eaff028367301d0686ed70258a714c4891d5377924487d8e5c35a8736e95b30c2cc3b6203a2e645be9efb5a9eeb0a3e446fc7798d0d5583922e98175
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch b/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch
new file mode 100644
index 000000000000..5b2e8e4e899c
--- /dev/null
+++ b/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch
@@ -0,0 +1,41 @@
+From 8133e1526750ab74ca4d5180fb140a7e172d473f Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 8 Aug 2020 23:43:12 +0100
+Subject: [PATCH] Lexer: allow zeros as line numbers in preprocessed directives
+
+Starting from `gcc-11` initial line numbers not related to
+actual files are marked as zeros. See the "preprocessor:
+Better line info for <builtin> & <command-line>"
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9
+
+language-c's grammar did not allow it (by accident)
+
+```
+Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos
+Left <no file>:: [ERROR]  >>> Syntax Error !
+  Lexical error !
+  The character '#' does not fit here.
+```
+
+The change allows '0' in line numbers as well.
+
+Closes: https://github.com/visq/language-c/issues/74
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/Language/C/Parser/Lexer.x | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Language/C/Parser/Lexer.x
++++ b/src/Language/C/Parser/Lexer.x
+@@ -147,7 +147,7 @@ $white+         ;
+ --
+ -- * see https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+ --
+-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol
++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol
+   { \pos len str -> setPos (adjustLineDirective len (takeChars len str) pos) >> lexToken' False }
+ 
+ -- #pragma directive (K&R A12.8)
+-- 
+2.28.0
+
diff --git a/dev-haskell/language-c/language-c-0.8.3-r1.ebuild b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..795d688b3cde
--- /dev/null
+++ b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Analysis and generation of C code"
+HOMEPAGE="http://visq.github.io/language-c/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.22.2.0
+	dev-haskell/happy
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-gcc-11.patch
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allwarnings \
+		--flag=iecfpextension \
+		--flag=separatesyb \
+		--flag=splitbase \
+		--flag=usebytestrings
+}