Sun Feb 5 17:25:01 UTC 2012

65 files changed, 0 insertions, 7859 deletions

diff --git a/community-testing/balsa/PKGBUILD b/community-testing/balsa/PKGBUILD
deleted file mode 100644
index 43eae5357..000000000
--- a/community-testing/balsa/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 62015 2012-01-14 12:24:56Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=balsa
-pkgver=2.4.11
-pkgrel=1
-pkgdesc="An e-mail client for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://pawsa.fedorapeople.org/balsa/'
-depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils')
-makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
-install=balsa.install
-source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        gmime26.patch)
-md5sums=('915c622b6385aa4f83d5eee8f31ee8e8'
-         '108d33f533558a371189441edce7d7e6')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/gmime26.patch"
-    autoreconf -fi
-
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-ssl \
-        --with-gpgme=gpgme-config \
-        --with-gss \
-        --with-ldap \
-        --with-gtksourceview \
-        --with-gtkspell \
-        --with-rubrica \
-        --with-sqlite \
-        --without-nm \
-        --without-gnome \
-        --with-html-widget=webkit
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/balsa/balsa.install b/community-testing/balsa/balsa.install
deleted file mode 100644
index 1f167b5e9..000000000
--- a/community-testing/balsa/balsa.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-testing/balsa/gmime26.patch b/community-testing/balsa/gmime26.patch
deleted file mode 100644
index fe4e6a9fa..000000000
--- a/community-testing/balsa/gmime26.patch
+++ /dev/null
@@ -1,1372 +0,0 @@
-From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
-Date: Mon, 28 Nov 2011 03:00:55 +0000
-Subject: Build with GMime 2.6.0
-
-	* configure.in: check for GMime >= 2.5.7
-	* libbalsa/gmime-application-pkcs7.c
-	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-	(g_mime_application_pkcs7_encrypt),
-	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-	* libbalsa/gmime-application-pkcs7.h: ditto.
-	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-	(g_mime_gpgme_digest_id): ditto.
-	* libbalsa/gmime-gpgme-context.h: ditto.
-	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-	ditto.
-	* libbalsa/gmime-part-rfc2440.h: ditto.
-	* libbalsa/rfc3156.c (password_request_func),
-	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
----
-diff --git a/ChangeLog b/ChangeLog
-index bd95e68..d5c62f5 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,25 @@
-+2011-11-27  Peter Bloomfield
-+
-+	Build with GMime 2.6.0
-+
-+	* configure.in: check for GMime >= 2.5.7
-+	* libbalsa/gmime-application-pkcs7.c
-+	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-+	(g_mime_application_pkcs7_encrypt),
-+	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-+	* libbalsa/gmime-application-pkcs7.h: ditto.
-+	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-+	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-+	(g_mime_gpgme_digest_id): ditto.
-+	* libbalsa/gmime-gpgme-context.h: ditto.
-+	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-+	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-+	ditto.
-+	* libbalsa/gmime-part-rfc2440.h: ditto.
-+	* libbalsa/rfc3156.c (password_request_func),
-+	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-+	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
-+
- 2011-11-22  Pawel Salek
- 
- 	* NEWS, configure.in: release balsa-2.4.11
-diff --git a/configure.in b/configure.in
-index 4a8320e..64d99f3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -307,7 +307,12 @@ fi
- case "$with_gmime" in
-     2.4) ;;
-     2.6) AC_DEFINE([HAVE_GMIME_2_6], [1],
--                   [Defined to build with GMime version 2.5 or 2.6]) ;;
-+                   [Defined to build with GMime version 2.5 or 2.6])
-+         if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then
-+             AC_DEFINE([HAVE_GMIME_2_5_7], [1],
-+                       [Defined when GMime version is at least 2.5.7])
-+         fi
-+         ;;
-     *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;;
- esac
- 
-diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
-index 12f4f8f..63b8087 100644
---- a/libbalsa/gmime-application-pkcs7.c
-+++ b/libbalsa/gmime-application-pkcs7.c
-@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter, *from_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->sign_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* Prepare all the parts for signing... */
-@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     sig_data_stream = g_mime_stream_mem_new ();
- 	
-     /* get the signed content */
--    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_sign
-+        (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream,
-+         sig_data_stream, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (filtered_stream);
- 	g_object_unref (sig_data_stream);
- 	g_object_unref (stream);
-@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-  * decrypting it again. In this case, validity is undefined.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 				GMimeSignatureValidity ** validity,
- 				GMimeCipherContext * ctx, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+                                GMimeSignatureList ** list,
-+                                GMimeCryptoContext * ctx, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
-+#ifndef HAVE_GMIME_2_5_7
-     *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT,
- 				     ciphertext, filtered_stream, err);
--    if (!*validity) {
-+    if (!*validity)
-+#else /* HAVE_GMIME_2_5_7 */
-+    *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT,
-+                                         ciphertext, filtered_stream, err);
-+    if (!*list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-  */
- int
- g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext *ctx, GPtrArray *recipients,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext *ctx,
-+                                  GPtrArray *recipients,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  GError **err)
- {
-     GMimeDataWrapper *wrapper;
-@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* get the cleartext */
-@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
- 	
-     /* encrypt the content stream */
-     ciphertext = g_mime_stream_mem_new ();
--    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_encrypt
-+        (ctx, FALSE, NULL,
-+         GMIME_CIPHER_ALGO_DEFAULT,
-+         recipients, stream, ciphertext, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (ciphertext);
- 	g_object_unref (stream);
- 	return -1;
-@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-  * err with more information about the reason.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
- 				  GError **err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7,
-+                                  GMimeCryptoContext *ctx,
-+				  GError **err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
--    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_decrypt
-+        (ctx, ciphertext, filtered_stream, err) == NULL)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h
-index 03fa401..6678ff5 100644
---- a/libbalsa/gmime-application-pkcs7.h
-+++ b/libbalsa/gmime-application-pkcs7.h
-@@ -28,7 +28,11 @@ extern "C" {
- #endif				/* __cplusplus */
- 
- #include <gmime/gmime-part.h>
-+#ifndef HAVE_GMIME_2_5_7
- #include <gmime/gmime-cipher-context.h>
-+#else /* HAVE_GMIME_2_5_7 */
-+#include <gmime/gmime-crypto-context.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT
- 
-@@ -39,21 +43,40 @@ extern "C" {
-  * Balsa always encodes S/MIME signed stuff as multipart/signed. */
- int g_mime_application_pkcs7_sign(GMimePart * pkcs7,
- 				  GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  const char *userid, GError ** err);
- #endif
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 					     GMimeSignatureValidity ** validity,
- 					     GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+					     GMimeSignatureList ** validity,
-+					     GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7,
- 				     GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				     GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				     GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				     GPtrArray * recipients, GError ** err);
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
- 					      GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
-+					      GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c
-index 24b140b..0c56f94 100644
---- a/libbalsa/gmime-gpgme-context.c
-+++ b/libbalsa/gmime-gpgme-context.c
-@@ -27,6 +27,9 @@
- #include <unistd.h>
- #include <glib.h>
- #include <gmime/gmime.h>
-+#ifdef HAVE_GMIME_2_5_7
-+#include <gmime/gmime-certificate.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- #include <gpgme.h>
- #include <time.h>
- #include <glib/gi18n.h>
-@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass
- 						    protocol,
- 						    GError ** error);
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx,
- 					    const char *hash);
- 
-@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext *
-                                                     GMimeStream * istream,
-                                                     GMimeStream * ostream,
-                                                     GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx,
-+                                              const char *hash);
-+
-+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx,
-+                                            GMimeDigestAlgo hash);
-+
-+static const char
-+    *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context);
-+
-+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx,
-+                             const char * userid,
-+			     GMimeDigestAlgo hash,
-+                             GMimeStream * istream,
-+			     GMimeStream * ostream,
-+                             GError ** err);
-+
-+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx,
-+                                               GMimeDigestAlgo hash,
-+                                               GMimeStream * istream,
-+                                               GMimeStream * sigstream,
-+                                               GError ** err);
-+
-+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx,
-+                                gboolean sign,
-+				const char *userid,
-+                                GMimeDigestAlgo digest,
-+                                GPtrArray * recipients,
-+				GMimeStream * istream,
-+				GMimeStream * ostream, GError ** err);
-+
-+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx,
-+                                                GMimeStream * istream,
-+                                                GMimeStream * ostream,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- /* internal passphrase callback */
-@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err,
- 				   const gchar * message);
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherContextClass *parent_class = NULL;
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeCryptoContextClass *parent_class = NULL;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- GType
-@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void)
- 	};
- 
- 	type =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT,
- 				   "GMimeGpgmeContext", &info, 0);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT,
-+				   "GMimeGpgmeContext", &info, 0);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     return type;
-@@ -136,19 +189,39 @@ static void
- g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass)
- {
-     GObjectClass *object_class = G_OBJECT_CLASS(klass);
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass *cipher_class =
- 	GMIME_CIPHER_CONTEXT_CLASS(klass);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass *crypto_class =
-+	GMIME_CRYPTO_CONTEXT_CLASS(klass);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     parent_class = g_type_class_ref(G_TYPE_OBJECT);
- 
-     object_class->finalize = g_mime_gpgme_context_finalize;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     cipher_class->hash_id = g_mime_gpgme_hash_id;
-     cipher_class->hash_name = g_mime_gpgme_hash_name;
-     cipher_class->sign = g_mime_gpgme_sign;
-     cipher_class->verify = g_mime_gpgme_verify;
-     cipher_class->encrypt = g_mime_gpgme_encrypt;
-     cipher_class->decrypt = g_mime_gpgme_decrypt;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto_class->digest_id = g_mime_gpgme_digest_id;
-+    crypto_class->digest_name = g_mime_gpgme_digest_name;
-+    crypto_class->get_signature_protocol =
-+        g_mime_gpgme_get_signature_protocol;
-+    crypto_class->get_encryption_protocol =
-+        g_mime_gpgme_get_encryption_protocol;
-+    crypto_class->get_key_exchange_protocol =
-+        g_mime_gpgme_get_key_exchange_protocol;
-+    crypto_class->sign = g_mime_gpgme_sign;
-+    crypto_class->verify = g_mime_gpgme_verify;
-+    crypto_class->encrypt = g_mime_gpgme_encrypt;
-+    crypto_class->decrypt = g_mime_gpgme_decrypt;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) ==
- 	GPG_ERR_NO_ERROR)
-@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object)
-     }
- 
- #if !defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif                          /* HAVE_GMIME_2_6 */
- 
-     G_OBJECT_CLASS(parent_class)->finalize(object);
-@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object)
- /*
-  * Convert a hash algorithm name to a number
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash
- g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo
-+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     if (hash == NULL)
- 	return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (hash == NULL)
-+	return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (!g_ascii_strcasecmp(hash, "pgp-"))
- 	hash += 4;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (!g_ascii_strcasecmp(hash, "md2"))
- 	return GMIME_CIPHER_HASH_MD2;
-     else if (!g_ascii_strcasecmp(hash, "md5"))
-@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
- 	return GMIME_CIPHER_HASH_HAVAL5160;
- 
-     return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (!g_ascii_strcasecmp(hash, "md2"))
-+	return GMIME_DIGEST_ALGO_MD2;
-+    else if (!g_ascii_strcasecmp(hash, "md5"))
-+	return GMIME_DIGEST_ALGO_MD5;
-+    else if (!g_ascii_strcasecmp(hash, "sha1"))
-+	return GMIME_DIGEST_ALGO_SHA1;
-+    else if (!g_ascii_strcasecmp(hash, "ripemd160"))
-+	return GMIME_DIGEST_ALGO_RIPEMD160;
-+    else if (!g_ascii_strcasecmp(hash, "tiger192"))
-+	return GMIME_DIGEST_ALGO_TIGER192;
-+    else if (!g_ascii_strcasecmp(hash, "haval-5-160"))
-+	return GMIME_DIGEST_ALGO_HAVAL5160;
-+
-+    return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-  * Convert a hash algorithm number to a string
-  */
- static const char *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-     char *p;
-@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     g_return_val_if_fail(ctx->gpgme_ctx, NULL);
- 
-     /* note: this is only a subset of the hash algorithms gpg(me) supports */
-+#ifndef HAVE_GMIME_2_5_7
-     switch (hash) {
-     case GMIME_CIPHER_HASH_MD2:
- 	p = "pgp-md2";
-@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     case GMIME_CIPHER_HASH_HAVAL5160:
- 	p = "pgp-haval-5-160";
- 	break;
-+#else /* HAVE_GMIME_2_5_7 */
-+    switch (hash) {
-+    case GMIME_DIGEST_ALGO_MD2:
-+	p = "pgp-md2";
-+	break;
-+    case GMIME_DIGEST_ALGO_MD5:
-+	p = "pgp-md5";
-+	break;
-+    case GMIME_DIGEST_ALGO_SHA1:
-+	p = "pgp-sha1";
-+	break;
-+    case GMIME_DIGEST_ALGO_RIPEMD160:
-+	p = "pgp-ripemd160";
-+	break;
-+    case GMIME_DIGEST_ALGO_TIGER192:
-+	p = "pgp-tiger192";
-+	break;
-+    case GMIME_DIGEST_ALGO_HAVAL5160:
-+	p = "pgp-haval-5-160";
-+	break;
-+#endif /* HAVE_GMIME_2_5_7 */
-     default:
- 	if (!(p = ctx->micalg))
- 	    return p;
-@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     return p;
- }
- 
-+#ifdef HAVE_GMIME_2_5_7
-+static const char *
-+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->sign_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->encrypt_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->key_protocol;
-+}
-+
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- /*
-  * Wrapper to convert the passphrase returned from the gmime session to gpgme.
-@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT,
- 			  const char *PASSPHRASE_INFO, int PREV_WAS_BAD,
- 			  int FD)
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK);
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
-     GMimeStream *stream;
-     gboolean rc;
-@@ -366,9 +523,15 @@ cb_data_release(void *handle)
-  * arg, but set the value in the context.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- 		  GMimeCipherHash hash, GMimeStream * istream,
- 		  GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid,
-+		  GMimeDigestAlgo hash, GMimeStream * istream,
-+		  GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_sig_mode_t sig_mode;
-@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * In standard mode, verify that sigstream contains a detached signature for
-  * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-@@ -471,13 +635,33 @@ static GMimeSignatureValidity *
- g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 		    GMimeStream * istream, GMimeStream * sigstream,
- 		    GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * In standard mode, verify that sigstream contains a detached signature for
-+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-+ * istream contains clearsigned data, and sigstream will be filled with the
-+ * verified plaintext. The routine returns a GMimeSignatureList object.
-+ * More information is saved in the context's signature object.
-+ * On error error is set accordingly.
-+ */
-+static GMimeSignatureList *
-+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash,
-+		    GMimeStream * istream, GMimeStream * sigstream,
-+		    GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-     gpgme_protocol_t protocol;
-     gpgme_error_t err;
-     gpgme_data_t msg, sig;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+
-+#endif /* HAVE_GMIME_2_5_7 */
-     struct gpgme_data_cbs cbs = {
- 	(gpgme_data_read_cb_t) g_mime_gpgme_stream_rd,	/* read method */
- 	(gpgme_data_write_cb_t) g_mime_gpgme_stream_wr,	/* write method */
-@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	ctx->sig_state =
- 	    g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	    }
-     } else
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* release gmgme data buffers */
-     gpgme_data_release(msg);
-     gpgme_data_release(sig);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
-  * Encrypt istream to ostream for recipients. If sign is set, sign by userid.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
- 		     const char *userid, GPtrArray * recipients,
- 		     GMimeStream * istream, GMimeStream * ostream,
- 		     GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign,
-+		     const char *userid,
-+                     GMimeDigestAlgo digest,
-+                     GPtrArray * recipients,
-+		     GMimeStream * istream, GMimeStream * ostream,
-+		     GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
-  * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included
-  * signature (if any).
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeSignatureValidity *
- g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 		     GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDecryptResult *
-+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream,
-+		     GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	NULL,			/* seek method */
- 	cb_data_release		/* release method */
-     };
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some paranoia checks */
-     g_return_val_if_fail(ctx, NULL);
-@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
-     /* try to get information about the signature (if any) */
-     ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
- 
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+    result = g_mime_decrypt_result_new();
-+    g_mime_decrypt_result_set_signatures(result, list);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+
-+    return result;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * Create a new gpgme cipher context with protocol. If anything fails, return
-  * NULL and set error.
-  */
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * Create a new gpgme crypto context with protocol. If anything fails, return
-+ * NULL and set error.
-+ */
-+#endif /* HAVE_GMIME_2_5_7 */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
- g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd,
-                          gpgme_protocol_t protocol, GError ** error)
-@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 			 gpgme_protocol_t protocol, GError ** error)
- #endif                          /* HAVE_GMIME_2_6 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GMimeGpgmeContext *ctx;
-     gpgme_error_t err;
-     gpgme_ctx_t gpgme_ctx;
-@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 	return NULL;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     /* create the cipher context */
-+#else /* HAVE_GMIME_2_5_7 */
-+    /* create the crypto context */
-+#endif /* HAVE_GMIME_2_5_7 */
-     ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL);
-     if (!ctx) {
- 	gpgme_release(gpgme_ctx);
- 	return NULL;
-     } else
- 	ctx->gpgme_ctx = gpgme_ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     cipher = (GMimeCipherContext *) ctx;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto = (GMimeCryptoContext *) ctx;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* check if the requested protocol is available */
-     if (!g_mime_gpgme_context_check_protocol
-@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 
-     /* setup according to requested protocol */
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->request_passwd = request_passwd;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->request_passwd = request_passwd;
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->session = session;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->session = session;
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_object_ref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-     gpgme_set_protocol(gpgme_ctx, protocol);
-     if (protocol == GPGME_PROTOCOL_OpenPGP) {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pgp-signature";
- 	cipher->encrypt_protocol = "application/pgp-encrypted";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pgp-signature";
-+	ctx->encrypt_protocol = "application/pgp-encrypted";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     } else {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pkcs7-signature";
- 	cipher->encrypt_protocol = "application/pkcs7-mime";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pkcs7-signature";
-+	ctx->encrypt_protocol = "application/pkcs7-mime";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h
-index 585d927..19c5fae 100644
---- a/libbalsa/gmime-gpgme-context.h
-+++ b/libbalsa/gmime-gpgme-context.h
-@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name,
- 					 GMimeGpgmeContext * ctx);
- 
- struct _GMimeGpgmeContext {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext parent_object;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext parent_object;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gpgme_ctx_t gpgme_ctx;	/* gpgme context */
-     gboolean singlepart_mode;	/* set context to single-part mode (RFC 2440, 2633) */
-@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext {
-     GMimeGpgmeKeySelectCB key_select_cb;	/* key selection callback */
-     GMimeGpgmeKeyTrustCB key_trust_cb;          /* low trust key cb */
-     gpgme_passphrase_cb_t passphrase_cb;	/* passphrase callback */
-+#ifdef HAVE_GMIME_2_5_7
-+
-+    const gchar *sign_protocol;
-+    const gchar *encrypt_protocol;
-+    const gchar *key_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
- };
- 
- 
- struct _GMimeGpgmeContextClass {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass parent_class;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass parent_class;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gboolean has_proto_openpgp;
-     gboolean has_proto_cms;
-@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass {
- 
- GType g_mime_gpgme_context_get_type(void);
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-                                              request_passwd,
- 					     gpgme_protocol_t protocol,
- 					     GError ** error);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-+                                             request_passwd,
-+					     gpgme_protocol_t protocol,
-+					     GError ** error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
- GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session,
- 					     gpgme_protocol_t protocol,
-diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
-index 795d2e1..e79c4cb 100644
---- a/libbalsa/gmime-part-rfc2440.c
-+++ b/libbalsa/gmime-part-rfc2440.c
-@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), -1);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1);
- 
-     /* get the raw content */
-@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-     ctx->singlepart_mode = TRUE;
-     if (recipients == NULL)
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid,
- 			       GMIME_CIPHER_HASH_DEFAULT, stream,
- 			       cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid,
-+			       GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			       cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     else
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx),
- 				  sign_userid != NULL, sign_userid,
- 				  recipients, stream, cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx),
-+				  sign_userid != NULL, sign_userid,
-+                                  GMIME_CIPHER_ALGO_DEFAULT,
-+				  recipients, stream, cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     if (result == -1) {
- 	g_object_unref(cipherstream);
- 	return -1;
-@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-  * set on err to provide more information. Upon success, the content
-  * of part is replaced by the verified output of the crypto engine.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_verify(GMimePart * part,
- 			   GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(GMIME_PART(part));
-@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part,
- 
-     /* verify the signature */
-     ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
-     valid =
- 	g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx),
- 			     GMIME_CIPHER_HASH_DEFAULT, stream,
- 			     plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list =
-+	g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx),
-+			     GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			     plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* upon success, replace the signed content by the checked one */
--    if (valid) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (valid)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
- 
- 	g_mime_data_wrapper_set_stream(wrapper, plainstream);
-@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-     }
-     g_object_unref(plainstream);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-  * verified and the result is placed in ctx by the underlying gpgme
-  * context.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeDecryptResult *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_decrypt(GMimePart * part,
- 			    GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *result;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+#endif /* HAVE_GMIME_2_5_7 */
-     gchar *headbuf = g_malloc0(1024);
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol !=
- 			 NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(part);
-@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part,
- 
-     /* decrypt and (if possible) verify the input */
-     result =
-+#ifndef HAVE_GMIME_2_5_7
- 	g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream,
- 			      plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream,
-+                                      plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (result != NULL) {
- 	GMimeStream *filter_stream;
-diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h
-index 48be5a4..cc1901a 100644
---- a/libbalsa/gmime-part-rfc2440.h
-+++ b/libbalsa/gmime-part-rfc2440.h
-@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 				     GPtrArray * recipients,
- 				     const char *sign_userid,
- 				     GError ** err);
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part,
- 						   GMimeGpgmeContext * ctx,
- 						   GError ** err);
- GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part,
-                                                     GMimeGpgmeContext *
-                                                     ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part,
-+                                               GMimeGpgmeContext * ctx,
-+                                               GError ** err);
-+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part,
-+                                                GMimeGpgmeContext * ctx,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
-index a56e12c..df4a2e1 100644
---- a/libbalsa/rfc3156.c
-+++ b/libbalsa/rfc3156.c
-@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body)
- 
- #if defined(HAVE_GMIME_2_6)
- static gboolean
-+#ifndef HAVE_GMIME_2_5_7
- password_request_func(GMimeCipherContext * ctx, const char *user_id,
-                       const char *prompt_ctx, gboolean reprompt,
-                       GMimeStream * response, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+password_request_func(GMimeCryptoContext * ctx, const char *user_id,
-+                      const char *prompt_ctx, gboolean reprompt,
-+                      GMimeStream * response, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     gint fd;
-     gchar *name_used;
-@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for,
- 	return FALSE;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (g_mime_multipart_signed_sign
- 	(mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for,
--	 GMIME_CIPHER_HASH_DEFAULT, error) != 0) {
-+	 GMIME_CIPHER_HASH_DEFAULT, error) != 0)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_multipart_signed_sign
-+	(mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for,
-+	 GMIME_DIGEST_ALGO_DEFAULT, error) != 0)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(mps);
- 	g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
-@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 
- 	encrypted_obj = GMIME_OBJECT(mpe);
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_encrypt(mpe, *content,
- 					       GMIME_CIPHER_CONTEXT(ctx),
-                                                FALSE, NULL,
- 					       recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_encrypt(mpe, *content,
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               FALSE, NULL,
-+                                               GMIME_DIGEST_ALGO_DEFAULT,
-+					       recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #ifdef HAVE_SMIME
-     else {
-@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 	encrypted_obj = GMIME_OBJECT(pkcs7);
- 	ctx->singlepart_mode = TRUE;
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
- 					     GMIME_CIPHER_CONTEXT(ctx),
- 					     recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
-+					     GMIME_CRYPTO_CONTEXT(ctx),
-+					     recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #endif
- 
-@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- #if !defined(HAVE_GMIME_2_6)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
--    GMimeCipherContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-+    GMimeCipherContext *g_mime_ctx;
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *g_mime_ctx;
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-+    GMimeGpgmeContext *ctx;
-     GError *error = NULL;
- 
-     /* paranoia checks */
-@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
-     /* try to create GMimeGpgMEContext */
- #if !defined(HAVE_GMIME_2_6)
-     session = g_object_new(g_mime_session_get_type(), NULL, NULL);
--    ctx = g_mime_gpgme_context_new(session, protocol, &error);
-+    g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error);
- #else                           /* HAVE_GMIME_2_6 */
--    ctx =
-+    g_mime_ctx =
-         g_mime_gpgme_context_new(password_request_func, protocol, &error);
- #endif                          /* HAVE_GMIME_2_6 */
--    if (ctx == NULL) {
-+    if (g_mime_ctx == NULL) {
- 	if (error) {
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s",
- 				 _("creating a gpgme context failed"),
-@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR;
- 	return FALSE;
-     }
-+    ctx = GMIME_GPGME_CONTEXT(g_mime_ctx);
- 
-     /* S/MIME uses the protocol application/pkcs7-signature, but some ancient
-        mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature,
-@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part),
- 						     "protocol");
- 	if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature"))
-+#ifndef HAVE_GMIME_2_5_7
-+	    g_mime_ctx->sign_protocol = cms_protocol;
-+#else /* HAVE_GMIME_2_5_7 */
- 	    ctx->sign_protocol = cms_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     /* verify the signature */
- 
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED
--					   (body->mime_part), ctx, &error);
-+					   (body->mime_part), g_mime_ctx,
-+                                           &error);
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-     if (valid == NULL) {
-@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR,
- 				 _("signature verification failed"));
-     }
--    if (GMIME_GPGME_CONTEXT(ctx)->sig_state) {
--	body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state;
-+    if (ctx->sig_state) {
-+	body->parts->next->sig_info = ctx->sig_state;
- 	g_object_ref(G_OBJECT(body->parts->next->sig_info));
-     }
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
--    g_object_unref(ctx);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(g_mime_ctx);
- #if !defined(HAVE_GMIME_2_6)
-     g_object_unref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     if (protocol == GPGME_PROTOCOL_OpenPGP)
- 	mime_obj =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               NULL,
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #ifdef HAVE_SMIME
-     else if (smime_signed) {
-+#ifndef HAVE_GMIME_2_5_7
- 	GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+	GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 	ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
- 	mime_obj =
- 	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
- 					    &valid,
-@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
- 	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	mime_obj =
-+	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
-+					    &valid,
-+					    GMIME_CRYPTO_CONTEXT(ctx),
-+					    &error);
-+	g_object_unref(valid);
-+    } else
-+	mime_obj =
-+	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
-     GMimeGpgmeContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GError *error = NULL;
-     gpgme_error_t retval;
- 
-@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     }
- 
-     /* clean up */
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-     retval = ctx->sig_state->status;
-     g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
---
-cgit v0.9.0.2
diff --git a/community-testing/dsniff/PKGBUILD b/community-testing/dsniff/PKGBUILD
deleted file mode 100644
index d705f8887..000000000
--- a/community-testing/dsniff/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 61872 2012-01-09 18:49:25Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: ViNS <gladiator@fastwebnet.it>
-
-pkgname=dsniff
-pkgver=2.4b1
-pkgrel=21
-pkgdesc="Collection of tools for network auditing and penetration testing"
-url="http://www.monkey.org/~dugsong/dsniff/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids')
-source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
-        "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz")
-md5sums=('2f761fa3475682a7512b0b43568ee7d6'
-         'fbc9f62f9ab2f98f24f53ad497c1ce5d')
-
-build() {
-  cd $srcdir/$pkgname-2.4
-  patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
-  for i in *.dpatch; do
-    patch -N < "$i"
-  done
-
-  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-2.4
-  make prefix="$pkgdir"/usr install
-  install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-
-  install -d "$pkgdir"/usr/share
-  mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
-}
diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog
deleted file mode 100644
index 80a101472..000000000
--- a/community-testing/exim/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2011-10-10 Angel Velasquez <angvp@archlinux.org>
-	* Updated to 4.77
-
-2011-07-15 Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt without tcp_wrappers
-	* Fixing logrotate issue FS#25094
-	* ChangeLog file changed name from exim.changelog to ChangeLog
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Rebuilt against db 5.2.28
-
-2010-05-09 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 4.76
-    * Removed previous patch since is no longer needed
-    * Removed newaliases script FS#22744
-    * Removed sudo dependency
-
-2010-05-07 Angel Velasquez <angvp@archlinux.org>
-    * Adding patch for security issue see: http://goo.gl/QBict
-
-2010-05-06 Angel Velasquez <angvp@archlinux.org>
-    * Setting sticky id to deliver mail. Closes FS#24109 
-
-2010-04-30 Angel Velasquez <angvp@archlinux.org>
-    * exim 4.75
-    * Config updated with the aliases path. Closes FS#22743
-    * Removed sed hackings and added a exim.Makefile . Closes FS#22744
-    * Replaced creation of the user at build time. Closes FS#22745
-
diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
deleted file mode 100644
index 31ad9632f..000000000
--- a/community-testing/exim/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 61874 2012-01-09 18:49:46Z stephane $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=exim
-pkgver=4.77
-pkgrel=2
-pkgdesc="Message Transfer Agent"
-arch=('x86_64' 'i686')
-url="http://www.exim.org/"
-license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf \
-        etc/logrotate.d/exim etc/conf.d/exim)
-install=exim.install
-changelog=ChangeLog
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
-options=('!makeflags')
-source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2"
-        aliases
-        exim
-        exim.logrotate
-        exim.conf.d
-        exim.Makefile)
-sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
-  install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
-  install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
-  install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim
-  mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
-    ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
-  chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
-  cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\
-          exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\
-          exim_fixdb eximstats exinext exiqgrep exiwhat; do
-          install -m 0755 "$i" "$pkgdir/usr/sbin"
-  done
-
-  cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
-      -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \
-      >"$pkgdir/etc/mail/exim.conf"
-
-  cp "$srcdir/aliases" "$pkgdir/etc/mail"
-  cd "$pkgdir/usr/sbin"
-  for i in mailq rmail rsmtp runq sendmail; do
-      ln -s exim "$i"
-  done
-  # fhs compliancy
-  ln -s ../sbin/exim ../lib/sendmail
-
-  mkdir -p "$pkgdir/etc/rc.d"
-  cp "$srcdir/exim" "$pkgdir/etc/rc.d"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases
deleted file mode 100644
index 5a76ff7d5..000000000
--- a/community-testing/exim/aliases
+++ /dev/null
@@ -1,35 +0,0 @@
-#  
-#  /etc/mail/aliases
-#
-#  NOTE:  Make sure you run 'newaliases' after modifying this file
-#
-
-# Basic system aliases -- these MUST be present.
-MAILER-DAEMON:	postmaster
-postmaster:	root
-hostmaster:	root
-webmaster:	hostmaster
-ftpmaster:	hostmaster
-admin:		hostmaster
-administrator:	hostmaster
-
-# General redirections for pseudo accounts.
-bin:		root
-daemon:		root
-games:		root
-ingres:		root
-nobody:		root
-system:		root
-toor:		root
-uucp:		root
-
-# Well-known aliases.
-manager:	root
-dumper:		root
-operator:	root
-
-# trap decode to catch security attacks
-decode:		root
-
-# Person who should get root's mail
-#root:
diff --git a/community-testing/exim/exim b/community-testing/exim/exim
deleted file mode 100644
index 8e9640b32..000000000
--- a/community-testing/exim/exim
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/exim`
-
-case "$1" in
-  start)
-    stat_busy "Starting Exim"
-    [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon exim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Exim"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/exim.pid
-      rm_daemon exim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile
deleted file mode 100644
index a304ce829..000000000
--- a/community-testing/exim/exim.Makefile
+++ /dev/null
@@ -1,1227 +0,0 @@
-# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $
-
-##################################################
-#          The Exim mail transport agent         #
-##################################################
-
-# This is the template for Exim's main build-time configuration file. It
-# contains settings that are independent of any operating system. These are
-# things that are mostly sysadmin choices. The items below are divided into
-# those you must specify, those you probably want to specify, those you might
-# often want to specify, and those that you almost never need to mention.
-
-# Edit this file and save the result to a file called Local/Makefile within the
-# Exim distribution directory before running the "make" command.
-
-# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
-
-# However, if you are building Exim for a single OS only, you don't need to
-# worry about setting up Local/Makefile-<osname>. Any build-time configuration
-# settings you require can in fact be placed in the one file called
-# Local/Makefile. It is only if you are building for several OS from the same
-# source files that you need to worry about splitting off your own OS-dependent
-# settings into separate files. (There's more explanation about how this all
-# works in the toplevel README file, under "Modifying the building process", as
-# well as in the Exim specification.)
-
-# One OS-specific thing that may need to be changed is the command for running
-# the C compiler; the overall default is gcc, but some OS Makefiles specify cc.
-# You can override anything that is set by putting CC=whatever in your
-# Local/Makefile.
-
-# NOTE: You should never need to edit any of the distributed Makefiles; all
-# overriding can be done in your Local/Makefile(s). This will make it easier
-# for you when the next release comes along.
-
-# The location of the X11 libraries is something else that is quite variable
-# even between different versions of the same operating system (and indeed
-# there are different versions of X11 as well, of course). The four settings
-# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-# (dynamic run-time library). You need not worry about X11 unless you want to
-# compile the Exim monitor utility. Exim itself does not use X11.
-
-# Another area of variability between systems is the type and location of the
-# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB.
-# By default the code assumes ndbm; this often works with gdbm or DB, provided
-# they are correctly installed, via their compatibility interfaces. However,
-# Exim can also be configured to use the native calls for Berkeley DB (obsolete
-# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm.
-
-# For some operating systems, a default DBM library (other than ndbm) is
-# selected by a setting in the OS-specific Makefile. Most modern OS now have
-# a DBM library installed as standard, and in many cases this will be selected
-# for you by the OS-specific configuration. If Exim compiles without any
-# problems, you probably do not have to worry about the DBM library. If you
-# do want or need to change it, you should first read the discussion in the
-# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's
-# interface to the DBM library.
-
-# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-# also permitted to use the # character to add a comment to a setting, for
-# example
-#
-# EXIM_GID=42   # the "mail" group
-#
-# However, with some versions of "make" this works only if there is no white
-# space between the end of the setting and the #, so perhaps it is best
-# avoided. A consequence of this facility is that it is not possible to have
-# the # character present in any setting, but I can't think of any cases where
-# this would be wanted.
-###############################################################################
-
-
-
-###############################################################################
-#                    THESE ARE THINGS YOU MUST SPECIFY                        #
-###############################################################################
-
-# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and
-# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number.
-
-# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it
-# really is a very good idea to specify it here rather than at run time. This
-# is particularly true if you let the logs go to their default location in the
-# spool directory, because it means that the location of the logs is known
-# before Exim has read the run time configuration file.
-
-#------------------------------------------------------------------------------
-# BIN_DIRECTORY defines where the exim binary will be installed by "make
-# install". The path is also used internally by Exim when it needs to re-invoke
-# itself, either to send an error message, or to recover root privilege. Exim's
-# utility binaries and scripts are also installed in this directory. There is
-# no "standard" place for the binary directory. Some people like to keep all
-# the Exim files under one directory such as /usr/exim; others just let the
-# Exim binaries go into an existing directory such as /usr/sbin or
-# /usr/local/sbin. The installation script will try to create this directory,
-# and any superior directories, if they do not exist.
-
-BIN_DIRECTORY=/usr/sbin
-
-
-#------------------------------------------------------------------------------
-# CONFIGURE_FILE defines where Exim's run time configuration file is to be
-# found. It is the complete pathname for the file, not just a directory. The
-# location of all other run time files and directories can be changed in the
-# run time configuration file. There is a lot of variety in the choice of
-# location in different OS, and in the preferences of different sysadmins. Some
-# common locations are in /etc or /etc/mail or /usr/local/etc or
-# /usr/local/etc/mail. Another possibility is to keep all the Exim files under
-# a single directory such as /usr/exim. Whatever you choose, the installation
-# script will try to make the directory and any superior directories if they
-# don't exist. It will also install a default runtime configuration if this
-# file does not exist.
-
-CONFIGURE_FILE=/etc/mail/exim.conf
-
-# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
-# In this case, Exim will use the first of them that exists when it is run.
-# However, if a list is specified, the installation script no longer tries to
-# make superior directories or to install a default runtime configuration.
-
-
-#------------------------------------------------------------------------------
-# The Exim binary must normally be setuid root, so that it starts executing as
-# root, but (depending on the options with which it is called) it does not
-# always need to retain the root privilege. These settings define the user and
-# group that is used for Exim processes when they no longer need to be root. In
-# particular, this applies when receiving messages and when doing remote
-# deliveries. (Local deliveries run as various non-root users, typically as the
-# owner of a local mailbox.) Specifying these values as root is not supported.
-
-EXIM_USER=ref:exim
-
-# If you specify EXIM_USER as a name, this is looked up at build time, and the
-# uid number is built into the binary. However, you can specify that this
-# lookup is deferred until runtime. In this case, it is the name that is built
-# into the binary. You can do this by a setting of the form:
-
-# EXIM_USER=ref:exim
-
-# In other words, put "ref:" in front of the user name. If you set EXIM_USER
-# like this, any value specified for EXIM_GROUP is also passed "by reference".
-# Although this costs a bit of resource at runtime, it is convenient to use
-# this feature when building binaries that are to be run on multiple systems
-# where the name may refer to different uids. It also allows you to build Exim
-# on a system where there is no Exim user defined.
-
-# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
-# also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
-# you want to use a group other than the default group for the given user.
-
-# EXIM_GROUP=
-
-# Many sites define a user called "exim", with an appropriate default group,
-# and use
-#
-# EXIM_USER=exim
-#
-# while leaving EXIM_GROUP unspecified (commented out).
-
-
-#------------------------------------------------------------------------------
-# SPOOL_DIRECTORY defines the directory where all the data for messages in
-# transit is kept. It is strongly recommended that you define it here, though
-# it is possible to leave this till the run time configuration.
-
-# Exim creates the spool directory if it does not exist. The owner and group
-# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to
-# all the files and directories that are created in the spool directory.
-
-# Almost all installations choose this:
-
-SPOOL_DIRECTORY=/var/spool/exim
-
-
-
-###############################################################################
-#           THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY                     #
-###############################################################################
-
-# If you need extra header file search paths on all compiles, put the -I
-# options in INCLUDE.  If you want the extra searches only for certain
-# parts of the build, see more specific xxx_INCLUDE variables below.
-
-# INCLUDE=-I/example/include
-
-# You need to specify some routers and transports if you want the Exim that you
-# are building to be capable of delivering mail. You almost certainly need at
-# least one type of lookup. You should consider whether you want to build
-# the Exim monitor or not.
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual router drivers are included in the
-# Exim binary. There are no defaults in the code; those routers that are wanted
-# must be defined here by setting the appropriate variables to the value "yes".
-# Including a router in the binary does not cause it to be used automatically.
-# It has also to be configured in the run time configuration file. By
-# commenting out those you know you don't want to use, you can make the binary
-# a bit smaller. If you are unsure, leave all of these included for now.
-
-ROUTER_ACCEPT=yes
-ROUTER_DNSLOOKUP=yes
-ROUTER_IPLITERAL=yes
-ROUTER_MANUALROUTE=yes
-ROUTER_QUERYPROGRAM=yes
-ROUTER_REDIRECT=yes
-
-# This one is very special-purpose, so is not included by default.
-
-# ROUTER_IPLOOKUP=yes
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual transport drivers are included in
-# the Exim binary. There are no defaults; those transports that are wanted must
-# be defined here by setting the appropriate variables to the value "yes".
-# Including a transport in the binary does not cause it to be used
-# automatically. It has also to be configured in the run time configuration
-# file. By commenting out those you know you don't want to use, you can make
-# the binary a bit smaller. If you are unsure, leave all of these included for
-# now.
-
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-
-# This one is special-purpose, and commonly not required, so it is not
-# included by default.
-
-TRANSPORT_LMTP=yes
-
-
-#------------------------------------------------------------------------------
-# The appendfile transport can write messages to local mailboxes in a number
-# of formats. The code for three specialist formats, maildir, mailstore, and
-# MBX, is included only when requested. If you do not know what this is about,
-# leave these settings commented out.
-
-SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
-
-
-#------------------------------------------------------------------------------
-# See below for dynamic lookup modules.
-# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
-# If not using package management but using this anyway, then think about how
-# you perform upgrades and revert them. You should consider the benefit of
-# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can
-# maintain two concurrent sets of modules.
-
-# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for
-# your platform.  Eg:
-# CFLAGS_DYNAMIC=-shared -rdynamic
-# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-
-#------------------------------------------------------------------------------
-# These settings determine which file and database lookup methods are included
-# in the binary. See the manual chapter entitled "File and database lookups"
-# for discussion. DBM and lsearch (linear search) are included by default. If
-# you are unsure about the others, leave them commented out for now.
-# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is
-# for the specialist case of using the DNS as a general database facility (not
-# common).
-# If set to "2" instead of "yes" then the corresponding lookup will be
-# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to
-# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to
-# EXTRALIBS so that dlopen() is available to Exim. You need to define
-# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup
-# modules.
-# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and
-# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS
-# (where * is the name as given here in this list). That ensures that only
-# the dynamic library and not the exim binary will be linked against the
-# library.
-# NOTE: LDAP cannot be built as a module!
-
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-LOOKUP_DNSDB=yes
-
-# LOOKUP_CDB=yes
-LOOKUP_DSEARCH=yes
-# LOOKUP_IBASE=yes
-LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
-# LOOKUP_NISPLUS=yes
-# LOOKUP_ORACLE=yes
-# LOOKUP_PASSWD=yes
-# LOOKUP_PGSQL=yes
-# LOOKUP_SQLITE=yes
-# LOOKUP_WHOSON=yes
-
-# These two settings are obsolete; all three lookups are compiled when
-# LOOKUP_LSEARCH is enabled. However, we retain these for backward
-# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set.
-
-# LOOKUP_WILDLSEARCH=yes
-# LOOKUP_NWILDLSEARCH=yes
-
-
-#------------------------------------------------------------------------------
-# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
-# which LDAP library you have. Unfortunately, though most of their functions
-# are the same, there are minor differences. Currently Exim knows about four
-# LDAP libraries: the one from the University of Michigan (also known as
-# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes
-# with Solaris 7 onwards. Uncomment whichever of these you are using.
-
-# LDAP_LIB_TYPE=OPENLDAP1
-LDAP_LIB_TYPE=OPENLDAP2
-# LDAP_LIB_TYPE=NETSCAPE
-# LDAP_LIB_TYPE=SOLARIS
-
-# If you don't set any of these, Exim assumes the original University of
-# Michigan (OpenLDAP 1) library.
-
-
-#------------------------------------------------------------------------------
-# The PCRE library is required for exim.  There is no longer an embedded
-# version of the PCRE library included with the source code, instead you
-# must use a system library or build your own copy of PCRE.
-# In either case you must specify the library link info here.  If the
-# PCRE header files are not in the standard search path you must also
-# modify the INCLUDE path (above)
-# The default setting of PCRE_LIBS should work on the vast majority of
-# systems
-
-PCRE_LIBS=-lpcre
-
-
-#------------------------------------------------------------------------------
-# Additional libraries and include directories may be required for some
-# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on
-# the command for linking Exim itself, not on any auxiliary programs. You
-# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-# specified in INCLUDE. The settings below are just examples; -lpq is for
-# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
-
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
-
-
-#------------------------------------------------------------------------------
-# Compiling the Exim monitor: If you want to compile the Exim monitor, a
-# program that requires an X11 display, then EXIM_MONITOR should be set to the
-# value "eximon.bin". Comment out this setting to disable compilation of the
-# monitor. The locations of various X11 directories for libraries and include
-# files are defaulted in the OS/Makefile-Default file, but can be overridden in
-# local OS-specific make files.
-
-
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with content scanning support: If you want to compile Exim
-# with support for message body content scanning, set WITH_CONTENT_SCAN to
-# the value "yes". This will give you malware and spam scanning in the DATA ACL,
-# and the MIME ACL. Please read the documentation to learn more about these
-# features.
-
-WITH_CONTENT_SCAN=yes
-
-# If you want to use the deprecated "demime" condition in the DATA ACL,
-# uncomment the line below. Doing so will also explicitly turn on the
-# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
-# the "demime" condition.
-
-WITH_OLD_DEMIME=yes
-
-# If you're using ClamAV and are backporting fixes to an old version, instead
-# of staying current (which is the more usual approach) then you may need to
-# use an older API which uses a STREAM command, now deprecated, instead of
-# zINSTREAM.  If you need to set this, please let the Exim developers know, as
-# if nobody reports a need for it, we'll remove this option and clean up the
-# code.  zINSTREAM was introduced with ClamAV 0.95.
-#
-# WITH_OLD_CLAMAV_STREAM=yes
-
-#------------------------------------------------------------------------------
-# By default Exim includes code to support DKIM (DomainKeys Identified
-# Mail, RFC4871) signing and verification.  Verification of signatures is
-# turned on by default.  See the spec for information on conditionally
-# disabling it.  To disable the inclusion of the entire feature, set
-# DISABLE_DKIM to "yes"
-
-# DISABLE_DKIM=yes
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with experimental features. These are documented in
-# experimental-spec.txt. "Experimental" means that the way these features are
-# implemented may still change. Backward compatibility is not guaranteed.
-
-# Uncomment the following lines to add SPF support. You need to have libspf2
-# installed on your system (www.libspf2.org). Depending on where it is installed
-# you may have to edit the CFLAGS and LDFLAGS lines.
-
-# EXPERIMENTAL_SPF=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lspf2
-
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
-# You need to have libsrs_alt installed on your system (srs.mirtol.com).
-# Depending on where it is installed you may have to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_SRS=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lsrs_alt
-
-# Uncomment the following lines to add Brightmail AntiSpam support. You need
-# to have the Brightmail client SDK installed. Please check the experimental
-# documentation for implementation details. You need to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_BRIGHTMAIL=yes
-# CFLAGS  += -I/opt/brightmail/bsdk-6.0/include
-# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
-
-
-
-###############################################################################
-#                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
-###############################################################################
-
-# The items in this section are those that are commonly changed according to
-# the sysadmin's preferences, but whose defaults are often acceptable. The
-# first five are concerned with security issues, where differing levels of
-# paranoia are appropriate in different environments. Sysadmins also vary in
-# their views on appropriate levels of defence in these areas. If you do not
-# understand these issues, go with the defaults, which are used by many sites.
-
-
-#------------------------------------------------------------------------------
-# Although Exim is normally a setuid program, owned by root, it refuses to run
-# local deliveries as root by default. There is a runtime option called
-# "never_users" which lists the users that must never be used for local
-# deliveries. There is also the setting below, which provides a list that
-# cannot be overridden at runtime. This guards against problems caused by
-# unauthorized changes to the runtime configuration. You are advised not to
-# remove "root" from this option, but you can add other users if you want. The
-# list is colon-separated. It must NOT contain any spaces.
-
-# FIXED_NEVER_USERS=root:bin:daemon
-FIXED_NEVER_USERS=root
-
-
-#------------------------------------------------------------------------------
-# By default, Exim insists that its configuration file be owned by root. You
-# can specify one additional permitted owner here.
-
-# CONFIGURE_OWNER=
-
-# If the configuration file is group-writeable, Exim insists by default that it
-# is owned by root. You can specify one additional permitted group owner here.
-
-# CONFIGURE_GROUP=
-
-# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked
-# up at build time, and the uid or gid number is built into the binary.
-# However, you can specify that the lookup is deferred until runtime. In this
-# case, it is the name that is built into the binary. You can do this by a
-# setting of the form:
-
-# CONFIGURE_OWNER=ref:mail
-# CONFIGURE_GROUP=ref:sysadmin
-
-# In other words, put "ref:" in front of the user or group name. Although this
-# costs a bit of resource at runtime, it is convenient to use this feature when
-# building binaries that are to be run on multiple systems where the names may
-# refer to different uids or gids. It also allows you to build Exim on a system
-# where the relevant user or group is not defined.
-
-
-#------------------------------------------------------------------------------
-# The -C option allows Exim to be run with an alternate runtime configuration
-# file. When this is used by root, root privilege is retained by the binary
-# (for any other caller including the Exim user, it is dropped). You can
-# restrict the location of alternate configurations by defining a prefix below.
-# Any file used with -C must then start with this prefix (except that /dev/null
-# is also permitted if the caller is root, because that is used in the install
-# script). If the prefix specifies a directory that is owned by root, a
-# compromise of the Exim account does not permit arbitrary alternate
-# configurations to be used. The prefix can be more restrictive than just a
-# directory (the second example).
-
-# ALT_CONFIG_PREFIX=/some/directory/
-# ALT_CONFIG_PREFIX=/some/directory/exim.conf-
-
-
-#------------------------------------------------------------------------------
-# When a user other than root uses the -C option to override the configuration
-# file (including the Exim user when re-executing Exim to regain root
-# privileges for local message delivery), this will normally cause Exim to
-# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which
-# contains a list of trusted configuration filenames, one per line. If the -C
-# option is used by the Exim user or by the user specified in the
-# CONFIGURE_OWNER setting, to specify a configuration file which is listed in
-# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
-
-# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
-
-
-#------------------------------------------------------------------------------
-# Uncommenting this option disables the use of the -D command line option,
-# which changes the values of macros in the runtime configuration file.
-# This is another protection against somebody breaking into the Exim account.
-
-# DISABLE_D_OPTION=yes
-
-
-#------------------------------------------------------------------------------
-# By contrast, you might be maintaining a system which relies upon the ability
-# to override values with -D and assumes that these will be passed through to
-# the delivery processes.  As of Exim 4.73, this is no longer the case by
-# default.  Going forward, we strongly recommend that you use a shim Exim
-# configuration file owned by root stored under TRUSTED_CONFIG_LIST.
-# That shim can set macros before .include'ing your main configuration file.
-#
-# As a strictly transient measure to ease migration to 4.73, the
-# WHITELIST_D_MACROS value definies a colon-separated list of macro-names
-# which are permitted to be overridden from the command-line which will be
-# honoured by the Exim user.  So these are macros that can persist to delivery
-# time.
-# Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the
-# command-line are filtered to only permit: [A-Za-z0-9_/.-]*
-#
-# This option is highly likely to be removed in a future release.  It exists
-# only to make 4.73 as easy as possible to migrate to.  If you use it, we
-# encourage you to schedule time to rework your configuration to not depend
-# upon it.  Most people should not need to use this.
-#
-# By default, no macros are whitelisted for -D usage.
-
-# WHITELIST_D_MACROS=TLS:SPOOL
-
-#------------------------------------------------------------------------------
-# Exim has support for the AUTH (authentication) extension of the SMTP
-# protocol, as defined by RFC 2554. If you don't know what SMTP authentication
-# is, you probably won't want to include this code, so you should leave these
-# settings commented out. If you do want to make use of SMTP authentication,
-# you must uncomment at least one of the following, so that appropriate code is
-# included in the Exim binary. You will then need to set up the run time
-# configuration to make use of the mechanism(s) selected.
-
-AUTH_CRAM_MD5=yes
-# AUTH_CYRUS_SASL=yes
-AUTH_DOVECOT=yes
-AUTH_PLAINTEXT=yes
-AUTH_SPA=yes
-
-
-#------------------------------------------------------------------------------
-# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
-# Cyrus SASL library installed before trying to build Exim, and you probably
-# want to uncomment the following line:
-
-# AUTH_LIBS=-lsasl2
-
-
-#------------------------------------------------------------------------------
-# When Exim is decoding MIME "words" in header lines, most commonly for use
-# in the $header_xxx expansion, it converts any foreign character sets to the
-# one that is set in the headers_charset option. The default setting is
-# defined by this setting:
-
-HEADERS_CHARSET="ISO-8859-1"
-
-# If you are going to make use of $header_xxx expansions in your configuration
-# file, or if your users are going to use them in filter files, and the normal
-# character set on your host is something other than ISO-8859-1, you might
-# like to specify a different default here. This value can be overridden in
-# the runtime configuration, and it can also be overridden in individual filter
-# files.
-#
-# IMPORTANT NOTE: The iconv() function is needed for character code
-# conversions. Please see the next item...
-
-
-#------------------------------------------------------------------------------
-# Character code conversions are possible only if the iconv() function is
-# installed on your operating system. There are two places in Exim where this
-# is relevant: (a) The $header_xxx expansion (see the previous item), and (b)
-# the Sieve filter support. For those OS where iconv() is known to be installed
-# as standard, the file in OS/Makefile-xxxx contains
-#
-# HAVE_ICONV=yes
-#
-# If you are not using one of those systems, but have installed iconv(), you
-# need to uncomment that line above. In some cases, you may find that iconv()
-# and its header file are not in the default places. You might need to use
-# something like this:
-#
-# HAVE_ICONV=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -liconv
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-
-
-#------------------------------------------------------------------------------
-# The passwords for user accounts are normally encrypted with the crypt()
-# function. Comparisons with encrypted passwords can be done using Exim's
-# "crypteq" expansion operator. (This is commonly used as part of the
-# configuration of an authenticator for use with SMTP AUTH.) At least one
-# operating system has an extended function called crypt16(), which uses up to
-# 16 characters of a password (the normal crypt() uses only the first 8). Exim
-# supports the use of crypt16() as well as crypt() but note the warning below.
-
-# You can always indicate a crypt16-encrypted password by preceding it with
-# "{crypt16}". If you want the default handling (without any preceding
-# indicator) to use crypt16(), uncomment the following line:
-
-# DEFAULT_CRYPT=crypt16
-
-# If you do that, you can still access the basic crypt() function by preceding
-# an encrypted password with "{crypt}". For more details, see the description
-# of the "crypteq" condition in the manual chapter on string expansions.
-
-# Some operating systems do not include a crypt16() function, so Exim has one
-# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will
-# be set in an OS-specific Makefile for the OS that have such a function, so
-# you should not need to bother with it.
-
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-# It turns out that the above is not entirely accurate. As well as crypt16()
-# there is a function called bigcrypt() that some operating systems have. This
-# may or may not use the same algorithm, and both of them may be different to
-# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined.
-#
-# However, since there is now a move away from the traditional crypt()
-# functions towards using SHA1 and other algorithms, tidying up this area of
-# Exim is seen as very low priority. In practice, if you need to, you can
-# define DEFAULT_CRYPT to the name of any function that has the same interface
-# as the traditional crypt() function.
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-
-
-#------------------------------------------------------------------------------
-# Exim can be built to support the SMTP STARTTLS command, which implements
-# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-# must install the OpenSSL library package or the GnuTLS library. Exim contains
-# no cryptographic code of its own. Uncomment the following lines if you want
-# to build Exim with TLS support. If you don't know what this is all about,
-# leave these settings commented out.
-
-# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-SUPPORT_TLS=yes
-
-# Uncomment this setting if you are using OpenSSL
-TLS_LIBS=-lssl -lcrypto
-
-# Uncomment these settings if you are using GnuTLS
-# USE_GNUTLS=yes
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-
-# If you are running Exim as a server, note that just building it with TLS
-# support is not all you need to do. You also need to set up a suitable
-# certificate, and tell Exim about it by means of the tls_certificate
-# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-# to specify the hosts to which Exim advertises TLS support. On the other hand,
-# if you are running Exim only as a client, building it with TLS support
-# is all you need to do.
-
-# Additional libraries and include files are required for both OpenSSL and
-# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-# with all your other libraries. If they are in a special directory, you may
-# need something like
-
-# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-# or
-# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-
-# TLS_LIBS is included only on the command for linking Exim itself, not on any
-# auxiliary programs. If the include files are not in a standard place, you can
-# set TLS_INCLUDE to specify where they are, for example:
-
-# TLS_INCLUDE=-I/usr/local/openssl/include/
-# or
-# TLS_INCLUDE=-I/opt/gnu/include
-
-# You don't need to set TLS_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-
-#------------------------------------------------------------------------------
-# The default distribution of Exim contains only the plain text form of the
-# documentation. Other forms are available separately. If you want to install
-# the documentation in "info" format, first fetch the Texinfo documentation
-# sources from the ftp directory and unpack them, which should create files
-# with the extension "texinfo" in the doc directory. You may find that the
-# version number of the texinfo files is different to your Exim version number,
-# because the main documentation isn't updated as often as the code. For
-# example, if you have Exim version 4.43, the source tarball upacks into a
-# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40.
-# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you
-# have unpacked them. Then set INFO_DIRECTORY to the location of your info
-# directory. This varies from system to system, but is often /usr/share/info.
-# Once you have done this, "make install" will build the info files and
-# install them in the directory you have defined.
-
-# INFO_DIRECTORY=/usr/share/info
-
-
-#------------------------------------------------------------------------------
-# Exim log directory and files: Exim creates several log files inside a
-# single log directory. You can define the directory and the form of the
-# log file name here. If you do not set anything, Exim creates a directory
-# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses
-# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change
-# this, you can set LOG_FILE_PATH to a path name containing one occurrence of
-# %s. This will be replaced by one of the strings "main", "panic", or "reject"
-# to form the final file names. Some installations may want something like this:
-
-LOG_FILE_PATH=/var/log/exim/%slog
-
-# which results in files with names /var/log/exim_mainlog, etc. The directory
-# in which the log files are placed must exist; Exim does not try to create
-# it for itself. It is also your responsibility to ensure that Exim is capable
-# of writing files using this path name. The Exim user (see EXIM_USER above)
-# must be able to create and update files in the directory you have specified.
-
-# You can also configure Exim to use syslog, instead of or as well as log
-# files, by settings such as these
-
-# LOG_FILE_PATH=syslog
-# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-
-# The first of these uses only syslog; the second uses syslog and also writes
-# to log files. Do not include white space in such a setting as it messes up
-# the building process.
-
-
-#------------------------------------------------------------------------------
-# When logging to syslog, the following option caters for syslog replacements
-# that are able to accept log entries longer than the 1024 characters allowed
-# by RFC 3164. It is up to you to make sure your syslog daemon can handle this.
-# Non-printable characters are usually unacceptable regardless, so log entries
-# are still split on newline characters.
-
-# SYSLOG_LONG_LINES=yes
-
-# If you are not interested in the process identifier (pid) of the Exim that is
-# making the call to syslog, then comment out the following line.
-
-SYSLOG_LOG_PID=yes
-
-
-#------------------------------------------------------------------------------
-# Cycling log files: this variable specifies the maximum number of old
-# log files that are kept by the exicyclog log-cycling script. You don't have
-# to use exicyclog. If your operating system has other ways of cycling log
-# files, you can use them instead. The exicyclog script isn't run by default;
-# you have to set up a cron job for it if you want it.
-
-EXICYCLOG_MAX=10
-
-
-#------------------------------------------------------------------------------
-# The compress command is used by the exicyclog script to compress old log
-# files. Both the name of the command and the suffix that it adds to files
-# need to be defined here. See also the EXICYCLOG_MAX configuration.
-
-COMPRESS_COMMAND=/bin/gzip
-COMPRESS_SUFFIX=gz
-
-
-#------------------------------------------------------------------------------
-# If the exigrep utility is fed compressed log files, it tries to uncompress
-# them using this command.
-
-ZCAT_COMMAND=/bin/zcat
-
-
-#------------------------------------------------------------------------------
-# Compiling in support for embedded Perl: If you want to be able to
-# use Perl code in Exim's string manipulation language and you have Perl
-# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
-# Perl costs quite a lot of resources. Only do this if you really need it.
-
-# EXIM_PERL=perl.o
-
-
-#------------------------------------------------------------------------------
-# Support for dynamically-loaded string expansion functions via ${dlfunc. If
-# you are using gcc the dynamically-loaded object must be compiled with the
-# -shared option, and you will need to add -export-dynamic to EXTRALIBS so
-# that the local_scan API is made available by the linker. You may also need
-# to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
-
-# EXPAND_DLFUNC=yes
-
-
-#------------------------------------------------------------------------------
-# Exim has support for PAM (Pluggable Authentication Modules), a facility
-# which is available in the latest releases of Solaris and in some GNU/Linux
-# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim
-# support, which is intended for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by the following setting:
-
-SUPPORT_PAM=yes
-
-# You probably need to add -lpam to EXTRALIBS, and in some releases of
-# GNU/Linux -ldl is also needed.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via Radius is also available. The Exim support,
-# which is intended for use in conjunction with the SMTP AUTH facilities,
-# is included only when requested by setting the following parameter to the
-# location of your Radius configuration file:
-
-# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf
-# RADIUS_CONFIG_FILE=/etc/radius.conf
-
-# If you have set RADIUS_CONFIG_FILE, you should also set one of these to
-# indicate which RADIUS library is used:
-
-# RADIUS_LIB_TYPE=RADIUSCLIENT
-# RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-# RADIUS_LIB_TYPE=RADLIB
-
-# RADIUSCLIENT is the radiusclient library; you probably need to add
-#   -lradiusclient to EXTRALIBS.
-#
-# The API for the radiusclient library was changed at release 0.4.0.
-# Unfortunately, the header file does not define a version number that clients
-# can use to support both the old and new APIs. If you are using version 0.4.0
-# or later of the radiusclient library, you should use RADIUSCLIENTNEW.
-#
-# RADLIB is the Radius library that comes with FreeBSD (the header file is
-#   called radlib.h); you probably need to add -lradius to EXTRALIBS.
-#
-# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library,
-# using the original API.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL pwcheck daemon is available.
-# Note, however, that pwcheck is now deprecated in favour of saslauthd (see
-# next item). The Exim support for pwcheck, which is intented for use in
-# conjunction with the SMTP AUTH facilities, is included only when requested by
-# setting the following parameter to the location of the pwcheck daemon's
-# socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-pwcheck, cd to the pwcheck directory within the sources,
-# make and make install. You must create the socket directory (default
-# /var/pwcheck) and chown it to exim's user and group. Once you have installed
-# pwcheck, you should arrange for it to be started by root at boot time.
-
-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL saslauthd daemon is available.
-# The Exim support, which is intented for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by setting the following
-# parameter to the location of the saslauthd daemon's socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-saslauthd (and any other options you need, for example, to
-# select or deselect authentication mechanisms), cd to the saslauthd directory
-# within the sources, make and make install. You must create the socket
-# directory (default /var/state/saslauthd) and chown it to exim's user and
-# group. Once you have installed saslauthd, you should arrange for it to be
-# started by root at boot time.
-
-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-
-
-#------------------------------------------------------------------------------
-# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-# this setting. See the manual section entitled "Use of tcpwrappers" in the
-# chapter on building and installing Exim.
-#
-# USE_TCP_WRAPPERS=yes
-#
-# You may well also have to specify a local "include" file and an additional
-# library for TCP wrappers, so you probably need something like this:
-#
-# USE_TCP_WRAPPERS=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-#
-# To use a name other than exim in the tcpwrappers config file,
-# e.g. if you're running multiple daemons with different access lists,
-# or multiple MTAs with the same access list, define
-# TCP_WRAPPERS_DAEMON_NAME accordingly
-#
-# TCP_WRAPPERS_DAEMON_NAME="exim"
-
-
-#------------------------------------------------------------------------------
-# The default action of the exim_install script (which is run by "make
-# install") is to install the Exim binary with a unique name such as
-# exim-4.43-1, and then set up a symbolic link called "exim" to reference it,
-# moving the symbolic link from any previous version. If you define NO_SYMLINK
-# (the value doesn't matter), the symbolic link is not created or moved. You
-# will then have to "turn Exim on" by setting up the link manually.
-
-# NO_SYMLINK=yes
-
-
-#------------------------------------------------------------------------------
-# Another default action of the install script is to install a default runtime
-# configuration file if one does not exist. This configuration has a router for
-# expanding system aliases. The default assumes that these aliases are kept
-# in the traditional file called /etc/aliases. If such a file does not exist,
-# the installation script creates one that contains just comments (no actual
-# aliases). The following setting can be changed to specify a different
-# location for the system alias file.
-
-SYSTEM_ALIASES_FILE=/etc/mail/aliases
-
-
-#------------------------------------------------------------------------------
-# There are some testing options (-be, -bt, -bv) that read data from the
-# standard input when no arguments are supplied. By default, the input lines
-# are read using the standard fgets() function. This does not support line
-# editing during interactive input (though the terminal's "erase" character
-# works as normal). If your operating system has the readline() function, and
-# in addition supports dynamic loading of library functions, you can cause
-# Exim to use readline() for the -be testing option (only) by uncommenting the
-# following setting. Dynamic loading is used so that the library is loaded only
-# when the -be testing option is given; by the time the loading occurs,
-# Exim has given up its root privilege and is running as the calling user. This
-# is the reason why readline() is NOT supported for -bt and -bv, because Exim
-# runs as root or as exim, respectively, for those options. When USE_READLINE
-# is "yes", as well as supporting line editing, a history of input lines in the
-# current run is maintained.
-
-# USE_READLINE=yes
-
-# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
-# Note that this option adds to the size of the Exim binary, because the
-# dynamic loading library is not otherwise included.
-
-
-
-###############################################################################
-#              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-###############################################################################
-
-# The settings in this section are available for use in special circumstances.
-# In the vast majority of installations you need not change anything below.
-
-
-#------------------------------------------------------------------------------
-# The following commands live in different places in some OS. Either the
-# ultimate default settings, or the OS-specific files should already point to
-# the right place, but they can be overridden here if necessary. These settings
-# are used when building various scripts to ensure that the correct paths are
-# used when the scripts are run. They are not used in the Makefile itself. Perl
-# is not necessary for running Exim unless you set EXIM_PERL (see above) to get
-# it embedded, but there are some utilities that are Perl scripts. If you
-# haven't got Perl, Exim will still build and run; you just won't be able to
-# use those utilities.
-
-# CHOWN_COMMAND=/usr/bin/chown
-# CHGRP_COMMAND=/usr/bin/chgrp
-# CHMOD_COMMAND=/usr/bin/chmod
-# MV_COMMAND=/bin/mv
-# RM_COMMAND=/bin/rm
-# TOUCH_COMMAND=/usr/bin/touch
-# PERL_COMMAND=/usr/bin/perl
-
-
-#------------------------------------------------------------------------------
-# The following macro can be used to change the command for building a library
-# of functions. By default the "ar" command is used, with options "cq".
-# Only in rare circumstances should you need to change this.
-
-# AR=ar cq
-
-
-#------------------------------------------------------------------------------
-# In some operating systems, the value of the TMPDIR environment variable
-# controls where temporary files are created. Exim does not make use of
-# temporary files, except when delivering to MBX mailboxes. However, if Exim
-# calls any external libraries (e.g. DBM libraries), they may use temporary
-# files, and thus be influenced by the value of TMPDIR. For this reason, when
-# Exim starts, it checks the environment for TMPDIR, and if it finds it is set,
-# it replaces the value with what is defined here. Commenting this setting
-# suppresses the check altogether.
-
-TMPDIR="/tmp"
-
-
-#------------------------------------------------------------------------------
-# The following macros can be used to change the default modes that are used
-# by the appendfile transport. In most installations the defaults are just
-# fine, and in any case, you can change particular instances of the transport
-# at run time if you want.
-
-# APPENDFILE_MODE=0600
-# APPENDFILE_DIRECTORY_MODE=0700
-# APPENDFILE_LOCKFILE_MODE=0600
-
-
-#------------------------------------------------------------------------------
-# In some installations there may be multiple machines sharing file systems,
-# where a different configuration file is required for Exim on the different
-# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-# for a configuration file whose name is that defined by CONFIGURE_FILE,
-# with the node name obtained by uname() tacked on the end, separated by a
-# period (for example, /usr/exim/configure.host.in.some.domain). If this file
-# does not exist, then the bare configuration file name is tried.
-
-# CONFIGURE_FILE_USE_NODE=yes
-
-
-#------------------------------------------------------------------------------
-# In some esoteric configurations two different versions of Exim are run,
-# with different setuid values, and different configuration files are required
-# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-# Exim will first look for a configuration file whose name is that defined
-# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-# then the bare configuration file name is tried. In the case when both
-# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-
-# CONFIGURE_FILE_USE_EUID=yes
-
-
-#------------------------------------------------------------------------------
-# The size of the delivery buffers: These specify the sizes (in bytes) of
-# the buffers that are used when copying a message from the spool to a
-# destination. There is rarely any need to change these values.
-
-# DELIVER_IN_BUFFER_SIZE=8192
-# DELIVER_OUT_BUFFER_SIZE=8192
-
-
-#------------------------------------------------------------------------------
-# The mode of the database directory: Exim creates a directory called "db"
-# in its spool directory, to hold its databases of hints. This variable
-# determines the mode of the created directory. The default value in the
-# source is 0750.
-
-# EXIMDB_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# Database file mode: The mode of files created in the "db" directory defaults
-# to 0640 in the source, and can be changed here.
-
-# EXIMDB_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Database lock file mode: The mode of zero-length files created in the "db"
-# directory to use for locking purposes defaults to 0640 in the source, and
-# can be changed here.
-
-# EXIMDB_LOCKFILE_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# This parameter sets the maximum length of the header portion of a message
-# that Exim is prepared to process. The default setting is one megabyte. The
-# limit exists in order to catch rogue mailers that might connect to your SMTP
-# port, start off a header line, and then just pump junk at it for ever. The
-# message_size_limit option would also catch this, but it may not be set.
-# The value set here is the default; it can be changed at runtime.
-
-# HEADER_MAXSIZE="(1024*1024)"
-
-
-#------------------------------------------------------------------------------
-# The mode of the input directory: The input directory is where messages are
-# kept while awaiting delivery. Exim creates it if necessary, using a mode
-# which can be defined here (default 0750).
-
-# INPUT_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of Exim's log directory, when it is created by Exim inside the spool
-# directory, defaults to 0750 but can be changed here.
-
-# LOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The log files themselves are created as required, with a mode that defaults
-# to 0640, but which can be changed here.
-
-# LOG_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# The TESTDB lookup is for performing tests on the handling of lookup results,
-# and is not useful for general running. It should be included only when
-# debugging the code of Exim.
-
-# LOOKUP_TESTDB=yes
-
-
-#------------------------------------------------------------------------------
-# /bin/sh is used by default as the shell in which to run commands that are
-# defined in the makefiles. This can be changed if necessary, by uncommenting
-# this line and specifying another shell, but note that a Bourne-compatible
-# shell is expected.
-
-# MAKE_SHELL=/bin/sh
-
-
-#------------------------------------------------------------------------------
-# The maximum number of named lists of each type (address, domain, host, and
-# local part) can be increased by changing this value. It should be set to
-# a multiple of 16.
-
-MAX_NAMED_LIST=16
-
-
-#------------------------------------------------------------------------------
-# Network interfaces: Unless you set the local_interfaces option in the runtime
-# configuration file to restrict Exim to certain interfaces only, it will run
-# code to find all the interfaces there are on your host. Unfortunately,
-# the call to the OS that does this requires a buffer large enough to hold
-# data for all the interfaces - it was designed in the days when a host rarely
-# had more than three or four interfaces. Nowadays hosts can have very many
-# virtual interfaces running on the same hardware. If you have more than 250
-# virtual interfaces, you will need to uncomment this setting and increase the
-# value.
-
-# MAXINTERFACES=250
-
-
-#------------------------------------------------------------------------------
-# Per-message logs: While a message is in the process of being delivered,
-# comments on its progress are written to a message log, for the benefit of
-# human administrators. These logs are held in a directory called "msglog"
-# in the spool directory. Its mode defaults to 0750, but can be changed here.
-# The message log directory is also used for storing files that are used by
-# transports for returning data to a message's sender (see the "return_output"
-# option for transports).
-
-# MSGLOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# There are three options which are used when compiling the Perl interface and
-# when linking with Perl. The default values for these are placed automatically
-# at the head of the Makefile by the script which builds it. However, if you
-# want to override them, you can do so here.
-
-# PERL_CC=
-# PERL_CCOPTS=
-# PERL_LIBS=
-
-
-#------------------------------------------------------------------------------
-# Identifying the daemon: When an Exim daemon starts up, it writes its pid
-# (process id) to a file so that it can easily be identified. The path of the
-# file can be specified here. Some installations may want something like this:
-
-PID_FILE_PATH=/var/run/exim.pid
-
-# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
-# using the name "exim-daemon.pid".
-
-# If you start up a daemon without the -bd option (for example, with just
-# the -q15m option), a pid file is not written. Also, if you override the
-# configuration file with the -oX option, no pid file is written. In other
-# words, the pid file is written only for a "standard" daemon.
-
-
-#------------------------------------------------------------------------------
-# If Exim creates the spool directory, it is given this mode, defaulting in the
-# source to 0750.
-
-# SPOOL_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of files on the input spool which hold the contents of messages can
-# be changed here. The default is 0640 so that information from the spool is
-# available to anyone who is a member of the Exim group.
-
-# SPOOL_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Moving frozen messages: If the following is uncommented, Exim is compiled
-# with support for automatically moving frozen messages out of the main spool
-# directory, a facility that is found useful by some large installations. A
-# run time option is required to cause the moving actually to occur. Such
-# messages become "invisible" to the normal management tools.
-
-# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
-
-#------------------------------------------------------------------------------
-# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you
-# really, really, really know what you are doing. And even then, think again.
-# You should never uncomment this when compiling a binary for distribution.
-# Use it only when compiling Exim for your own use.
-#
-# Uncommenting this line enables the use of a runtime option called
-# disable_fsync, which can be used to stop Exim using fsync() to ensure that
-# files are written to disc before proceeding. When this is disabled, crashes
-# and hardware problems such as power outages can cause data to be lost. This
-# feature should only be used in very exceptional circumstances. YOU HAVE BEEN
-# WARNED.
-
-# ENABLE_DISABLE_FSYNC=yes
-
-HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap -llber
-EXTRALIBS_EXIM=-lpam
-# End of EDITME for Exim 4.
diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d
deleted file mode 100644
index b9bec4335..000000000
--- a/community-testing/exim/exim.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install
deleted file mode 100644
index 8ed329559..000000000
--- a/community-testing/exim/exim.install
+++ /dev/null
@@ -1,25 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
-  if getent passwd exim > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
-  fi
-  passwd -l exim > /dev/null
-  chown root.exim /var/spool/exim /var/log/exim
-  chown exim.exim /var/spool/exim/db
-  chmod u+s /usr/sbin/exim
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  getent passwd exim >/dev/null 2>&1 && userdel exim
-}
-
diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate
deleted file mode 100644
index 070ba4747..000000000
--- a/community-testing/exim/exim.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/exim/*log {
-   su exim exim
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/community-testing/expac/PKGBUILD b/community-testing/expac/PKGBUILD
deleted file mode 100644
index ff83247d7..000000000
--- a/community-testing/expac/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 56821 2011-10-13 19:47:47Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
-
-pkgname=expac
-pkgver=0.07
-pkgrel=1
-pkgdesc="pacman database extraction utility"
-arch=('i686' 'x86_64')
-url="http://github.com/falconindy/expac"
-license=('GPL')
-depends=('pacman')
-makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1bc637b733051827982db12db84643f2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-}
-
-# vim: ft=sh syn=sh
diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD
deleted file mode 100644
index 2efb43d1e..000000000
--- a/community-testing/fcron/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 61839 2012-01-08 19:56:09Z ttopper $
-# Contributor: Giorgio Lando <lando at imap dot cc>
-# Contributor: Sergej Pupykin
-# Contributor: Thomas Bächler
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-
-pkgname=fcron
-pkgver=3.0.6
-pkgrel=5
-pkgdesc="feature-rich cron implementation"
-arch=(i686 x86_64)
-url="http://fcron.free.fr"
-license=('GPL')
-depends=('pam')
-makedepends=('smtp-server')
-optdepends=('smtp-server: to receive mails from cron jobs')
-provides=('cron')
-conflicts=('dcron')
-backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
-        var/spool/fcron/systab var/spool/fcron/systab.orig)
-options=('emptydirs' '!makeflags')
-source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
-        systab systab.orig run-cron)
-md5sums=('69ebcb41921e2a282f41ebecb3a27053'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/fcron \
-              --with-answer-all=no \
-              --with-boot-install=no \
-              --with-username=root \
-              --with-groupname=root \
-              --datarootdir=/usr/share \
-	            --datadir=/usr/share \
-              --with-docdir=/usr/share/doc \
-              --localstatedir=/var \
-	            --with-editor=/usr/bin/vi \
-              --with-sendmail=/usr/sbin/sendmail
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  make DESTDIR="$pkgdir/" install
-  install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
-  install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
-  
-  install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
-  # Install default fcrontab so that fcron can completely replace dcron
-  
-  install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
-  # In order to preserve the systab crontab in any case it is better to have
-  # it in non-binary form too
-  install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
-
-  # Add cron.* directories
-  install -d -m755 "$pkgdir/etc/cron.daily"
-  install -d -m755 "$pkgdir/etc/cron.hourly"
-  install -d -m755 "$pkgdir/etc/cron.monthly"
-  install -d -m755 "$pkgdir/etc/cron.weekly"
-  
-  # Install run-cron script to make fcron run without dcron
-  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fcron/fcron.rc b/community-testing/fcron/fcron.rc
deleted file mode 100644
index 880439a1d..000000000
--- a/community-testing/fcron/fcron.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/fcron`
-case "$1" in
-  start)
-    stat_busy "Starting Fcron Daemon"
-    [ -z "$PID" ] && /usr/sbin/fcron -b
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fcron
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Fcron Daemon"
-    [ -n "$PID" ]  && kill $PID >/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fcron
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/fcron/run-cron b/community-testing/fcron/run-cron
deleted file mode 100644
index 51007a15a..000000000
--- a/community-testing/fcron/run-cron
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-
-if [ -z $1 ]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in $1/* ; do
-  if [ -x $cron ]; then
-     $cron
-  fi
-done
-unset cron
diff --git a/community-testing/fcron/systab b/community-testing/fcron/systab
deleted file mode 100644
index 11c7e2fd0..000000000
--- a/community-testing/fcron/systab
+++ /dev/null
diff --git a/community-testing/fcron/systab.orig b/community-testing/fcron/systab.orig
deleted file mode 100644
index 5b0045626..000000000
--- a/community-testing/fcron/systab.orig
+++ /dev/null
@@ -1,4 +0,0 @@
-&bootrun 01 * * * *  /usr/sbin/run-cron /etc/cron.hourly
-&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily
-&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly
-&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly
diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD
deleted file mode 100644
index 1ba275a25..000000000
--- a/community-testing/gogglesmm/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61833 2012-01-08 19:51:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=gogglesmm
-pkgver=0.12.6
-pkgrel=1
-pkgdesc="Music Manager and Player"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/gogglesmm/"
-license=('GPL3')
-install=gogglesmm.install
-depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
-makedepends=('pkgconfig' 'glproto' 'dri2proto')
-replaces=('musicmanager')
-conflicts=('musicmanager')
-source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('19505ee514690fe3372621685666db4c')
-
-build() {
-  cd $srcdir/gogglesmm-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/gogglesmm-$pkgver
-  mkdir -p $pkgdir/usr/bin
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install
deleted file mode 100644
index 04c026840..000000000
--- a/community-testing/gogglesmm/gogglesmm.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/libgda3/PKGBUILD b/community-testing/libgda3/PKGBUILD
deleted file mode 100644
index 8505681d0..000000000
--- a/community-testing/libgda3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 61876 2012-01-09 18:49:52Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgda3
-pkgver=3.1.5
-pkgrel=11
-pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=('i686' 'x86_64')
-url="http://www.gnome-db.org/Download"
-license=('GPL')
-depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs'
-         'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng')
-options=('!libtool' '!distcc')
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2)
-md5sums=('eb7da5286a112e7cff3111c89fba4456')
-
-build() {
-  cd "$srcdir/libgda-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package(){
-  cd "$srcdir/libgda-$pkgver"
-  make DESTDIR=$pkgdir install
-  cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \;
-}
diff --git a/community-testing/librcc/PKGBUILD b/community-testing/librcc/PKGBUILD
deleted file mode 100644
index 121323dd8..000000000
--- a/community-testing/librcc/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 61878 2012-01-09 18:50:01Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=librcc
-pkgver=0.2.6
-pkgrel=5
-pkgdesc="Charset Conversion Library"
-arch=(i686 x86_64)
-url="http://rusxmms.sourceforge.net/"
-license=('GPL')
-depends=(aspell enca libxml2 db librcd)
-makedepends=(patch gtk gtk2)
-install=librcc.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2
-        librcc-strnlen.patch)
-md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
-         '040313d1d8f166ccf2b128cea4c05f21')
-
-build() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/librcc-strnlen.patch
-  make
-}
-
-package() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  mkdir -p $startdir/pkg/etc/rcc
-  mkdir -p $startdir/pkg/usr/lib/rcc/engines
-  mkdir -p $startdir/pkg/usr/bin
-
-  make DESTDIR=$startdir/pkg install
-
-  make -C examples
-  make -C examples install DESTDIR=$startdir/pkg
-  rm -f $startdir/pkg/usr/bin/example*
-
-  install -m 644 examples/rcc.xml $startdir/pkg/etc
-
-  if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then
-      ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config
-  elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then
-      ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config
-  else
-      echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config
-      echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config
-  fi
-}
diff --git a/community-testing/librcc/librcc-strnlen.patch b/community-testing/librcc/librcc-strnlen.patch
deleted file mode 100644
index 9fc0e8b0b..000000000
--- a/community-testing/librcc/librcc-strnlen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h
---- librcc-0.2.6/src/rccstring.h	2006-01-08 15:42:59.000000000 +0000
-+++ librcc-0.2.6.qwe/src/rccstring.h	2009-09-28 08:45:37.000000000 +0000
-@@ -18,13 +18,6 @@
- int rccStringFixID(rcc_string string, rcc_context ctx);
- int rccStringChangeID(rcc_string string, rcc_language_id language_id);
- 
--#ifdef HAVE_STRNLEN
--# ifndef strnlen
--int strnlen(const char *str, size_t size);
--# endif /* !strnlen */
--#else
--int rccStrnlen(const char *str, size_t size);
--#endif /* HAVE_STRNLEN */
- int rccIsASCII(const char *str);
- size_t rccStringSizedGetChars(const char *str, size_t size);
- 
diff --git a/community-testing/librcc/librcc.install b/community-testing/librcc/librcc.install
deleted file mode 100644
index 53b1d7ce7..000000000
--- a/community-testing/librcc/librcc.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc"
-  echo "   gui features"
-  echo "-- Also you may change /usr/bin/rcc-config symlink to switch between"
-  echo "   gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)"
-}
diff --git a/community-testing/libzdb/PKGBUILD b/community-testing/libzdb/PKGBUILD
deleted file mode 100644
index 9e03c87cf..000000000
--- a/community-testing/libzdb/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 62082 2012-01-15 19:15:26Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libzdb
-pkgver=2.10
-pkgrel=1
-pkgdesc="Zild Database Library"
-arch=(i686 x86_64)
-url="http://www.tildeslash.com/libzdb/"
-license=('GPL')
-depends=('postgresql-libs' 'sqlite3' 'libmysqlclient')
-options=(!libtool)
-source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz)
-md5sums=('fdc04b4b7f33cdcdfc6b559ba9965825')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/lilypond/PKGBUILD b/community-testing/lilypond/PKGBUILD
deleted file mode 100644
index 5742b97cd..000000000
--- a/community-testing/lilypond/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62073 2012-01-15 17:13:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
-
-pkgname=lilypond
-pkgver=2.14.2
-pkgrel=4
-pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
-url="http://lilypond.org"
-license=('GPL')
-depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
-	     'gsfonts' 'texi2html')
-options=('emptydirs')
-install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
-	texlive-workaround.patch)
-md5sums=('4053a19e03181021893981280feb9aaa'
-         'ff32863f3eed67ac744e50bc4fc67a87')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  rm -rf python/out/
-  patch -p1 <$srcdir/texlive-workaround.patch
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/lilypond/lilypond.install b/community-testing/lilypond/lilypond.install
deleted file mode 100644
index 934e7b435..000000000
--- a/community-testing/lilypond/lilypond.install
+++ /dev/null
@@ -1,48 +0,0 @@
-infodir=usr/share/info
-filelist=(music-glossary.info
-	lilypond-web.info
-	lilypond-contributor.info
-	lilypond-contributor.info-1
-	lilypond-contributor.info-2
-	lilypond-internals.info-1
-	lilypond-internals.info-2
-	lilypond-internals.info-3
-	lilypond-internals.info-4
-	lilypond-internals.info-5
-	lilypond-notation.info-1
-	lilypond-notation.info-2
-	lilypond-notation.info-3
-	lilypond-notation.info-4
-	lilypond-notation.info-5
-	lilypond-notation.info-6
-	lilypond-usage.info
-	lilypond-learning.info
-	lilypond-web.info-1
-	lilypond-web.info-2
-	lilypond-internals.info
-	lilypond-essay.info
-	lilypond-notation.info
-	lilypond-learning.info-1
-	lilypond-learning.info-2
-	lilypond-extending.info
-	lilypond-changes.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/lilypond/texlive-workaround.patch b/community-testing/lilypond/texlive-workaround.patch
deleted file mode 100644
index 1eb262863..000000000
--- a/community-testing/lilypond/texlive-workaround.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
-index d5cbb7f..b25c4bc 100644
---- a/mf/feta-autometric.mf
-+++ b/mf/feta-autometric.mf
-@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- 			& to_bp (w) & " "
- 			& to_bp (h);
- 		special "% MF2PT1: font_size " & decimal designsize;
--		special "% MF2PT1: font_slant " & decimal font_slant_;
- 
- 		for fvar = "font_identifier",
- 			   "font_coding_scheme",
-@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- 			fi;
- 		endfor;
- 
--		special "% MF2PT1: font_fixed_pitch "
--			& (if font_fixed_pitch_: "1" else: "0" fi);
--
- 		% this must come after the `font_size' special
- 		special "% MF2PT1: charwd " & decimal charwd;
- 	fi;
-diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
-index a8b45aa..c935628 100644
---- a/mf/mf2pt1.mp
-+++ b/mf/mf2pt1.mp
-@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
-     def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
-     special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
-     special "% MF2PT1: font_size " & decimal designsize;
--    special "% MF2PT1: font_slant " & decimal font_slant_;
-     special "% MF2PT1: charwd " & decimal charwd;   % Must come after the |font_size| |special|
-     for fvar = "font_identifier", "font_coding_scheme", "font_version",
-       "font_comment", "font_family", "font_weight", "font_unique_id",
-@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
-           scantokens ("decimal " & fvar & "_");
-       fi;
-     endfor;
--    special "% MF2PT1: font_fixed_pitch " &
--            (if font_fixed_pitch_: "1" else: "0" fi);
- enddef;
- 
- 
-@@ -91,19 +88,6 @@ enddef;
- 
- 
- %% \begin{explaincode}
--%%   Store the value of \mfcomment
--%    |font_slant_|, so we can recall it at each |beginchar|.
--%% \end{explaincode}
--
--font_slant_ := 0;
--
--def font_slant expr x =
--  font_slant_ := x;
--  fontdimen 1: x
--enddef;
--
--
--%% \begin{explaincode}
- %%   Redefine \mfcomment
- %    |bpppix_|, the number of ``big'' points per pixel. \mfcomment
- %    This in turn redefines |mm|, |in|, |pt|, and other derived units.
-@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
-   scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
- endfor;
- 
--boolean font_fixed_pitch_;
--font_fixed_pitch_ := false;
--def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
--
--
- %% \begin{explaincode}
- %%   We'd like to be able to use calligraphic pens.  Normally, MetaPost's
- %%   output routine does all the work for us of converting these to filled
-diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
-index 95df0f8..20f410b 100644
---- a/scripts/build/mf2pt1.pl
-+++ b/scripts/build/mf2pt1.pl
-@@ -427,7 +427,7 @@ ENDHEADER
- sub get_bboxes ($)
- {
-     execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
--                        "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
-+                        "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
-     opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
-     @charfiles = sort
-                    { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
diff --git a/community-testing/me-tv/PKGBUILD b/community-testing/me-tv/PKGBUILD
deleted file mode 100644
index 4a97fb410..000000000
--- a/community-testing/me-tv/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#Maintainer: jakob gruber <jakob.gruber@gmail.com>
-#Contributor: gborzi
-#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us>
-#Previous Contributor: Heiko Baums <heiko@baums-on-web.de>
-#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
-
-pkgname=me-tv
-pkgver=2.0.1
-pkgrel=3
-pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/me-tv"
-license=('GPL')
-depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base')
-makedepends=('intltool')
-install='me-tv.install'
-source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-options=('!emptydirs')
-md5sums=('7cda820b795f2fea522ba3de5e312483')
-
-build() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr
-	make
-
-}
-
-package() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-	install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-	gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
-        --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas"
-
-	rm -rf "${pkgdir}/usr/etc/"
-
-}
diff --git a/community-testing/me-tv/me-tv.install b/community-testing/me-tv/me-tv.install
deleted file mode 100644
index f701b4754..000000000
--- a/community-testing/me-tv/me-tv.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=me-tv
-
-post_install() {
-	usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community-testing/packagekit/PKGBUILD b/community-testing/packagekit/PKGBUILD
deleted file mode 100644
index a4b82edcd..000000000
--- a/community-testing/packagekit/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 61812 2012-01-08 10:29:29Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-pkgbase='packagekit'
-pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.19
-pkgrel=5
-pkgdesc="A system designed to make installation and updates of packages easier."
-arch=('i686' 'x86_64')
-url="http://www.packagekit.org"
-license=('GPL')
-makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
-             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
-	     'shared-mime-info' 'sqlite3' 'udev')
-options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
-        'alpm.patch')
-sha256sums=('961c6408de08ebaf15c09e74afd06918d699be8974b5c35c2c9663e5b12b5223'
-            '5ae3330f28d98c2369fad2a1fb6f8c1edd95c096b8fb4f1b170de6e8b2b134d8')
-
-build() {
-  cd "$srcdir/PackageKit-$pkgver"
-
-  patch -Np1 -i "$srcdir/alpm.patch"
-
-  # TODO: remove when this is fixed upstream
-  find -name '*.moc' -print0 | xargs -0 rm
-
-  sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
-  sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
-  sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
-
-  export PYTHON=/usr/bin/python2
-  # TODO: remove when upstream is patched
-  autoreconf
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --localstatedir=/var \
-	      --libexecdir=/usr/lib/PackageKit \
-	      --disable-static \
-	      --disable-gtk-doc \
-	      --disable-tests \
-	      --disable-local \
-	      --disable-browser-plugin \
-	      --disable-gstreamer-plugin \
-	      --disable-gtk-module \
-	      --disable-command-not-found \
-	      --disable-cron \
-	      --disable-debuginfo-install \
-	      --enable-pm-utils \
-	      --disable-dummy \
-	      --enable-alpm \
-	      --with-default-backend=alpm
-  make -s
-}
-
-package_packagekit() {
-  backup=('var/lib/PackageKit/transactions.db'
-          'etc/PackageKit/alpm.d/pacman.conf'
-          'etc/PackageKit/alpm.d/repos.list')
-  depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
-           'shared-mime-info' 'sqlite3' 'udev')
-  optdepends=('networkmanager')
-  install='packagekit.install'
-
-  cd "$srcdir/PackageKit-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir/usr/include/PackageKit/packagekit-qt"*
-  rm -rf "$pkgdir/usr/lib/libpackagekit-qt"*
-  rm -rf "$pkgdir/usr/lib/pkgconfig/packagekit-qt"*
-  rm -rf "$pkgdir/usr/share/cmake"
-
-  rm -rf "$pkgdir/usr/lib/python"*
-  rm -rf "$pkgdir/usr/share/PackageKit/website"
-
-  mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \
-     "$pkgdir/etc/bash_completion.d/pkcon"
-  touch "$pkgdir/var/log/PackageKit"
-}
-
-package_packagekit-qt() {
-  depends=('packagekit' 'qt')
-  pkgdesc=('Qt bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt"
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_packagekit-qt2() {
-  depends=('packagekit' 'qt')
-  pkgdesc=('Qt bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2"
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_packagekit-python() {
-  depends=('packagekit' 'python2')
-  pkgdesc=('Python bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/python"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/packagekit/alpm.patch b/community-testing/packagekit/alpm.patch
deleted file mode 100644
index a6a6fcc0a..000000000
--- a/community-testing/packagekit/alpm.patch
+++ /dev/null
@@ -1,2991 +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..417714c 100644
---- a/backends/alpm/pk-backend-alpm.c
-+++ b/backends/alpm/pk-backend-alpm.c
-@@ -26,6 +26,7 @@
- #include <sys/utsname.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 +36,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 +164,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 +178,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;
-@@ -212,26 +214,21 @@ pk_backend_initialize_alpm (PkBackend *self, GError **error)
- 	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 ());
-+	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 +237,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
-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..a51a984 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") == 0) {
-+			if (package) {
-+				*level &= ~ALPM_SIG_PACKAGE;
-+			}
-+			if (database) {
-+				*level &= ~ALPM_SIG_DATABASE;
-+			}
-+		} else if (g_str_has_prefix (list, "Optional") == 0) {
-+			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") == 0) {
-+			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") == 0) {
-+			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") == 0) {
-+			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,100 @@ 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') {
- 		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 +843,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 +859,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..ac530c7 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);
-@@ -128,37 +136,65 @@ disabled_repos_configure (GHashTable *table, 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_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;
- 		}
- 
--		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, repo->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_initialize_databases (PkBackend *self, GError **error)
- {
-@@ -179,11 +215,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 +256,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)) {
-@@ -269,7 +316,7 @@ pk_backend_repo_enable_thread (PkBackend *self)
- 			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 +339,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 +365,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..2636cae 100644
---- a/backends/alpm/pk-backend-databases.h
-+++ b/backends/alpm/pk-backend-databases.h
-@@ -24,6 +24,10 @@
- #include <alpm.h>
- #include <pk-backend.h>
- 
-+void		 pk_backend_configure_repos		(alpm_list_t *repos,
-+							 GHashTable *servers,
-+							 GHashTable *levels);
-+
- 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;
-+	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 PM_ERR_BADPERMS:
--				code = PK_ERROR_ENUM_NOT_AUTHORIZED;
--				break;
-+		case ALPM_ERR_DISK_SPACE:
-+			code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
-+			break;
- 
--			case PM_ERR_NOT_A_FILE:
--			case PM_ERR_NOT_A_DIR:
--				code = PK_ERROR_ENUM_FILE_NOT_FOUND;
--				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 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 ALPM_ERR_HANDLE_LOCK:
-+			code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
-+			break;
- 
--			case PM_ERR_DISK_SPACE:
--				code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
--				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 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 ALPM_ERR_DB_CREATE:
-+			code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
-+			break;
- 
--			case PM_ERR_HANDLE_LOCK:
--				code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
--				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 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 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 PM_ERR_DB_CREATE:
--				code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
--				break;
-+		case ALPM_ERR_DB_WRITE:
-+			code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
-+			break;
- 
--			case PM_ERR_DB_VERSION:
--			case PM_ERR_DB_REMOVE:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
-+		case ALPM_ERR_SERVER_NONE:
-+			code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
-+			break;
- 
--			case PM_ERR_DB_WRITE:
--				code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
--				break;
-+		case ALPM_ERR_TRANS_DUP_TARGET:
-+		case ALPM_ERR_TRANS_ABORT:
-+			code = PK_ERROR_ENUM_TRANSACTION_ERROR;
-+			break;
- 
--			case PM_ERR_SERVER_BAD_URL:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
-+		case ALPM_ERR_TRANS_TYPE:
-+			code = PK_ERROR_ENUM_CANNOT_CANCEL;
-+			break;
- 
--			case PM_ERR_SERVER_NONE:
--				code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
--				break;
-+		case ALPM_ERR_PKG_NOT_FOUND:
-+			code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
-+			break;
- 
--			case PM_ERR_TRANS_DUP_TARGET:
--			case PM_ERR_TRANS_ABORT:
--				code = PK_ERROR_ENUM_TRANSACTION_ERROR;
--				break;
-+		case ALPM_ERR_PKG_IGNORED:
-+			code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
-+			break;
- 
--			case PM_ERR_TRANS_TYPE:
--				code = PK_ERROR_ENUM_CANNOT_CANCEL;
--				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 PM_ERR_PKG_NOT_FOUND:
--				code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
--				break;
-+		case ALPM_ERR_PKG_INVALID_CHECKSUM:
-+			code = PK_ERROR_ENUM_PACKAGE_CORRUPT;
-+			break;
- 
--			case PM_ERR_PKG_IGNORED:
--				code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
--				break;
-+		case ALPM_ERR_PKG_CANT_REMOVE:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
-+			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 ALPM_ERR_PKG_INVALID_ARCH:
-+			code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
-+			break;
- 
--			case PM_ERR_PKG_CANT_REMOVE:
--				code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
--				break;
-+		case ALPM_ERR_SIG_MISSING:
-+			code = PK_ERROR_ENUM_MISSING_GPG_SIGNATURE;
-+			break;
- 
--			case PM_ERR_PKG_INVALID_ARCH:
--				code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
--				break;
-+		case ALPM_ERR_DLT_PATCHFAILED:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD;
-+			break;
- 
--			case PM_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 PM_ERR_UNSATISFIED_DEPS:
--				code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED;
--				break;
-+		case ALPM_ERR_CONFLICTING_DEPS:
-+			code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
-+			break;
- 
--			case PM_ERR_CONFLICTING_DEPS:
--				code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
--				break;
-+		case ALPM_ERR_FILE_CONFLICTS:
-+			code = PK_ERROR_ENUM_FILE_CONFLICTS;
-+			break;
- 
--			case PM_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 PM_ERR_RETRIEVE:
--			case PM_ERR_LIBFETCH:
--			case PM_ERR_EXTERNAL_DOWNLOAD:
--				code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED;
--				break;
-+		case ALPM_ERR_LIBARCHIVE:
-+			code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
-+			break;
- 
--			case PM_ERR_LIBARCHIVE:
--				code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
--				break;
-+		case ALPM_ERR_GPGME:
-+			code = PK_ERROR_ENUM_GPG_FAILURE;
-+			break;
- 
--			case PM_ERR_CONFIG_INVALID:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				break;
-+		case ALPM_ERR_CONFIG_INVALID:
-+			code = PK_ERROR_ENUM_FAILED_CONFIG_PARSING;
-+			break;
- 
--			case PM_ERR_PKG_HELD:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				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..5b5e2b2 100644
---- a/backends/alpm/pk-backend-install.c
-+++ b/backends/alpm/pk-backend-install.c
-@@ -32,15 +32,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 +65,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;
- 		}
- 	}
-diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
-index e9a7c94..2d057aa 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;
-@@ -286,7 +285,7 @@ pk_backend_get_details_thread (PkBackend *self)
- 		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);
-@@ -317,17 +316,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,11 +339,13 @@ 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);
-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..c770159 100644
---- a/backends/alpm/pk-backend-sync.c
-+++ b/backends/alpm/pk-backend-sync.c
-@@ -30,41 +30,13 @@
- #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 +47,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 +84,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 +113,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);
-@@ -190,16 +185,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 +204,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;
- 		}
- 	}
-@@ -224,6 +220,7 @@ pk_backend_update_packages_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);
- 
- 	if (!pk_backend_transaction_initialize (self, 0, &error) ||
-@@ -233,8 +230,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,7 +251,8 @@ 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:
-diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c
-index fdb840e..f812766 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,
-+pk_backend_select_provider (PkBackend *self, alpm_depend_t *depend,
- 			    const alpm_list_t *providers)
- {
- 	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);
-+		alpm_conflict_t *conflict = (alpm_conflict_t *) i->data;
-+		alpm_depend_t *depend = conflict->reason;
- 
--		if (g_strcmp0 (first, reason) == 0 ||
--		    g_strcmp0 (second, reason) == 0) {
--			g_string_append_printf (list, "%s <-> %s, ", first,
--						second);
-+		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-testing/packagekit/packagekit.install b/community-testing/packagekit/packagekit.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/community-testing/packagekit/packagekit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD
deleted file mode 100644
index 4a03ded15..000000000
--- a/community-testing/percona-server/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=percona-server
-pkgver=5.5.18_rel23.0
-pkgrel=1
-pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
-arch=('i686' 'x86_64')
-
-depends=('mysql-clients' 'libaio')
-conflicts=('mysql')
-provides=('mysql')
-optdepends=('perl-dbi' 'perl-dbd-mysql')
-makedepends=('cmake' 'openssl' 'zlib')
-
-license=('GPL')
-url="http://www.percona.com/software/percona-server/"
-options=('!libtool' 'emptydirs')
-backup=('etc/mysql/my.cnf')
-install=percona.install
-source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/Percona-Server-${pkgver/_/-}.tar.gz"
-        'mysqld'
-        'my.cnf')
-
-build() {
-	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
-	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
-
-	cd "${srcdir}"
-	rm -rf build
-	mkdir build
-	cd build
-
-	# CFLAGS/CXXFLAGS as suggested upstream
-	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-	cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \
-		-DMANUFACTURER=Arch \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DSYSCONFDIR=/etc/mysql \
-		-DMYSQL_DATADIR=/var/lib/mysql \
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DDEFAULT_CHARSET=utf8 \
-		-DDEFAULT_COLLATION=utf8_general_ci \
-		-DENABLED_LOCAL_INFILE=ON \
-		-DINSTALL_INFODIR=share/mysql/docs \
-		-DINSTALL_MANDIR=share/man \
-		-DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
-		-DINSTALL_SCRIPTDIR=bin \
-		-DINSTALL_INCLUDEDIR=include/mysql \
-		-DINSTALL_DOCREADMEDIR=share/mysql \
-		-DINSTALL_SUPPORTFILESDIR=share/mysql \
-		-DINSTALL_MYSQLSHAREDIR=share/mysql \
-		-DINSTALL_DOCDIR=share/mysql/docs \
-		-DINSTALL_SHAREDIR=share/mysql \
-		-DWITH_READLINE=OFF \
-		-DWITH_ZLIB=system \
-		-DWITH_SSL=system \
-		-DWITH_LIBWRAP=OFF \
-		-DWITH_LIBEDIT=OFF \
-		-DWITH_UNIT_TESTS=OFF \
-		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-		-DWITH_EXTRA_CHARSETS=complex \
-		-DWITH_EMBEDDED_SERVER=ON \
-		-DWITH_INNOBASE_STORAGE_ENGINE=ON \
-		-DWITH_PARTITION_STORAGE_ENGINE=ON \
-		-DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \
-		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
-		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
-		-DWITH_FEDERATED_STORAGE_ENGINE=OFF \
-		-DWITH_EXAMPLE_STORAGE_ENGINE=OFF
-
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR=${pkgdir} install
-
-	install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-	install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
-
-	# provided by libmysqlclient
-	rm ${pkgdir}/usr/bin/mysql_config
-	rm ${pkgdir}/usr/lib/libmysql*
-	rm -r ${pkgdir}/usr/include/
-	rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
-	# provided by mysql-clients
-	rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-	rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-	# not needed
-	rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
-	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-	install -dm700 "${pkgdir}"/var/lib/mysql
-}
-
-md5sums=('17b266f5c10d01838522188f313a1ead'
-         '243864805611764a7e5883c1dba7afd8'
-         '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community-testing/percona-server/my.cnf b/community-testing/percona-server/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/community-testing/percona-server/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/community-testing/percona-server/mysqld b/community-testing/percona-server/mysqld
deleted file mode 100755
index 07f6b7e4c..000000000
--- a/community-testing/percona-server/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Percona Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Percona Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/percona-server/percona.install b/community-testing/percona-server/percona.install
deleted file mode 100644
index caacccf1b..000000000
--- a/community-testing/percona-server/percona.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  /usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD
deleted file mode 100644
index d57c0ede6..000000000
--- a/community-testing/perl-berkeleydb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 61880 2012-01-09 18:50:05Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Charles Mauch <cmauch@gmail.com>
-# Contributor: Francois Charette <firmicus@gmx.net>
-
-pkgname=perl-berkeleydb
-pkgver=0.50
-pkgrel=2
-pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/BerkeleyDB/"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'db')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('6afc8f49133c262c606d1b96e1412863')
-
-build() {
-  cd  $srcdir/BerkeleyDB-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  _dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
-  depends=('perl' "db=$_dbver")
-
-  cd  $srcdir/BerkeleyDB-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
-  find $pkgdir -name '.packlist' -delete
-  find $pkgdir -name '*.pod' -delete
-}
diff --git a/community-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD
deleted file mode 100644
index 8dd7c740a..000000000
--- a/community-testing/pinot/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 62017 2012-01-14 12:25:05Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pinot
-pkgver=0.98
-pkgrel=2
-pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
-url='http://pinot.berlios.de/'
-license=('GPL')
-depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
-         'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 
-         'hicolor-icon-theme' 'cairo' 'exiv2')
-makedepends=('boost' 'desktop-file-utils')
-optdepends=('unzip: ZIP files extraction'
-            'poppler: PDF to text conversion'
-            'catdvi: DVI to text conversion'
-            'djvulibre: DjVu text extraction'
-            'unrtf: RTF to HTML conversion'
-            'antiword: MS Word to text conversion'
-            'catdoc: XLS and PPT to text conversion'
-            'deskbar-applet: Pinot Deskbar-Applet module')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
-  sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
-/usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
-/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-
-  # Remove Deskbar-Applet handler
-  rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers
-}
diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog
deleted file mode 100644
index 7d899cdb0..000000000
--- a/community-testing/pinot/pinot.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* pinot 0.98-1
diff --git a/community-testing/pinot/pinot.install b/community-testing/pinot/pinot.install
deleted file mode 100644
index 55ab40426..000000000
--- a/community-testing/pinot/pinot.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo "Starting with 0.63, the service is auto-started. "
-  echo "The file that enables this is located at "
-  echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop"
-  echo "Delete this file if you don't want the auto-start."
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/pkgtools/PKGBUILD b/community-testing/pkgtools/PKGBUILD
deleted file mode 100644
index 922bb5fa3..000000000
--- a/community-testing/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=23
-pkgrel=3
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg'
-            'python-yaml: for gem2arch'
-            'python2: for pkgconflict')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
-
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make
-}
-
-package() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make DESTDIR="$pkgdir" install
-
-  # fix infinite loop in autotools configure scripts
-  sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/pkgtools/pkgtools.install b/community-testing/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community-testing/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
-   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
-   This will automatically run pkgfile whenever you run
-   a command which the shell cannot find. If you want
-   this functionality, set CMD_SEARCH_ENABLED to 1 in
-   /etc/pkgtools/pkgfile.conf (or per-user by copying
-   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
-   in your current shell run:
-     source /etc/profile"
-
-is_update_from() {
-  res="`vercmp $1 $2`"
-  case $res in
-    '-1'|'0') return 0;;
-    '1') return 1;;
-  esac
-}
-
-## arg 1:  the new package version
-post_install() {
-  echo "$_MSG_UPDATE"
-  echo "$_MSG_HOOK"
-  echo "$_MSG_CRON"
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if is_update_from $2 11-1; then
-    echo " - All bugs related to pkgfile -b should be fixed in this update."
-  fi
-  if is_update_from $2 12-1; then
-    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
-    echo "   Please remove any old symlinks relating to it."
-    echo "$_MSG_HOOK"
-  fi
-  if is_update_from $2 15-1; then
-    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
-    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
-  fi
-  if is_update_from $2 18-1; then
-    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
-  fi
-  if is_update_from $2 19-1; then
-    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
-    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
-    echo "   in /etc/pkgtools/pkgfile.conf"
-    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
-    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
-  fi
-  if is_update_from $2 22-1; then
-    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
-    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-testing/poedit/PKGBUILD b/community-testing/poedit/PKGBUILD
deleted file mode 100644
index 59e2358a5..000000000
--- a/community-testing/poedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61882 2012-01-09 18:50:15Z stephane $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=poedit
-pkgver=1.4.6.1
-pkgrel=6
-pkgdesc="Cross-platform gettext catalogs (.po files) editor"
-arch=('i686' 'x86_64')
-url="http://www.poedit.net/"
-license=('custom')
-depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
-makedepends=('pkgconfig')
-install=poedit.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c63ffd991b1a6085ef356a6922356e0a')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-    install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/poedit/poedit.install b/community-testing/poedit/poedit.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/community-testing/poedit/poedit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE
deleted file mode 100644
index 7d6035775..000000000
--- a/community-testing/python-bsddb/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Jesus Cea Avion
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD
deleted file mode 100644
index 8f7c2fb53..000000000
--- a/community-testing/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 61884 2012-01-09 18:50:28Z stephane $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-bsddb
-pkgname=('python2-bsddb' 'python-bsddb')
-pkgver=5.2.0
-pkgrel=3
-pkgdesc="Python interface for BerkeleyDB"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-distribute' 'python-distribute')
-source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
-        db_5.3.patch
-        LICENSE)
-sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8'
-          '150bb6ce1758ca29f55e876ac75dbac76c9d743d'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-  
-  pushd bsddb3-${pkgver}
-  patch -Np1 -i ../db_5.3.patch
-  popd
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python setup.py --berkeley-db=/usr build
-
-  # Build python 2 module
-  cd ../bsddb3-${pkgver}-python2
-  python2 setup.py --berkeley-db=/usr build
-}
-
-package_python2-bsddb() {
-  depends=('db' 'python2>=2.7')
-  cd "${srcdir}/bsddb3-${pkgver}-python2"
-
-  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python-bsddb() {
-  depends=('db' 'python>=3.2')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/python-bsddb/db_5.3.patch b/community-testing/python-bsddb/db_5.3.patch
deleted file mode 100644
index 6ea4d18bb..000000000
--- a/community-testing/python-bsddb/db_5.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jesus Cea <jcea@jcea.es>
-# Date 1324876054 -3600
-# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12
-# Parent  670b1ec4472908a9dc745a338a9f595f92aba667
-Support Berkeley DB 5.3.x
-
-diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py
---- a/setup2.py	Mon Dec 26 06:04:34 2011 +0100
-+++ b/setup2.py	Mon Dec 26 06:07:34 2011 +0100
-@@ -128,7 +128,7 @@
-     incdir = libdir = None
-     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
-         # Supported Berkeley DB versions, in order of preference.
--        db_ver_list = ((5, 2), (5, 1), (5, 0),
-+        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
-                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2))
- 
-         # construct a list of paths to look for the header file in on
-
diff --git a/community-testing/speed-dreams/speed-dreams.sh b/community-testing/speed-dreams/speed-dreams.sh
deleted file mode 100644
index fa6dde97a..000000000
--- a/community-testing/speed-dreams/speed-dreams.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /opt/speed-dreams/bin
-./speed-dreams
diff --git a/community-testing/tomoyo-tools/PKGBUILD b/community-testing/tomoyo-tools/PKGBUILD
deleted file mode 100644
index c2e406cd5..000000000
--- a/community-testing/tomoyo-tools/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61687 2012-01-06 17:27:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-
-pkgname=tomoyo-tools
-_basever=2.5.0
-_timestamp=20111025
-_file=53357
-pkgver=${_basever}.${_timestamp}
-pkgrel=1
-pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0'
-arch=('i686' 'x86_64')
-url='http://tomoyo.sourceforge.jp'
-#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
-license=('GPL')
-depends=('ncurses')
-conflicts=('ccs-tools')
-install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('99999779698ea5f44c74d49e8c640ec1')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  make -j1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make INSTALLDIR="${pkgdir}" install
-}
diff --git a/community-testing/tomoyo-tools/tomoyo-tools.install b/community-testing/tomoyo-tools/tomoyo-tools.install
deleted file mode 100644
index 695a53f19..000000000
--- a/community-testing/tomoyo-tools/tomoyo-tools.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-  echo
-  echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
-  echo "   boot options and initialize policy with this command:"
-  echo "     /usr/lib/tomoyo/init_policy"
-  echo
-}
-
-post_upgrade () {
-    post_install $1
-}
diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD
deleted file mode 100644
index 297df9eb7..000000000
--- a/community-testing/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 61760 2012-01-07 13:17:55Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2011.10.22
-pkgrel=3
-pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('6f8806ab1be303e9e1e47522c9eee890')
-install=vdrift.install
-
-build() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp
-  #sed -i '/types.h/d' src/http.h
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png \
-    "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png \
-    "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png \
-    "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-
-  rm -r $pkgdir/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/vdrift/vdrift.desktop b/community-testing/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community-testing/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-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install
deleted file mode 100644
index 868f6717b..000000000
--- a/community-testing/vdrift/vdrift.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/virtualbox-modules/60-vboxguest.rules b/community-testing/virtualbox-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community-testing/virtualbox-modules/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community-testing/virtualbox-modules/LocalConfig.kmk b/community-testing/virtualbox-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/community-testing/virtualbox-modules/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS =
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD
deleted file mode 100644
index ea3d9e7ce..000000000
--- a/community-testing/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 61651 2012-01-05 16:53:34Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
-pkgver=4.1.8
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-         LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('2092bba46baa62fab5520d67dee2ece8'
-         '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.2-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure \
-        --with-linux=/usr/src/linux-${_kernver} \
-        --disable-java \
-        --disable-docs \
-        --disable-xpcom \
-        --disable-python \
-        --disable-sdl-ttf \
-        --disable-alsa \
-        --disable-pulse \
-        --disable-dbus  \
-        --disable-opengl \
-        --build-headless \
-        --nofatal
-    source ./env.sh
-    kmk all
-
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-archlinux-modules(){
-    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-archlinux-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
-    replaces=('virtualbox-guest-modules')
-    conflicts=('virtualbox-guest-modules')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
-        install -D -m644 ${module} \
-            "$pkgdir/lib/modules/${_extramodules}/${module}"
-    done
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install"
-}
-
-package_virtualbox-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
-    license=('GPL')
-    install=virtualbox-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
-    install -D -m644 vboxdrv.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
-    install -D -m644 vboxnetadp.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
-    install -D -m644 vboxnetflt.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
-    install -D -m644 vboxpci.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
deleted file mode 100644
index 74af049cc..000000000
--- a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index eeab16ca9..000000000
--- a/community-testing/virtualbox-modules/virtualbox-modules.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD
deleted file mode 100644
index f2b4b3b97..000000000
--- a/community-testing/xfmedia/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 61733 2012-01-07 05:11:32Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Tom Killian <tomk@runbox.com>
-# Contributor: Spider.007 <archPackage@spider007.net>
-
-pkgname=xfmedia
-pkgver=0.9.2
-pkgrel=10
-pkgdesc="xfce media player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://spuriousinterrupt.org/projects/xfmedia/"
-depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib')
-makedepends=('intltool' 'libxt')
-install=xfmedia.install
-source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
-	xfmedia-dbus-0.6-support.patch
-	xfmedia-empty-prev-next-fix.patch
-	xfmedia-exo-0.6.patch
-	xfmedia-xine-1.2.0.patch)
-md5sums=('6eb8bd1f67201f829e0f45e733c02bd5'
-         '8f2aa12eea584de65d8ed28179e56b51'
-         '650f8cb9e2ddd9a8a2a03748b8757110'
-         'f5e17fcdf2056dcc8ca8aae8600c0132'
-         '934603c7d3a1a0a66edb847bcb930df1')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ../xfmedia-dbus-0.6-support.patch
-  patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
-  patch -Np1 -i ../xfmedia-exo-0.6.patch
-  patch -Np1 -i ../xfmedia-xine-1.2.0.patch
-  LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
deleted file mode 100644
index 9b1eb3678..000000000
--- a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c
---- xfmedia-0.9.1.orig/src/remote.c	2005-09-05 00:56:37.000000000 -0400
-+++ xfmedia-0.9.1/src/remote.c	2006-04-08 00:27:18.000000000 -0400
-@@ -55,6 +55,10 @@
- #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
- #endif
- 
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
-+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
-+#endif
-+
- #endif  /* HAVE_DBUS */
- 
- #include <libxfce4util/libxfce4util.h>
diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
deleted file mode 100644
index e2d0d8166..000000000
--- a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c
---- xfmedia-0.9.2/src/mainwin.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mainwin.c	2010-11-01 13:01:17.000000000 +0000
-@@ -1865,6 +1865,10 @@
-     gboolean use_playlist_q  = xfmedia_playlist_queue_n_entries(mwin->playlist_q);
-     gboolean ret = FALSE;
-     
-+    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+	return;
-+
-     if(mwin->cur_playing
-        && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")
-        && !use_playlist_q )
-@@ -1899,6 +1903,10 @@
- {
-     gint tot_items, idx = -1;
-     
-+    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+	return;
-+
-     if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) {
-         XfmediaPlaylistEntryRef *ref = NULL;
-         gboolean playing = FALSE;
diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch
deleted file mode 100644
index 1de611c82..000000000
--- a/community-testing/xfmedia/xfmedia-exo-0.6.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
---- xfmedia-0.9.2/configure	2006-11-27 20:20:59.000000000 +0000
-+++ xfmedia-0.9.2.my/configure	2011-01-31 17:15:58.000000000 +0000
-@@ -27417,7 +27417,7 @@
- 
- 
-   if test x"$xdt_cv_EXO_check" = x"yes"; then
--    if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
-+    if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
- 
- 
-   # minimum supported version of pkg-config
-@@ -27501,22 +27501,22 @@
-   fi
- 
- 
--  { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
--  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
--    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
-+  { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
-+  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
-+    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
- echo "${ECHO_T}$EXO_VERSION" >&6; }
- 
-     { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
- echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
--    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
-+    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
- echo "${ECHO_T}$EXO_CFLAGS" >&6; }
- 
-     { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
- echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
--    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
-+    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
- echo "${ECHO_T}$EXO_LIBS" >&6; }
- 
-@@ -27535,15 +27535,15 @@
- 
-         EXO_FOUND="yes"
- 
--  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
--    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
-+  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
-+    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
-     { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
- echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
- 
- 
--      echo "*** The required package exo-0.3 was found on your system,"
-+      echo "*** The required package exo-1 was found on your system,"
-       echo "*** but the installed version ($xdt_cv_version) is too old."
--      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
-+      echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
-       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
-       echo "*** the new version of the package in a nonstandard prefix so"
-       echo "*** pkg-config is able to find it."
-@@ -27554,8 +27554,8 @@
- echo "${ECHO_T}not found" >&6; }
- 
- 
--      echo "*** The required package exo-0.3 was not found on your system."
--      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
-+      echo "*** The required package exo-1 was not found on your system."
-+      echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
-       echo "*** the PKG_CONFIG_PATH environment variable if you"
-       echo "*** installed the package in a nonstandard prefix so that"
-       echo "*** pkg-config is able to find it."
-@@ -27564,14 +27564,14 @@
-   fi
- 
-     else
--      { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
-+      { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
-       { echo "$as_me:$LINENO: result: not found" >&5
- echo "${ECHO_T}not found" >&6; }
-     fi
-   else
--    { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
--echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
-+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
-     { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
-   fi
-diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
---- xfmedia-0.9.2/src/main.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/main.c	2011-02-01 11:08:02.000000000 +0000
-@@ -388,6 +388,23 @@
-     return optind;
- }
- 
-+/**
-+ * exo_str_get_md5_str:
-+ * @contents : The string to create a digest of.
-+ *
-+ * Creates a character array MD5 digestof the string
-+ * @contents.
-+ *
-+ * Return value: A newly-allocated character array which
-+ *               should be free with g_free() when no
-+ *               longer needed.
-+ **/
-+gchar*
-+exo_str_get_md5_str (const gchar *contents)
-+{
-+  return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
-+}
-+
- int
- main(int argc, char **argv)
- {
-diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
---- xfmedia-0.9.2/src/mediamarks.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mediamarks.c	2011-02-01 11:04:42.000000000 +0000
-@@ -684,9 +684,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1693,9 +1693,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1705,9 +1705,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
-diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
---- xfmedia-0.9.2/src/playlist.c	2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/playlist.c	2011-02-01 11:04:47.000000000 +0000
-@@ -1409,9 +1409,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
- 	if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
-diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
---- xfmedia-0.9.2/src/settings-dialog.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/settings-dialog.c	2011-02-01 11:04:53.000000000 +0000
-@@ -552,7 +552,7 @@
-     render = exo_cell_renderer_ellipsized_text_new();
-     col = gtk_tree_view_column_new_with_attributes("name", render,
-             "text", PLUGINS_NAME, NULL);
--    g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+    g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
-             "ellipsize-set", TRUE, NULL);
-     gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
-     
-diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c	2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c	2011-02-01 11:04:57.000000000 +0000
-@@ -171,7 +171,7 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     g_object_set(G_OBJECT(render),
--                 "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+                 "ellipsize", PANGO_ELLIPSIZE_END,
-                  "ellipsize-set", TRUE,
-                  NULL);
-     col = gtk_tree_view_column_new_with_attributes("display-name", render,
diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
deleted file mode 100644
index 2e04ac80a..000000000
--- a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c
---- xfmedia-0.9.2/src/xfmedia-xine.c	2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.c	2012-01-05 01:23:21.000000000 +0400
-@@ -1450,17 +1450,6 @@
- }
- 
- gboolean
--xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value)
--{
--
--    g_return_val_if_fail(xfx != NULL, 0);
--    g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0);
--    g_return_val_if_fail(xfx->priv->stream != NULL, 0);
--
--    return xine_trick_mode(xfx->priv->stream, mode, value);
--}
--
--gboolean
- xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream,
-     gint *pos_time, gint *length_time)
- {
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h
---- xfmedia-0.9.2/src/xfmedia-xine.h	2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.h	2012-01-05 01:20:47.000000000 +0400
-@@ -87,9 +87,6 @@
- gboolean     xfmedia_xine_play                       (XfmediaXine *xfx,
-                                                   gint pos,
-                                                   gint start_time);
--gboolean     xfmedia_xine_trick_mode                 (XfmediaXine *xfx,
--                                                  gint mode,
--                                                  gint value);
- gint         xfmedia_xine_get_stream_info            (XfmediaXine *xfx,
-                                                   gint info);
- G_CONST_RETURN gchar *xfmedia_xine_get_meta_info     (XfmediaXine *xfx,
diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install
deleted file mode 100644
index b95cc069d..000000000
--- a/community-testing/xfmedia/xfmedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}