public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2016-03-15 22:01 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2016-03-15 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     29af3b2d676dd10f25af3d4a6a5c914d94e655ba
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 21:56:35 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 22:01:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29af3b2d

dev-haskell/cabal: bump up to 1.22.8.0

Package-Manager: portage-2.2.28

 dev-haskell/cabal/Manifest              |  1 +
 dev-haskell/cabal/cabal-1.22.8.0.ebuild | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index b43cc99..2eacd77 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -6,3 +6,4 @@ DIST Cabal-1.18.1.5.tar.gz 706722 SHA256 2a5f14599e390e4ed6fc78ad05e16792a671bd5
 DIST Cabal-1.20.0.2.tar.gz 717941 SHA256 234d2299bcf580f727cd3fa649448ff84b304d1f270e3b6836f8e2211d11bf02 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3 WHIRLPOOL 38ccfaded54fb86bedca33dd48742f06763b6b7dc89444dac6846102dec27fe61acefef3b1f0a3e4053751e88f79ab523e89264f070eddc999ca9810b47cce9b
 DIST Cabal-1.22.4.0.tar.gz 404549 SHA256 b96a8db268e3501ded01bdb0d178fe334274e92c1497c3249a59ef5cfc55dca6 SHA512 0a25889fd5fe224868210091f429489c24e01334b2ae49444dfdfaaae6e0892a8c3262e4146fefc7f95b165d637b812abd9519394de9a7d801fda9a75a945b31 WHIRLPOOL 996fd9ac055afec29f16c1e91e38ee00193894c3ed7e183a017a2fb04ead50dabf247e2209c17c5ca66c0016fa676cead36b8b0ee884f0353d3b85e08c3a0541
 DIST Cabal-1.22.6.0.tar.gz 405017 SHA256 e6a58714bd33ea107b5e99c7f149b48ddd3fbfa72e6105abbab4478bcf4f2433 SHA512 f7a4bfed3a2c10709b4e1fa6abfc612835d1874e976fa732dd0dd8af41c92dcb1ba55482fbbbffd834579cdea4625d00aa11f83fbbf5b6edfeff062b332a27bc WHIRLPOOL dc1c64e771473b42954ecd78dc58434fd3822a3612ab4279697f7abd7b5c3a8be5581473a0af6188fcdd6cf376afae6befe7894c54ed27688c4a9b190e9ea0b8
+DIST Cabal-1.22.8.0.tar.gz 405552 SHA256 2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3 WHIRLPOOL 33b409ac997a1ef18f395a03707ee7dc7c1cfe8cf155f10d7116267e0502c733bf4a0c0b5de9a7075b364855cf3b8151af245b34cfb1f717191fb199328544f3

diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
new file mode 100644
index 0000000..2018c46
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile test-suite"
+CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
+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}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-7.8.1:="
+DEPEND="${RDEPEND}
+	test? ( dev-haskell/extensible-exceptions
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
+		dev-haskell/regex-posix
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	if [[ -n ${LIVE_EBUILD} ]]; then
+		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
+	fi
+}
+
+src_configure() {
+	cabal-is-dummy-lib && return
+
+	einfo "Bootstrapping Cabal..."
+	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+		-o setup || die "compiling Setup.hs failed"
+	cabal-configure
+}
+
+src_compile() {
+	cabal-is-dummy-lib && return
+
+	cabal-build
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2016-05-15  8:26 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2016-05-15  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     8235588ff6c9d8fea67bf36809e0197184788ad9
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:42:59 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 15 08:25:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8235588f

dev-haskell/cabal: disable circular dependency in tests

Package-Manager: portage-2.2.28

 dev-haskell/cabal/cabal-1.18.1.5.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 0554381..69b8eed 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -22,6 +22,8 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
+RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
+
 RDEPEND=">=dev-lang/ghc-6.12.1:="
 DEPEND="${RDEPEND}
 	test? ( dev-haskell/extensible-exceptions


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2016-12-28 22:49 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2016-12-28 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ec45f110b0c68c8c3212296b193a3fc6c5d359fe
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 22:33:57 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 22:37:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec45f110

dev-haskell/cabal: drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/cabal/Manifest              |  2 --
 dev-haskell/cabal/cabal-1.14.0.ebuild   | 48 -----------------------------
 dev-haskell/cabal/cabal-1.16.0.3.ebuild | 54 ---------------------------------
 3 files changed, 104 deletions(-)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 76df172..c46a0736 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,5 +1,3 @@
-DIST Cabal-1.14.0.tar.gz 276517 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4 SHA512 6e31f44cfafd44e1e3987ed0b116a52e12495228cb1de89e9f4ded8dbc06a0d1537bf647c4576c606d623b7d58d10367d243258b500b8c8329db6c48afd9eee3 WHIRLPOOL 22225d5923bc454e2fa24bcc9fe845b07c41c56ea67f45a0815597f0dffc4d60027117d38bdd1eccd4e61cd24d682bd8b3f4026cfaf62481712234fc9cea5321
-DIST Cabal-1.16.0.3.tar.gz 284665 SHA256 ef27629d540e46c77cabac08c008583abee4e4a04ed5a5ecb1a84725dbc39f86 SHA512 7dd365c44b5ea489fcc990e0deca8ffcfdd6b867a35b85b422fc0fe9e3c70739df393cacf425575e5e4977729ef875eb0737aaa13a0f20cfaff9d22b39027a85 WHIRLPOOL 84fbe4c41c14377685c89a93b79e03920d19e65c3c8c51a4ef590bfb8ad331e1ae85d224c1cd820e90262a579131c823510a2e62f4566d452af8e67d5cf26be2
 DIST Cabal-1.18.1.2.tar.gz 323545 SHA256 594ef792c085f00f06728dad0a02dd63450b49b5ac394484be6c6a0a484b6f5d SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6 WHIRLPOOL cfc3872b944ce5209ebc0429e5561ba3fd5ddecf1256aa47e8d4968727bd3498a6dd23f6417161e7a570259728e6f66098d045d7d7b4c7e87f721c5b2edf0f73
 DIST Cabal-1.18.1.3.tar.gz 705715 SHA256 25c436290dd9d05b588b6b002f0357302a9b0bf8c2630b8b069c300d803335d4 SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708 WHIRLPOOL 4679e7e0f6b9f1a887f3bbc9bdd5eccfac0bed8d62fd13cb516a51b7e8d1efe2d654c78fd38207a9678152629f60ff2528080a6fb857e7a05dd349f7c3f5f417
 DIST Cabal-1.18.1.5.tar.gz 706722 SHA256 2a5f14599e390e4ed6fc78ad05e16792a671bd5c5b479c6834aa1a000ff45237 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef WHIRLPOOL de3dc78ba6f99107746c75cedbdefd5661dea773cff5362ec73695b1de3ed247f0e034551da5fa39e46084ed81ee6fabbba1907f199a12c4599d66db2f7fb974

diff --git a/dev-haskell/cabal/cabal-1.14.0.ebuild b/dev-haskell/cabal/cabal-1.14.0.ebuild
deleted file mode 100644
index 1bdf7c3..00000000
--- a/dev-haskell/cabal/cabal-1.14.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.12
-
-EAPI="4"
-
-CABAL_FEATURES="bootstrap lib profile"
-inherit haskell-cabal eutils versionator
-
-MY_PN="Cabal"
-MY_PV=$(get_version_component_range '1-3')
-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"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc"
-
-RESTRICT="test" # avoid circular deps
-
-DEPEND=">=dev-lang/ghc-6.10.1
-		<dev-lang/ghc-7.6.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
-
-src_configure() {
-	if ! cabal-is-dummy-lib; then
-		einfo "Bootstrapping Cabal..."
-		$(ghc-getghc) -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-			-o setup || die "compiling Setup.hs failed"
-		cabal-configure
-	fi
-}
-
-src_compile() {
-	if ! cabal-is-dummy-lib; then
-		cabal-build
-	fi
-}

diff --git a/dev-haskell/cabal/cabal-1.16.0.3.ebuild b/dev-haskell/cabal/cabal-1.16.0.3.ebuild
deleted file mode 100644
index 5f501b9..00000000
--- a/dev-haskell/cabal/cabal-1.16.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit haskell-cabal eutils versionator
-
-MY_PN="Cabal"
-MY_PV=$(get_version_component_range '1-4')
-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}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/extensible-exceptions
-			dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.1.0.1
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)"
-
-RESTRICT="test" # Fails own tests
-
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_configure() {
-	if ! cabal-is-dummy-lib; then
-		einfo "Bootstrapping Cabal..."
-		$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-			-o setup || die "compiling Setup.hs failed"
-		cabal-configure
-	fi
-}
-
-src_compile() {
-	if ! cabal-is-dummy-lib; then
-		cabal-build
-	fi
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2017-02-15  8:39 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2017-02-15  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7db735e14d1a9667af549140ed36e1c1a214a291
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 08:29:52 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 08:29:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db735e1

dev-haskell/cabal: bump up to 1.24.2.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/cabal/Manifest              |  1 +
 dev-haskell/cabal/cabal-1.24.2.0.ebuild | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index c46a07365b..1c3fe48804 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -3,3 +3,4 @@ DIST Cabal-1.18.1.3.tar.gz 705715 SHA256 25c436290dd9d05b588b6b002f0357302a9b0bf
 DIST Cabal-1.18.1.5.tar.gz 706722 SHA256 2a5f14599e390e4ed6fc78ad05e16792a671bd5c5b479c6834aa1a000ff45237 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef WHIRLPOOL de3dc78ba6f99107746c75cedbdefd5661dea773cff5362ec73695b1de3ed247f0e034551da5fa39e46084ed81ee6fabbba1907f199a12c4599d66db2f7fb974
 DIST Cabal-1.20.0.2.tar.gz 717941 SHA256 234d2299bcf580f727cd3fa649448ff84b304d1f270e3b6836f8e2211d11bf02 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3 WHIRLPOOL 38ccfaded54fb86bedca33dd48742f06763b6b7dc89444dac6846102dec27fe61acefef3b1f0a3e4053751e88f79ab523e89264f070eddc999ca9810b47cce9b
 DIST Cabal-1.22.8.0.tar.gz 405552 SHA256 2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3 WHIRLPOOL 33b409ac997a1ef18f395a03707ee7dc7c1cfe8cf155f10d7116267e0502c733bf4a0c0b5de9a7075b364855cf3b8151af245b34cfb1f717191fb199328544f3
+DIST Cabal-1.24.2.0.tar.gz 441440 SHA256 b7d0eb8e3503fbca460c0a6ca5c88352cecfe1b69e0bbc79827872134ed86340 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36 WHIRLPOOL 9e5cd53d4e6a83bb6c2c8f5284e7d4c6b0645ceb5f0d5d3951aa199b6b02c3cb30cfd0b53f786656bc65a2a189fba65cf694f5a16ba9540a547acd052e908c19

diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
new file mode 100644
index 0000000000..0b2660c7d1
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -bundled-binary-generic
+
+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}"
+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}"
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.0.2_rc2 PM:8.0.2"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bundled-binary-generic
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2020-05-27  6:52 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2020-05-27  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     30191f673e57b9ceebf65fb1c345b9174eb2f07f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 06:52:09 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May 27 06:52:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30191f67

