summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-01-26 00:01:15 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-01-26 00:06:27 +0000
commita87068ce30830fd698b6bdf32412483b110977ac (patch)
tree56e9b298a646f54dbe2d1a0a40ff1e55beb1386d /app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
parenttoolchain.eclass: drop PRERELEASE support (diff)
downloadgentoo-a87068ce30830fd698b6bdf32412483b110977ac.tar.gz
gentoo-a87068ce30830fd698b6bdf32412483b110977ac.tar.bz2
gentoo-a87068ce30830fd698b6bdf32412483b110977ac.zip
app-portage/hackport: bump up to 0.6.3
Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/704778 Package-Manager: Portage-2.3.85, Repoman-2.3.20 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, 40 insertions, 0 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
new file mode 100644
index 00000000000..c660db766b2
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
@@ -0,0 +1,40 @@
+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
+