gentoo resync : 05.02.2020

5 files changed, 220 insertions, 0 deletions

diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 6eea1610edf5..e047af0b14b6 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,6 +1,11 @@
+AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc591d88ba358e334a7cf574f10568b394acc28d8bc1b7a0ab13c6ab6d2fccdda56694fdc558387f03de13feda7192703c836 SHA512 f51b403d8781a064ba3c7ae00dec8f4d65e98d59b521586f8c2ce7060bfe49df94fcc00de0d41f39df38c92db2c520d59b65884fb09e96e4de9f9c286d16aa37
+AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
+AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
 DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f
 DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92
+DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
 EBUILD hackport-0.5.6.ebuild 1265 BLAKE2B 14c0e4692bdfa62cb118639e681886b537354b8f02132baa69e7098ec50e03e09d8f1da81a7ce5e1255e2423907e9af6fbb1e1c08250e256ea7c1a0bb1021140 SHA512 e7367caa9ee201016caa31e56aad82066a1e34989266594c60d42dfc44d45121dcc8c79304ecc71348e4d1d6b569666091908b368fd9f0b591b2b6a1b97cd6a5
 EBUILD hackport-0.6.2.ebuild 1263 BLAKE2B 4e1bda2c18c368209c20f6df94c664efeaf0fd5fbcd0e7e02da7d8fe0048963e7714bb06e5960fecd4dd1555449a44aa8ee7ca2497973b10c45fd1b0796dca5d SHA512 45a93a427efee5fecde630f9fa35e02267b58300f17498645d8bc11de6314421c10aa597009482bd97492b194988cab5c8c888aa26f218410a704c4b5331e681
+EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch
new file mode 100644
index 000000000000..21c848ab53c5
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch
@@ -0,0 +1,33 @@
+From 4264f8bc91dabce03ac858388358ff5f4c6db8df Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 23:52:58 +0000
+Subject: [PATCH 2/3] hackport.cabal: add missing ForeignFunctionInterface
+ extension
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc-8.0 does not enable `ForeignFunctionInterface` by default.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/704778
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ hackport.cabal | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hackport.cabal b/hackport.cabal
+index 049933e00..70928fe6b 100644
+--- a/hackport.cabal
++++ b/hackport.cabal
+@@ -70,6 +70,7 @@ Executable    hackport
+     DoAndIfThenElse,
+     EmptyDataDecls,
+     ExistentialQuantification,
++    ForeignFunctionInterface,
+     FlexibleContexts,
+     FlexibleInstances,
+     GADTs,
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch
new file mode 100644
index 000000000000..fa6c446cf38b
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch
@@ -0,0 +1,79 @@
+From 4cd81196f7a477327ce87971b376e785f362b9b7 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 24 Jan 2020 08:09:34 +0000
+Subject: [PATCH 1/3] hackport.cabal: add missing test depends
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ hackport.cabal | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/hackport.cabal b/hackport.cabal
+index 94d345292..049933e00 100644
+--- a/hackport.cabal
++++ b/hackport.cabal
+@@ -76,6 +76,7 @@ Executable    hackport
+     GeneralizedNewtypeDeriving,
+     KindSignatures,
+     MultiParamTypeClasses,
++    -- cabal
+     PatternGuards,
+     RankNTypes,
+     RecordWildCards,
+@@ -86,7 +87,6 @@ Executable    hackport
+     ViewPatterns
+   other-extensions:
+     DeriveDataTypeable,
+-    PatternGuards,
+     -- extensions due to bundled cabal-install
+     CPP,
+     ForeignFunctionInterface,
+@@ -151,9 +151,15 @@ Test-Suite test-resolve-category
+                         pretty,
+                         process,
+                         split,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+ 
+ Test-Suite test-print-deps
+   ghc-options: -Wall
+@@ -174,9 +180,15 @@ Test-Suite test-print-deps
+                         parsec,
+                         pretty,
+                         process,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+ 
+ Test-Suite test-normalize-deps
+   ghc-options: -Wall
+@@ -197,6 +209,13 @@ Test-Suite test-normalize-deps
+                         parsec,
+                         pretty,
+                         process,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
new file mode 100644
index 000000000000..c660db766b26
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
@@ -0,0 +1,40 @@
+From b4fe6e48679084ca28c1192612c60599ae81808c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 23:53:39 +0000
+Subject: [PATCH 3/3] Merge.hs: avoid using isExtensionOf
+
+`isExtensionOf` is not available in gcc-8.0.
+
+Reported-by: Jeremy Stent
+Bug: https://bugs.gentoo.org/704778
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Merge.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Merge.hs b/Merge.hs
+index 645817345..522a3739d 100644
+--- a/Merge.hs
++++ b/Merge.hs
+@@ -39,7 +39,8 @@ import System.Directory ( getCurrentDirectory
+                         , listDirectory
+                         )
+ import System.Process (system)
+-import System.FilePath ((</>), isExtensionOf)
++import System.FilePath ((</>))
++import qualified System.FilePath as SF
+ import System.Exit
+ 
+ import qualified Cabal2Ebuild as C2E
+@@ -183,7 +184,7 @@ getPreviousPackageId pkgDir newPkgId = do
+                . L.sortOn (Portage.pkgVersion)
+                . filter (<newPkgId)
+                $ Portage.filePathToPackageId newPkgId
+-               <$> filter (\fp -> ".ebuild" `isExtensionOf` fp) pkgDir
++               <$> filter (\fp -> SF.takeExtension fp == ".ebuild") pkgDir
+   case pkgIds of
+     x:_ -> Just x
+     _ -> Nothing
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/hackport-0.6.3.ebuild b/app-portage/hackport/hackport-0.6.3.ebuild
new file mode 100644
index 000000000000..5a74aa2efb67
--- /dev/null
+++ b/app-portage/hackport/hackport-0.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="
+	app-portage/repoman
+	dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	dev-haskell/text:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-ffi.patch
+	"${FILESDIR}"/${P}-missing-test-deps.patch
+	"${FILESDIR}"/${P}-old-filepath.patch
+)
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}