dev-haskell/cabal: bump up to 2.4.0.1 (ghc-8.6 core lib)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/Manifest             |  1 +
 dev-haskell/cabal/cabal-2.4.0.1.ebuild | 44 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 8e84244c8fe..d75f72fe087 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -5,3 +5,4 @@ DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b
 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
+DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c

diff --git a/dev-haskell/cabal/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
new file mode 100644
index 00000000000..0b868d122ce
--- /dev/null
+++ b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -bundled-binary-generic
+
+CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
+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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.6
+#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
+
+CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bundled-binary-generic
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2020-09-02  7:31 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2020-09-02  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ba6b18a0467a3f7ac82b91f330da43cead4074f3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 07:25:24 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 07:31:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6b18a0

dev-haskell/cabal: use https:// HOMEPAGE

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/cabal-2.4.0.1.ebuild | 2 +-
 dev-haskell/cabal/cabal-3.0.1.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/cabal/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
index 0b868d122ce..9335390f8e6 100644
--- a/dev-haskell/cabal/cabal-2.4.0.1.ebuild
+++ b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
@@ -14,7 +14,7 @@ MY_PN="Cabal"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
+HOMEPAGE="https://www.haskell.org/cabal/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index 88d667c8f67..a5735f4398e 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PN="Cabal"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
+HOMEPAGE="https://www.haskell.org/cabal/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2020-09-04 11:48 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2020-09-04 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f9e51610b060ca7f4c21eecefd6a2b666067ce25
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 11:47:50 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 11:48:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e51610

