dev-haskell/cabal: bump up to 2.0.0.2, bug #635268

ghc-8.2 branch needs at least Cabal-2.

Closes: https://bugs.gentoo.org/635268
Package-Manager: Portage-2.3.16, Repoman-2.3.6

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index b2b49797e58211c5b28fe989f5c3b6b83173bb4f..8e84244c8fe73edc3ae07e229a45205c17f96729 100644 (file)
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -4,3 +4,4 @@ DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc90
 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

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 (file)
index 0000000..6940bc3
--- /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 (file)
index 0000000..2eed504
--- /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 b3df786ec7637f015276dedbc12bce5da2146f4d..97bee0727e403f5340ea1869c9fdecd3c982d76e 100644 (file)
--- 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>