gentoo resync : 16.09.2020

4 files changed, 1 insertions, 99 deletions

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index d9019191d3a9..2fd6fb72ccb7 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,7 +1,4 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
-AUX cabal-install-1.24.0.0-nopref.patch 651 BLAKE2B baf9f0b75bdfe0c49c0c54f9cfb63a917c778a4983db9d79672244b3c424488686914e0a3fee58e249510e489d45f358f33645a427762583c65c5233c0e4905a SHA512 052241ec023ffd24fdb45902835f79d639ea8ae0bb745b1456e5a730448880739f3a050a48f5af1715b7669f1168f52c28f967fb8a6c7a47d5064efcad501d48
-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
-EBUILD cabal-install-1.24.0.2.ebuild 2408 BLAKE2B c2b3610a41005997f6ac0fac5e8c950722a9250d3490fb8c07cef67b31b8547579e0fb83467e7aba7b7d87dc44cb7b9dfa27e6298ea72dcfb8d1d649dbf8e795 SHA512 255447d3d772615b66e16cc92276a82d1e898d9e0960c3448c98279719cbd56cdc69c93e6604a91af8dda9a3feb27eeec3e4874b974430702800d0f9f1fbdc2c
 EBUILD cabal-install-3.0.0.0.ebuild 2474 BLAKE2B 30b95a329b7af6a57e1d3fd59dbf468f7addb010556e7dba0be7c51ce103b79f6f4abb640ac57fbd73a52dfb360e857c868cad5738dae9ee16e8b669bc19b468 SHA512 967298ab3af7495f4338763da78b5dcfeaed058740883ae54ebcda868b3307c16dd26f9277a7cf3dcc6a26cf4c697d34b354c6c49325c94c8c402c2d579c0a78
-MISC metadata.xml 773 BLAKE2B 3be3014c36c393086afcfd6723ff532907dc89eba816f512fb05b25966ccbce4cc1726a45284703f8ac9cebd25cc070a9870d592828d8928f22db78e85a21279 SHA512 e6176c36f85f5764e8974654fcc599a1f4c9f840d8761c32d1d5e7103d6e536667618fafb37c0741c57bfd1c0cb9d283cf0cfd0e0084710bec2ed1263f25cb6c
+MISC metadata.xml 606 BLAKE2B c3d2bf45b3a96dc8d7245cccbeee3a49ba328afa5ce5efb1feaa6d76dec8063156c10451b65fb946a4de0c96b719ceb00e958400f607845d17df4ee8c7746681 SHA512 33177964ce5c096ea1d1557c3f2500ed999df3a4245a55d73c7b2ec04d42444089502de367f4b6fd84bf3c4012c7d430706b36f76461d6f1c5c6dc957dd2003d
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 b1c902a33f93..000000000000
--- 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/files/cabal-install-1.24.0.0-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
deleted file mode 100644
index 40b281073c0e..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 95545fc..a9c8417 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -345,2 +345,6 @@ extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
-   Tar.NormalFile content _
-@@ -351,2 +355,3 @@ extractPrefs entry = case Tar.entryContent entry of
-       prefs     = parsePreferredVersions content
-+-}
-   _ -> Nothing
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 659d87e35f01..efa8d4e362b3 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>