[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal-install/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     a56d4c966de8732a4605416c05cbc58d8dbae3e0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 09:11:09 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:30:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56d4c96

dev-haskell/cabal-install: drop old

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

 dev-haskell/cabal-install/Manifest                 |  1 -
 .../cabal-install/cabal-install-1.24.0.2.ebuild    | 78 ----------------------
 dev-haskell/cabal-install/metadata.xml             |  2 -
 3 files changed, 81 deletions(-)

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 76c1ef74067..b2cccfa8c91 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,2 +1 @@
-DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
 DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca

diff --git a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
deleted file mode 100644
index b1c902a33f9..00000000000
--- a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="test-suite"
-inherit bash-completion-r1 haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
-	>=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:=
-	>=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:=
-			>=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.8.2
-		dev-haskell/regex-posix
-		dev-haskell/tagged
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	default
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-1.24.0.0-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/cabal.1" "${S}/cabal.1" || die
-	doman "${S}/cabal.1"
-}

diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 659d87e35f0..efa8d4e362b 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -11,8 +11,6 @@
 		and installation of Haskell libraries and programs.
 	</longdescription>
 	<use>
-		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
 		<flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>