Remove Portage.Tables module

There were two packages in the tree that had non-0 slots and they had to be handled specially by hackport. Now that those packages have been switched to a 0 slot, the code to specially handle them is no longer needed. In the future, there shouldn't be any other packages with non-0 slots since slotted packages don't play well with haskell. See: https://github.com/gentoo-haskell/gentoo-haskell/blob/master/scripts/doc/maintaining-tips.rst#on-problems-with-slotting-haskell-libraries Signed-off-by: hololeap <[email protected]>
hololeap · Feb 1, 2024 · bfb6876 · bfb6876
1 parent fc45382
commit bfb6876
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 43 deletions.
diff --git a/hackport.cabal b/hackport.cabal
@@ -870,7 +870,6 @@ library hackport-internal
     Portage.Overlay
     Portage.PackageId
     Portage.Resolve
-    Portage.Tables
     Portage.Use
     Portage.Version
     Status

diff --git a/src/Merge/Dependencies.hs b/src/Merge/Dependencies.hs
@@ -43,7 +43,6 @@ import qualified Portage.Dependency.Normalize as PN
 import qualified Portage.Overlay as Portage
 import qualified Portage.PackageId as Portage
 import qualified Portage.Use as Portage
-import qualified Portage.Tables as Portage
 import qualified Cabal2Ebuild as C2E
 
 import qualified Portage.GHCCore as GHCCore
@@ -156,8 +155,8 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg
                               ],
                     dep_e = S.singleton "${RDEPEND}",
                     rdep = Portage.DependAllOf
-                               [ Portage.set_build_slot ghc_dep
-                               , Portage.set_build_slot $ add_profile $ raw_haskell_deps
+                               [ ghc_dep
+                               , add_profile $ raw_haskell_deps
                                , extra_libs
                                , Portage.DependAllOf pkg_config_libs
                                ]
@@ -172,8 +171,8 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg
                               ],
                     dep_e = S.singleton "${RDEPEND}",
                     rdep = Portage.DependAllOf
-                               [ Portage.set_build_slot ghc_dep
-                               , Portage.set_build_slot $ raw_haskell_deps
+                               [ ghc_dep
+                               , raw_haskell_deps
                                , extra_libs
                                , Portage.DependAllOf pkg_config_libs
                                ]

diff --git a/src/Portage/Tables.hs b/src/Portage/Tables.hs