Fri May 4 20:00:31 UTC 2012

author: Parabola <dev@list.parabolagnulinux.org> 2012-05-04 20:00:41 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2012-05-04 20:00:41 +0000
commit: b2c353d874b85e06f355a9419852e2616613c7d0 (patch)
tree: f0773e0a930d308198ef5036d4f74e7f53015e6e /community
parent: 0a24fb835cac4007388213ad0afb15257b035b14 (diff)
39 files changed, 0 insertions, 5316 deletions
diff --git a/community/armagetronad/armagetronad.desktop b/community/armagetronad/armagetronad.desktop
deleted file mode 100644
index 125b4261d..000000000
--- a/community/armagetronad/armagetronad.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Armagetronad
-GenericName=3D Tron clone
-GenericName[pl]=Klon gry Tron w 3D
-Exec=armagetronad
-Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png
-Categories=Game;
-Terminal=false
-Type=Application
-Encoding=UTF-8
-StartupNotify=false
diff --git a/community/armagetronad/gcc43.patch b/community/armagetronad/gcc43.patch
deleted file mode 100644
index 358f48221..000000000
--- a/community/armagetronad/gcc43.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ur a/src/network/md5.cpp b/src/network/md5.cpp
---- a/src/network/md5.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/md5.cpp	2009-08-24 20:21:51.000000000 +0200
-@@ -75,7 +75,7 @@
-  */
- 
- #include "md5.h"
--
-+#include<cstring>
- #include <string>
- #include <memory>
- 
-Tylko w b/src/network: md5.cpp~
-diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp
---- a/src/network/nNetwork.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.cpp	2009-08-24 20:20:40.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tInitExit.h"
- #include "nSimulatePing.h"
-Tylko w b/src/network: nNetwork.cpp~
-diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h
---- a/src/network/nNetwork.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.h	2009-08-24 20:21:18.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_NET_H
- #define ArmageTron_NET_H
--
-+#include<cstring>
- #include "tError.h"
- #include "tString.h"
- #include "tHeap.h"
-Tylko w b/src/network: nNetwork.h~
-diff -ur a/src/network/nSocket.h b/src/network/nSocket.h
---- a/src/network/nSocket.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nSocket.h	2009-08-24 20:22:09.000000000 +0200
-@@ -33,7 +33,7 @@
- 
- #ifndef NET_SOCKET_H
- #define NET_SOCKET_H
--
-+#include<cstring>
- #include <iostream>
- #include "tConsole.h"
- #include "tException.h"
-Tylko w b/src/network: nSocket.h~
-diff -ur a/src/render/rModel.h b/src/render/rModel.h
---- a/src/render/rModel.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/render/rModel.h	2009-08-24 20:20:57.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_MODEL_H
- #define ArmageTron_MODEL_H
--
-+#include<cstring>
- #include "defs.h"
- #include "tArray.h"
- #include "tLinkedList.h"
-Tylko w b/src/render: rModel.h~
-diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp
---- a/src/tools/tArray.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tArray.cpp	2009-08-24 20:22:25.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #define NO_MALLOC_REPLACEMENT
--
-+#include<cstring>
- #include "tMemManager.h"
- #include <iostream>
- #include <stdlib.h>
-Tylko w b/src/tools: tArray.cpp~
-diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp
---- a/src/tools/tCommandLine.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCommandLine.cpp	2009-08-24 20:24:19.000000000 +0200
-@@ -30,7 +30,7 @@
- #ifndef		TCOMMANDLINE_H_INCLUDED
- #include	"tCommandLine.h"
- #endif
--
-+#include<cstring>
- #include    "tLocale.h"
- #include    "tConfiguration.h"
- #include    "tException.h"
-Tylko w b/src/tools: tCommandLine.cpp~
-diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp
---- a/src/tools/tConfiguration.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tConfiguration.cpp	2009-08-24 20:22:42.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
- #include <fstream>
- #include <iomanip>
-Tylko w b/src/tools: tConfiguration.cpp~
-diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp
---- a/src/tools/tCrypt.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCrypt.cpp	2009-08-24 20:22:54.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tCrypt.h"
- #include "tMemManager.h"
- 
-Tylko w b/src/tools: tCrypt.cpp~
-diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp
---- a/src/tools/tDirectories.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tDirectories.cpp	2009-08-24 20:23:06.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #include "config.h"
--
-+#include<cstring>
- #include <errno.h>
- #include <sys/types.h>
- #include <stdio.h>
-Tylko w b/src/tools: tDirectories.cpp~
-diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp
---- a/src/tools/tError.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tError.cpp	2009-08-24 20:28:01.000000000 +0200
-@@ -24,8 +24,9 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
-+#include<cstdlib>
- #include <iostream>
- #if HAVE_UNISTD_H
- #include <unistd.h>
-Tylko w b/src/tools: tError.cpp~
-diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp
---- a/src/tools/tLocale.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tLocale.cpp	2009-08-24 20:23:49.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "tConsole.h"
- #include "tDirectories.h"
- #include "tSafePTR.h"
--
-+#include<cstring>
- #include <fstream>
- #include <string>
- #include <map>
-Tylko w b/src/tools: tLocale.cpp~
-diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp
---- a/src/tools/tMemManager.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tMemManager.cpp	2009-08-24 20:24:42.000000000 +0200
-@@ -29,7 +29,7 @@
- #define NO_MALLOC_REPLACEMENT
- 
- #include "defs.h"
--
-+#include<cstring>
- #include <iostream>
- #include <sstream>
- #include <stdio.h>  // need basic C IO since STL IO does memory management
-Tylko w b/src/tools: tMemManager.cpp~
-diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp
---- a/src/tools/tRandom.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tRandom.cpp	2009-08-24 20:24:31.000000000 +0200
-@@ -29,7 +29,7 @@
- #ifndef		TRANDOM_H_INCLUDED
- #include	"tRandom.h"
- #endif
--
-+#include<cstdlib>
- #ifdef      HAVE_STDLIB
- #include    <stdlib.h>
- #endif
-Tylko w b/src/tools: tRandom.cpp~
-diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp
---- a/src/tools/tString.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tString.cpp	2009-08-24 20:24:03.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tString.h"
- #include "tLocale.h"
-Tylko w b/src/tools: tString.cpp~
-diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h
---- a/src/tron/gAIBase.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tron/gAIBase.h	2009-08-24 20:21:33.000000000 +0200
-@@ -29,7 +29,7 @@
- #define ArmageTron_AIBASE_H
- 
- #include "rSDL.h"
--
-+#include<memory>
- #include "eTimer.h"
- #include "ePath.h"
- #include "ePlayer.h"
-Tylko w b/src/tron: gAIBase.h~
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
deleted file mode 100644
index cfbfdadbc..000000000
--- a/community/camlp5/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Nathan Owe <ndowens.aur at gmail dot com>
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-
-pkgname=('camlp5' 'camlp5-transitional')
-_baseversion=6.05
-_patchlevel=0
-#pkgver=${_baseversion}.${_patchlevel}
-pkgver=${_baseversion}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pauillac.inria.fr/~ddr/camlp5/'
-license=('BSD')
-depends=('ocaml')
-source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${_baseversion}.tgz")
-# upstream likes to release occasional patches instead of releasing new versions
-for i in $(seq ${_patchlevel}); do
-  source+=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${_baseversion}-${i}")
-done
-md5sums=('51e333f027ead70aa1b0cd7993320e24')
-
-build() {
-  cd camlp5-${_baseversion}
-
-  for i in $(seq ${_patchlevel}); do
-    patch -Np0 -i ${srcdir}/patch-${_baseversion}-${i}
-  done
-
-  cd ${srcdir}
-
-  cp -r camlp5-${_baseversion} camlp5-transitional-${_baseversion}
-
-  cd ${srcdir}/camlp5-${_baseversion}
-
-  ./configure \
-    -prefix '/usr' \
-    -mandir '/usr/share/man' \
-    -strict
-
-  make world.opt
-
-  cd ${srcdir}/camlp5-transitional-${_baseversion}
-
-  ./configure \
-    -prefix '/usr' \
-    -mandir '/usr/share/man' \
-    -transitional
-
-  make world.opt
-}
-
-package_camlp5() {
-  pkgdesc='A preprocessor-pretty-printer of OCaml.'
-  conflicts=('camlp5-transitional')
-
-  cd camlp5-${_baseversion}
-
-  make DESTDIR=${pkgdir} install
-
-  install -D -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/camlp5/LICENSE
-}
-
-package_camlp5-transitional() {
-  pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)'
-  conflicts=('camlp5')
-
-  cd camlp5-transitional-${_baseversion}
-
-  make DESTDIR=${pkgdir} install
-
-  install -D -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE
-}
diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD
deleted file mode 100644
index 31077d16d..000000000
--- a/community/coq/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-
-pkgname=coq
-pkgver=8.3pl4
-pkgrel=1
-pkgdesc='Formal proof management system.'
-arch=('i686' 'x86_64')
-url='http://coq.inria.fr/'
-license=('GPL')
-options=('!emptydirs')
-depends=('gtk2' 'lablgtk2' 'ocaml')
-makedepends=('camlp5-transitional' 'netpbm' 'hevea')
-source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz")
-md5sums=('88e2ce021b09eca207e3119d5202a695')
-
-build() {
-  cd coq-${pkgver}
-
-  ./configure \
-    -prefix '/usr' \
-    -mandir '/usr/share/man' \
-    -opt \
-    -with-doc yes
-
-  make world
-
-  make doc-html
-}
-
-package() {
-  cd coq-${pkgver}
-
-  make COQINSTALLPREFIX=${pkgdir} install
-
-  make COQINSTALLPREFIX=${pkgdir} install-doc-html
-}
diff --git a/community/coq/camlp5-latest-fix.diff b/community/coq/camlp5-latest-fix.diff
deleted file mode 100644
index 80af1c924..000000000
--- a/community/coq/camlp5-latest-fix.diff
+++ /dev/null
@@ -1,354 +0,0 @@
-Index: checker/checker.ml
-===================================================================
---- checker/checker.ml	(revision 15024)
-+++ checker/checker.ml	(revision 15025)
-@@ -274,7 +274,7 @@
- (*      let ctx = Check.get_env() in
-       hov 0
-         (str "Error:" ++ spc () ++ Himsg.explain_inductive_error ctx e)*)
--  | Stdpp.Exc_located (loc,exc) ->
-+  | Compat.Exc_located (loc,exc) ->
-       hov 0 ((if loc = dummy_loc then (mt ())
-                else (str"At location " ++ print_loc loc ++ str":" ++ fnl ()))
-                ++ explain_exn exc)
-Index: lib/compat.ml4
-===================================================================
---- lib/compat.ml4	(revision 15024)
-+++ lib/compat.ml4	(revision 15025)
-@@ -15,6 +15,7 @@
- IFDEF CAMLP5 THEN
- module M = struct
- type loc = Stdpp.location
-+exception Exc_located = Ploc.Exc
- let dummy_loc = Stdpp.dummy_loc
- let make_loc = Stdpp.make_loc
- let unloc loc = Stdpp.first_pos loc, Stdpp.last_pos loc
-@@ -26,6 +27,7 @@
- end
- ELSE IFDEF OCAML308 THEN
- module M = struct
-+exception Exc_located = Stdpp.Exc_located
- type loc = Token.flocation
- let dummy_loc = Token.dummy_loc
- let make_loc loc = Token.make_loc loc
-@@ -45,6 +47,7 @@
- end
- ELSE
- module M = struct
-+exception Exc_located = Stdpp.Exc_located
- type loc = int * int
- let dummy_loc = (0,0)
- let make_loc x = x
-@@ -59,6 +62,7 @@
- END
- 
- type loc = M.loc
-+exception Exc_located = M.Exc_located
- let dummy_loc = M.dummy_loc
- let make_loc = M.make_loc
- let unloc = M.unloc
-Index: pretyping/pretype_errors.ml
-===================================================================
---- pretyping/pretype_errors.ml	(revision 15024)
-+++ pretyping/pretype_errors.ml	(revision 15025)
-@@ -45,7 +45,7 @@
- 
- let precatchable_exception = function
-   | Util.UserError _ | TypeError _ | PretypeError _
--  | Stdpp.Exc_located(_,(Util.UserError _ | TypeError _ |
-+  | Compat.Exc_located(_,(Util.UserError _ | TypeError _ |
-     Nametab.GlobalizationError _ | PretypeError _)) -> true
-   | _ -> false
- 
-Index: pretyping/cases.ml
-===================================================================
---- pretyping/cases.ml	(revision 15024)
-+++ pretyping/cases.ml	(revision 15025)
-@@ -100,7 +100,7 @@
-   | h::t ->
-       try f h
-       with UserError _ | TypeError _ | PretypeError _
--	| Stdpp.Exc_located (_,(UserError _ | TypeError _ | PretypeError _)) ->
-+	| Compat.Exc_located (_,(UserError _ | TypeError _ | PretypeError _)) ->
- 	    list_try_compile f t
- 
- let force_name =
-Index: pretyping/typeclasses_errors.ml
-===================================================================
---- pretyping/typeclasses_errors.ml	(revision 15024)
-+++ pretyping/typeclasses_errors.ml	(revision 15025)
-@@ -47,7 +47,7 @@
-       raise (TypeClassError (env, UnsatisfiableConstraints (evd, None)))
-   | Some ev ->
-       let loc, kind = Evd.evar_source ev evd in
--	raise (Stdpp.Exc_located (loc, TypeClassError
-+	raise (Compat.Exc_located (loc, TypeClassError
- 	  (env, UnsatisfiableConstraints (evd, Some (ev, kind)))))
- 
- let mismatched_ctx_inst env c n m = typeclass_error env (MismatchedContextInstance (c, n, m))
-@@ -55,5 +55,5 @@
- let rec unsatisfiable_exception exn =
-   match exn with
-   | TypeClassError (_, UnsatisfiableConstraints _) -> true
--  | Stdpp.Exc_located(_, e) -> unsatisfiable_exception e
-+  | Compat.Exc_located(_, e) -> unsatisfiable_exception e
-   | _ -> false
-Index: plugins/subtac/subtac_obligations.ml
-===================================================================
---- plugins/subtac/subtac_obligations.ml	(revision 15024)
-+++ plugins/subtac/subtac_obligations.ml	(revision 15025)
-@@ -485,8 +485,8 @@
- 	      true
- 	  else false
- 	with
--	| Stdpp.Exc_located(_, Proof_type.LtacLocated (_, Refiner.FailError (_, s)))
--	| Stdpp.Exc_located(_, Refiner.FailError (_, s))
-+	| Compat.Exc_located(_, Proof_type.LtacLocated (_, Refiner.FailError (_, s)))
-+	| Compat.Exc_located(_, Refiner.FailError (_, s))
- 	| Refiner.FailError (_, s) ->
- 	    user_err_loc (fst obl.obl_source, "solve_obligation", Lazy.force s)
- 	| e -> false
-Index: toplevel/cerrors.ml
-===================================================================
---- toplevel/cerrors.ml	(revision 15024)
-+++ toplevel/cerrors.ml	(revision 15025)
-@@ -81,7 +81,7 @@
-       hov 0 (str "Syntax error: Undefined token.")
-   | Lexer.Error (Bad_token s) ->
-       hov 0 (str "Syntax error: Bad token" ++ spc () ++ str s ++ str ".")
--  | Stdpp.Exc_located (loc,exc) ->
-+  | Compat.Exc_located (loc,exc) ->
-       hov 0 ((if loc = dummy_loc then (mt ())
-                else (str"At location " ++ print_loc loc ++ str":" ++ fnl ()))
-                ++ explain_exn_default_aux anomaly_string report_fn exc)
-@@ -156,8 +156,8 @@
-   | Proof_type.LtacLocated (s,exc) ->
-       EvaluatedError (hov 0 (Himsg.explain_ltac_call_trace s ++ fnl()),
-         Some (process_vernac_interp_error exc))
--  | Stdpp.Exc_located (loc,exc) ->
--      Stdpp.Exc_located (loc,process_vernac_interp_error exc)
-+  | Compat.Exc_located (loc,exc) ->
-+      Compat.Exc_located (loc,process_vernac_interp_error exc)
-   | exc ->
-       exc
- 
-Index: toplevel/vernac.ml
-===================================================================
---- toplevel/vernac.ml	(revision 15024)
-+++ toplevel/vernac.ml	(revision 15025)
-@@ -41,14 +41,14 @@
-     match re with
-       | Error_in_file (_, (b,f,loc), e) when loc <> dummy_loc ->
-           ((b, f, loc), e)
--      | Stdpp.Exc_located (loc, e) when loc <> dummy_loc ->
-+      | Compat.Exc_located (loc, e) when loc <> dummy_loc ->
-           ((false,file, loc), e)
--      | Stdpp.Exc_located (_, e) | e -> ((false,file,cmdloc), e)
-+      | Compat.Exc_located (_, e) | e -> ((false,file,cmdloc), e)
-   in
-   raise (Error_in_file (file, inner, disable_drop inex))
- 
- let real_error = function
--  | Stdpp.Exc_located (_, e) -> e
-+  | Compat.Exc_located (_, e) -> e
-   | Error_in_file (_, _, e) -> e
-   | e -> e
- 
-Index: toplevel/toplevel.ml
-===================================================================
---- toplevel/toplevel.ml	(revision 15024)
-+++ toplevel/toplevel.ml	(revision 15025)
-@@ -274,7 +274,7 @@
- let rec is_pervasive_exn = function
-   | Out_of_memory | Stack_overflow | Sys.Break -> true
-   | Error_in_file (_,_,e) -> is_pervasive_exn e
--  | Stdpp.Exc_located (_,e) -> is_pervasive_exn e
-+  | Compat.Exc_located (_,e) -> is_pervasive_exn e
-   | DuringCommandInterp (_,e) -> is_pervasive_exn e
-   | _ -> false
- 
-@@ -290,7 +290,7 @@
-   in
-   let (locstrm,exc) =
-     match exc with
--      | Stdpp.Exc_located (loc, ie) ->
-+      | Compat.Exc_located (loc, ie) ->
-           if valid_buffer_loc top_buffer dloc loc then
-             (print_highlight_location top_buffer loc, ie)
-           else
-@@ -325,7 +325,7 @@
- let rec discard_to_dot () =
-   try
-     Gram.Entry.parse parse_to_dot top_buffer.tokens
--  with Stdpp.Exc_located(_,(Token.Error _|Lexer.Error _)) ->
-+  with Compat.Exc_located(_,(Token.Error _|Lexer.Error _)) ->
-     discard_to_dot()
- 
- 
-Index: tactics/extratactics.ml4
-===================================================================
---- tactics/extratactics.ml4	(revision 15024)
-+++ tactics/extratactics.ml4	(revision 15025)
-@@ -580,7 +580,7 @@
-     try 
-       Pretyping.Default.understand sigma env t_hole
-     with 
--    | Stdpp.Exc_located (loc,Pretype_errors.PretypeError (_, Pretype_errors.UnsolvableImplicit _)) -> 
-+    | Compat.Exc_located (loc,Pretype_errors.PretypeError (_, Pretype_errors.UnsolvableImplicit _)) -> 
-         resolve_hole (subst_hole_with_term (fst (unloc loc)) c_raw t_hole)
-   in
-   let t_constr = resolve_hole (subst_var_with_hole occ id t_raw) in
-Index: tactics/class_tactics.ml4
-===================================================================
---- tactics/class_tactics.ml4	(revision 15024)
-+++ tactics/class_tactics.ml4	(revision 15025)
-@@ -219,7 +219,7 @@
- 
- let rec catchable = function
-   | Refiner.FailError _ -> true
--  | Stdpp.Exc_located (_, e) -> catchable e
-+  | Compat.Exc_located (_, e) -> catchable e
-   | e -> Logic.catchable_exception e
- 
- let is_dep gl gls =
-Index: tactics/rewrite.ml4
-===================================================================
---- tactics/rewrite.ml4	(revision 15024)
-+++ tactics/rewrite.ml4	(revision 15025)
-@@ -1057,7 +1057,7 @@
- 	      else tclIDTAC
- 	    in tclTHENLIST [evartac; rewtac] gl
- 	  with
--	  | Stdpp.Exc_located (_, TypeClassError (env, (UnsatisfiableConstraints _ as e)))
-+	  | Compat.Exc_located (_, TypeClassError (env, (UnsatisfiableConstraints _ as e)))
- 	  | TypeClassError (env, (UnsatisfiableConstraints _ as e)) ->
- 	      Refiner.tclFAIL_lazy 0
- 		(lazy (str"setoid rewrite failed: unable to satisfy the rewriting constraints."
-Index: tactics/tacinterp.ml
-===================================================================
---- tactics/tacinterp.ml	(revision 15024)
-+++ tactics/tacinterp.ml	(revision 15025)
-@@ -93,15 +93,15 @@
- let catch_error call_trace tac g =
-   if call_trace = [] then tac g else try tac g with
-   | LtacLocated _ as e -> raise e
--  | Stdpp.Exc_located (_,LtacLocated _) as e -> raise e
-+  | Compat.Exc_located (_,LtacLocated _) as e -> raise e
-   | e ->
-     let (nrep,loc',c),tail = list_sep_last call_trace in
--    let loc,e' = match e with Stdpp.Exc_located(loc,e) -> loc,e | _ ->dloc,e in
-+    let loc,e' = match e with Compat.Exc_located(loc,e) -> loc,e | _ ->dloc,e in
-     if tail = [] then
-       let loc = if loc = dloc then loc' else loc in
--      raise (Stdpp.Exc_located(loc,e'))
-+      raise (Compat.Exc_located(loc,e'))
-     else
--      raise (Stdpp.Exc_located(loc',LtacLocated((nrep,c,tail,loc),e')))
-+      raise (Compat.Exc_located(loc',LtacLocated((nrep,c,tail,loc),e')))
- 
- (* Signature for interpretation: val_interp and interpretation functions *)
- type interp_sign =
-@@ -1979,14 +1979,14 @@
- 	VRTactic (catch_error trace tac goal)
-     | a -> a)
-   with
--    | FailError (0,s) | Stdpp.Exc_located(_, FailError (0,s))
--    | Stdpp.Exc_located(_,LtacLocated (_,FailError (0,s))) ->
-+    | FailError (0,s) | Compat.Exc_located(_, FailError (0,s))
-+    | Compat.Exc_located(_,LtacLocated (_,FailError (0,s))) ->
- 	raise (Eval_fail (Lazy.force s))
-     | FailError (lvl,s) -> raise (FailError (lvl - 1, s))
--    | Stdpp.Exc_located(s,FailError (lvl,s')) ->
--	raise (Stdpp.Exc_located(s,FailError (lvl - 1, s')))
--    | Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) ->
--	raise (Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl - 1, s'))))
-+    | Compat.Exc_located(s,FailError (lvl,s')) ->
-+	raise (Compat.Exc_located(s,FailError (lvl - 1, s')))
-+    | Compat.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) ->
-+	raise (Compat.Exc_located(s,LtacLocated (s'',FailError (lvl - 1, s'))))
- 
- (* Interprets the clauses of a recursive LetIn *)
- and interp_letrec ist gl llc u =
-Index: ide/coq.ml
-===================================================================
---- ide/coq.ml	(revision 15024)
-+++ ide/coq.ml	(revision 15025)
-@@ -112,7 +112,7 @@
-     | _ -> true
- 
- let user_error_loc l s =
--  raise (Stdpp.Exc_located (l, Util.UserError ("CoqIde", s)))
-+  raise (Compat.Exc_located (l, Util.UserError ("CoqIde", s)))
- 
- type printing_state = {
-   mutable printing_implicit : bool;
-@@ -443,7 +443,7 @@
- let rec is_pervasive_exn = function
-   | Out_of_memory | Stack_overflow | Sys.Break -> true
-   | Error_in_file (_,_,e) -> is_pervasive_exn e
--  | Stdpp.Exc_located (_,e) -> is_pervasive_exn e
-+  | Compat.Exc_located (_,e) -> is_pervasive_exn e
-   | DuringCommandInterp (_,e) -> is_pervasive_exn e
-   | _ -> false
- 
-@@ -456,7 +456,7 @@
-   in
-   let (loc,exc) =
-     match exc with
--      | Stdpp.Exc_located (loc, ie) -> (Some loc),ie
-+      | Compat.Exc_located (loc, ie) -> (Some loc),ie
-       | Error_in_file (s, (_,fname, loc), ie) -> None, ie
-       | _ -> dloc,exc
-   in
-Index: parsing/ppvernac.ml
-===================================================================
---- parsing/ppvernac.ml	(revision 15024)
-+++ parsing/ppvernac.ml	(revision 15025)
-@@ -781,7 +781,7 @@
-       (if i = 1 then mt() else int i ++ str ": ") ++
-       pr_raw_tactic tac
-       ++ (try if deftac & Pfedit.get_end_tac() <> None then str ".." else mt ()
--      with UserError _|Stdpp.Exc_located _ -> mt())
-+      with UserError _|Compat.Exc_located _ -> mt())
- 
-   | VernacSolveExistential (i,c) ->
-       str"Existential " ++ int i ++ pr_lconstrarg c
-Index: proofs/refiner.ml
-===================================================================
---- proofs/refiner.ml	(revision 15024)
-+++ proofs/refiner.ml	(revision 15025)
-@@ -494,15 +494,15 @@
- let catch_failerror e =
-   if catchable_exception e then check_for_interrupt ()
-   else match e with
--  | FailError (0,_) | Stdpp.Exc_located(_, FailError (0,_))
--  | Stdpp.Exc_located(_, LtacLocated (_,FailError (0,_)))  ->
-+  | FailError (0,_) | Compat.Exc_located(_, FailError (0,_))
-+  | Compat.Exc_located(_, LtacLocated (_,FailError (0,_)))  ->
-       check_for_interrupt ()
-   | FailError (lvl,s) -> raise (FailError (lvl - 1, s))
--  | Stdpp.Exc_located(s,FailError (lvl,s')) ->
--      raise (Stdpp.Exc_located(s,FailError (lvl - 1, s')))
--  | Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl,s')))  ->
-+  | Compat.Exc_located(s,FailError (lvl,s')) ->
-+      raise (Compat.Exc_located(s,FailError (lvl - 1, s')))
-+  | Compat.Exc_located(s,LtacLocated (s'',FailError (lvl,s')))  ->
-       raise
--       (Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl - 1,s'))))
-+       (Compat.Exc_located(s,LtacLocated (s'',FailError (lvl - 1,s'))))
-   | e -> raise e
- 
- (* ORELSE0 t1 t2 tries to apply t1 and if it fails, applies t2 *)
-Index: proofs/logic.ml
-===================================================================
---- proofs/logic.ml	(revision 15024)
-+++ proofs/logic.ml	(revision 15025)
-@@ -48,7 +48,7 @@
- open Pretype_errors
- 
- let rec catchable_exception = function
--  | Stdpp.Exc_located(_,e) -> catchable_exception e
-+  | Compat.Exc_located(_,e) -> catchable_exception e
-   | LtacLocated(_,e) -> catchable_exception e
-   | Util.UserError _ | TypeError _
-   | RefinerError _ | Indrec.RecursionSchemeError _
diff --git a/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch b/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch
deleted file mode 100644
index 8cac7cb67..000000000
--- a/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/ROMReader.cpp	2012/02/09 21:33:57	4177
-+++ b/src/ROMReader.cpp	2012/02/10 19:58:06	4178
-@@ -140,7 +140,7 @@
- 
- void GZIPROMReaderDeInit(void * file)
- {
--	gzclose(file);
-+	gzclose((gzFile)file);
- }
- 
- u32 GZIPROMReaderSize(void * file)
-@@ -150,22 +150,22 @@
- 
- 	/* FIXME this function should first save the current
- 	 * position and restore it after size calculation */
--	gzrewind(file);
--	while (gzeof (file) == 0)
--		size += gzread(file, useless, 1024);
--	gzrewind(file);
-+	gzrewind((gzFile)file);
-+	while (gzeof ((gzFile)file) == 0)
-+		size += gzread((gzFile)file, useless, 1024);
-+	gzrewind((gzFile)file);
- 
- 	return size;
- }
- 
- int GZIPROMReaderSeek(void * file, int offset, int whence)
- {
--	return gzseek(file, offset, whence);
-+	return gzseek((gzFile)file, offset, whence);
- }
- 
- int GZIPROMReaderRead(void * file, void * buffer, u32 size)
- {
--	return gzread(file, buffer, size);
-+	return gzread((gzFile)file, buffer, size);
- }
- #endif
- 
diff --git a/community/gnome-packagekit/arch.patch b/community/gnome-packagekit/arch.patch
deleted file mode 100644
index bf4cd91c4..000000000
--- a/community/gnome-packagekit/arch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru a/data/gpk-install-local-file.desktop.in b/data/gpk-install-local-file.desktop.in
---- a/data/gpk-install-local-file.desktop.in	2011-03-23 23:15:41.000000000 +1300
-+++ b/data/gpk-install-local-file.desktop.in	2011-04-10 01:04:51.606666671 +1200
-@@ -8,5 +8,5 @@
- Icon=system-software-install
- StartupNotify=true
- NoDisplay=true
--MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-servicepack;application/x-deb;
-+MimeType=application/x-xz-compressed-tar;application/x-servicepack;
- 
-diff -Nru a/data/org.gnome.packagekit.gschema.xml b/data/org.gnome.packagekit.gschema.xml
---- a/data/org.gnome.packagekit.gschema.xml	2011-03-28 21:49:37.000000000 +1300
-+++ b/data/org.gnome.packagekit.gschema.xml	2011-04-10 02:37:29.433333340 +1200
-@@ -104,14 +104,4 @@
-       <description>When displaying UI from a session DBus request, force these options to be turned on.</description>
-     </key>
-   </schema>
--  <schema id="org.gnome.settings-daemon" path="/org/gnome/settings-daemon/">
--    <child name="gtk-modules" schema="gnome-settings-daemon.gtk-modules"/>
--  </schema>
--  <schema id="gnome-settings-daemon.gtk-modules" path="/org/gnome/settings-daemon/gtk-modules/">
--    <key name="pk-gtk-module" type="b">
--      <default>true</default>
--      <summary>GTK+ module for font installation</summary>
--      <description>This key determines if applications should be able to prompt for fonts.</description>
--    </key>
--  </schema>
- </schemalist>
diff --git a/community/ldns/Makefile.patch b/community/ldns/Makefile.patch
deleted file mode 100644
index d98291ac9..000000000
--- a/community/ldns/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
-+++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
-@@ -130,7 +130,7 @@
- 		exit -1 ; \
- 	fi
- drill/drill: $(DRILL_LOBJS) $(LIB)
--	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
-+	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
- 
- install-drill: drill/drill
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-@@ -157,7 +157,7 @@
- 		exit -1 ; \
- 	fi
- $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
--	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
-+	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
- 
- $(TESTNS): $(TESTNS_LOBJS) $(LIB)
- 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD
deleted file mode 100644
index a7c1a0b30..000000000
--- a/community/ldns/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62792 2012-01-27 01:01:36Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: mathieui <mathieui@mathieui.net>
-# Contributor: jiribb <jiribb@gmail.com>
-
-pkgname=ldns
-pkgver=1.6.12
-pkgrel=1
-pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools'
-url='http://www.nlnetlabs.nl/projects/ldns/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('openssl')
-makedepends=('libpcap')
-optdepends=('libpcap: ldns-dpa tool')
-source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'Makefile.patch')
-sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
-          '01bce260e9639d9cd26109a689dddf2498e5026a')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../Makefile.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--disable-rpath \
-		--with-drill \
-		--with-examples \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
deleted file mode 100644
index ff955101f..000000000
--- a/community/luxrays/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 59944 2011-12-02 20:59:16Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=luxrays
-pkgver=0.8
-_pkgver=ed424ec77571
-pkgrel=7
-epoch=0
-pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
-        luxrays_opencl1.2_use_deprecated.diff)
-md5sums=('2ac9c588675c5971c57f473ef10ac67d'
-         '27b3eb7c6332aa7f040cc4ca94dc3df6')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  # fix the build with opencl-headers 1.2
-  # they doesn't support OpenCL 1.1, so we have to use this ugly hack of using deprecated API
-  patch -Np1 < "$srcdir/luxrays_opencl1.2_use_deprecated.diff"
-  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
-  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
-  install -m755 bin/* "$pkgdir"/usr/bin
-  install -m644 lib/* "$pkgdir"/usr/lib
-  cp -a include/luxrays "$pkgdir"/usr/include
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/luxrays/luxrays_opencl1.2_use_deprecated.diff b/community/luxrays/luxrays_opencl1.2_use_deprecated.diff
deleted file mode 100644
index 0876628d7..000000000
--- a/community/luxrays/luxrays_opencl1.2_use_deprecated.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h
---- luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h	2011-04-24 17:43:08.000000000 +0200
-+++ luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h	2011-11-26 11:38:00.336459874 +0100
-@@ -30,6 +30,8 @@
- 
- #define __CL_ENABLE_EXCEPTIONS
- 
-+#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
-+
- #if defined(__APPLE__)
- #include <OpenCL/cl.hpp>
- #else
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
deleted file mode 100644
index 155eaa5a1..000000000
--- a/community/luxrender/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 67190 2012-03-05 08:57:43Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-pkgname=luxrender
-pkgver=0.8
-_pkgver=45d3e13eb94c
-pkgrel=13
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers')
-source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
-md5sums=('0f2d856385db72131f51e44a7ee527fa')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/lxpanel/battery.patch b/community/lxpanel/battery.patch
deleted file mode 100644
index 5d701ea6d..000000000
--- a/community/lxpanel/battery.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c
-index 54ff678..1eebab5 100644
---- a/src/plugins/batt/batt_sys.c
-+++ b/src/plugins/batt/batt_sys.c
-@@ -35,15 +35,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--battery* battery_new() {
--    static int battery_num = 1;
--    battery * b = g_new0 ( battery, 1 );
--    battery_reset(b);
--    b->battery_num = battery_num;
--    battery_num++;
--    return b;
--}
--
- void battery_reset( battery * b) {
-     b->type_battery = TRUE;
-     b->capacity_unit = "mAh";
-@@ -58,6 +49,15 @@ void battery_reset( battery * b) {
-     b->state = NULL;
- }
- 
-+battery* battery_new() {
-+    static int battery_num = 1;
-+    battery * b = g_new0 ( battery, 1 );
-+    battery_reset(b);
-+    b->battery_num = battery_num;
-+    battery_num++;
-+    return b;
-+}
-+
- static gchar* parse_info_file(char *filename)
- {
-     char *buf = NULL;
-@@ -194,7 +194,7 @@ void battery_update( battery *b ) {
-     
-     /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */
-     if (b->last_capacity_unit != -1 && b->last_capacity == -1) {
--	if (b->voltage != -1) {
-+	if (b->voltage > 0) {
- 	    b->last_capacity = b->last_capacity_unit * 1000 / b->voltage;
- 	} else {
- 	    b->last_capacity = b->last_capacity_unit;
-@@ -202,7 +202,7 @@ void battery_update( battery *b ) {
- 	}
-     }
-     if (b->design_capacity_unit != -1 && b->design_capacity == -1) {
--	if (b->voltage != -1) {
-+	if (b->voltage > 0) {
- 	    b->design_capacity = b->design_capacity_unit * 1000 / b->voltage;
- 	} else {
- 	    b->design_capacity = b->design_capacity_unit;
-@@ -210,7 +210,7 @@ void battery_update( battery *b ) {
- 	}
-     }
-     if (b->remaining_energy != -1 && b->remaining_capacity == -1) {
--	if (b->voltage != -1) {
-+	if (b->voltage > 0) {
- 	    b->remaining_capacity = b->remaining_energy * 1000 / b->voltage;
- 	    b->present_rate = b->present_rate * 1000 / b->voltage;
- 	} else {
-@@ -220,7 +220,7 @@ void battery_update( battery *b ) {
-     if (b->last_capacity < MIN_CAPACITY)
- 	b->percentage = 0;
-     else
--	b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit;
-+	b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity;
- 	    
-     if (b->percentage > 100)
- 	b->percentage = 100;
diff --git a/community/mldonkey/mldonkey.desktop b/community/mldonkey/mldonkey.desktop
deleted file mode 100644
index b307261e1..000000000
--- a/community/mldonkey/mldonkey.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MLDonkey GUI
-Comment=multi-protocol P2P program
-Exec=mldonkey_gui
-Icon=mldonkey
-Terminal=false
-Type=Application
-Categories=Network;P2P;
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
deleted file mode 100644
index d98fa95df..000000000
--- a/community/nut/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Slash <demodevil5 [at] yahoo [dot] com>
-
-pkgname=nut
-pkgver=17.5
-pkgrel=1
-pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
-url='http://nut.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('1b18b9fab54a778f21ee4cd95fca5c63')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # change install path to /usr instead of /usr/local
-  sed \
-    -e 's#/local##' \
-    -i Makefile
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  # Install Data
-  install -d ${pkgdir}/usr/lib/${pkgname}
-  install -m644 raw.data/* \
-    ${pkgdir}/usr/lib/${pkgname}/
-
-  # Install Binary
-  install -D ${pkgname} \
-    ${pkgdir}/usr/bin/${pkgname}
-
-  # Install Man Page
-  install -D -m644 ${pkgname}.1 \
-    ${pkgdir}/usr/share/man/man1/${pkgname}.1
-}
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
deleted file mode 100644
index 904cb11d1..000000000
--- a/community/packagekit/alpm.patch
+++ /dev/null
@@ -1,3320 +0,0 @@
-diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am
-index 5a5468a..d8c3dfc 100644
---- a/backends/alpm/Makefile.am
-+++ b/backends/alpm/Makefile.am
-@@ -5,6 +5,7 @@ PK_BACKEND_REPO_FILE = $(confdir)/repos.list
- PK_BACKEND_DEFAULT_PATH = "/bin:/usr/bin:/sbin:/usr/sbin"
- PK_BACKEND_DEFAULT_ROOT = "/"
- PK_BACKEND_DEFAULT_DBPATH = $(localstatedir)/lib/pacman/
-+PK_BACKEND_DEFAULT_GPGDIR = $(sysconfdir)/pacman.d/gnupg/
- PK_BACKEND_DEFAULT_CACHEDIR = $(localstatedir)/cache/pacman/pkg/
- PK_BACKEND_DEFAULT_LOGFILE = $(localstatedir)/log/pacman.log
- 
-@@ -17,6 +18,7 @@ DEFS = -DPK_BACKEND_CONFIG_FILE=\"$(PK_BACKEND_CONFIG_FILE)\" \
-        -DPK_BACKEND_DEFAULT_PATH=\"$(PK_BACKEND_DEFAULT_PATH)\" \
-        -DPK_BACKEND_DEFAULT_ROOT=\"$(PK_BACKEND_DEFAULT_ROOT)\" \
-        -DPK_BACKEND_DEFAULT_DBPATH=\"$(PK_BACKEND_DEFAULT_DBPATH)\" \
-+       -DPK_BACKEND_DEFAULT_GPGDIR=\"$(PK_BACKEND_DEFAULT_GPGDIR)\" \
-        -DPK_BACKEND_DEFAULT_CACHEDIR=\"$(PK_BACKEND_DEFAULT_CACHEDIR)\" \
-        -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \
-        -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \
-diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
-index ba993f0..5c6b629 100644
---- a/backends/alpm/pk-backend-alpm.c
-+++ b/backends/alpm/pk-backend-alpm.c
-@@ -22,10 +22,13 @@
-  */
- 
- #include <config.h>
-+#include <locale.h>
- #include <glib/gstdio.h>
- #include <sys/utsname.h>
-+#include <pk-backend-spawn.h>
- 
- #include "pk-backend-alpm.h"
-+#include "pk-backend-config.h"
- #include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- #include "pk-backend-groups.h"
-@@ -35,7 +38,8 @@ PkBackend *backend = NULL;
- GCancellable *cancellable = NULL;
- static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
- 
--pmdb_t *localdb = NULL;
-+alpm_handle_t *alpm = NULL;
-+alpm_db_t *localdb = NULL;
- 
- gchar *xfercmd = NULL;
- alpm_list_t *holdpkgs = NULL;
-@@ -162,7 +166,7 @@ out:
- }
- 
- static void
--pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args)
-+pk_backend_logcb (alpm_loglevel_t level, const gchar *format, va_list args)
- {
- 	gchar *output;
- 
-@@ -176,12 +180,12 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args)
- 
- 	/* report important output to PackageKit */
- 	switch (level) {
--		case PM_LOG_DEBUG:
--		case PM_LOG_FUNCTION:
-+		case ALPM_LOG_DEBUG:
-+		case ALPM_LOG_FUNCTION:
- 			g_debug ("%s", output);
- 			break;
- 
--		case PM_LOG_WARNING:
-+		case ALPM_LOG_WARNING:
- 			g_warning ("%s", output);
- 			pk_backend_output (backend, output);
- 			break;
-@@ -194,44 +198,99 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args)
- 	g_free (output);
- }
- 
--static gboolean
--pk_backend_initialize_alpm (PkBackend *self, GError **error)
-+static void
-+pk_backend_configure_environment (PkBackend *self)
- {
- 	struct utsname un;
--	gchar *user_agent;
-+	gchar *value;
- 
--	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_if_fail (self != NULL);
- 
- 	/* PATH might have been nuked by D-Bus */
- 	g_setenv ("PATH", PK_BACKEND_DEFAULT_PATH, FALSE);
- 
- 	uname (&un);
--	user_agent = g_strdup_printf ("%s/%s (%s %s) libalpm/%s",
--				      PACKAGE_TARNAME, PACKAGE_VERSION,
--				      un.sysname, un.machine, alpm_version ());
--	g_setenv ("HTTP_USER_AGENT", user_agent, FALSE);
--	g_free (user_agent);
--
--	g_debug ("initializing");
--	if (alpm_initialize () < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	value = g_strdup_printf ("%s/%s (%s %s) libalpm/%s", PACKAGE_TARNAME,
-+				 PACKAGE_VERSION, un.sysname, un.machine,
-+				 alpm_version ());
-+	g_setenv ("HTTP_USER_AGENT", value, FALSE);
-+	g_free (value);
-+
-+	value = pk_backend_get_locale (self);
-+	if (value != NULL) {
-+		setlocale (LC_ALL, value);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_proxy_http (self);
-+	if (value != NULL) {
-+		gchar *uri = pk_backend_spawn_convert_uri (value);
-+		g_setenv ("http_proxy", uri, TRUE);
-+		g_free (uri);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_proxy_https (self);
-+	if (value != NULL) {
-+		gchar *uri = pk_backend_spawn_convert_uri (value);
-+		g_setenv ("https_proxy", uri, TRUE);
-+		g_free (uri);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_proxy_ftp (self);
-+	if (value != NULL) {
-+		gchar *uri = pk_backend_spawn_convert_uri (value);
-+		g_setenv ("ftp_proxy", uri, TRUE);
-+		g_free (uri);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_proxy_socks (self);
-+	if (value != NULL) {
-+		gchar *uri = pk_backend_spawn_convert_uri (value);
-+		g_setenv ("socks_proxy", uri, TRUE);
-+		g_free (uri);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_no_proxy (self);
-+	if (value != NULL) {
-+		g_setenv ("no_proxy", value, TRUE);
-+		g_free (value);
-+	}
-+
-+	value = pk_backend_get_pac (self);
-+	if (value != NULL) {
-+		gchar *uri = pk_backend_spawn_convert_uri (value);
-+		g_setenv ("pac", uri, TRUE);
-+		g_free (uri);
-+		g_free (value);
-+	}
-+}
-+
-+static gboolean
-+pk_backend_initialize_alpm (PkBackend *self, GError **error)
-+{
-+	g_return_val_if_fail (self != NULL, FALSE);
-+
-+	pk_backend_configure_environment (self);
-+
-+	alpm = pk_backend_configure (PK_BACKEND_CONFIG_FILE, error);
-+	if (alpm == NULL) {
- 		return FALSE;
- 	}
- 
- 	backend = self;
--	localdb = alpm_option_get_localdb ();
-+	alpm_option_set_logcb (alpm, pk_backend_logcb);
-+
-+	localdb = alpm_option_get_localdb (alpm);
- 	if (localdb == NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", "local",
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", "local",
-+			     alpm_strerror (errno));
- 	}
- 
--	/* set some sane defaults */
--	alpm_option_set_logcb (pk_backend_logcb);
--	alpm_option_set_root (PK_BACKEND_DEFAULT_ROOT);
--	alpm_option_set_dbpath (PK_BACKEND_DEFAULT_DBPATH);
--	alpm_option_set_logfile (PK_BACKEND_DEFAULT_LOGFILE);
--
- 	return TRUE;
- }
- 
-@@ -240,17 +299,20 @@ pk_backend_destroy_alpm (PkBackend *self)
- {
- 	g_return_if_fail (self != NULL);
- 
--	if (backend != NULL) {
--		if (alpm_trans_get_flags () != -1) {
--			alpm_trans_release ();
-+	if (alpm != NULL) {
-+		if (alpm_trans_get_flags (alpm) < 0) {
-+			alpm_trans_release (alpm);
- 		}
--		alpm_release ();
-+		alpm_release (alpm);
-+
-+		alpm = NULL;
- 		backend = NULL;
- 	}
- 
- 	FREELIST (syncfirsts);
- 	FREELIST (holdpkgs);
- 	g_free (xfercmd);
-+	xfercmd = NULL;
- }
- 
- void
-@@ -380,3 +442,11 @@ pk_backend_finish (PkBackend *self, GError *error)
- 	pk_backend_thread_finished (self);
- 	return (error == NULL);
- }
-+
-+void
-+pk_backend_transaction_start (PkBackend *self)
-+{
-+	g_return_if_fail (self != NULL);
-+
-+	pk_backend_configure_environment (self);
-+}
-diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h
-index 23a2724..ecd6d0f 100644
---- a/backends/alpm/pk-backend-alpm.h
-+++ b/backends/alpm/pk-backend-alpm.h
-@@ -28,7 +28,8 @@
- extern PkBackend *backend;
- extern GCancellable *cancellable;
- 
--extern pmdb_t *localdb;
-+extern alpm_handle_t *alpm;
-+extern alpm_db_t *localdb;
- 
- extern gchar *xfercmd;
- extern alpm_list_t *holdpkgs;
-diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
-index 21a4c54..c8fd13b 100644
---- a/backends/alpm/pk-backend-config.c
-+++ b/backends/alpm/pk-backend-config.c
-@@ -28,29 +28,44 @@
- 
- #include "pk-backend-alpm.h"
- #include "pk-backend-config.h"
-+#include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- 
--typedef struct {
--	gboolean checkspace, ilovecandy, showsize, totaldl, usedelta, usesyslog;
-+typedef struct
-+{
-+	 gboolean	 checkspace, ilovecandy, totaldl, usedelta, usesyslog,
-+			 verbosepkglists;
- 
--	gchar *arch, *cleanmethod, *dbpath, *logfile, *root, *xfercmd;
-+	 gchar		*arch, *cleanmethod, *dbpath, *gpgdir, *logfile, *root,
-+			*xfercmd;
- 
--	alpm_list_t *cachedirs, *holdpkgs, *ignoregrps, *ignorepkgs,
--		    *noextracts, *noupgrades, *syncfirsts;
-+	 alpm_list_t	*cachedirs, *holdpkgs, *ignoregroups, *ignorepkgs,
-+			*noextracts, *noupgrades, *syncfirsts;
- 
--	alpm_list_t *repos;
--	GHashTable *servers;
--	GRegex *xrepo, *xarch;
-+	 alpm_list_t	*repos;
-+	 GHashTable	*servers;
-+	 GHashTable	*levels;
-+	 GRegex		*xrepo, *xarch;
- } PkBackendConfig;
- 
- static PkBackendConfig *
- pk_backend_config_new (void)
- {
- 	PkBackendConfig *config = g_new0 (PkBackendConfig, 1);
-+	alpm_siglevel_t *level = g_new0 (alpm_siglevel_t, 1);
-+
- 	config->servers = g_hash_table_new_full (g_str_hash, g_str_equal,
- 						 g_free, NULL);
-+	config->levels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-+						g_free);
-+
-+	*level |= ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL;
-+	*level |= ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
-+	g_hash_table_insert (config->levels, g_strdup ("options"), level);
-+
- 	config->xrepo = g_regex_new ("\\$repo", 0, 0, NULL);
- 	config->xarch = g_regex_new ("\\$arch", 0, 0, NULL);
-+
- 	return config;
- }
- 
-@@ -76,13 +91,14 @@ pk_backend_config_free (PkBackendConfig *config)
- 	g_free (config->arch);
- 	g_free (config->cleanmethod);
- 	g_free (config->dbpath);
-+	g_free (config->gpgdir);
- 	g_free (config->logfile);
- 	g_free (config->root);
- 	g_free (config->xfercmd);
- 
- 	FREELIST (config->cachedirs);
- 	FREELIST (config->holdpkgs);
--	FREELIST (config->ignoregrps);
-+	FREELIST (config->ignoregroups);
- 	FREELIST (config->ignorepkgs);
- 	FREELIST (config->noextracts);
- 	FREELIST (config->noupgrades);
-@@ -92,6 +108,8 @@ pk_backend_config_free (PkBackendConfig *config)
- 	g_hash_table_foreach_remove (config->servers,
- 				     pk_backend_config_servers_free, NULL);
- 	g_hash_table_unref (config->servers);
-+	g_hash_table_unref (config->levels);
-+
- 	g_regex_unref (config->xrepo);
- 	g_regex_unref (config->xarch);
- }
-@@ -113,14 +131,6 @@ pk_backend_config_set_ilovecandy (PkBackendConfig *config)
- }
- 
- static void
--pk_backend_config_set_showsize (PkBackendConfig *config)
--{
--	g_return_if_fail (config != NULL);
--
--	config->showsize = TRUE;
--}
--
--static void
- pk_backend_config_set_totaldl (PkBackendConfig *config)
- {
- 	g_return_if_fail (config != NULL);
-@@ -144,19 +154,28 @@ pk_backend_config_set_usesyslog (PkBackendConfig *config)
- 	config->usesyslog = TRUE;
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config);
-+static void
-+pk_backend_config_set_verbosepkglists (PkBackendConfig *config)
-+{
-+	g_return_if_fail (config != NULL);
-+
-+	config->verbosepkglists = TRUE;
-+}
-+
-+typedef struct
-+{
-+	 const gchar	*name;
-+	 void		(*func) (PkBackendConfig *config);
- } PkBackendConfigBoolean;
- 
- /* keep this in alphabetical order */
- static const PkBackendConfigBoolean pk_backend_config_boolean_options[] = {
- 	{ "CheckSpace", pk_backend_config_set_checkspace },
- 	{ "ILoveCandy", pk_backend_config_set_ilovecandy },
--	{ "ShowSize", pk_backend_config_set_showsize },
- 	{ "TotalDownload", pk_backend_config_set_totaldl },
- 	{ "UseDelta", pk_backend_config_set_usedelta },
- 	{ "UseSyslog", pk_backend_config_set_usesyslog },
-+	{ "VerbosePkgLists", pk_backend_config_set_verbosepkglists },
- 	{ NULL, NULL }
- };
- 
-@@ -234,6 +253,17 @@ pk_backend_config_set_dbpath (PkBackendConfig *config, const gchar *path)
- }
- 
- static void
-+pk_backend_config_set_gpgdir (PkBackendConfig *config, const gchar *path)
-+{
-+	g_return_if_fail (config != NULL);
-+	g_return_if_fail (path != NULL);
-+
-+	g_free (config->gpgdir);
-+	config->gpgdir = g_strdup (path);
-+}
-+
-+
-+static void
- pk_backend_config_set_logfile (PkBackendConfig *config, const gchar *filename)
- {
- 	g_return_if_fail (config != NULL);
-@@ -263,9 +293,10 @@ pk_backend_config_set_xfercmd (PkBackendConfig *config, const gchar *command)
- 	config->xfercmd = g_strdup (command);
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config, const gchar *s);
-+typedef struct
-+{
-+	 const gchar	*name;
-+	 void		(*func) (PkBackendConfig *config, const gchar *s);
- } PkBackendConfigString;
- 
- /* keep this in alphabetical order */
-@@ -274,6 +305,7 @@ static const PkBackendConfigString pk_backend_config_string_options[] = {
- 	{ "CacheDir", pk_backend_config_add_cachedir },
- 	{ "CleanMethod", pk_backend_config_set_cleanmethod },
- 	{ "DBPath", pk_backend_config_set_dbpath },
-+	{ "GPGDir", pk_backend_config_set_gpgdir },
- 	{ "LogFile", pk_backend_config_set_logfile },
- 	{ "RootDir", pk_backend_config_set_root },
- 	{ "XferCommand", pk_backend_config_set_xfercmd },
-@@ -313,12 +345,12 @@ pk_backend_config_add_holdpkg (PkBackendConfig *config, gchar *package)
- }
- 
- static void
--pk_backend_config_add_ignoregrp (PkBackendConfig *config, gchar *group)
-+pk_backend_config_add_ignoregroup (PkBackendConfig *config, gchar *group)
- {
- 	g_return_if_fail (config != NULL);
- 	g_return_if_fail (group != NULL);
- 
--	config->ignoregrps = alpm_list_add (config->ignoregrps, group);
-+	config->ignoregroups = alpm_list_add (config->ignoregroups, group);
- }
- 
- static void
-@@ -357,15 +389,16 @@ pk_backend_config_add_syncfirst (PkBackendConfig *config, gchar *package)
- 	config->syncfirsts = alpm_list_add (config->syncfirsts, package);
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config, gchar *value);
-+typedef struct
-+{
-+	const gchar	*name;
-+	void		(*func) (PkBackendConfig *config, gchar *value);
- } PkBackendConfigList;
- 
- /* keep this in alphabetical order */
- static const PkBackendConfigList pk_backend_config_list_options[] = {
- 	{ "HoldPkg", pk_backend_config_add_holdpkg },
--	{ "IgnoreGroup", pk_backend_config_add_ignoregrp },
-+	{ "IgnoreGroup", pk_backend_config_add_ignoregroup },
- 	{ "IgnorePkg", pk_backend_config_add_ignorepkg },
- 	{ "NoExtract", pk_backend_config_add_noextract },
- 	{ "NoUpgrade", pk_backend_config_add_noupgrade },
-@@ -451,7 +484,7 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
- 			return FALSE;
- 		}
- 	} else if (strstr (url, "$arch") != NULL) {
--		g_set_error (e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+		g_set_error (e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 			     "url contained $arch, which is not set");
- 	}
- 
-@@ -463,6 +496,95 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
- }
- 
- static gboolean
-+pk_backend_config_set_siglevel (PkBackendConfig *config, const gchar *section,
-+				const gchar *list, GError **error)
-+{
-+	alpm_siglevel_t *level;
-+
-+	g_return_val_if_fail (config != NULL, FALSE);
-+	g_return_val_if_fail (section != NULL, FALSE);
-+	g_return_val_if_fail (list != NULL, FALSE);
-+
-+	level = g_hash_table_lookup (config->levels, section);
-+	if (level == NULL) {
-+		level = g_hash_table_lookup (config->levels, "options");
-+		level = g_memdup (level, sizeof (alpm_siglevel_t));
-+		g_hash_table_insert (config->levels, g_strdup (section), level);
-+	}
-+
-+	while (TRUE) {
-+		gboolean package = TRUE, database = TRUE;
-+
-+		if (g_str_has_prefix (list, "Package")) {
-+			database = FALSE;
-+			list += 7;
-+		} else if (g_str_has_prefix (list, "Database")) {
-+			package = FALSE;
-+			list += 8;
-+		}
-+
-+		/* this also allows e.g. NeverEver, so put prefixes last */
-+		if (g_str_has_prefix (list, "Never")) {
-+			if (package) {
-+				*level &= ~ALPM_SIG_PACKAGE;
-+			}
-+			if (database) {
-+				*level &= ~ALPM_SIG_DATABASE;
-+			}
-+		} else if (g_str_has_prefix (list, "Optional")) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE;
-+				*level |= ALPM_SIG_PACKAGE_OPTIONAL;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE;
-+				*level |= ALPM_SIG_DATABASE_OPTIONAL;
-+			}
-+		} else if (g_str_has_prefix (list, "Required")) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE;
-+				*level &= ~ALPM_SIG_PACKAGE_OPTIONAL;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE;
-+				*level &= ~ALPM_SIG_DATABASE_OPTIONAL;
-+			}
-+		} else if (g_str_has_prefix (list, "TrustedOnly")) {
-+			if (package) {
-+				*level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK;
-+				*level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK;
-+			}
-+			if (database) {
-+				*level &= ~ALPM_SIG_DATABASE_MARGINAL_OK;
-+				*level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK;
-+			}
-+		} else if (g_str_has_prefix (list, "TrustAll")) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE_MARGINAL_OK;
-+				*level |= ALPM_SIG_PACKAGE_UNKNOWN_OK;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE_MARGINAL_OK;
-+				*level |= ALPM_SIG_DATABASE_UNKNOWN_OK;
-+			}
-+		} else {
-+			g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
-+				     "invalid SigLevel value: %s", list);
-+			return FALSE;
-+		}
-+
-+		list = strchr (list, ' ');
-+		if (list == NULL) {
-+			break;
-+		} else {
-+			++list;
-+		}
-+	}
-+
-+	return TRUE;
-+}
-+
-+static gboolean
- pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 			 gchar *section, GError **error)
- {
-@@ -515,7 +637,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 
- 			if (*str == '\0') {
- 				g_set_error (&e, ALPM_ERROR,
--					     PM_ERR_CONFIG_INVALID,
-+					     ALPM_ERR_CONFIG_INVALID,
- 					     "empty section name");
- 				break;
- 			}
-@@ -532,7 +654,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 
- 		/* parse a directive */
- 		if (section == NULL) {
--			g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+			g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 				     "directive must belong to a section");
- 			break;
- 		}
-@@ -590,9 +712,18 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 				continue;
- 			}
- 		}
-+	
-+		if (g_strcmp0 (key, "SigLevel") == 0 && str != NULL) {
-+			if (!pk_backend_config_set_siglevel (config, section,
-+							     str, &e)) {
-+				break;
-+			} else {
-+				continue;
-+			}
-+		}
- 
- 		/* report errors from above */
--		g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+		g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 			     "unrecognised directive '%s'", key);
- 		break;
- 	}
-@@ -611,107 +742,101 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 	}
- }
- 
--static gboolean
--pk_backend_config_configure_paths (PkBackendConfig *config, GError **error)
-+static alpm_handle_t *
-+pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error)
- {
-+	alpm_handle_t *handle;
-+	enum _alpm_errno_t errno;
-+	gsize dir = 1;
-+
- 	g_return_val_if_fail (config != NULL, FALSE);
- 
--	if (config->root == NULL) {
-+	if (config->root == NULL || *config->root == '\0') {
-+		g_free (config->root);
- 		config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT);
-+	} else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) {
-+		dir = 0;
- 	}
- 
--	if (alpm_option_set_root (config->root) < 0) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "RootDir: %s",
--			     alpm_strerrorlast ());
--		return FALSE;
-+	if (config->dbpath == NULL) {
-+		config->dbpath = g_strconcat (config->root,
-+					      PK_BACKEND_DEFAULT_DBPATH + dir,
-+					      NULL);
- 	}
- 
--	if (config->dbpath == NULL) {
--		config->dbpath = g_strconcat (alpm_option_get_root (),
--					      PK_BACKEND_DEFAULT_DBPATH + 1,
-+	g_debug ("initializing alpm");
-+	handle = alpm_initialize (config->root, config->dbpath, &errno);
-+	if (handle == NULL) {
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
-+		return handle;
-+	}
-+
-+	if (config->gpgdir == NULL) {
-+		config->gpgdir = g_strconcat (config->root,
-+					      PK_BACKEND_DEFAULT_GPGDIR + dir,
- 					      NULL);
- 	}
- 
--	if (alpm_option_set_dbpath (config->dbpath) < 0) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "DBPath: %s",
--			     alpm_strerrorlast ());
--		return FALSE;
-+	if (alpm_option_set_gpgdir (handle, config->gpgdir) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "GPGDir: %s",
-+			     alpm_strerror (errno));
-+		return handle;
- 	}
- 
- 	if (config->logfile == NULL) {
--		config->logfile = g_strconcat (alpm_option_get_root (),
--					       PK_BACKEND_DEFAULT_LOGFILE + 1,
-+		config->logfile = g_strconcat (config->root,
-+					       PK_BACKEND_DEFAULT_LOGFILE + dir,
- 					       NULL);
- 	}
- 
--	alpm_option_set_logfile (config->logfile);
-+	if (alpm_option_set_logfile (handle, config->logfile) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "LogFile: %s",
-+			     alpm_strerror (errno));
-+		return handle;
-+	}
- 
- 	if (config->cachedirs == NULL) {
--		gchar *path = g_strconcat (alpm_option_get_root (),
--					   PK_BACKEND_DEFAULT_CACHEDIR + 1,
-+		gchar *path = g_strconcat (config->root,
-+					   PK_BACKEND_DEFAULT_CACHEDIR + dir,
- 					   NULL);
- 		config->cachedirs = alpm_list_add (NULL, path);
- 	}
- 
- 	/* alpm takes ownership */
--	alpm_option_set_cachedirs (config->cachedirs);
-+	if (alpm_option_set_cachedirs (handle, config->cachedirs) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "CacheDir: %s",
-+			     alpm_strerror (errno));
-+		return handle;
-+	}
- 	config->cachedirs = NULL;
- 
--	return TRUE;
-+	return handle;
- }
- 
--static gboolean
--pk_backend_config_configure_repos (PkBackendConfig *config, GError **error)
-+static alpm_handle_t *
-+pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- {
--	const alpm_list_t *i;
-+	alpm_handle_t *handle;
-+	alpm_siglevel_t *level;
- 
- 	g_return_val_if_fail (config != NULL, FALSE);
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		if (alpm_db_unregister (i->data) < 0) {
--			g_set_error_literal (error, ALPM_ERROR, pm_errno,
--					     alpm_strerrorlast ());
--			return FALSE;
--		}
--	}
--
--	for (i = config->repos; i != NULL; i = i->next) {
--		const gchar *key;
--		gpointer value;
--		pmdb_t *db;
--		alpm_list_t *j;
--
--		key = (const gchar *) i->data;
--		value = g_hash_table_lookup (config->servers, key);
--
--		db = alpm_db_register_sync (key);
--		if (db == NULL) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
--				     key, alpm_strerrorlast ());
--			return FALSE;
--		}
--
--		for (j = (alpm_list_t *) value; j != NULL; j = j->next) {
--			alpm_db_setserver (db, (const gchar *) j->data);
--		}
-+	handle = pk_backend_config_initialize_alpm (config, error);
-+	if (handle == NULL) {
-+		return NULL;
- 	}
- 
--	return TRUE;
--}
--
--static gboolean
--pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
--{
--	g_return_val_if_fail (config != NULL, FALSE);
--
--	if (!pk_backend_config_configure_paths (config, error)) {
--		return FALSE;
--	}
-+	alpm_option_set_checkspace (handle, config->checkspace);
-+	alpm_option_set_usedelta (handle, config->usedelta);
-+	alpm_option_set_usesyslog (handle, config->usesyslog);
-+	alpm_option_set_arch (handle, config->arch);
- 
--	alpm_option_set_checkspace (config->checkspace);
--	alpm_option_set_usedelta (config->usedelta);
--	alpm_option_set_usesyslog (config->usesyslog);
--	alpm_option_set_arch (config->arch);
-+	level = g_hash_table_lookup (config->levels, "options");
-+	alpm_option_set_default_siglevel (handle, *level);
- 
- 	/* backend takes ownership */
- 	g_free (xfercmd);
-@@ -719,9 +844,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- 	config->xfercmd = NULL;
- 
- 	if (xfercmd != NULL) {
--		alpm_option_set_fetchcb (pk_backend_fetchcb);
-+		alpm_option_set_fetchcb (handle, pk_backend_fetchcb);
- 	} else {
--		alpm_option_set_fetchcb (NULL);
-+		alpm_option_set_fetchcb (handle, NULL);
- 	}
- 
- 	/* backend takes ownership */
-@@ -735,41 +860,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- 	config->syncfirsts = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_ignoregrps (config->ignoregrps);
--	config->ignoregrps = NULL;
-+	alpm_option_set_ignoregroups (handle, config->ignoregroups);
-+	config->ignoregroups = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_ignorepkgs (config->ignorepkgs);
-+	alpm_option_set_ignorepkgs (handle, config->ignorepkgs);
- 	config->ignorepkgs = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_noextracts (config->noextracts);
-+	alpm_option_set_noextracts (handle, config->noextracts);
- 	config->noextracts = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_noupgrades (config->noupgrades);
-+	alpm_option_set_noupgrades (handle, config->noupgrades);
- 	config->noupgrades = NULL;
- 
--	if (!pk_backend_config_configure_repos (config, error)) {
--		return FALSE;
--	}
-+	pk_backend_configure_repos (config->repos, config->servers,
-+				    config->levels);
- 
--	return TRUE;
-+	return handle;
- }
- 
--gboolean
-+alpm_handle_t *
- pk_backend_configure (const gchar *filename, GError **error)
- {
- 	PkBackendConfig *config;
--	gboolean result;
-+	alpm_handle_t *handle;
-+	GError *e = NULL;
- 
- 	g_return_val_if_fail (filename != NULL, FALSE);
- 
-+	g_debug ("reading config from %s", filename);
- 	config = pk_backend_config_new ();
- 
--	result = pk_backend_config_parse (config, filename, NULL, error) &&
--		 pk_backend_config_configure_alpm (config, error);
-+	if (pk_backend_config_parse (config, filename, NULL, &e)) {
-+		handle = pk_backend_config_configure_alpm (config, &e);
-+	} else {
-+		handle = NULL;
-+	}
- 
- 	pk_backend_config_free (config);
--	return result;
-+	if (e != NULL) {
-+		g_propagate_error (error, e);
-+		if (handle != NULL) {
-+			alpm_release (handle);
-+		}
-+		return NULL;
-+	} else {
-+		return handle;
-+	}
- }
-diff --git a/backends/alpm/pk-backend-config.h b/backends/alpm/pk-backend-config.h
-index cb8b8dc..412f59c 100644
---- a/backends/alpm/pk-backend-config.h
-+++ b/backends/alpm/pk-backend-config.h
-@@ -21,6 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <alpm.h>
- #include <glib.h>
- 
--gboolean	 pk_backend_configure	(const gchar *filename, GError **error);
-+alpm_handle_t	*pk_backend_configure	(const gchar *filename, GError **error);
-diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c
-index f6ab06e..a123297 100644
---- a/backends/alpm/pk-backend-databases.c
-+++ b/backends/alpm/pk-backend-databases.c
-@@ -26,7 +26,15 @@
- #include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- 
-+typedef struct
-+{
-+	gchar *name;
-+	alpm_list_t *servers;
-+	alpm_siglevel_t level;
-+} PkBackendRepo;
-+
- static GHashTable *disabled = NULL;
-+static alpm_list_t *configured = NULL;
- 
- static GHashTable *
- disabled_repos_new (GError **error)
-@@ -113,8 +121,8 @@ disabled_repos_free (GHashTable *table)
- 
- 	/* write all disabled repos line by line */
- 	while (g_hash_table_iter_next (&iter, (gpointer *) &line, NULL) &&
--		g_data_output_stream_put_string (output, line, NULL, NULL) &&
--		g_data_output_stream_put_byte (output, '\n', NULL, NULL));
-+	       g_data_output_stream_put_string (output, line, NULL, NULL) &&
-+	       g_data_output_stream_put_byte (output, '\n', NULL, NULL));
- 
- 	g_object_unref (output);
- 	g_object_unref (os);
-@@ -124,41 +132,91 @@ disabled_repos_free (GHashTable *table)
- }
- 
- static gboolean
--disabled_repos_configure (GHashTable *table, GError **error)
-+disabled_repos_configure (GHashTable *table, gboolean only_trusted,
-+			  GError **error)
- {
- 	const alpm_list_t *i;
- 
--	g_debug ("reading config from %s", PK_BACKEND_CONFIG_FILE);
-+	g_return_val_if_fail (table != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
--	/* read configuration from pacman.conf file */
--	if (!pk_backend_configure (PK_BACKEND_CONFIG_FILE, error)) {
-+	if (alpm_db_unregister_all (alpm) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
--	/* disable disabled repos */
--	for (i = alpm_option_get_syncdbs (); i != NULL;) {
--		pmdb_t *db = (pmdb_t *) i->data;
--		const gchar *repo = alpm_db_get_name (db);
-+	for (i = configured; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = (PkBackendRepo *) i->data;
-+		alpm_siglevel_t level = repo->level;
-+		alpm_db_t *db;
- 
--		if (g_hash_table_lookup (table, repo) == NULL) {
--			/* repo is not disabled */
--			i = i->next;
-+		if (g_hash_table_lookup (table, repo->name) != NULL) {
-+			/* repo is disabled */
- 			continue;
-+		} else if (!only_trusted) {
-+			level &= ~ALPM_SIG_PACKAGE;
-+			level &= ~ALPM_SIG_DATABASE;
-+			level &= ~ALPM_SIG_USE_DEFAULT;
- 		}
- 
--		if (alpm_db_unregister (db) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
--				     repo, alpm_strerrorlast ());
-+		db = alpm_db_register_sync (alpm, repo->name, level);
-+		if (db == NULL) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
-+				     repo->name, alpm_strerror (errno));
- 			return FALSE;
- 		}
- 
--		/* start again because the list gets invalidated */
--		i = alpm_option_get_syncdbs ();
-+		alpm_db_set_servers (db, alpm_list_strdup (repo->servers));
- 	}
- 
- 	return TRUE;
- }
- 
-+void
-+pk_backend_configure_repos (alpm_list_t *repos, GHashTable *servers,
-+			    GHashTable *levels)
-+{
-+	alpm_list_t *i;
-+
-+	g_return_if_fail (servers != NULL);
-+
-+	for (i = repos; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = g_new (PkBackendRepo, 1);
-+		gpointer value = g_hash_table_lookup (servers, i->data);
-+
-+		repo->name = g_strdup ((const gchar *) i->data);
-+		repo->servers = alpm_list_strdup ((alpm_list_t *) value);
-+
-+		value = g_hash_table_lookup (levels, i->data);
-+		if (value != NULL) {
-+			repo->level = *(alpm_siglevel_t *) value;
-+		} else {
-+			repo->level = ALPM_SIG_USE_DEFAULT;
-+		}
-+
-+		configured = alpm_list_add (configured, repo);
-+	}
-+}
-+
-+gboolean
-+pk_backend_disable_signatures (PkBackend *self, GError **error)
-+{
-+	g_return_val_if_fail (self != NULL, FALSE);
-+
-+	return disabled_repos_configure (disabled, FALSE, error);
-+}
-+
-+gboolean
-+pk_backend_enable_signatures (PkBackend *self, GError **error)
-+{
-+	g_return_val_if_fail (self != NULL, FALSE);
-+
-+	return disabled_repos_configure (disabled, TRUE, error);
-+}
-+
- gboolean
- pk_backend_initialize_databases (PkBackend *self, GError **error)
- {
-@@ -169,7 +227,7 @@ pk_backend_initialize_databases (PkBackend *self, GError **error)
- 		return FALSE;
- 	}
- 
--	if (!disabled_repos_configure (disabled, error)) {
-+	if (!disabled_repos_configure (disabled, TRUE, error)) {
- 		return FALSE;
- 	}
- 
-@@ -179,11 +237,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error)
- void
- pk_backend_destroy_databases (PkBackend *self)
- {
-+	alpm_list_t *i;
-+
- 	g_return_if_fail (self != NULL);
- 
- 	if (disabled != NULL) {
- 		disabled_repos_free (disabled);
- 	}
-+
-+	for (i = configured; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = (PkBackendRepo *) i->data;
-+		g_free (repo->name);
-+		FREELIST (repo->servers);
-+		g_free (repo);
-+	}
-+	alpm_list_free (configured);
- }
- 
- static gboolean
-@@ -210,11 +278,12 @@ pk_backend_get_repo_list_thread (PkBackend *self)
- 	gpointer key, value;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (disabled != NULL, FALSE);
- 
- 	/* emit enabled repos */
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		pmdb_t *db = (pmdb_t *) i->data;
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
-+		alpm_db_t *db = (alpm_db_t *) i->data;
- 		const gchar *repo = alpm_db_get_name (db);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -265,11 +334,11 @@ pk_backend_repo_enable_thread (PkBackend *self)
- 
- 	if (g_hash_table_remove (disabled, repo)) {
- 		/* reload configuration to preserve ordering */
--		if (disabled_repos_configure (disabled, &error)) {
-+		if (disabled_repos_configure (disabled, TRUE, &error)) {
- 			pk_backend_repo_list_changed (self);
- 		}
- 	} else {
--		int code = PM_ERR_DB_NOT_NULL;
-+		int code = ALPM_ERR_DB_NOT_NULL;
- 		g_set_error (&error, ALPM_ERROR, code, "[%s]: %s",
- 			     repo, alpm_strerror (code));
- 	}
-@@ -292,21 +361,23 @@ pk_backend_repo_disable_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (disabled != NULL, FALSE);
- 
- 	repo = pk_backend_get_string (self, "repo_id");
- 
- 	g_return_val_if_fail (repo != NULL, FALSE);
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		pmdb_t *db = (pmdb_t *) i->data;
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
-+		alpm_db_t *db = (alpm_db_t *) i->data;
- 		const gchar *name = alpm_db_get_name (db);
- 
- 		if (g_strcmp0 (repo, name) == 0) {
- 			if (alpm_db_unregister (db) < 0) {
--				g_set_error (&error, ALPM_ERROR, pm_errno,
-+				enum _alpm_errno_t errno = alpm_errno (alpm);
-+				g_set_error (&error, ALPM_ERROR, errno,
- 					     "[%s]: %s", repo,
--					     alpm_strerrorlast ());
-+					     alpm_strerror (errno));
- 			} else {
- 				g_hash_table_insert (disabled, g_strdup (repo),
- 						     GINT_TO_POINTER (1));
-@@ -316,7 +387,7 @@ pk_backend_repo_disable_thread (PkBackend *self)
- 	}
- 
- 	if (i == NULL) {
--		int code = PM_ERR_DB_NULL;
-+		int code = ALPM_ERR_DB_NULL;
- 		g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo,
- 			     alpm_strerror (code));
- 	}
-diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h
-index f9eb2f9..d9b9e78 100644
---- a/backends/alpm/pk-backend-databases.h
-+++ b/backends/alpm/pk-backend-databases.h
-@@ -24,6 +24,16 @@
- #include <alpm.h>
- #include <pk-backend.h>
- 
-+void		 pk_backend_configure_repos		(alpm_list_t *repos,
-+							 GHashTable *servers,
-+							 GHashTable *levels);
-+
-+gboolean	 pk_backend_disable_signatures		(PkBackend *self,
-+							 GError **error);
-+
-+gboolean	 pk_backend_enable_signatures		(PkBackend *self,
-+							 GError **error);
-+
- gboolean	 pk_backend_initialize_databases	(PkBackend *self,
- 							 GError **error);
- 
-diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c
-index 8bb8567..7c7b45a 100644
---- a/backends/alpm/pk-backend-depends.c
-+++ b/backends/alpm/pk-backend-depends.c
-@@ -29,7 +29,7 @@
- #include "pk-backend-error.h"
- #include "pk-backend-packages.h"
- 
--static pmpkg_t *
-+static alpm_pkg_t *
- alpm_list_find_pkg (const alpm_list_t *pkgs, const gchar *name)
- {
- 	g_return_val_if_fail (name != NULL, NULL);
-@@ -50,11 +50,12 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 	PkBitfield filters;
- 	gboolean recursive, skip_local, skip_remote;
- 
--	pmpkg_t *provider;
-+	alpm_pkg_t *provider;
- 	alpm_list_t *pkgcache, *syncdbs;
- 
- 	g_return_val_if_fail (self != NULL, pkgs);
- 	g_return_val_if_fail (depend != NULL, pkgs);
-+	g_return_val_if_fail (alpm != NULL, pkgs);
- 	g_return_val_if_fail (localdb != NULL, pkgs);
- 
- 	recursive = pk_backend_get_bool (self, "recursive");
-@@ -84,8 +85,8 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 	}
- 
- 	/* look for remote dependencies */
--	syncdbs = alpm_option_get_syncdbs ();
--	provider = alpm_find_dbs_satisfier (syncdbs, depend);
-+	syncdbs = alpm_option_get_syncdbs (alpm);
-+	provider = alpm_find_dbs_satisfier (alpm, syncdbs, depend);
- 
- 	if (provider != NULL) {
- 		if (!skip_remote) {
-@@ -96,7 +97,7 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 			pkgs = alpm_list_add (pkgs, provider);
- 		}
- 	} else {
--		int code = PM_ERR_UNSATISFIED_DEPS;
-+		int code = ALPM_ERR_UNSATISFIED_DEPS;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", depend,
- 			     alpm_strerror (code));
- 	}
-@@ -108,7 +109,7 @@ static alpm_list_t *
- pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name,
- 			  GError **error)
- {
--	pmpkg_t *requirer;
-+	alpm_pkg_t *requirer;
- 
- 	g_return_val_if_fail (self != NULL, pkgs);
- 	g_return_val_if_fail (name != NULL, pkgs);
-@@ -127,7 +128,7 @@ pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name,
- 			pkgs = alpm_list_add (pkgs, requirer);
- 		}
- 	} else {
--		int code = PM_ERR_PKG_NOT_FOUND;
-+		int code = ALPM_ERR_PKG_NOT_FOUND;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", name,
- 			     alpm_strerror (code));
- 	}
-@@ -150,7 +151,7 @@ pk_backend_get_depends_thread (PkBackend *self)
- 
- 	/* construct an initial package list */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-@@ -206,7 +207,7 @@ pk_backend_get_requires_thread (PkBackend *self)
- 
- 	/* construct an initial package list */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-diff --git a/backends/alpm/pk-backend-error.c b/backends/alpm/pk-backend-error.c
-index 255f1fb..57c4b4b 100644
---- a/backends/alpm/pk-backend-error.c
-+++ b/backends/alpm/pk-backend-error.c
-@@ -33,140 +33,159 @@ pk_backend_error (PkBackend *self, GError *error)
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (error != NULL);
- 
--	if (error->domain == ALPM_ERROR) {
--		switch (error->code) {
--			case PM_ERR_MEMORY:
--			case PM_ERR_SYSTEM:
--				code = PK_ERROR_ENUM_OOM;
--				break;
--
--			case PM_ERR_BADPERMS:
--				code = PK_ERROR_ENUM_NOT_AUTHORIZED;
--				break;
--
--			case PM_ERR_NOT_A_FILE:
--			case PM_ERR_NOT_A_DIR:
--				code = PK_ERROR_ENUM_FILE_NOT_FOUND;
--				break;
--
--			case PM_ERR_WRONG_ARGS:
--			case PM_ERR_HANDLE_NULL:
--			case PM_ERR_DB_NULL:
--			case PM_ERR_TRANS_NULL:
--			case PM_ERR_TRANS_NOT_INITIALIZED:
--			case PM_ERR_TRANS_NOT_PREPARED:
--			case PM_ERR_TRANS_NOT_LOCKED:
--			case PM_ERR_INVALID_REGEX:
--				code = PK_ERROR_ENUM_INTERNAL_ERROR;
--				break;
--
--			case PM_ERR_DISK_SPACE:
--				code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
--				break;
--
--			case PM_ERR_HANDLE_NOT_NULL:
--			case PM_ERR_DB_NOT_NULL:
--			case PM_ERR_TRANS_NOT_NULL:
--				code = PK_ERROR_ENUM_FAILED_INITIALIZATION;
--				break;
--
--			case PM_ERR_HANDLE_LOCK:
--				code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
--				break;
--
--			case PM_ERR_DB_OPEN:
--			case PM_ERR_DB_NOT_FOUND:
--			case PM_ERR_PKG_REPO_NOT_FOUND:
--				code = PK_ERROR_ENUM_REPO_NOT_FOUND;
--				break;
--
--			case PM_ERR_DB_CREATE:
--				code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
--				break;
--
--			case PM_ERR_DB_VERSION:
--			case PM_ERR_DB_REMOVE:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
--
--			case PM_ERR_DB_WRITE:
--				code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
--				break;
--
--			case PM_ERR_SERVER_BAD_URL:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
--
--			case PM_ERR_SERVER_NONE:
--				code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
--				break;
--
--			case PM_ERR_TRANS_DUP_TARGET:
--			case PM_ERR_TRANS_ABORT:
--				code = PK_ERROR_ENUM_TRANSACTION_ERROR;
--				break;
--
--			case PM_ERR_TRANS_TYPE:
--				code = PK_ERROR_ENUM_CANNOT_CANCEL;
--				break;
--
--			case PM_ERR_PKG_NOT_FOUND:
--				code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
--				break;
--
--			case PM_ERR_PKG_IGNORED:
--				code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
--				break;
--
--			case PM_ERR_PKG_INVALID:
--			case PM_ERR_PKG_OPEN:
--			case PM_ERR_PKG_INVALID_NAME:
--			case PM_ERR_DLT_INVALID:
--				code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE;
--				break;
--
--			case PM_ERR_PKG_CANT_REMOVE:
--				code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
--				break;
--
--			case PM_ERR_PKG_INVALID_ARCH:
--				code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
--				break;
--
--			case PM_ERR_DLT_PATCHFAILED:
--				code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD;
--				break;
--
--			case PM_ERR_UNSATISFIED_DEPS:
--				code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED;
--				break;
--
--			case PM_ERR_CONFLICTING_DEPS:
--				code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
--				break;
--
--			case PM_ERR_FILE_CONFLICTS:
--				code = PK_ERROR_ENUM_FILE_CONFLICTS;
--				break;
--
--			case PM_ERR_RETRIEVE:
--			case PM_ERR_LIBFETCH:
--			case PM_ERR_EXTERNAL_DOWNLOAD:
--				code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED;
--				break;
--
--			case PM_ERR_LIBARCHIVE:
--				code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
--				break;
--
--			case PM_ERR_CONFIG_INVALID:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				break;
--
--			case PM_ERR_PKG_HELD:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				break;
--		}
-+	if (error->domain != ALPM_ERROR) {
-+		pk_backend_error_code (self, code, "%s", error->message);
-+		return;
-+	}
-+
-+	switch (error->code) {
-+		case ALPM_ERR_MEMORY:
-+		case ALPM_ERR_SYSTEM:
-+			code = PK_ERROR_ENUM_OOM;
-+			break;
-+
-+		case ALPM_ERR_BADPERMS:
-+			code = PK_ERROR_ENUM_NOT_AUTHORIZED;
-+			break;
-+
-+		case ALPM_ERR_NOT_A_FILE:
-+		case ALPM_ERR_NOT_A_DIR:
-+			code = PK_ERROR_ENUM_FILE_NOT_FOUND;
-+			break;
-+
-+		case ALPM_ERR_WRONG_ARGS:
-+		case ALPM_ERR_HANDLE_NULL:
-+		case ALPM_ERR_DB_NULL:
-+		case ALPM_ERR_TRANS_NULL:
-+		case ALPM_ERR_TRANS_NOT_INITIALIZED:
-+		case ALPM_ERR_TRANS_NOT_PREPARED:
-+		case ALPM_ERR_TRANS_NOT_LOCKED:
-+		case ALPM_ERR_INVALID_REGEX:
-+			code = PK_ERROR_ENUM_INTERNAL_ERROR;
-+			break;
-+
-+		case ALPM_ERR_DISK_SPACE:
-+			code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
-+			break;
-+
-+		case ALPM_ERR_HANDLE_NOT_NULL:
-+		case ALPM_ERR_DB_NOT_NULL:
-+		case ALPM_ERR_TRANS_NOT_NULL:
-+			code = PK_ERROR_ENUM_FAILED_INITIALIZATION;
-+			break;
-+
-+		case ALPM_ERR_HANDLE_LOCK:
-+			code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
-+			break;
-+
-+		case ALPM_ERR_DB_OPEN:
-+		case ALPM_ERR_DB_NOT_FOUND:
-+		case ALPM_ERR_PKG_REPO_NOT_FOUND:
-+			code = PK_ERROR_ENUM_REPO_NOT_FOUND;
-+			break;
-+
-+		case ALPM_ERR_DB_CREATE:
-+			code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
-+			break;
-+
-+		case ALPM_ERR_DB_INVALID:
-+		case ALPM_ERR_DB_VERSION:
-+		case ALPM_ERR_DB_REMOVE:
-+		case ALPM_ERR_SERVER_BAD_URL:
-+			code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
-+			break;
-+
-+		case ALPM_ERR_DB_INVALID_SIG:
-+		case ALPM_ERR_PKG_INVALID_SIG:
-+		case ALPM_ERR_SIG_INVALID:
-+			code = PK_ERROR_ENUM_BAD_GPG_SIGNATURE;
-+			break;
-+
-+		case ALPM_ERR_DB_WRITE:
-+			code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
-+			break;
-+
-+		case ALPM_ERR_SERVER_NONE:
-+			code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
-+			break;
-+
-+		case ALPM_ERR_TRANS_DUP_TARGET:
-+		case ALPM_ERR_TRANS_ABORT:
-+			code = PK_ERROR_ENUM_TRANSACTION_ERROR;
-+			break;
-+
-+		case ALPM_ERR_TRANS_TYPE:
-+			code = PK_ERROR_ENUM_CANNOT_CANCEL;
-+			break;
-+
-+		case ALPM_ERR_PKG_NOT_FOUND:
-+			code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
-+			break;
-+
-+		case ALPM_ERR_PKG_IGNORED:
-+			code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
-+			break;
-+
-+		case ALPM_ERR_PKG_INVALID:
-+		case ALPM_ERR_PKG_OPEN:
-+		case ALPM_ERR_PKG_INVALID_NAME:
-+		case ALPM_ERR_DLT_INVALID:
-+			code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE;
-+			break;
-+
-+		case ALPM_ERR_PKG_INVALID_CHECKSUM:
-+			code = PK_ERROR_ENUM_PACKAGE_CORRUPT;
-+			break;
-+
-+		case ALPM_ERR_PKG_CANT_REMOVE:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
-+			break;
-+
-+		case ALPM_ERR_PKG_INVALID_ARCH:
-+			code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
-+			break;
-+
-+		case ALPM_ERR_SIG_MISSING:
-+			code = PK_ERROR_ENUM_MISSING_GPG_SIGNATURE;
-+			break;
-+
-+		case ALPM_ERR_DLT_PATCHFAILED:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD;
-+			break;
-+
-+		case ALPM_ERR_UNSATISFIED_DEPS:
-+			code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED;
-+			break;
-+
-+		case ALPM_ERR_CONFLICTING_DEPS:
-+			code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
-+			break;
-+
-+		case ALPM_ERR_FILE_CONFLICTS:
-+			code = PK_ERROR_ENUM_FILE_CONFLICTS;
-+			break;
-+
-+		case ALPM_ERR_RETRIEVE:
-+		case ALPM_ERR_LIBCURL:
-+		case ALPM_ERR_EXTERNAL_DOWNLOAD:
-+			code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED;
-+			break;
-+
-+		case ALPM_ERR_LIBARCHIVE:
-+			code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
-+			break;
-+
-+		case ALPM_ERR_GPGME:
-+			code = PK_ERROR_ENUM_GPG_FAILURE;
-+			break;
-+
-+		case ALPM_ERR_CONFIG_INVALID:
-+			code = PK_ERROR_ENUM_FAILED_CONFIG_PARSING;
-+			break;
-+
-+		case ALPM_ERR_PKG_HELD:
-+			code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
-+			break;
- 	}
- 
- 	pk_backend_error_code (self, code, "%s", error->message);
-diff --git a/backends/alpm/pk-backend-error.h b/backends/alpm/pk-backend-error.h
-index 83fe4a5..0a029e4 100644
---- a/backends/alpm/pk-backend-error.h
-+++ b/backends/alpm/pk-backend-error.h
-@@ -26,8 +26,8 @@
- #define	 ALPM_ERROR		(alpm_error_quark ())
- 
- enum {
--	PM_ERR_CONFIG_INVALID = 0x10000,
--	PM_ERR_PKG_HELD
-+	ALPM_ERR_CONFIG_INVALID = 0x10000,
-+	ALPM_ERR_PKG_HELD
- };
- 
- void	 pk_backend_error	(PkBackend *self, GError *error);
-diff --git a/backends/alpm/pk-backend-groups.c b/backends/alpm/pk-backend-groups.c
-index 59e304d..6056c54 100644
---- a/backends/alpm/pk-backend-groups.c
-+++ b/backends/alpm/pk-backend-groups.c
-@@ -125,7 +125,7 @@ pk_backend_destroy_groups (PkBackend *self)
- }
- 
- const gchar *
--alpm_pkg_get_group (pmpkg_t *pkg)
-+alpm_pkg_get_group (alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i;
- 
-diff --git a/backends/alpm/pk-backend-groups.h b/backends/alpm/pk-backend-groups.h
-index 28dcf65..d736e37 100644
---- a/backends/alpm/pk-backend-groups.h
-+++ b/backends/alpm/pk-backend-groups.h
-@@ -29,4 +29,4 @@ gboolean	 pk_backend_initialize_groups	(PkBackend *self,
- 
- void		 pk_backend_destroy_groups	(PkBackend *self);
- 
--const gchar	*alpm_pkg_get_group		(pmpkg_t *pkg);
-+const gchar	*alpm_pkg_get_group		(alpm_pkg_t *pkg);
-diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c
-index 65a6c11..d0cbca2 100644
---- a/backends/alpm/pk-backend-install.c
-+++ b/backends/alpm/pk-backend-install.c
-@@ -25,6 +25,7 @@
- #include <pk-backend.h>
- 
- #include "pk-backend-alpm.h"
-+#include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- #include "pk-backend-install.h"
- #include "pk-backend-transaction.h"
-@@ -32,15 +33,19 @@
- static gint
- alpm_add_file (const gchar *filename)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
-+	alpm_siglevel_t level;
- 
- 	g_return_val_if_fail (filename != NULL, -1);
-+	g_return_val_if_fail (alpm != NULL, -1);
- 
--	if (alpm_pkg_load (filename, 1, &pkg) < 0) {
-+	level = alpm_option_get_default_siglevel (alpm);
-+
-+	if (alpm_pkg_load (alpm, filename, 1, level, &pkg) < 0) {
- 		return -1;
- 	}
- 
--	if (alpm_add_pkg (pkg) < 0) {
-+	if (alpm_add_pkg (alpm, pkg) < 0) {
- 		alpm_pkg_free (pkg);
- 		return -1;
- 	}
-@@ -61,8 +66,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error)
- 
- 	for (; *paths != NULL; ++paths) {
- 		if (alpm_add_file (*paths) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s",
--				     *paths, alpm_strerrorlast ());
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s: %s",
-+				     *paths, alpm_strerror (errno));
- 			return FALSE;
- 		}
- 	}
-@@ -89,17 +95,32 @@ pk_backend_simulate_install_files_thread (PkBackend *self)
- static gboolean
- pk_backend_install_files_thread (PkBackend *self)
- {
-+	gboolean only_trusted;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
-+	only_trusted = pk_backend_get_bool (self, "only_trusted");
-+
-+	if (!only_trusted && !pk_backend_disable_signatures (self, &error)) {
-+		goto out;
-+	}
-+
- 	if (pk_backend_transaction_initialize (self, 0, &error) &&
- 	    pk_backend_transaction_add_targets (self, &error) &&
- 	    pk_backend_transaction_simulate (self, &error)) {
- 		pk_backend_transaction_commit (self, &error);
- 	}
- 
--	return pk_backend_transaction_finish (self, error);
-+out:
-+	pk_backend_transaction_end (self, (error == NULL) ? &error : NULL);
-+
-+	if (!only_trusted) {
-+		GError **e = (error == NULL) ? &error : NULL;
-+		pk_backend_enable_signatures (self, e);
-+	}
-+
-+	return pk_backend_finish (self, error);
- }
- 
- void
-diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
-index e9a7c94..c90cd7d 100644
---- a/backends/alpm/pk-backend-packages.c
-+++ b/backends/alpm/pk-backend-packages.c
-@@ -27,13 +27,11 @@
- #include "pk-backend-packages.h"
- 
- gchar *
--alpm_pkg_build_id (pmpkg_t *pkg)
-+alpm_pkg_build_id (alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version, *arch, *repo;
--	pmdb_t *db;
- 
- 	g_return_val_if_fail (pkg != NULL, NULL);
--	g_return_val_if_fail (localdb != NULL, NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
-@@ -43,19 +41,18 @@ alpm_pkg_build_id (pmpkg_t *pkg)
- 		arch = "any";
- 	}
- 
--	db = alpm_pkg_get_db (pkg);
--	/* TODO: check */
--	if (db == NULL || db == localdb) {
--		repo = "installed";
-+	/* TODO: check correctness */
-+	if (alpm_pkg_get_origin (pkg) == PKG_FROM_SYNCDB) {
-+		repo = alpm_db_get_name (alpm_pkg_get_db (pkg));
- 	} else {
--		repo = alpm_db_get_name (db);
-+		repo = "installed";
- 	}
- 
- 	return pk_package_id_build (name, version, arch, repo);
- }
- 
- void
--pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info)
-+pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, PkInfoEnum info)
- {
- 	gchar *package;
- 
-@@ -67,16 +64,17 @@ pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info)
- 	g_free (package);
- }
- 
--pmpkg_t *
-+alpm_pkg_t *
- pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- {
- 	gchar **package;
- 	const gchar *repo_id;
--	pmdb_t *db = NULL;
--	pmpkg_t *pkg;
-+	alpm_db_t *db = NULL;
-+	alpm_pkg_t *pkg;
- 
- 	g_return_val_if_fail (self != NULL, NULL);
- 	g_return_val_if_fail (package_id != NULL, NULL);
-+	g_return_val_if_fail (alpm != NULL, NULL);
- 	g_return_val_if_fail (localdb != NULL, NULL);
- 
- 	package = pk_package_id_split (package_id);
-@@ -86,8 +84,8 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- 	if (g_strcmp0 (repo_id, "installed") == 0) {
- 		db = localdb;
- 	} else {
--		const alpm_list_t *i;
--		for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		for (; i != NULL; i = i->next) {
- 			const gchar *repo = alpm_db_get_name (i->data);
- 
- 			if (g_strcmp0 (repo, repo_id) == 0) {
-@@ -111,7 +109,7 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- 	}
- 
- 	if (pkg == NULL) {
--		int code = PM_ERR_PKG_NOT_FOUND;
-+		int code = ALPM_ERR_PKG_NOT_FOUND;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", package_id,
- 			     alpm_strerror (code));
- 	}
-@@ -123,7 +121,7 @@ static gboolean
- pk_backend_resolve_package (PkBackend *self, const gchar *package,
- 			    GError **error)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
- 	
- 	PkBitfield filters;
- 	gboolean skip_local, skip_remote;
-@@ -142,7 +140,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package,
- 					  PK_FILTER_ENUM_NOT_INSTALLED);
- 	skip_remote = pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED);
- 
--	if (alpm_pkg_get_db (pkg) == localdb) {
-+	if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
- 		if (!skip_local) {
- 			pk_backend_pkg (self, pkg, PK_INFO_ENUM_INSTALLED);
- 		}
-@@ -158,7 +156,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package,
- static gboolean
- pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
- 	int code;
- 	
- 	PkBitfield filters;
-@@ -166,6 +164,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 	g_return_val_if_fail (name != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	filters = pk_backend_get_uint (self, "filters");
-@@ -180,8 +179,8 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 			return TRUE;
- 		}
- 	} else if (!skip_remote) {
--		const alpm_list_t *i;
--		for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		for (; i != NULL; i = i->next) {
- 			pkg = alpm_db_get_pkg (i->data, name);
- 			if (pkg != NULL) {
- 				pk_backend_pkg (self, pkg,
-@@ -191,7 +190,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 		}
- 	}
- 
--	code = PM_ERR_PKG_NOT_FOUND;
-+	code = ALPM_ERR_PKG_NOT_FOUND;
- 	g_set_error (error, ALPM_ERROR, code, "%s: %s", name,
- 		     alpm_strerror (code));
- 	return FALSE;
-@@ -254,7 +253,7 @@ pk_backend_get_details_thread (PkBackend *self)
- 	g_return_val_if_fail (packages != NULL, FALSE);
- 
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 		const alpm_list_t *i;
- 
- 		GString *licenses;
-@@ -271,28 +270,30 @@ pk_backend_get_details_thread (PkBackend *self)
- 			break;
- 		}
- 
--		licenses = g_string_new ("");
- 		i = alpm_pkg_get_licenses (pkg);
--		for (; i != NULL; i = i->next) {
--			/* assume OR although it may not be correct */
--			g_string_append_printf (licenses, " or %s",
--						(const gchar *) i->data);
--		}
--		if (licenses->len == 0) {
--			g_string_append (licenses, " or Unknown");
-+		if (i == NULL) {
-+			licenses = g_string_new ("Unknown");
-+		} else {
-+			licenses = g_string_new ((const gchar *) i->data);
-+			while ((i = i->next) != NULL) {
-+				const gchar *license = (const gchar *) i->data;
-+				/* assume OR although it may not be correct */
-+				g_string_append_printf (licenses, " or %s",
-+							license);
-+			}
- 		}
- 
- 		group = pk_group_enum_from_string (alpm_pkg_get_group (pkg));
- 		desc = alpm_pkg_get_desc (pkg);
- 		url = alpm_pkg_get_url (pkg);
- 
--		if (alpm_pkg_get_db (pkg) == localdb) {
-+		if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
- 			size = alpm_pkg_get_isize (pkg);
- 		} else {
- 			size = alpm_pkg_download_size (pkg);
- 		}
- 
--		pk_backend_details (self, *packages, licenses->str + 4, group,
-+		pk_backend_details (self, *packages, licenses->str, group,
- 				    desc, url, size);
- 		g_string_free (licenses, TRUE);
- 	}
-@@ -317,17 +318,19 @@ pk_backend_get_files_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
- 	g_return_val_if_fail (packages != NULL, FALSE);
- 
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
--		const alpm_list_t *i;
-+		alpm_pkg_t *pkg;
-+		const gchar *root;
- 
- 		GString *files;
--		const gchar *root;
-+		alpm_filelist_t *filelist;
-+		gsize i;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-@@ -338,14 +341,17 @@ pk_backend_get_files_thread (PkBackend *self)
- 			break;
- 		}
- 
-+		root = alpm_option_get_root (alpm);
- 		files = g_string_new ("");
--		root = alpm_option_get_root ();
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
--			g_string_append_printf (files, ";%s%s", root,
--						(const gchar *) i->data);
-+
-+		filelist = alpm_pkg_get_files (pkg);
-+		for (i = 0; i < filelist->count; ++i) {
-+			const gchar *file = filelist->files[i].name;
-+			g_string_append_printf (files, "%s%s;", root, file);
- 		}
- 
--		pk_backend_files (self, *packages, files->str + 1);
-+		g_string_truncate (files, MAX (files->len, 1) - 1);
-+		pk_backend_files (self, *packages, files->str);
- 		g_string_free (files, TRUE);
- 	}
- 
-diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h
-index 4b2d7f8..2d54684 100644
---- a/backends/alpm/pk-backend-packages.h
-+++ b/backends/alpm/pk-backend-packages.h
-@@ -24,10 +24,11 @@
- #include <alpm.h>
- #include <pk-backend.h>
- 
--gchar	*alpm_pkg_build_id	(pmpkg_t *pkg);
-+gchar		*alpm_pkg_build_id	(alpm_pkg_t *pkg);
- 
--void	 pk_backend_pkg		(PkBackend *self, pmpkg_t *pkg,
--				 PkInfoEnum info);
-+void		 pk_backend_pkg		(PkBackend *self, alpm_pkg_t *pkg,
-+					 PkInfoEnum info);
- 
--pmpkg_t	*pk_backend_find_pkg	(PkBackend *self, const gchar *package_id,
--				 GError **error);
-+alpm_pkg_t	*pk_backend_find_pkg	(PkBackend *self,
-+					 const gchar *package_id,
-+					 GError **error);
-diff --git a/backends/alpm/pk-backend-remove.c b/backends/alpm/pk-backend-remove.c
-index 03329b1..1993061 100644
---- a/backends/alpm/pk-backend-remove.c
-+++ b/backends/alpm/pk-backend-remove.c
-@@ -29,29 +29,14 @@
- #include "pk-backend-remove.h"
- #include "pk-backend-transaction.h"
- 
--static gint
--alpm_remove_local (const gchar *name)
--{
--	pmpkg_t *pkg;
--
--	g_return_val_if_fail (name != NULL, -1);
--	g_return_val_if_fail (localdb != NULL, -1);
--
--	pkg = alpm_db_get_pkg (localdb, name);
--	if (pkg == NULL) {
--		pm_errno = PM_ERR_PKG_NOT_FOUND;
--		return -1;
--	}
--
--	return alpm_remove_pkg (pkg);
--}
--
- static gboolean
- pk_backend_transaction_remove_targets (PkBackend *self, GError **error)
- {
- 	gchar **packages;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
-@@ -61,9 +46,11 @@ pk_backend_transaction_remove_targets (PkBackend *self, GError **error)
- 		gchar **package = pk_package_id_split (*packages);
- 		gchar *name = package[PK_PACKAGE_ID_NAME];
- 
--		if (alpm_remove_local (name) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s",
--				     name, alpm_strerrorlast ());
-+		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
-+		if (pkg == NULL || alpm_remove_pkg (alpm, pkg) < 0) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s: %s", name,
-+				     alpm_strerror (errno));
- 			g_strfreev (package);
- 			return FALSE;
- 		}
-@@ -79,14 +66,17 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error)
- {
- 	const alpm_list_t *i;
- 
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
- 	if (!pk_backend_transaction_simulate (self, error)) {
- 		return FALSE;
- 	}
- 
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
- 		const gchar *name = alpm_pkg_get_name (i->data);
- 		if (alpm_list_find_str (holdpkgs, name)) {
--			g_set_error (error, ALPM_ERROR, PM_ERR_PKG_HELD,
-+			g_set_error (error, ALPM_ERROR, ALPM_ERR_PKG_HELD,
- 				     "%s: %s", name,
- 				     "could not remove HoldPkg");
- 			return FALSE;
-@@ -99,14 +89,14 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error)
- static gboolean
- pk_backend_simulate_remove_packages_thread (PkBackend *self)
- {
--	pmtransflag_t flags = PM_TRANS_FLAG_CASCADE;
-+	alpm_transflag_t flags = ALPM_TRANS_FLAG_CASCADE;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
- 	/* remove unneeded packages that were required by those to be removed */
- 	if (pk_backend_get_bool (self, "autoremove")) {
--		flags |= PM_TRANS_FLAG_RECURSE;
-+		flags |= ALPM_TRANS_FLAG_RECURSE;
- 	}
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
-@@ -121,18 +111,18 @@ pk_backend_simulate_remove_packages_thread (PkBackend *self)
- static gboolean
- pk_backend_remove_packages_thread (PkBackend *self)
- {
--	pmtransflag_t flags = 0;
-+	alpm_transflag_t flags = 0;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
- 	/* remove packages that depend on those to be removed */
- 	if (pk_backend_get_bool (self, "allow_deps")) {
--		flags |= PM_TRANS_FLAG_CASCADE;
-+		flags |= ALPM_TRANS_FLAG_CASCADE;
- 	}
- 	/* remove unneeded packages that were required by those to be removed */
- 	if (pk_backend_get_bool (self, "autoremove")) {
--		flags |= PM_TRANS_FLAG_RECURSE;
-+		flags |= ALPM_TRANS_FLAG_RECURSE;
- 	}
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
-diff --git a/backends/alpm/pk-backend-search.c b/backends/alpm/pk-backend-search.c
-index 592472d..c4e80ae 100644
---- a/backends/alpm/pk-backend-search.c
-+++ b/backends/alpm/pk-backend-search.c
-@@ -55,9 +55,10 @@ static gpointer
- pk_backend_pattern_chroot (const gchar *needle, GError **error)
- {
- 	g_return_val_if_fail (needle != NULL, NULL);
-+	g_return_val_if_fail (alpm != NULL, NULL);
- 
- 	if (G_IS_DIR_SEPARATOR (*needle)) {
--		const gchar *file = needle, *root = alpm_option_get_root ();
-+		const gchar *file = needle, *root = alpm_option_get_root (alpm);
- 
- 		/* adjust needle to the correct prefix */
- 		for (; *file == *root; ++file, ++root) {
-@@ -74,7 +75,7 @@ pk_backend_pattern_chroot (const gchar *needle, GError **error)
- }
- 
- static gboolean
--pk_backend_match_all (pmpkg_t *pkg, gpointer pattern)
-+pk_backend_match_all (alpm_pkg_t *pkg, gpointer pattern)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (pattern != NULL, FALSE);
-@@ -84,10 +85,10 @@ pk_backend_match_all (pmpkg_t *pkg, gpointer pattern)
- }
- 
- static gboolean
--pk_backend_match_details (pmpkg_t *pkg, GRegex *regex)
-+pk_backend_match_details (alpm_pkg_t *pkg, GRegex *regex)
- {
- 	const gchar *desc;
--	pmdb_t *db;
-+	alpm_db_t *db;
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
-@@ -123,32 +124,38 @@ pk_backend_match_details (pmpkg_t *pkg, GRegex *regex)
- }
- 
- static gboolean
--pk_backend_match_file (pmpkg_t *pkg, const gchar *needle)
-+pk_backend_match_file (alpm_pkg_t *pkg, const gchar *needle)
- {
--	const alpm_list_t *i;
-+	alpm_filelist_t *files;
-+	gsize i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (needle != NULL, FALSE);
- 
-+	files = alpm_pkg_get_files (pkg);
-+
- 	/* match any file the package contains */
- 	if (G_IS_DIR_SEPARATOR (*needle)) {
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
-+		for (i = 0; i < files->count; ++i) {
-+			const gchar *file = files->files[i].name;
- 			/* match the full path of file */
--			if (g_strcmp0 (i->data, needle + 1) == 0) {
-+			if (g_strcmp0 (file, needle + 1) == 0) {
- 				return TRUE;
- 			}
- 		}
- 	} else {
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
--			const gchar *file = strrchr (i->data, G_DIR_SEPARATOR);
--			if (file == NULL) {
--				file = i->data;
-+		for (i = 0; i < files->count; ++i) {
-+			const gchar *file = files->files[i].name;
-+			const gchar *name = strrchr (file, G_DIR_SEPARATOR);
-+
-+			if (name == NULL) {
-+				name = file;
- 			} else {
--				++file;
-+				++name;
- 			}
- 
- 			/* match the basename of file */
--			if (g_strcmp0 (file, needle) == 0) {
-+			if (g_strcmp0 (name, needle) == 0) {
- 				return TRUE;
- 			}
- 		}
-@@ -158,7 +165,7 @@ pk_backend_match_file (pmpkg_t *pkg, const gchar *needle)
- }
- 
- static gboolean
--pk_backend_match_group (pmpkg_t *pkg, const gchar *needle)
-+pk_backend_match_group (alpm_pkg_t *pkg, const gchar *needle)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (needle != NULL, FALSE);
-@@ -168,7 +175,7 @@ pk_backend_match_group (pmpkg_t *pkg, const gchar *needle)
- }
- 
- static gboolean
--pk_backend_match_name (pmpkg_t *pkg, GRegex *regex)
-+pk_backend_match_name (alpm_pkg_t *pkg, GRegex *regex)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (regex != NULL, FALSE);
-@@ -178,7 +185,7 @@ pk_backend_match_name (pmpkg_t *pkg, GRegex *regex)
- }
- 
- static gboolean
--pk_backend_match_provides (pmpkg_t *pkg, gpointer pattern)
-+pk_backend_match_provides (alpm_pkg_t *pkg, gpointer pattern)
- {
- 	/* TODO: implement GStreamer codecs, Pango fonts, etc. */
- 	const alpm_list_t *i;
-@@ -215,7 +222,7 @@ typedef enum {
- } SearchType;
- 
- typedef gpointer (*PatternFunc) (const gchar *needle, GError **error);
--typedef gboolean (*MatchFunc) (pmpkg_t *pkg, gpointer pattern);
-+typedef gboolean (*MatchFunc) (alpm_pkg_t *pkg, gpointer pattern);
- 
- static PatternFunc pattern_funcs[] = {
- 	pk_backend_pattern_needle,
-@@ -245,9 +252,9 @@ static MatchFunc match_funcs[] = {
- };
- 
- static gboolean
--alpm_pkg_is_local (pmpkg_t *pkg)
-+alpm_pkg_is_local (alpm_pkg_t *pkg)
- {
--	pmpkg_t *local;
-+	alpm_pkg_t *local;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
-@@ -274,7 +281,7 @@ alpm_pkg_is_local (pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_search_db (PkBackend *self, pmdb_t *db, MatchFunc match,
-+pk_backend_search_db (PkBackend *self, alpm_db_t *db, MatchFunc match,
- 		      const alpm_list_t *patterns)
- {
- 	const alpm_list_t *i, *j;
-@@ -326,6 +333,7 @@ pk_backend_search_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	needles = pk_backend_get_strv (self, "search");
-@@ -366,7 +374,7 @@ pk_backend_search_thread (PkBackend *self)
- 		goto out;
- 	}
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		}
-diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c
-index 9e1e02b..d2f363b 100644
---- a/backends/alpm/pk-backend-sync.c
-+++ b/backends/alpm/pk-backend-sync.c
-@@ -26,45 +26,18 @@
- #include <string.h>
- 
- #include "pk-backend-alpm.h"
-+#include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- #include "pk-backend-sync.h"
- #include "pk-backend-transaction.h"
- 
--static gint
--alpm_add_dbtarget (const gchar *repo, const gchar *name)
--{
--	const alpm_list_t *i;
--	pmpkg_t *pkg;
--
--	g_return_val_if_fail (repo != NULL, -1);
--	g_return_val_if_fail (name != NULL, -1);
--
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) {
--			break;
--		}
--	}
--
--	if (i == NULL) {
--		pm_errno = PM_ERR_DB_NOT_FOUND;
--		return -1;
--	}
--
--	pkg = alpm_db_get_pkg (i->data, name);
--	if (pkg == NULL) {
--		pm_errno = PM_ERR_PKG_NOT_FOUND;
--		return -1;
--	}
--
--	return alpm_add_pkg (pkg);
--}
--
- static gboolean
- pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
- {
- 	gchar **packages;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
-@@ -75,9 +48,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
- 		gchar *repo = package[PK_PACKAGE_ID_DATA];
- 		gchar *name = package[PK_PACKAGE_ID_NAME];
- 
--		if (alpm_add_dbtarget (repo, name) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s/%s: %s",
--				     repo, name, alpm_strerrorlast ());
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		alpm_pkg_t *pkg;
-+
-+		for (; i != NULL; i = i->next) {
-+			if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) {
-+				break;
-+			}
-+		}
-+
-+		if (i == NULL) {
-+			enum _alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND;
-+			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
-+				     repo, name, alpm_strerror (errno));
-+			g_strfreev (package);
-+			return FALSE;
-+		}
-+
-+		pkg = alpm_db_get_pkg (i->data, name);
-+		if (pkg == NULL || alpm_add_pkg (alpm, pkg) < 0) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
-+				     repo, name, alpm_strerror (errno));
- 			g_strfreev (package);
- 			return FALSE;
- 		}
-@@ -93,23 +85,27 @@ pk_backend_download_packages_thread (PkBackend *self)
- {
- 	alpm_list_t *cachedirs;
- 	const gchar *directory;
--	pmtransflag_t flags = 0;
-+	alpm_transflag_t flags = 0;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	directory = pk_backend_get_string (self, "directory");
- 
- 	if (directory != NULL) {
- 		/* download files to a PackageKit directory */
- 		gchar *cachedir = strdup (directory);
--		cachedirs = alpm_list_strdup (alpm_option_get_cachedirs ());
--		alpm_option_set_cachedirs (alpm_list_add (NULL, cachedir));
-+		const alpm_list_t *old = alpm_option_get_cachedirs (alpm);
-+		alpm_list_t *new = alpm_list_add (NULL, cachedir);
-+
-+		cachedirs = alpm_list_strdup (old);
-+		alpm_option_set_cachedirs (alpm, new);
- 	}
- 
--	flags |= PM_TRANS_FLAG_NODEPS;
--	flags |= PM_TRANS_FLAG_NOCONFLICTS;
--	flags |= PM_TRANS_FLAG_DOWNLOADONLY;
-+	flags |= ALPM_TRANS_FLAG_NODEPS;
-+	flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
-+	flags |= ALPM_TRANS_FLAG_DOWNLOADONLY;
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
- 	    pk_backend_transaction_sync_targets (self, &error) &&
-@@ -118,7 +114,7 @@ pk_backend_download_packages_thread (PkBackend *self)
- 	}
- 
- 	if (directory != NULL) {
--		alpm_option_set_cachedirs (cachedirs);
-+		alpm_option_set_cachedirs (alpm, cachedirs);
- 	}
- 
- 	return pk_backend_transaction_finish (self, error);
-@@ -155,17 +151,31 @@ pk_backend_simulate_install_packages_thread (PkBackend *self)
- static gboolean
- pk_backend_install_packages_thread (PkBackend *self)
- {
-+	gboolean only_trusted;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
-+	only_trusted = pk_backend_get_bool (self, "only_trusted");
-+
-+	if (!only_trusted && !pk_backend_disable_signatures (self, &error)) {
-+		goto out;
-+	}
-+
- 	if (pk_backend_transaction_initialize (self, 0, &error) &&
- 	    pk_backend_transaction_sync_targets (self, &error) &&
- 	    pk_backend_transaction_simulate (self, &error)) {
- 		pk_backend_transaction_commit (self, &error);
- 	}
- 
--	return pk_backend_transaction_finish (self, error);
-+	pk_backend_transaction_end (self, (error == NULL) ? &error : NULL);
-+out:
-+	if (!only_trusted) {
-+		GError **e = (error == NULL) ? &error : NULL;
-+		pk_backend_enable_signatures (self, e);
-+	}
-+
-+	return pk_backend_finish (self, error);
- }
- 
- void
-@@ -190,16 +200,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted,
- }
- 
- static gboolean
--pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_replaces_dependencies (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i, *replaces;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 	g_return_val_if_fail (pkg != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	replaces = alpm_pkg_get_replaces (pkg);
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
--		pmpkg_t *rpkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *rpkg = (alpm_pkg_t *) i->data;
- 		const gchar *rname = alpm_pkg_get_name (rpkg);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -208,7 +219,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg)
- 			continue;
- 		}
- 
--		if (alpm_pkg_get_reason (rpkg) == PM_PKG_REASON_EXPLICIT) {
-+		if (alpm_pkg_get_reason (rpkg) == ALPM_PKG_REASON_EXPLICIT) {
- 			return FALSE;
- 		}
- 	}
-@@ -219,13 +230,21 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg)
- static gboolean
- pk_backend_update_packages_thread (PkBackend *self)
- {
-+	gboolean only_trusted;
- 	const alpm_list_t *i;
- 	alpm_list_t *asdeps = NULL;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
-+	only_trusted = pk_backend_get_bool (self, "only_trusted");
-+
-+	if (!only_trusted && !pk_backend_disable_signatures (self, &error)) {
-+		goto out;
-+	}
-+
- 	if (!pk_backend_transaction_initialize (self, 0, &error) ||
- 	    !pk_backend_transaction_sync_targets (self, &error) ||
- 	    !pk_backend_transaction_simulate (self, &error)) {
-@@ -233,8 +252,8 @@ pk_backend_update_packages_thread (PkBackend *self)
- 	}
- 
- 	/* change the install reason of packages that replace dependencies */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
--		pmpkg_t *pkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *pkg = (alpm_pkg_t *) i->data;
- 		const gchar *name = alpm_pkg_get_name (pkg);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -254,14 +273,22 @@ pk_backend_update_packages_thread (PkBackend *self)
- 
- 	for (i = asdeps; i != NULL; i = i->next) {
- 		const gchar *name = (const gchar *) i->data;
--		alpm_db_set_pkgreason (localdb, name, PM_PKG_REASON_DEPEND);
-+		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
-+		alpm_db_set_pkgreason (alpm, pkg, ALPM_PKG_REASON_DEPEND);
- 	}
- 
- out:
-+	pk_backend_transaction_end (self, (error == NULL) ? &error : NULL);
-+
-+	if (!only_trusted) {
-+		GError **e = (error == NULL) ? &error : NULL;
-+		pk_backend_enable_signatures (self, e);
-+	}
-+
- 	alpm_list_free_inner (asdeps, g_free);
- 	alpm_list_free (asdeps);
- 
--	return pk_backend_transaction_finish (self, error);
-+	return pk_backend_finish (self, error);
- }
- 
- void
-diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c
-index fdb840e..76402f0 100644
---- a/backends/alpm/pk-backend-transaction.c
-+++ b/backends/alpm/pk-backend-transaction.c
-@@ -29,10 +29,10 @@
- static off_t dcomplete = 0;
- static off_t dtotal = 0;
- 
--static pmpkg_t *dpkg = NULL;
-+static alpm_pkg_t *dpkg = NULL;
- static GString *dfiles = NULL;
- 
--static pmpkg_t *tpkg = NULL;
-+static alpm_pkg_t *tpkg = NULL;
- static GString *toutput = NULL;
- 
- static gchar *
-@@ -51,25 +51,26 @@ pk_backend_resolve_path (PkBackend *self, const gchar *basename)
- }
- 
- static gboolean
--alpm_pkg_has_basename (pmpkg_t *pkg, const gchar *basename)
-+alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename)
- {
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (basename != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	if (g_strcmp0 (alpm_pkg_get_filename (pkg), basename) == 0) {
- 		return TRUE;
- 	}
- 
--	if (alpm_option_get_usedelta () == 0) {
-+	if (alpm_option_get_usedelta (alpm) == 0) {
- 		return FALSE;
- 	}
- 
- 	for (i = alpm_pkg_get_deltas (pkg); i != NULL; i = i->next) {
--		const gchar *patch = alpm_delta_get_filename (i->data);
-+		alpm_delta_t *delta = (alpm_delta_t *) i->data;
- 
--		if (g_strcmp0 (patch, basename) == 0) {
-+		if (g_strcmp0 (delta->delta, basename) == 0) {
- 			return TRUE;
- 		}
- 	}
-@@ -109,6 +110,7 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename)
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (basename != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	/* continue or finish downloading the current package */
- 	if (dpkg != NULL) {
-@@ -127,8 +129,8 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename)
- 	}
- 
- 	/* figure out what the next package is */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
--		pmpkg_t *pkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *pkg = (alpm_pkg_t *) i->data;
- 
- 		if (alpm_pkg_has_basename (pkg, basename)) {
- 			dpkg = pkg;
-@@ -202,16 +204,17 @@ pk_backend_transaction_dlcb (const gchar *basename, off_t complete, off_t total)
- }
- 
- static void
--pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
-+pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target,
- 				    gint percent, gsize targets, gsize current)
- {
- 	static gint recent = 101;
- 	gsize overall = percent + (current - 1) * 100;
- 
- 	/* TODO: revert when fixed upstream */
--	if (type == PM_TRANS_PROGRESS_CONFLICTS_START ||
--	    type == PM_TRANS_PROGRESS_DISKSPACE_START ||
--	    type == PM_TRANS_PROGRESS_INTEGRITY_START) {
-+	if (type == ALPM_PROGRESS_CONFLICTS_START ||
-+	    type == ALPM_PROGRESS_DISKSPACE_START ||
-+	    type == ALPM_PROGRESS_INTEGRITY_START ||
-+	    type == ALPM_PROGRESS_LOAD_START) {
- 		if (current < targets) {
- 			overall = percent + current++ * 100;
- 		}
-@@ -228,12 +231,13 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
- 
- 	/* update transaction progress */
- 	switch (type) {
--		case PM_TRANS_PROGRESS_ADD_START:
--		case PM_TRANS_PROGRESS_UPGRADE_START:
--		case PM_TRANS_PROGRESS_REMOVE_START:
--		case PM_TRANS_PROGRESS_CONFLICTS_START:
--		case PM_TRANS_PROGRESS_DISKSPACE_START:
--		case PM_TRANS_PROGRESS_INTEGRITY_START:
-+		case ALPM_PROGRESS_ADD_START:
-+		case ALPM_PROGRESS_UPGRADE_START:
-+		case ALPM_PROGRESS_REMOVE_START:
-+		case ALPM_PROGRESS_CONFLICTS_START:
-+		case ALPM_PROGRESS_DISKSPACE_START:
-+		case ALPM_PROGRESS_INTEGRITY_START:
-+		case ALPM_PROGRESS_LOAD_START:
- 			if (percent == recent) {
- 				break;
- 			}
-@@ -253,7 +257,7 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
- }
- 
- static void
--pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result)
-+pk_backend_install_ignorepkg (PkBackend *self, alpm_pkg_t *pkg, gint *result)
- {
- 	gchar *output;
- 
-@@ -280,50 +284,52 @@ pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result)
- }
- 
- static void
--pk_backend_select_provider (PkBackend *self, pmdepend_t *dep,
--			    const alpm_list_t *providers)
-+pk_backend_select_provider (PkBackend *self, const alpm_list_t *providers,
-+		            alpm_depend_t *depend)
- {
- 	gchar *output;
- 
- 	g_return_if_fail (self != NULL);
--	g_return_if_fail (dep != NULL);
-+	g_return_if_fail (depend != NULL);
- 	g_return_if_fail (providers != NULL);
- 
- 	output = g_strdup_printf ("provider package was selected "
- 				  "(%s provides %s)\n",
- 				  alpm_pkg_get_name (providers->data),
--				  alpm_dep_get_name (dep));
-+				  depend->name);
- 	pk_backend_output (self, output);
- 	g_free (output);
- }
- 
- static void
--pk_backend_transaction_conv_cb (pmtransconv_t question, gpointer data1,
-+pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1,
- 				gpointer data2, gpointer data3, gint *result)
- {
- 	g_return_if_fail (result != NULL);
- 	g_return_if_fail (backend != NULL);
- 
- 	switch (question) {
--		case PM_TRANS_CONV_INSTALL_IGNOREPKG:
-+		case ALPM_QUESTION_INSTALL_IGNOREPKG:
- 			pk_backend_install_ignorepkg (backend, data1, result);
- 			break;
- 
--		case PM_TRANS_CONV_REPLACE_PKG:
--		case PM_TRANS_CONV_CONFLICT_PKG:
--		case PM_TRANS_CONV_CORRUPTED_PKG:
--		case PM_TRANS_CONV_LOCAL_NEWER:
-+		case ALPM_QUESTION_REPLACE_PKG:
-+		case ALPM_QUESTION_CONFLICT_PKG:
-+		case ALPM_QUESTION_CORRUPTED_PKG:
-+		case ALPM_QUESTION_LOCAL_NEWER:
- 			/* these actions are mostly harmless */
- 			g_debug ("safe question %d", question);
- 			*result = 1;
- 			break;
- 
--		case PM_TRANS_CONV_REMOVE_PKGS:
-+		case ALPM_QUESTION_REMOVE_PKGS:
-+		/* TODO: handle keys better */
-+		case ALPM_QUESTION_IMPORT_KEY:
- 			g_debug ("unsafe question %d", question);
- 			*result = 0;
- 			break;
- 
--		case PM_TRANS_CONV_SELECT_PROVIDER:
-+		case ALPM_QUESTION_SELECT_PROVIDER:
- 			pk_backend_select_provider (backend, data1, data2);
- 			*result = 0;
- 			break;
-@@ -349,7 +355,7 @@ pk_backend_output_end (PkBackend *self)
- }
- 
- static void
--pk_backend_output_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_output_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -398,7 +404,7 @@ pk_backend_transaction_test_commit (PkBackend *self)
- }
- 
- static void
--pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_add_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -409,18 +415,19 @@ pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version;
- 	const alpm_list_t *i, *optdepends;
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("installed %s (%s)\n", name, version);
-+	alpm_logaction (alpm, "installed %s (%s)\n", name, version);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 
- 	optdepends = alpm_pkg_get_optdepends (pkg);
-@@ -438,7 +445,7 @@ pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_remove_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -449,24 +456,25 @@ pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_remove_done (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version;
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("removed %s (%s)\n", name, version);
-+	alpm_logaction (alpm, "removed %s (%s)\n", name, version);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 	pk_backend_output_end (self);
- }
- 
- static void
--pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg,
--				      pmpkg_t *old)
-+pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg,
-+				      alpm_pkg_t *old)
- {
- 	PkRoleEnum role;
- 	PkStatusEnum state;
-@@ -491,8 +499,8 @@ pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg,
- }
- 
- static void
--pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
--				     pmpkg_t *old)
-+pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg,
-+				     alpm_pkg_t *old)
- {
- 	const gchar *name, *pre, *post;
- 	const alpm_list_t *i;
-@@ -501,12 +509,13 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
- 	g_return_if_fail (old != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	pre = alpm_pkg_get_version (old);
- 	post = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("upgraded %s (%s -> %s)\n", name, pre, post);
-+	alpm_logaction (alpm, "upgraded %s (%s -> %s)\n", name, pre, post);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 
- 	optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg),
-@@ -528,53 +537,65 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
- }
- 
- static void
--pk_backend_transaction_event_cb (pmtransevt_t event, gpointer data,
-+pk_backend_transaction_setup (PkBackend *self)
-+{
-+	g_return_if_fail (self != NULL);
-+
-+	pk_backend_set_status (self, PK_STATUS_ENUM_SETUP);
-+}
-+
-+static void
-+pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
- 				 gpointer old)
- {
- 	g_return_if_fail (backend != NULL);
- 
- 	/* figure out the backend status and package info */
- 	switch (event) {
--		case PM_TRANS_EVT_CHECKDEPS_START:
--		case PM_TRANS_EVT_RESOLVEDEPS_START:
-+		case ALPM_EVENT_CHECKDEPS_START:
-+		case ALPM_EVENT_RESOLVEDEPS_START:
- 			pk_backend_transaction_dep_resolve (backend);
- 			break;
- 
--		case PM_TRANS_EVT_FILECONFLICTS_START:
--		case PM_TRANS_EVT_INTERCONFLICTS_START:
--		case PM_TRANS_EVT_INTEGRITY_START:
--		case PM_TRANS_EVT_DELTA_INTEGRITY_START:
--		case PM_TRANS_EVT_DISKSPACE_START:
-+		case ALPM_EVENT_FILECONFLICTS_START:
-+		case ALPM_EVENT_INTERCONFLICTS_START:
-+		case ALPM_EVENT_INTEGRITY_START:
-+		case ALPM_EVENT_DELTA_INTEGRITY_START:
-+		case ALPM_EVENT_DISKSPACE_START:
- 			pk_backend_transaction_test_commit (backend);
- 			break;
- 
--		case PM_TRANS_EVT_ADD_START:
-+		case ALPM_EVENT_ADD_START:
- 			pk_backend_transaction_add_start (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_ADD_DONE:
-+		case ALPM_EVENT_ADD_DONE:
- 			pk_backend_transaction_add_done (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_REMOVE_START:
-+		case ALPM_EVENT_REMOVE_START:
- 			pk_backend_transaction_remove_start (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_REMOVE_DONE:
-+		case ALPM_EVENT_REMOVE_DONE:
- 			pk_backend_transaction_remove_done (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_UPGRADE_START:
-+		case ALPM_EVENT_UPGRADE_START:
- 			pk_backend_transaction_upgrade_start (backend, data,
- 							      old);
- 			break;
- 
--		case PM_TRANS_EVT_UPGRADE_DONE:
-+		case ALPM_EVENT_UPGRADE_DONE:
- 			pk_backend_transaction_upgrade_done (backend, data,
- 							     old);
- 			break;
- 
--		case PM_TRANS_EVT_SCRIPTLET_INFO:
-+		case ALPM_EVENT_LOAD_START:
-+			pk_backend_transaction_setup (backend);
-+			break;
-+
-+		case ALPM_EVENT_SCRIPTLET_INFO:
- 			pk_backend_output (backend, data);
- 			break;
- 
-@@ -588,27 +609,32 @@ static void
- transaction_cancelled_cb (GCancellable *object, gpointer data)
- {
- 	g_return_if_fail (data != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
--	alpm_trans_interrupt ();
-+	alpm_trans_interrupt (alpm);
- }
- 
- gboolean
--pk_backend_transaction_initialize (PkBackend *self, pmtransflag_t flags,
-+pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags,
- 				   GError **error)
- {
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (cancellable != NULL, FALSE);
- 
--	if (alpm_trans_init (flags, pk_backend_transaction_event_cb,
--			     pk_backend_transaction_conv_cb,
--			     pk_backend_transaction_progress_cb) < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	if (alpm_trans_init (alpm, flags) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
--	alpm_option_set_dlcb (pk_backend_transaction_dlcb);
--	alpm_option_set_totaldlcb (pk_backend_transaction_totaldlcb);
-+	alpm_option_set_eventcb (alpm, pk_backend_transaction_event_cb);
-+	alpm_option_set_questioncb (alpm, pk_backend_transaction_conv_cb);
-+	alpm_option_set_progresscb (alpm, pk_backend_transaction_progress_cb);
-+
-+	alpm_option_set_dlcb (alpm, pk_backend_transaction_dlcb);
-+	alpm_option_set_totaldlcb (alpm, pk_backend_transaction_totaldlcb);
- 
- 	g_cancellable_connect (cancellable,
- 			       G_CALLBACK (transaction_cancelled_cb),
-@@ -649,10 +675,11 @@ alpm_miss_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		pmdepend_t *dep = alpm_miss_get_dep (i->data);
--		gchar *depend = alpm_dep_compute_string (dep);
-+		alpm_depmissing_t *miss = (alpm_depmissing_t *) i->data;
-+		gchar *depend = alpm_dep_compute_string (miss->depend);
-+
- 		g_string_append_printf (list, "%s <- %s, ", depend,
--					alpm_miss_get_target (i->data));
-+					miss->target);
- 		free (depend);
- 	}
- 
-@@ -661,25 +688,21 @@ alpm_miss_build_list (const alpm_list_t *i)
- }
- 
- static void
--alpm_dep_free (gpointer dep)
-+alpm_depend_free (alpm_depend_t *depend)
- {
--	/* TODO: remove when implemented in libalpm */
--	free ((gpointer) alpm_dep_get_name (dep));
--	free ((gpointer) alpm_dep_get_version (dep));
--	free (dep);
-+	free (depend->name);
-+	free (depend->version);
-+	free (depend);
- }
- 
- static void
--alpm_miss_free (gpointer miss)
-+alpm_depmissing_free (gpointer miss)
- {
--	/* TODO: remove when implemented in libalpm */
--	const gchar *temp = alpm_miss_get_causingpkg (miss);
--	if (temp != NULL) {
--		free ((gpointer) temp);
--	}
-+	alpm_depmissing_t *self = (alpm_depmissing_t *) miss;
- 
--	free ((gpointer) alpm_miss_get_target (miss));
--	alpm_dep_free (alpm_miss_get_dep (miss));
-+	free (self->target);
-+	alpm_depend_free (self->depend);
-+	free (self->causingpkg);
- 	free (miss);
- }
- 
-@@ -695,17 +718,20 @@ alpm_conflict_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		const gchar *first = alpm_conflict_get_package1 (i->data);
--		const gchar *second = alpm_conflict_get_package2 (i->data);
--		const gchar *reason = alpm_conflict_get_reason (i->data);
--
--		if (g_strcmp0 (first, reason) == 0 ||
--		    g_strcmp0 (second, reason) == 0) {
--			g_string_append_printf (list, "%s <-> %s, ", first,
--						second);
-+		alpm_conflict_t *conflict = (alpm_conflict_t *) i->data;
-+		alpm_depend_t *depend = conflict->reason;
-+
-+		if (g_strcmp0 (conflict->package1, depend->name) == 0 ||
-+		    g_strcmp0 (conflict->package2, depend->name) == 0) {
-+			g_string_append_printf (list, "%s <-> %s, ",
-+						conflict->package1,
-+						conflict->package2);
- 		} else {
--			g_string_append_printf (list, "%s <-> %s (%s), ", first,
--						second, reason);
-+			gchar *reason = alpm_dep_compute_string (depend);
-+			g_string_append_printf (list, "%s <-> %s (%s), ",
-+						conflict->package1,
-+						conflict->package2, reason);
-+			g_free (reason);
- 		}
- 	}
- 
-@@ -716,10 +742,10 @@ alpm_conflict_build_list (const alpm_list_t *i)
- static void
- alpm_conflict_free (gpointer conflict)
- {
--	/* TODO: remove when implemented in libalpm */
--	free ((gpointer) alpm_conflict_get_package1 (conflict));
--	free ((gpointer) alpm_conflict_get_package2 (conflict));
--	free ((gpointer) alpm_conflict_get_reason (conflict));
-+	alpm_conflict_t *self = (alpm_conflict_t *) conflict;
-+
-+	free (self->package1);
-+	free (self->package2);
- 	free (conflict);
- }
- 
-@@ -735,15 +761,17 @@ alpm_fileconflict_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		const gchar *target = alpm_fileconflict_get_target (i->data);
--		const gchar *file = alpm_fileconflict_get_file (i->data);
--		const gchar *ctarget = alpm_fileconflict_get_ctarget (i->data);
--		if (*ctarget != '\0') {
-+		alpm_fileconflict_t *conflict = (alpm_fileconflict_t *) i->data;
-+
-+		if (*conflict->ctarget != '\0') {
- 			g_string_append_printf (list, "%s <-> %s (%s), ",
--						target, ctarget, file);
-+						conflict->target,
-+						conflict->ctarget,
-+						conflict->file);
- 		} else {
--			g_string_append_printf (list, "%s (%s), ", target,
--						file);
-+			g_string_append_printf (list, "%s (%s), ",
-+						conflict->target,
-+						conflict->file);
- 		}
- 	}
- 
-@@ -754,14 +782,11 @@ alpm_fileconflict_build_list (const alpm_list_t *i)
- static void
- alpm_fileconflict_free (gpointer conflict)
- {
--	/* TODO: remove when implemented in libalpm */
--	const gchar *temp = alpm_fileconflict_get_ctarget (conflict);
--	if (*temp != '\0') {
--		free ((gpointer) temp);
--	}
-+	alpm_fileconflict_t *self = (alpm_fileconflict_t *) conflict;
- 
--	free ((gpointer) alpm_fileconflict_get_target (conflict));
--	free ((gpointer) alpm_fileconflict_get_file (conflict));
-+	free (self->target);
-+	free (self->file);
-+	free (self->ctarget);
- 	free (conflict);
- }
- 
-@@ -771,29 +796,32 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
- 	alpm_list_t *data = NULL;
- 	gchar *prefix;
- 
--	if (alpm_trans_prepare (&data) >= 0) {
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
-+	if (alpm_trans_prepare (alpm, &data) >= 0) {
- 		return TRUE;
- 	}
- 
--	switch (pm_errno) {
--		case PM_ERR_PKG_INVALID_ARCH:
-+	switch (alpm_errno (alpm)) {
-+		case ALPM_ERR_PKG_INVALID_ARCH:
- 			prefix = alpm_pkg_build_list (data);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_UNSATISFIED_DEPS:
-+		case ALPM_ERR_UNSATISFIED_DEPS:
- 			prefix = alpm_miss_build_list (data);
--			alpm_list_free_inner (data, alpm_miss_free);
-+			alpm_list_free_inner (data, alpm_depmissing_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_CONFLICTING_DEPS:
-+		case ALPM_ERR_CONFLICTING_DEPS:
- 			prefix = alpm_conflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_conflict_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_FILE_CONFLICTS:
-+		case ALPM_ERR_FILE_CONFLICTS:
- 			prefix = alpm_fileconflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_fileconflict_free);
- 			alpm_list_free (data);
-@@ -802,18 +830,21 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
- 		default:
- 			prefix = NULL;
- 			if (data != NULL) {
--				g_warning ("unhandled error %d", pm_errno);
-+				g_warning ("unhandled error %d",
-+					   alpm_errno (alpm));
- 			}
- 			break;
- 	}
- 
- 	if (prefix != NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix,
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
-+			     alpm_strerror (errno));
- 		g_free (prefix);
- 	} else {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 	}
- 
- 	return FALSE;
-@@ -826,10 +857,11 @@ pk_backend_transaction_packages (PkBackend *self)
- 	PkInfoEnum info;
- 
- 	g_return_if_fail (self != NULL);
-+	g_return_if_fail (alpm != NULL);
- 	g_return_if_fail (localdb != NULL);
- 
- 	/* emit packages that would have been installed */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		} else {
-@@ -856,7 +888,7 @@ pk_backend_transaction_packages (PkBackend *self)
- 	}
- 
- 	/* emit packages that would have been removed */
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		} else {
-@@ -890,6 +922,9 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 	alpm_list_t *data = NULL;
- 	gchar *prefix;
- 
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
- 	if (pk_backend_cancelled (self)) {
- 		return TRUE;
- 	}
-@@ -897,19 +932,19 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 	pk_backend_set_allow_cancel (self, FALSE);
- 	pk_backend_set_status (self, PK_STATUS_ENUM_RUNNING);
- 
--	if (alpm_trans_commit (&data) >= 0) {
-+	if (alpm_trans_commit (alpm, &data) >= 0) {
- 		return TRUE;
- 	}
- 
--	switch (pm_errno) {
--		case PM_ERR_FILE_CONFLICTS:
-+	switch (alpm_errno (alpm)) {
-+		case ALPM_ERR_FILE_CONFLICTS:
- 			prefix = alpm_fileconflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_fileconflict_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_PKG_INVALID:
--		case PM_ERR_DLT_INVALID:
-+		case ALPM_ERR_PKG_INVALID:
-+		case ALPM_ERR_DLT_INVALID:
- 			prefix = alpm_string_build_list (data);
- 			alpm_list_free (data);
- 			break;
-@@ -917,18 +952,21 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 		default:
- 			prefix = NULL;
- 			if (data != NULL) {
--				g_warning ("unhandled error %d", pm_errno);
-+				g_warning ("unhandled error %d",
-+					   alpm_errno (alpm));
- 			}
- 			break;
- 	}
- 
- 	if (prefix != NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix,
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
-+			     alpm_strerror (errno));
- 		g_free (prefix);
- 	} else {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 	}
- 
- 	return FALSE;
-@@ -938,9 +976,14 @@ gboolean
- pk_backend_transaction_end (PkBackend *self, GError **error)
- {
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
-+	alpm_option_set_eventcb (alpm, NULL);
-+	alpm_option_set_questioncb (alpm, NULL);
-+	alpm_option_set_progresscb (alpm, NULL);
- 
--	alpm_option_set_dlcb (NULL);
--	alpm_option_set_totaldlcb (NULL);
-+	alpm_option_set_dlcb (alpm, NULL);
-+	alpm_option_set_totaldlcb (alpm, NULL);
- 
- 	if (dpkg != NULL) {
- 		pk_backend_transaction_download_end (self);
-@@ -949,9 +992,10 @@ pk_backend_transaction_end (PkBackend *self, GError **error)
- 		pk_backend_output_end (self);
- 	}
- 
--	if (alpm_trans_release () < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	if (alpm_trans_release (alpm) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
-diff --git a/backends/alpm/pk-backend-transaction.h b/backends/alpm/pk-backend-transaction.h
-index 6bb1d69..e3733d6 100644
---- a/backends/alpm/pk-backend-transaction.h
-+++ b/backends/alpm/pk-backend-transaction.h
-@@ -25,7 +25,7 @@
- #include <pk-backend.h>
- 
- gboolean	 pk_backend_transaction_initialize	(PkBackend *self,
--							 pmtransflag_t flags,
-+							 alpm_transflag_t flags,
- 							 GError **error);
- 
- gboolean	 pk_backend_transaction_simulate	(PkBackend *self,
-diff --git a/backends/alpm/pk-backend-update.c b/backends/alpm/pk-backend-update.c
-index a281953..37ade1e 100644
---- a/backends/alpm/pk-backend-update.c
-+++ b/backends/alpm/pk-backend-update.c
-@@ -34,7 +34,7 @@
- #include "pk-backend-update.h"
- 
- static gchar *
--alpm_pkg_build_replaces (pmpkg_t *pkg)
-+alpm_pkg_build_replaces (alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i;
- 	GString *string = NULL;
-@@ -44,7 +44,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg)
- 
- 	/* make a list of the packages that package replaces */
- 	for (i = alpm_pkg_get_replaces (pkg); i != NULL; i = i->next) {
--		pmpkg_t *replaces = alpm_db_get_pkg (localdb, i->data);
-+		alpm_pkg_t *replaces = alpm_db_get_pkg (localdb, i->data);
- 
- 		if (replaces != NULL) {
- 			gchar *package = alpm_pkg_build_id (replaces);
-@@ -65,7 +65,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg)
- }
- 
- static gchar *
--alpm_pkg_build_urls (pmpkg_t *pkg)
-+alpm_pkg_build_urls (alpm_pkg_t *pkg)
- {
- 	GString *string = g_string_new ("");
- #ifdef ALPM_PACKAGE_URL
-@@ -97,7 +97,7 @@ alpm_pkg_build_urls (pmpkg_t *pkg)
- }
- 
- static gboolean
--alpm_pkg_same_pkgver (pmpkg_t *a, pmpkg_t *b)
-+alpm_pkg_same_pkgver (alpm_pkg_t *a, alpm_pkg_t *b)
- {
- 	const gchar *version_a, *version_b, *last_a, *last_b;
- 	gsize length_a, length_b;
-@@ -145,8 +145,8 @@ pk_backend_get_update_detail_thread (PkBackend *self)
- 
- 	/* collect details about updates */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg, *old;
--		pmdb_t *db;
-+		alpm_pkg_t *pkg, *old;
-+		alpm_db_t *db;
- 
- 		gchar *upgrades, *replaces, *urls;
- 		const gchar *reason;
-@@ -245,18 +245,19 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	if (!pk_backend_transaction_initialize (self, 0, error)) {
- 		return FALSE;
- 	}
- 
--	alpm_logaction ("synchronizing package lists\n");
-+	alpm_logaction (alpm, "synchronizing package lists\n");
- 
--	dlcb = alpm_option_get_dlcb ();
--	totaldlcb = alpm_option_get_totaldlcb ();
-+	dlcb = alpm_option_get_dlcb (alpm);
-+	totaldlcb = alpm_option_get_totaldlcb (alpm);
- 
- 	/* set total size to minus the number of databases */
--	i = alpm_option_get_syncdbs ();
-+	i = alpm_option_get_syncdbs (alpm);
- 	totaldlcb (-alpm_list_count (i));
- 
- 	for (; i != NULL; i = i->next) {
-@@ -274,9 +275,10 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- 			/* fake the download when already up to date */
- 			dlcb ("", 1, 1);
- 		} else if (result < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
- 				     alpm_db_get_name (i->data),
--				     alpm_strerrorlast ());
-+				     alpm_strerror (errno));
- 			break;
- 		}
- 	}
-@@ -292,20 +294,21 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- }
- 
- static gboolean
--alpm_pkg_is_ignorepkg (pmpkg_t *pkg)
-+alpm_pkg_is_ignorepkg (alpm_pkg_t *pkg)
- {
--	const alpm_list_t *ignorepkgs, *ignoregrps, *i;
-+	const alpm_list_t *ignorepkgs, *ignoregroups, *i;
- 
- 	g_return_val_if_fail (pkg != NULL, TRUE);
-+	g_return_val_if_fail (alpm != NULL, TRUE);
- 
--	ignorepkgs = alpm_option_get_ignorepkgs ();
-+	ignorepkgs = alpm_option_get_ignorepkgs (alpm);
- 	if (alpm_list_find_str (ignorepkgs, alpm_pkg_get_name (pkg)) != NULL) {
- 		return TRUE;
- 	}
- 
--	ignoregrps = alpm_option_get_ignoregrps ();
-+	ignoregroups = alpm_option_get_ignoregroups (alpm);
- 	for (i = alpm_pkg_get_groups (pkg); i != NULL; i = i->next) {
--		if (alpm_list_find_str (ignoregrps, i->data) != NULL) {
-+		if (alpm_list_find_str (ignoregroups, i->data) != NULL) {
- 			return TRUE;
- 		}
- 	}
-@@ -314,7 +317,7 @@ alpm_pkg_is_ignorepkg (pmpkg_t *pkg)
- }
- 
- static gboolean
--alpm_pkg_is_syncfirst (pmpkg_t *pkg)
-+alpm_pkg_is_syncfirst (alpm_pkg_t *pkg)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 
-@@ -325,8 +328,18 @@ alpm_pkg_is_syncfirst (pmpkg_t *pkg)
- 	return FALSE;
- }
- 
--static pmpkg_t *
--alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
-+static gboolean
-+alpm_pkg_replaces (alpm_pkg_t *pkg, const gchar *name)
-+{
-+	g_return_val_if_fail (pkg != NULL, FALSE);
-+	g_return_val_if_fail (name != NULL, FALSE);
-+
-+	return alpm_list_find_str (alpm_pkg_get_replaces (pkg), name) != NULL;
-+}
-+
-+
-+static alpm_pkg_t *
-+alpm_pkg_find_update (alpm_pkg_t *pkg, const alpm_list_t *dbs)
- {
- 	const gchar *name;
- 	const alpm_list_t *i;
-@@ -336,7 +349,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
- 	name = alpm_pkg_get_name (pkg);
- 
- 	for (; dbs != NULL; dbs = dbs->next) {
--		pmpkg_t *update = alpm_db_get_pkg (dbs->data, name);
-+		alpm_pkg_t *update = alpm_db_get_pkg (dbs->data, name);
- 
- 		if (update != NULL) {
- 			if (alpm_pkg_vercmp (alpm_pkg_get_version (update),
-@@ -349,8 +362,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
- 
- 		i = alpm_db_get_pkgcache (dbs->data);
- 		for (; i != NULL; i = i->next) {
--			if (alpm_list_find_str (alpm_pkg_get_replaces (i->data),
--						name) != NULL) {
-+			if (alpm_pkg_replaces (i->data, name)) {
- 				return i->data;
- 			}
- 		}
-@@ -367,6 +379,7 @@ pk_backend_get_updates_thread (PkBackend *self)
- 	const alpm_list_t *i, *syncdbs;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	time (&one_hour_ago);
-@@ -385,9 +398,9 @@ pk_backend_get_updates_thread (PkBackend *self)
- 	}
- 
- 	/* find outdated and replacement packages */
--	syncdbs = alpm_option_get_syncdbs ();
-+	syncdbs = alpm_option_get_syncdbs (alpm);
- 	for (i = alpm_db_get_pkgcache (localdb); i != NULL; i = i->next) {
--		pmpkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
-+		alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
diff --git a/community/parrot/ChangeLog b/community/parrot/ChangeLog
deleted file mode 100644
index 725287638..000000000
--- a/community/parrot/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-
-2008-01-06  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Added for x86_64
-
diff --git a/community/pgadmin3/pgadmin3.desktop b/community/pgadmin3/pgadmin3.desktop
deleted file mode 100644
index 2e0864f60..000000000
--- a/community/pgadmin3/pgadmin3.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=pgadmin3
-Comment=A comprehensive design and management interface for PostgreSQL database
-Exec=pgadmin3
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
-Categories=Application;Development;
diff --git a/community/pion-net/pion-net-4.0.5-build.patch b/community/pion-net/pion-net-4.0.5-build.patch
deleted file mode 100644
index 25fdca20b..000000000
--- a/community/pion-net/pion-net-4.0.5-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp	2010-12-21 03:07:13.000000000 +0100
-+++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp	2011-07-31 09:01:38.445559768 +0200
-@@ -639,7 +639,7 @@
- 	
- 	/// returns reference to the io_service used for async operations
- 	inline boost::asio::io_service& getIOService(void) {
--		return m_ssl_socket.lowest_layer().io_service();
-+		return m_ssl_socket.lowest_layer().get_io_service();
- 	}
- 
- 	/// returns non-const reference to underlying TCP socket object
diff --git a/community/pound/pound-2.5-openssl.patch b/community/pound/pound-2.5-openssl.patch
deleted file mode 100644
index efefd5487..000000000
--- a/community/pound/pound-2.5-openssl.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff -up Pound-2.5/config.c.openssl Pound-2.5/config.c
---- Pound-2.5/config.c.openssl	2010-02-10 12:23:09.000000000 +0100
-+++ Pound-2.5/config.c	2010-02-10 12:23:07.000000000 +0100
-@@ -431,14 +431,22 @@ t_hash(const TABNODE *e)
-         res = (res ^ *k++) * 16777619;
-     return res;
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
- 
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
-     return strcmp(d1->key, d2->key);
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
- 
- /*
-  * parse a service
-@@ -460,7 +468,11 @@ parse_service(const char *svc_name)
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
-+#else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL)
-+#endif
-         conf_err("lh_new failed - aborted");
-     ign_case = ignore_case;
-     while(conf_fgets(lin, MAXBUF)) {
-diff -up Pound-2.5/pound.h.openssl Pound-2.5/pound.h
---- Pound-2.5/pound.h.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/pound.h	2010-02-10 12:15:18.000000000 +0100
-@@ -322,6 +322,10 @@ typedef struct _tn {
- /* maximal session key size */
- #define KEY_SIZE    127
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
-     char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@ typedef struct _service {
-     int                 sess_ttl;   /* session time-to-live */
-     regex_t             sess_start; /* pattern to identify the session data */
-     regex_t             sess_pat;   /* pattern to match the session data */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
-+#else
-     LHASH               *sessions;  /* currently active sessions */
-+#endif
-     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
-     int                 disabled;   /* true if the service is disabled */
-     struct _service     *next;
-diff -up Pound-2.5/svc.c.openssl Pound-2.5/svc.c
---- Pound-2.5/svc.c.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/svc.c	2010-02-10 12:13:29.000000000 +0100
-@@ -27,12 +27,17 @@
- 
- #include    "pound.h"
- 
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
-  * Add a new key/content pair to a hash table
-  * the table should be already locked
-  */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
-     TABNODE *t, *old;
- 
-@@ -53,7 +58,11 @@ t_add(LHASH *const tab, const char *key,
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
-         free(old->key);
-         free(old->content);
-         free(old);
-@@ -68,12 +77,16 @@ t_add(LHASH *const tab, const char *key,
-  * side-effect: update the time of last access
-  */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
-         res->last_acc = time(NULL);
-         return res->content;
-     }
-@@ -84,12 +97,16 @@ t_find(LHASH *const tab, char *const key
-  * Delete a key
-  */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
-         free(res->key);
-         free(res->content);
-         free(res);
-@@ -98,59 +115,75 @@ t_remove(LHASH *const tab, char *const k
- }
- 
- typedef struct  {
--    LHASH   *tab;
-+    LHASH_OF(TABNODE) *tab;
-     time_t  lim;
-     void    *content;
-     int     cont_len;
- }   ALL_ARG;
- 
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Expire all old nodes
-  */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
-     ALL_ARG a;
-     int down_load;
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(memcmp(t->content, a->content, a->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Remove all nodes with the given content
-  */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
-     ALL_ARG a;
-     int down_load;
-@@ -158,10 +191,14 @@ t_clean(LHASH *const tab, void *const co
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
-@@ -1410,13 +1447,11 @@ typedef struct  {
- }   DUMP_ARG;
- 
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *a)
- {
--    DUMP_ARG    *a;
-     BACKEND     *be, *bep;
-     int         n_be, sz;
- 
--    a = (DUMP_ARG *)arg;
-     memcpy(&bep, t->content, sizeof(bep));
-     for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-         if(be == bep)
-@@ -1432,19 +1467,28 @@ t_dump(TABNODE *t, void *arg)
-     return;
- }
- 
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
- 
- /*
-  * write sessions to the control socket
-  */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
-     DUMP_ARG a;
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
-     return;
- }
- 
diff --git a/community/rekonq/fix-build.patch b/community/rekonq/fix-build.patch
deleted file mode 100644
index 1a401ce2c..000000000
--- a/community/rekonq/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rekonq-0.9.0/doc/nl/index.docbook~	2012-03-02 15:31:21.730372412 +0000
-+++ rekonq-0.9.0/doc/nl/index.docbook	2012-03-02 15:31:48.780152894 +0000
-@@ -82,7 +82,7 @@
- ></surname
- > </personname>
-     </author>
--&ged.vertaald;&Freek.de.Kruijf; 
-+&Freek.de.Kruijf; 
-     </authorgroup>
- <legalnotice
- >&FDLNotice;</legalnotice>
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
deleted file mode 100644
index 7fc664154..000000000
--- a/community/root/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.02
-pkgrel=2
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme' 'gtk-update-icon-cache')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
-        'root.sh'
-        'rootd'
-        'root.xml')
-md5sums=('614a00632ab11fb33d2002800aabdcc7'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
-
-build() {
-  cd root
-
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
-  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
-                           -e 's/python -O/python2 -O/g' \
-                           -e 's/python -c/python2 -c/g' -i {} \;
-  sed \
-    -e 's/python 2/python2 2/g' \
-    -i configure
-  sed \
-    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
-    -i cint/reflex/python/genreflex/Makefile.am
-  sed \
-    -e 's/python /python2 /' \
-    -i config/genreflex.in config/genreflex-rootcint.in
-
-  local sys_libs=""
-  for sys_lib in ftgl freetype glew pcre zlib lzma; do
-    sys_libs+="--disable-builtin-${sys_lib} "
-  done
-  # move from aur if possible
-  #--disable-builtin-afterimage \
-
-  ./configure \
-    ${TARGET} \
-    --prefix=/usr \
-    --enable-gdml \
-    --enable-gsl-shared \
-    --enable-minuit2 \
-    --enable-soversion \
-    --enable-roofit \
-    --enable-python \
-    --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib \
-    ${sys_libs}
-
-  make
-}
-
-package() {
-  cd root
-
-  make DESTDIR=${pkgdir} install
-
-  install -D ${srcdir}/root.sh \
-    ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd \
-    ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.xml \
-    ${pkgdir}/usr/share/mime/packages/root.xml
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
-    ${pkgdir}/usr/share/applications/root-system-bin.desktop
-  # replace @prefix@ with /usr for the desktop
-  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
-    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
-  # use a file that pacman can track instead of adding directly to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
-  rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community/root/root.install b/community/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/root/root.sh b/community/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
-    export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community/root/root.xml b/community/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-root">
-    <comment>ROOT file</comment>
-    <comment xml:lang="de">ROOT-Datei</comment>
-    <glob pattern="*.root"/>
-    <magic priority="80">
-      <match value="root" type="string" offset="0:64"/>
-    </magic>
-  </mime-type>
-</mime-info>
diff --git a/community/root/rootd b/community/root/rootd
deleted file mode 100755
index fb2c3388c..000000000
--- a/community/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
-  start)
-  stat_busy "Starting ROOT file server daemon"
-    [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/rootd`
-      echo $PID >/var/run/rootd.pid
-      add_daemon rootd
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping ROOT file server daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rootd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/rxvt-unicode/ChangeLog b/community/rxvt-unicode/ChangeLog
deleted file mode 100644
index ba267d49e..000000000
--- a/community/rxvt-unicode/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2012-01-22  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.15
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.14
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Moved perl from optdepend to depend (closes FS#25782)
-
-2011-05-22  Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt against perl 5.14.0
-
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-	* Removed not accepted upstream patch (closes FS#23324)
diff --git a/community/rxvt-unicode/rxvt-unicode.desktop b/community/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 68d613dbd..000000000
--- a/community/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=rxvt-unicode
-Comment=An Unicode capable rxvt clone
-Exec=urxvt
-Icon=terminal
-Terminal=false
-Type=Application
-Categories=Application;System;TerminalEmulator;
diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch
deleted file mode 100644
index f6f021b61..000000000
--- a/community/shotwell/fix-with-libraw-0.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
-diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
---- shotwell-0.11.5/src/photos/GRaw.vala	2011-09-24 00:52:27.000000000 +0200
-+++ shotwell-0.11.5-fixed/src/photos/GRaw.vala	2011-11-01 00:25:05.976289495 +0100
-@@ -163,9 +163,9 @@
-         proc = new LibRaw.Processor(options);
-     }
-     
--    public void add_masked_borders_to_bitmap() {
--        proc.add_masked_borders_to_bitmap();
--    }
-+//    public void add_masked_borders_to_bitmap() {
-+//        proc.add_masked_borders_to_bitmap();
-+//    }
-     
-     public void adjust_sizes_info_only() throws Exception {
-         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
-@@ -215,9 +215,9 @@
-         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
-     }
-     
--    public void rotate_fuji_raw() throws Exception {
--        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
--    }
-+//    public void rotate_fuji_raw() throws Exception {
-+//        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
-+//    }
-     
-     public void thumb_writer(string filename) throws Exception {
-         throw_exception("thumb_writer", proc.thumb_writer(filename));
-@@ -262,7 +262,7 @@
-         // camera_profile
-         // bad_pixels
-         // dark_frame
--        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-+        // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-         output_params->output_bps = 8;
-         // output_tiff
-         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
-@@ -303,8 +303,8 @@
-         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
-             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
-         
--        case LibRaw.Result.CANNOT_ADDMASK:
--            throw new Exception.CANNOT_ADDMASK(msg);
-+//        case LibRaw.Result.CANNOT_ADDMASK:
-+//            throw new Exception.CANNOT_ADDMASK(msg);
-         
-         case LibRaw.Result.UNSUFFICIENT_MEMORY:
-             throw new Exception.OUT_OF_MEMORY(msg);
diff --git a/community/stone-soup/stone-soup.desktop b/community/stone-soup/stone-soup.desktop
deleted file mode 100644
index f76343515..000000000
--- a/community/stone-soup/stone-soup.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Dungeon Crawl Stone Soup 
-Comment=An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting
-Icon=stone-soup.png
-Exec=/usr/bin/crawl-tiles
-Categories=Game;AdventureGame
-
diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD
deleted file mode 100644
index b3754a72c..000000000
--- a/community/swi-prolog/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=swi-prolog
-pkgver=6.0.1
-pkgrel=1
-pkgdesc='Prolog environment'
-arch=('i686' 'x86_64')
-url='http://www.swi-prolog.org/'
-license=('GPL' 'LGPL')
-depends=('gmp' 'readline' 'openssl')
-makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama')
-optdepends=('unixodbc: for using the odbc4pl library'
-            'libjpeg: for using the pl2xpce library'
-            'libxpm: for using the pl2xpce library'
-            'libxinerama: for using the pl2xpce library'
-            'libxft: for using the pl2xpce library')
-options=('!makeflags')
-source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz")
-md5sums=('a4ea80195b4e1dc63dc1b2c82a59a088')
-
-build() {
-  cd pl-${pkgver}
-
-  # enable shared because x86 doesn't build with shared libs, upstream made it intentional...
-  ./configure \
-    --prefix=/usr \
-    --with-world \
-    --enable-shared
-
-  make
-}
-
-check() {
-  cd pl-${pkgver}
-
-  make check || true
-}
-
-package() {
-  cd pl-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  # fix https://bugs.archlinux.org/task/20873
-  chmod +x ${pkgdir}/usr/lib/swipl-${pkgver}/library/dialect/sicstus/swipl-lfr.pl
-}
diff --git a/community/vdrift/vdrift.desktop b/community/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community/vdrift/vdrift.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=VDrift
-Version=2009-06-15
-GenericName=Racing Simulation
-Comment=An open source driving simulation made with drift racing in mind
-Exec=vdrift
-Icon=vdrift.png
-Terminal=false
-Categories=Game;Simulation;
diff --git a/community/vhba-module/vhba-kernel2.6.37.patch b/community/vhba-module/vhba-kernel2.6.37.patch
deleted file mode 100644
index e2b619c74..000000000
--- a/community/vhba-module/vhba-kernel2.6.37.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 6 Jan 2011 03:39:26 -0500
-Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API
-
-Due to the SCSI host lock push-down changes introduced in 2.6.37 (see
-http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a
-for more details), trying to use current vhba on 2.6.37 leads to oopses
-and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753
-
-Add some #ifdefs to enable compatibility both with 2.6.37 and older API.
-Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this
-issue will need to be revisited.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- vhba-module/vhba.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index 059f6ce..9d13016 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -27,6 +27,7 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif
-@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd)
-         spin_unlock_irqrestore(&vhost->cmd_lock, flags);
- }
- 
--static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
-+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
- {
-         struct vhba_device *vdev;
-         int retval;
-@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
-         return retval;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+DEF_SCSI_QCMD(vhba_queuecommand)
-+#else
-+#define vhba_queuecommand vhba_queuecommand_lck
-+#endif
-+
- static int vhba_abort(struct scsi_cmnd *cmd)
- {
-         struct vhba_device *vdev;
--- 
-1.7.3.4
-
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
deleted file mode 100644
index c1984cfb6..000000000
--- a/community/vtk/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 63769 2012-02-05 12:13:32Z ibiru $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=8
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
-            'java-runtime: java bindings'
-            'tk: tcl bindings'
-            'gnuplot: plotting tools'
-            'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff'
-        'ffmpeg-0.8.diff'
-        'fix-boost-graph-api-changes.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
-         'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389'
-         'e992321c9d1def6034d0fa6607b40c5a'
-         'e715aef2aea26fc05f904efb5d0d5627')
-
-build() {
-  cd VTK
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
-  # fix compilation error:
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12772
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  # flags to enable using system libs
-  local cmake_system_flags=""
-  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-
-  # flags to use python2 instead of python which is 3.x.x on archlinux
-  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-  cmake \
-    -Wno-dev \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
-    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
-    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
-    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
-    -DVTK_WRAP_JAVA:BOOL=ON \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
-    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    ${cmake_system_flags} \
-    ${cmake_system_python_flags} \
-    ${srcdir}/VTK
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/vtk
-  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
-    ${pkgdir}/usr/share/java/vtk
-
-  # Install license
-  install -dv ${pkgdir}/usr/share/licenses/vtk
-  install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/vtk
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community/vtk/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
-   [ Michael Schutte ]
-   * Non-maintainer upload.
-   * Remove absolute paths to required libraries from
-     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
-     #506992.  Due to the multiarch transition, the original behavior
-     frequently causes reverse build-deps to FTBFS.  This change should
-     probably be reverted once all required libraries are multiarched.
- .
-   [ Steve M. Robbins ]
-   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
-   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
-     0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //choose avi media file format
--  this->avOutputFormat = guess_format("avi", NULL, NULL);
-+  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
-   if (!this->avOutputFormat) 
-     {
-     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
--  c->codec_type = CODEC_TYPE_VIDEO;
-+  c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-   c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     pkt.stream_index = this->avStream->index;
-     if (cc->coded_frame->key_frame) //treat keyframes well
-       {
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       }
-     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
-     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 2162e7a28..000000000
--- a/community/vtk/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-    
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-    
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
- 
- 
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
- 
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-   }
- 
- private:
diff --git a/community/vtk/fixkernelversioncheck.diff b/community/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community/wings3d/wings3d.png b/community/wings3d/wings3d.png
deleted file mode 100644
index 45a1140bf..000000000
--- a/community/wings3d/wings3d.png
+++ /dev/null
diff --git a/community/zynaddsubfx/zynaddsubfx.desktop b/community/zynaddsubfx/zynaddsubfx.desktop
deleted file mode 100644
index ebca740ef..000000000
--- a/community/zynaddsubfx/zynaddsubfx.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=ZynAddSubFX
-Comment=A powerful realtime software synthesizer
-Exec=zynaddsubfx
-Icon=zynaddsubfx
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
author	Parabola <dev@list.parabolagnulinux.org>	2012-05-04 20:00:41 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2012-05-04 20:00:41 +0000
commit	b2c353d874b85e06f355a9419852e2616613c7d0 (patch)
tree	f0773e0a930d308198ef5036d4f74e7f53015e6e /community
parent	0a24fb835cac4007388213ad0afb15257b035b14 (diff)