summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-09-02 19:24:12 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-09-02 19:24:23 +0100
commitad37e9dd4ba89b0bf1cf4957457fb5f44f994d1e (patch)
tree42e98b705a8f3cd8cb6a33539f9229ada68ba598 /app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
parentmedia-libs/openal: Stabilize 1.20.1 amd64, #738246 (diff)
downloadgentoo-ad37e9dd4ba89b0bf1cf4957457fb5f44f994d1e.tar.gz
gentoo-ad37e9dd4ba89b0bf1cf4957457fb5f44f994d1e.tar.bz2
gentoo-ad37e9dd4ba89b0bf1cf4957457fb5f44f994d1e.zip
app-portage/hackport: drop old
Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-portage/hackport/files/hackport-0.6.3-old-filepath.patch')
-rw-r--r--app-portage/hackport/files/hackport-0.6.3-old-filepath.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
deleted file mode 100644
index c660db766b2..00000000000
--- a/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b4fe6e48679084ca28c1192612c60599ae81808c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 25 Jan 2020 23:53:39 +0000
-Subject: [PATCH 3/3] Merge.hs: avoid using isExtensionOf
-
-`isExtensionOf` is not available in gcc-8.0.
-
-Reported-by: Jeremy Stent
-Bug: https://bugs.gentoo.org/704778
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- Merge.hs | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Merge.hs b/Merge.hs
-index 645817345..522a3739d 100644
---- a/Merge.hs
-+++ b/Merge.hs
-@@ -39,7 +39,8 @@ import System.Directory ( getCurrentDirectory
- , listDirectory
- )
- import System.Process (system)
--import System.FilePath ((</>), isExtensionOf)
-+import System.FilePath ((</>))
-+import qualified System.FilePath as SF
- import System.Exit
-
- import qualified Cabal2Ebuild as C2E
-@@ -183,7 +184,7 @@ getPreviousPackageId pkgDir newPkgId = do
- . L.sortOn (Portage.pkgVersion)
- . filter (<newPkgId)
- $ Portage.filePathToPackageId newPkgId
-- <$> filter (\fp -> ".ebuild" `isExtensionOf` fp) pkgDir
-+ <$> filter (\fp -> SF.takeExtension fp == ".ebuild") pkgDir
- case pkgIds of
- x:_ -> Just x
- _ -> Nothing
---
-2.25.0
-