Skip to content
Browse files

dependencies: don't try to resolve pkgconfig depends as hackell packa…

…ge names

Otherwise hackport mistakenly merges pkgconfig 'glib' depend as
'dev-haskell/glib' depend.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  • Loading branch information...
1 parent 8084777 commit 595bf01554f9ead2721102c86c782d67e6a53abd @trofi trofi committed Mar 12, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 Merge/Dependencies.hs
View
18 Merge/Dependencies.hs
@@ -270,20 +270,20 @@ resolvePkgConfigs overlay cdeps =
resolvePkgConfig :: Portage.Overlay -> Cabal.Dependency -> Maybe Portage.Dependency
resolvePkgConfig overlay (Cabal.Dependency (Cabal.PackageName pn) _cabalVersion) = do
(cat,portname) <- lookup pn table
- return . head $ (C2E.convertDependency overlay (Portage.Category cat) (Cabal.Dependency (Cabal.PackageName portname) _cabalVersion))
+ return $ Portage.AnyVersionOf (Portage.mkPackageName cat portname) []
table :: [(String, (String, String))]
table =
[("gconf-2.0", ("gnome-base", "gconf"))
- ,("gio-2.0", ("dev-libs", "glib"))
- ,("gio-unix-2.0", ("dev-libs", "glib"))
- ,("glib-2.0", ("dev-libs", "glib"))
- ,("gmodule-2.0", ("dev-libs", "glib"))
- ,("gmodule-export-2.0", ("dev-libs", "glib"))
- ,("gmodule-no-export-2.0", ("dev-libs", "glib"))
- ,("gobject-2.0", ("dev-libs", "glib"))
- ,("gthread-2.0", ("dev-libs", "glib")) -- should be slot 2
+ ,("gio-2.0", ("dev-libs", "glib:2"))
+ ,("gio-unix-2.0", ("dev-libs", "glib:2"))
+ ,("glib-2.0", ("dev-libs", "glib:2"))
+ ,("gmodule-2.0", ("dev-libs", "glib:2"))
+ ,("gmodule-export-2.0", ("dev-libs", "glib:2"))
+ ,("gmodule-no-export-2.0", ("dev-libs", "glib:2"))
+ ,("gobject-2.0", ("dev-libs", "glib:2"))
+ ,("gthread-2.0", ("dev-libs", "glib:2"))
,("gtk+-2.0", ("x11-libs", "gtk+")) -- should be slot 2
,("gdk-2.0", ("x11-libs", "gtk+"))

0 comments on commit 595bf01

Please sign in to comment.
Something went wrong with that request. Please try again.