dev-haskell/cabal: requre ghc-8.8 for 3.0.1.0

Reported-by: martin <AT> vassor.org
Closes: https://bugs.gentoo.org/740034
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/cabal-3.0.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index a5735f4398e..ec738e686df 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/semigroups-0.18.3:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
 	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.8:=
 "
 DEPEND="${RDEPEND}"
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2020-11-01 13:58 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2020-11-01 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6eb09f115ed0c281d77a4ae1543b0eb43b9845cb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 13:57:52 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 13:57:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb09f11

dev-haskell/cabal: update to EAPI=7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/cabal-1.18.1.3.ebuild | 4 +++-
 dev-haskell/cabal/cabal-1.18.1.5.ebuild | 4 +++-
 dev-haskell/cabal/cabal-1.20.0.2.ebuild | 4 +++-
 dev-haskell/cabal/cabal-1.22.8.0.ebuild | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
index b4a410cf4d3..c48c74d40c4 100644
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.3.6.9999
 
@@ -37,6 +37,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi

diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 369324fa471..220ee8187a5 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.3.6.9999
 
@@ -39,6 +39,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 CABAL_CORE_LIB_GHC_PV="7.8.4"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi

diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
index abbfa9df88f..de5558e4a3a 100644
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.4.9999
 
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi

diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index c42d09e543c..15fd12acb3a 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.4.5.9999
 
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-01-06 18:45 Fabian Groffen
  0 siblings, 0 replies; 17+ messages in thread
From: Fabian Groffen @ 2021-01-06 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     e317b9048f338f357625f35f88e6a524208a467b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 18:43:52 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 18:43:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e317b904

dev-haskell/cabal: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-haskell/cabal/cabal-1.18.1.2.ebuild | 4 ++--
 dev-haskell/cabal/cabal-1.18.1.3.ebuild | 4 ++--
 dev-haskell/cabal/cabal-1.18.1.5.ebuild | 4 ++--
 dev-haskell/cabal/cabal-1.20.0.2.ebuild | 4 ++--
 dev-haskell/cabal/cabal-1.22.8.0.ebuild | 4 ++--
 dev-haskell/cabal/cabal-1.24.2.0.ebuild | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
index ddbea6669cf..f70319a436d 100644
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="

diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
index c48c74d40c4..4e3ef6605f6 100644
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="

diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 220ee8187a5..b788a5425ab 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal

diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
index de5558e4a3a..b2818d3ca18 100644
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=

diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index 15fd12acb3a..e9344803aa7 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test

diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
index 8174b449767..b55efde6e14 100644
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular dependencies


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-01-07  8:20 Fabian Groffen
  0 siblings, 0 replies; 17+ messages in thread
From: Fabian Groffen @ 2021-01-07  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     242c824de17a8536c3a0a64120e587896849ba86
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 08:13:16 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 08:13:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242c824d

dev-haskell/cabal: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-haskell/cabal/cabal-2.0.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
index b88e0149373..e46b1a1e7a6 100644
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 #not keyworded yet: many packages are broken
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular dependencies


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-03-14  8:47 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2021-03-14  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6d142f30776abeb0dc9f72ffddd4c035f4c42840
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 08:47:29 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:47:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d142f30

dev-haskell/cabal: drop old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/Manifest              |  8 -----
 dev-haskell/cabal/cabal-1.18.1.2.ebuild | 53 ---------------------------
 dev-haskell/cabal/cabal-1.18.1.3.ebuild | 60 -------------------------------
 dev-haskell/cabal/cabal-1.18.1.5.ebuild | 62 --------------------------------
 dev-haskell/cabal/cabal-1.20.0.2.ebuild | 63 ---------------------------------
 dev-haskell/cabal/cabal-1.22.8.0.ebuild | 60 -------------------------------
 dev-haskell/cabal/cabal-1.24.2.0.ebuild | 37 -------------------
 dev-haskell/cabal/cabal-2.0.0.2.ebuild  | 40 ---------------------
 dev-haskell/cabal/cabal-2.4.0.1.ebuild  | 44 -----------------------
 9 files changed, 427 deletions(-)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index f0f69a36610..d1a7a7a8108 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,9 +1 @@
-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
-DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06

diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
deleted file mode 100644
index f70319a436d..00000000000
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit haskell-cabal versionator
-
-MY_PN=Cabal
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}

diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
deleted file mode 100644
index 4e3ef6605f6..00000000000
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}

diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
deleted file mode 100644
index b788a5425ab..00000000000
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.4"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}

diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
deleted file mode 100644
index b2818d3ca18..00000000000
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-
-	cabal_chdeps \
-		'QuickCheck < 2.7' 'QuickCheck < 2.8' \
-		'QuickCheck >= 2.1.0.1 && < 2.7' 'QuickCheck >= 2.1.0.1 && < 2.8'
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}

diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
deleted file mode 100644
index e9344803aa7..00000000000
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}

diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
deleted file mode 100644
index b55efde6e14..00000000000
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -bundled-binary-generic
-
-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="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.2_rc2 PM:8.0.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}

diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
deleted file mode 100644
index e46b1a1e7a6..00000000000
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#not keyworded yet: many packages are broken
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-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/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
deleted file mode 100644
index 9335390f8e6..00000000000
--- a/dev-haskell/cabal/cabal-2.4.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
-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="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
-
-CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-03-15 22:33 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2021-03-15 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e22a1f7c6d9cc0525a374e9b257d200843472026
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:06:57 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 22:32:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22a1f7c

dev-haskell/cabal: bump up to 3.2.1.0

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/Manifest                |  1 +
 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 54 +++++++++++++++++++++++++++++++
 dev-haskell/cabal/metadata.xml            |  8 -----
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index d1a7a7a8108..ac7dbabfe31 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1 +1,2 @@
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
+DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598

diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
new file mode 100644
index 00000000000..d18123f7001
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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
+#hackport: flags: -bundled-binary-generic
+
+# Drop test-suite due to "circular" dependencies with quickcheck
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+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="https://www.haskell.org/cabal/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris
+IUSE=""
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+# GHC lower bound set to 8.0 to remove semigroups and fail dependencies.
+RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.0:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Cabal bootstraps with 'ghc --make' without package cleanup in environment.
+	# That causes module collisions at build:
+	# - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3
+	# - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5
+	HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
+	HCFLAGS="${HCFLAGS} -ignore-package=kinds"
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bundled-binary-generic
+}
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"

diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 97bee0727e4..b7878815d80 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -5,12 +5,4 @@
 		<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>


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-07-19  7:13 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2021-07-19  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     94505e69eccdf0d9b047d1d2fda679d99daea54e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 07:10:52 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 07:13:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94505e69

dev-haskell/cabal: fix CABAL_CORE_LIB_GHC_PV for rev-bumped ghc

Fixes: f423849485dc ("dev-lang/ghc: Add sys-libs/ncurses[unicode(+)]")
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/802771
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/cabal-3.0.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index ec738e686df..7aa96e571d2 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1"
 
 src_configure() {
 	haskell-cabal_src_configure \


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2021-07-19  7:59 Sergei Trofimovich
  0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2021-07-19  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d23d3f3945b0c25db7da5e2cdaab1ef859eff0ce
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 07:58:41 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 07:59:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23d3f39

dev-haskell/cabal: fix CABAL_CORE_LIB_GHC_PV for rev-bumped ghc

Fixes: f423849485dc ("dev-lang/ghc: Add sys-libs/ncurses[unicode(+)]")
Reported-by: Andrew Udvare
Bug: https://bugs.gentoo.org/802771
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index d18123f7001..0e4d42da0f0 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -51,4 +51,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9999"


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2022-07-29  2:33 Sam James
  0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-07-29  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e6842a238edf4c2c6fff571f2a600e984f31f570
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 02:28:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:32:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6842a23

dev-haskell/cabal: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-haskell/cabal/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 937381521944..ac62fa133898 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">haskell/cabal</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2022-08-14 20:52 Sam James
  0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-08-14 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     78ae4132ded7e3efbed7cd5ca7b6ed32abd0d40c
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Aug  4 04:22:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 20:51:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ae4132

dev-haskell/cabal: clean GHC

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 4 ++--
 dev-haskell/cabal/cabal-3.4.1.0.ebuild    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index 0e4d42da0f0b..65173d2541c5 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,4 +51,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.6"

diff --git a/dev-haskell/cabal/cabal-3.4.1.0.ebuild b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
index ed14fea82137..579fc6a98aec 100644
--- a/dev-haskell/cabal/cabal-3.4.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
@@ -48,4 +48,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:9.0.2 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:9.0.2"


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/
@ 2022-11-25 21:57 Sam James
  0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-11-25 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     bc0ff6df750ad9e8aa26b20478bd1552cff6ec81
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Wed Nov 23 07:35:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 21:56:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc0ff6df

dev-haskell/cabal: adjust core lib markings

Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 2 +-
 dev-haskell/cabal/cabal-3.4.1.0.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index 65173d2541c5..0877c3f6e60a 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -51,4 +51,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6"
+CABAL_CORE_LIB_GHC_PV="8.10.6"

diff --git a/dev-haskell/cabal/cabal-3.4.1.0.ebuild b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
index 4d2f4b6ec1a4..d809c1c95059 100644
--- a/dev-haskell/cabal/cabal-3.4.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
@@ -48,4 +48,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="9.0.2"


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-11-25 21:57 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-14 20:52 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-11-25 21:57 Sam James
2022-07-29  2:33 Sam James
2021-07-19  7:59 Sergei Trofimovich
2021-07-19  7:13 Sergei Trofimovich
2021-03-15 22:33 Sergei Trofimovich
2021-03-14  8:47 Sergei Trofimovich
2021-01-07  8:20 Fabian Groffen
2021-01-06 18:45 Fabian Groffen
2020-11-01 13:58 Sergei Trofimovich
2020-09-04 11:48 Sergei Trofimovich
2020-09-02  7:31 Sergei Trofimovich
2020-05-27  6:52 Sergei Trofimovich
2017-02-15  8:39 Sergei Trofimovich
2016-12-28 22:49 Sergei Trofimovich
2016-05-15  8:26 Sergei Trofimovich
2016-03-15 22:01 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox