From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/cabal-install-0.13.3-nopref.patch | 20 -------------------- .../files/cabal-install-1.24.0.0-nopref.patch | 15 --------------- 2 files changed, 35 deletions(-) delete mode 100644 dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch delete mode 100644 dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch (limited to 'dev-haskell/cabal-install/files') diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch deleted file mode 100644 index c36582680a56..000000000000 --- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs -index 48d8d49..3a38ee1 100644 ---- a/Distribution/Client/IndexUtils.hs -+++ b/Distribution/Client/IndexUtils.hs -@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of - - 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 _ - | takeFileName (Tar.entryPath entry) == "preferred-versions" - -> Just . parsePreferredVersions - . BS.Char8.unpack $ content -+-} - _ -> Nothing - - parsePreferredVersions :: String -> [Dependency] 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 -- cgit v1.2.3