summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennartKolmodin <>2011-01-16 09:18:55 (GMT)
committerLuite Stegeman <luite@luite.com>2011-01-16 09:18:55 (GMT)
commitb8516fea67c9fce6ad81e826da97b4d0fb7b1454 (patch)
tree9280bbdd37d4fc3a2d9861fc3bee52fea46840b1
parent3686aa848e9f424694f70afb28ed2b28a307c03c (diff)
version 0.2.120.2.12
-rw-r--r--Merge/Dependencies.hs55
-rw-r--r--Portage/EBuild.hs4
-rw-r--r--hackport.cabal2
3 files changed, 46 insertions, 15 deletions
diff --git a/Merge/Dependencies.hs b/Merge/Dependencies.hs
index 75d6454..4ccc360 100644
--- a/Merge/Dependencies.hs
+++ b/Merge/Dependencies.hs
@@ -202,6 +202,7 @@ staticTranslateExtraLib lib = lookup lib m
, ("ev", Portage.AnyVersionOf (Portage.mkPackageName "dev-libs" "libev"))
, ("expat", Portage.AnyVersionOf (Portage.mkPackageName "dev-libs" "expat"))
, ("curl", Portage.AnyVersionOf (Portage.mkPackageName "net-misc" "curl"))
+ , ("xml2", Portage.AnyVersionOf (Portage.mkPackageName "dev-libs" "libxml2"))
]
---------------------------------------------------------------
@@ -260,33 +261,61 @@ table :: [(String, (String, String))]
table =
[("gconf-2.0", ("gnome-base", "gconf"))
- ,("gthread-2.0", ("dev-libs", "glib")) -- should be slot 2
- ,("gio-2.0", ("dev-libs", "glib"))
- ,("glib-2.0", ("dev-libs", "glib"))
- ,("gobject-2.0", ("dev-libs", "glib"))
+ ,("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
+
+ ,("gtk+-2.0", ("x11-libs", "gtk+")) -- should be slot 2
+ ,("gdk-2.0", ("x11-libs", "gtk+"))
+ ,("gdk-pixbuf-2.0", ("x11-libs", "gtk+"))
+ ,("gdk-pixbuf-xlib-2.0", ("x11-libs", "gtk+"))
+ ,("gdk-x11-2.0", ("x11-libs", "gtk+"))
+ ,("gtk+-unix-print-2.0", ("x11-libs", "gtk+"))
+ ,("gtk+-x11-2.0", ("x11-libs", "gtk+"))
+
+ ,("cairo", ("x11-libs", "cairo")) -- need [svg] for dev-haskell/cairo
+ ,("cairo-ft", ("x11-libs", "cairo"))
+ ,("cairo-ps", ("x11-libs", "cairo"))
+ ,("cairo-png", ("x11-libs", "cairo"))
+ ,("cairo-pdf", ("x11-libs", "cairo"))
+ ,("cairo-svg", ("x11-libs", "cairo"))
+ ,("cairo-xlib", ("x11-libs", "cairo"))
+ ,("cairo-xlib-xrender", ("x11-libs", "cairo"))
- ,("gtk+-2.0", ("x11-libs", "gtk+")) -- should be slot 2
+ ,("pangocairo", ("x11-libs", "pango"))
+ ,("pangoft2", ("x11-libs", "pango"))
+ ,("pango", ("x11-libs", "pango"))
+ ,("pangoxft", ("x11-libs", "pango"))
+ ,("pangox", ("x11-libs", "pango"))
- ,("cairo", ("x11-libs", "cairo"))
- ,("cairo-ps", ("x11-libs", "cairo"))
- ,("cairo-pdf", ("x11-libs", "cairo"))
- ,("cairo-svg", ("x11-libs", "cairo")) -- need [svg] for dev-haskell/cairo
- ,("pangocairo", ("x11-libs", "cairo"))
- ,("pango", ("x11-libs", "pango"))
,("libglade-2.0", ("gnome-base", "libglade"))
,("gnome-vfs-2.0", ("gnome-base", "gnome-vfs"))
,("gnome-vfs-module-2.0", ("gnome-base", "gnome-vfs"))
,("webkit-1.0", ("net-libs","webkit-gtk"))
+
,("gstreamer-0.10", ("media-libs", "gstreamer"))
- ,("gstreamer-audio-0.10", ("media-libs","gst-plugins-base"))
- ,("gstreamer-base-0.10", ("media-libs","gstreamer"))
+ ,("gstreamer-base-0.10", ("media-libs", "gstreamer"))
+ ,("gstreamer-check-0.10", ("media-libs", "gstreamer"))
,("gstreamer-controller-0.10", ("media-libs", "gstreamer"))
,("gstreamer-dataprotocol-0.10", ("media-libs", "gstreamer"))
,("gstreamer-net-0.10", ("media-libs", "gstreamer"))
+
+ ,("gstreamer-app-0.10", ("media-libs", "gst-plugins-base"))
+ ,("gstreamer-audio-0.10", ("media-libs", "gst-plugins-base"))
+ ,("gstreamer-video-0.10", ("media-libs", "gst-plugins-base"))
,("gstreamer-plugins-base-0.10", ("media-libs", "gst-plugins-base"))
+
,("gtksourceview-2.0", ("x11-libs", "gtksourceview"))
,("librsvg-2.0", ("gnome-base","librsvg"))
,("vte", ("x11-libs","vte"))
,("gtkglext-1.0", ("x11-libs","gtkglext"))
+
,("curl", ("net-misc", "curl"))
+ ,("libxml2", ("dev-libs", "libxml2"))
+
]
diff --git a/Portage/EBuild.hs b/Portage/EBuild.hs
index 42aeda7..4c6f8fd 100644
--- a/Portage/EBuild.hs
+++ b/Portage/EBuild.hs
@@ -72,12 +72,14 @@ src_uri e =
showEBuild :: EBuild -> String
showEBuild ebuild =
- ss "# Copyright 1999-2010 Gentoo Foundation". nl.
+ ss "# Copyright 1999-2011 Gentoo Foundation". nl.
ss "# Distributed under the terms of the GNU General Public License v2". nl.
ss "# $Header: $". nl.
nl.
ss ("# ebuild generated by hackport " ++ hackportVersion ebuild). nl.
nl.
+ ss "EAPI=\"2\"". nl.
+ nl.
ss "CABAL_FEATURES=". quote' (sepBy " " $ features ebuild). nl.
ss "inherit haskell-cabal". nl.
nl.
diff --git a/hackport.cabal b/hackport.cabal
index f4eb7fb..c3b011b 100644
--- a/hackport.cabal
+++ b/hackport.cabal
@@ -1,5 +1,5 @@
Name: hackport
-Version: 0.2.10
+Version: 0.2.12
License: GPL
License-file: LICENSE
Author: Henning G√ľnther, Duncan Coutts, Lennart Kolmodin