gentoo resync : 04.12.2017

4 files changed, 66 insertions, 4 deletions

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 912dd3364de4..5ff4a5b7b6b3 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,13 +1,16 @@
+AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
 DIST Cabal-1.18.1.2.tar.gz 323545 BLAKE2B d9e88f8f512b6bf23f8c57b6719fcf560b24aa2b20a0be3aeaba455dbea79c7320cfec495f31524a098b2d0298fe04cdd29c65f8c527066fcac82ba1f592e761 SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6
 DIST Cabal-1.18.1.3.tar.gz 705715 BLAKE2B 46d6c446e9410d7bd3e3f2e68e2e950e180f8fde4332ba3c4657add30dd721d7e2887b830e9c2954d3ce8e521e42d7db90d87150804589ad5fbea5c08b6b3fca SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708
 DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc9096b0e185fcf1299897e536be23714ba9126033d98b60558272fc28e9d72f638ee94d9f769e61d00c2d2bd1a092 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef
 DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b6aeb6e83ea169aacab0bcb1d14629df885cc9c02bb64567069e475497cf2ac716731bf84ee89bdf177404cc5e0 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3
 DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b407711a8dcfcee127e03f3cce6a0e96165126a996b39a8f29e97e65eff4f5ec308fb3f53c53cb795cb8ba1ab0daf SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3
 DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
+DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
 EBUILD cabal-1.18.1.2.ebuild 1310 BLAKE2B c6490c92d19e9f84fd33b859865170b083cbe0726337965311d5e17ffac9e7a8ffbc24a8137207ad07fdb3ac0c9b72c48b1fcfe7b9acb6910622de2281c1eb67 SHA512 79d6d4fea74176190c4cf9b37be79790c0d1f340b3f4c29a3e0ed3cbb19d048b04b3d4c3a7769bfe3eaf4707613725afba7452f28132ce30b14494c8b49b9e21
 EBUILD cabal-1.18.1.3.ebuild 1489 BLAKE2B d1ef02de7c0517988a8c6bef39520b5068b67f329fcfbccbc43b7006232ffbd5303ece6aee2bc69509d7d058070016c540a7543b3d3152a4ce72bf62d2b9bfd2 SHA512 312fbc3f713bfd170a1a5825c374f8fb81b59b242c8b6c7e516d1f10f47eb62b8ff26af1907bb45d7b0701cc3a4a913af837bd7a237fd7dde32b673a0b090f4b
 EBUILD cabal-1.18.1.5.ebuild 1504 BLAKE2B d1abcbbebf88b2860178efa5c996fcc0834bf6e1317279d21224bec54adefc628764b8149b8053457226c3ae8aa19d4448b78f624e4a35fe11c3a5dda308c56b SHA512 6631bc5ac5017b5167e9830370a1d37fb39c5411ef0daa8cc1454cd24a99f3b9e3bca7edd9c154b132f42a46ade7f04dd48de05bc2babd53c779ad26ea5caeb0
 EBUILD cabal-1.20.0.2.ebuild 1566 BLAKE2B a94e9df84ae92684444d10916d01ebbed387ebd7b414b6434405c43cb9e98b53e2325fabe8548b05c64efe1f42c7cb71f0ddfb533ce8fe91df5493ba698e41ea SHA512 43a24a9d1f800fa4267808ad85c156e602916c156e380fad32ec9abe987e72eb2126c31a05881cdaf357b62bff61dcc325e3aae06bcbf4cda427405130fecfcd
 EBUILD cabal-1.22.8.0.ebuild 1453 BLAKE2B d728a8fafe08b4240e025eda34cae7def1000300749ca0d931a9df406b275904d9a3ff7287d98a665881fc1b8dec4a051675da90741e0e37623554109fb34322 SHA512 2ab65a807e81402a63d215f1876da576c7ac3e23d40e37789dc2af40a7062f7f408f6721180f8f089832973c3548b478f5b09752bc99544621132a1599f0fc3d
 EBUILD cabal-1.24.2.0.ebuild 936 BLAKE2B fde47bbeb66732209eaa9b4389420b0c8130ed77f9c5744d4829ba8cb62f91ac27a8fa56108c564154a67c5f8908152cc8b65d0f3e28b090e8e63041cbb983a0 SHA512 50796827840967c4ba091ddc63e1dc854feabefc7dd0b87abf4ba57f0766fe8692a32f4350647c28b06db74d7b3aa1c4014e4c2aff6fee9a76071cb4597f04e7
-MISC metadata.xml 223 BLAKE2B e11afb7bd2d6874573289d9011b6d3c0c64ea9a0c8a1b56a21e28be81ea22dec73294b216eecdf1557301fa04792d24ec07aad40137bb4d00d85a495cf735ee6 SHA512 a95e1e8e49facff470233b8ce06b8b8de0bee533571391e53624f051b0518bc9e448293b7827515708058d0b98fc92c435440158362e1b1f52c9b99c5a3f47d7
+EBUILD cabal-2.0.0.2.ebuild 1014 BLAKE2B ad1f0e55d1ca91f0ae260ab0e130d3dd579e9bca7fc919366a3911ec397e76f325758a3b3b574a3e2c1e0e20b5d9bbdc36ca54f5c78fe2c6941a6f82ae6fc893 SHA512 8b78c7509cdfbfff4e682079c97ce9d68c679de981f5e211ac426ebae16dd259c54093b4f9ca56ce9bd1057cbdbe462a43e7c329c7dfb78caac1a32d1ce89bb5
+MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
new file mode 100644
index 000000000000..6940bc3c4e4d
--- /dev/null
+++ b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_FEATURES="lib profile test-suite"
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#not keyworded yet: many packages are broken
+#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test # circular dependencies
+
+RDEPEND=">=dev-lang/ghc-7.8.1:="
+DEPEND="${RDEPEND}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.2.1"
+
+PATCHES=("${FILESDIR}"/${P}-no-bootstrap.patch)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-parsec-struct-diff
+}
diff --git a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
new file mode 100644
index 000000000000..2eed504b5654
--- /dev/null
+++ b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
@@ -0,0 +1,10 @@
+diff --git a/Setup.hs b/Setup.hs
+index 42784ab..6bb3f8a 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,2 +1,4 @@
+-import Distribution.Simple
++{-# LANGUAGE PackageImports #-}
++-- forces not to use local files
++import "Cabal" Distribution.Simple
+ main :: IO ()
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index b3df786ec763..97bee0727e40 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The Haskell Common Architecture for Building Applications and
+		Libraries: a framework defining a common interface for authors to more
+		easily build their Haskell applications in a portable way.
+		
+		The Haskell Cabal is part of a larger infrastructure for distributing,
+		organizing, and cataloging Haskell libraries and tools.
+	</longdescription>
 </pkgmetadata>