gentoo resync : 24.12.2018

7 files changed, 203 insertions, 102 deletions

diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 13e1825ee2dd..04767fd6b1a8 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,5 +1,7 @@
-AUX packagekit-base-1.1.1-cache-qafix.patch 469 BLAKE2B fb0666e27d2908236a0adf31adcc9dbcaab94bdb1d4b253369b2bf92e18279e289ea8b486285ce9b19abfc79c81e308675019777f49b98ce6aca1e341695cfb6 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424
-AUX packagekit-base-1.1.7-elogind-support.patch 5872 BLAKE2B a18f2e6016781b043d34cc82e76970a8fd18a4e08fb5516b2f332f6a3213e4fbb90311d6bd54a11b82b98e84d90598648562473aa497c8c4c69ad99a4cbd474e SHA512 26b6f163e44a1a837e8c9ac43b8f6ec9733962d746d0081e05d1691099c953e16055d530e7de5558aacd985b1690dcbea9c6087755d037d8029f34b158d74a45
-DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
-EBUILD packagekit-base-1.1.7-r2.ebuild 3658 BLAKE2B 1c762371380374854d5f5745c990dee34114952be04c1837cebf17f6db147f6aac80e6935c1984d765469cb70d23ed4e47e34a4728df334706ad42f8fca6aa5e SHA512 05be68bff165af27a2354e72f8a9102992530473dea1bdeb68507af493fce811bd338ff0d6b5ab7b2a17d4e91d1d258d151719a8742fa5e932126fd206292e6f
+AUX 1.1.12-add-missing-config.h.patch 713 BLAKE2B 490b87f64d6e21419a3832d2a3a8fb9a5c9b306cf63f7e5b956b8c585b1ccbe2bc8ce69f0a80f219dfff182789ace28a81cc81f4dd793ba98e1735295bd53fbd SHA512 a92c60f2c476f608021ecd9aa2b06169c9b690efcbf14c82afcc3313070a06965d35fff7b95873107f71d1f7d4557ee3e8de49c7d9544ce274c370ef7e9af09c
+AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae2533217207355475eaf6febffcf8395c6301fba7475ca7979187ae787e59209fc9d3178654a5edb7f2f744bddcc72d7ff5ed718f SHA512 dd35d569c5980ce3bb8ce508178dd7daaade553f380e91248186278b557c77a46486c52ed4ea25a808116e1579f3d51e9cb2ca09015fb1d03d6e0c31bd3b9403
+AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
+AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
+DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
+EBUILD packagekit-base-1.1.12.ebuild 3975 BLAKE2B b5bcec53f996e1ab5419959ec360e20dd0e3486ecbc205de1be4ba1a9e4e43f20b121a4d770b36dd7b48676ddf98b06c9950ea512954d297636a339c8f9da1eb SHA512 4a9249d43ba58abe4a7311a0bde7ace79c30d21dcb96a4477c0e26b7739dd9509bdc423f0fd565fe5db58bc6a5e1c18746ba31f60a4933997c66a1e1f4e2f6b5
 MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323
diff --git a/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch b/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
new file mode 100644
index 000000000000..eb8c192e882c
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
@@ -0,0 +1,25 @@
+From 3620f182745db77b5bf4552a9e8d8cb38fdc0268 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 4 Dec 2018 22:15:49 +0100
+Subject: [PATCH 2/2] trivial: Add missing config.h include
+
+---
+ lib/packagekit-glib2/pk-progress-bar.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/packagekit-glib2/pk-progress-bar.c b/lib/packagekit-glib2/pk-progress-bar.c
+index e75f319e4..28d8f5ac2 100644
+--- a/lib/packagekit-glib2/pk-progress-bar.c
++++ b/lib/packagekit-glib2/pk-progress-bar.c
+@@ -19,6 +19,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
++#include "config.h"
++
+ #include <glib.h>
+ #include <string.h>
+ #include <unistd.h>
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch b/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
new file mode 100644
index 000000000000..4e747616c06f
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
@@ -0,0 +1,38 @@
+From d64070f1782ed06f83be7783e22cf86f4098f34e Mon Sep 17 00:00:00 2001
+From: Ettore Di Giacinto <mudler@gentoo.org>
+Date: Tue, 11 Dec 2018 16:54:42 +0100
+Subject: [PATCH 1/2] Drop $(localstatedir)/cache rules
+
+This directory can be flushed any moment and pre-existence of folders
+in it cannot be assumed.
+
+pk-transaction creates the downloads directory as needed. If backends
+need metadata folder they should create it if not found.
+
+Closes: https://github.com/gentoo/gentoo/pull/1760
+References: https://github.com/hughsie/PackageKit/issues/143
+---
+ src/Makefile.am | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 830aaf873..24c9a0b9a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -166,13 +166,6 @@ pk_self_test_CFLAGS =					\
+ 
+ TESTS = pk-self-test
+ 
+-install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/log; \
+-	fi
+-
+ clean-local:
+ 	rm -f *~
+ 
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch b/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
index bb6b6103dde2..8be115bbc71d 100644
--- a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
+++ b/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
@@ -1,19 +1,22 @@
---- a/config.h.in	2017-06-07 16:38:45.046910693 +0200
-+++ b/config.h.in	2017-06-07 16:39:06.973911120 +0200
-@@ -78,8 +78,8 @@
- /* Define to 1 if you have the <string.h> header file. */
- #undef HAVE_STRING_H
- 
--/* Build systemd code */
--#undef HAVE_SYSTEMD
-+/* Build systemd-login code */
-+#undef HAVE_SYSTEMD_SD_LOGIN_H
- 
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
---- a/configure.ac	2017-06-06 09:03:57.171355965 +0200
-+++ b/configure.ac	2017-06-06 09:55:11.242384458 +0200
-@@ -254,7 +254,6 @@
+From ee8a65b3fd7636a60f8a2b2e509376cbbd8326cb Mon Sep 17 00:00:00 2001
+From: Sven Eden <yamakuzure@gmx.net>
+Date: Tue, 11 Dec 2018 16:59:28 +0100
+Subject: [PATCH 2/2] Add elogind support
+
+Closes: https://bugs.gentoo.org/620948
+Signed-off-by: Ettore Di Giacinto <mudler@gentoo.org>
+---
+ configure.ac    | 20 +++++++++++++++++++-
+ src/Makefile.am |  4 ++++
+ src/pk-dbus.c   |  8 ++++----
+ src/pk-engine.c | 12 ++++++------
+ 4 files changed, 33 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 737c1d4dc..0778c57d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,7 +216,6 @@ if test x$enable_systemd = xyes; then
  		    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
  		    [has_systemdsystemunitdir=$with_systemdsystemunitdir],
  		    [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
@@ -21,10 +24,11 @@
  	AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
  fi
  AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
-@@ -267,6 +266,24 @@
+@@ -228,6 +227,24 @@ AC_ARG_ENABLE(offline-update, AS_HELP_STRING([--enable-offline-update],[enable o
+ 	      enable_offline_update=$enableval,enable_offline_update=yes)
  AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
  
- dnl ---------------------------------------------------------------------------
++dnl ---------------------------------------------------------------------------
 +dnl - Use elogind instead of systemd-login
 +dnl ---------------------------------------------------------------------------
 +AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]),
@@ -42,18 +46,19 @@
 +		AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
 +fi
 +
-+dnl ---------------------------------------------------------------------------
+ dnl ---------------------------------------------------------------------------
  dnl - Generate man pages ? (default enabled)
  dnl ---------------------------------------------------------------------------
- AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
-@@ -629,6 +644,7 @@
+@@ -590,6 +607,7 @@ echo "
          cflags:                    ${CFLAGS}
          cppflags:                  ${CPPFLAGS}
          Able to run locally:       ${enable_local}
 +        Use elogind:               ${enable_elogind}
          Use systemd:               ${enable_systemd}
          Enable offline update:     ${enable_offline_update}
-         Networking stacks:         ${networking_apis}
+         GStreamer plugin:          ${build_gstreamer_plugin}
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 24c9a0b9a..468f31d04 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -9,6 +9,7 @@ AM_CPPFLAGS =						\
@@ -88,9 +93,51 @@
  	$(SYSTEMD_LIBS)
  
  pk_self_test_CPPFLAGS =					\
---- a/src/pk-engine.c	2017-06-06 09:12:23.828371176 +0200
-+++ b/src/pk-engine.c	2017-06-06 09:55:47.426385545 +0200
-@@ -98,7 +98,7 @@
+diff --git a/src/pk-dbus.c b/src/pk-dbus.c
+index 0cf512f38..37cc1d83c 100644
+--- a/src/pk-dbus.c
++++ b/src/pk-dbus.c
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <gio/gio.h>
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+  #include <systemd/sd-login.h>
+ #endif
+ 
+@@ -177,7 +177,7 @@ pk_dbus_get_cmdline (PkDbus *dbus, const gchar *sender)
+ 	return cmdline;
+ }
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ static gchar *
+ pk_dbus_make_logind_session_id (const gchar *session)
+ {
+@@ -218,7 +218,7 @@ gchar *
+ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ {
+ 	gchar *session = NULL;
+-#ifndef HAVE_SYSTEMD
++#ifndef HAVE_SYSTEMD_SD_LOGIN_H
+ 	g_autoptr(GError) error = NULL;
+ #endif
+ 	guint pid;
+@@ -248,7 +248,7 @@ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ 	}
+ 
+ 	/* get session from systemd or ConsoleKit */
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	session = pk_dbus_get_session_systemd (pid);
+ 	if (session == NULL)
+ 		g_warning ("failed to get session for pid %u", pid);
+diff --git a/src/pk-engine.c b/src/pk-engine.c
+index f63058fbc..7ea87a448 100644
+--- a/src/pk-engine.c
++++ b/src/pk-engine.c
+@@ -98,7 +98,7 @@ struct PkEnginePrivate
  	guint			 owner_id;
  	GDBusNodeInfo		*introspection;
  	GDBusConnection		*connection;
@@ -99,7 +146,7 @@
  	GDBusProxy		*logind_proxy;
  	gint			 logind_fd;
  #endif
-@@ -281,7 +281,7 @@
+@@ -256,7 +256,7 @@ pk_engine_emit_offline_property_changed (PkEngine *engine,
  static void
  pk_engine_inhibit (PkEngine *engine)
  {
@@ -108,7 +155,7 @@
  	g_autoptr(GError) error = NULL;
  	g_autoptr(GUnixFDList) out_fd_list = NULL;
  	g_autoptr(GVariant) res = NULL;
-@@ -331,7 +331,7 @@
+@@ -303,7 +303,7 @@ pk_engine_inhibit (PkEngine *engine)
  static void
  pk_engine_uninhibit (PkEngine *engine)
  {
@@ -117,16 +164,16 @@
  	if (engine->priv->logind_fd == 0)
  		return;
  	g_debug ("closed logind fd %i", engine->priv->logind_fd);
-@@ -1830,7 +1830,7 @@
+@@ -1701,7 +1701,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
  	}
  }
  
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_engine_proxy_logind_cb:
-  **/
-@@ -1872,7 +1872,7 @@
+ static void
+ pk_engine_proxy_logind_cb (GObject *source_object,
+ 			   GAsyncResult *res,
+@@ -1737,7 +1737,7 @@ pk_engine_on_bus_acquired_cb (GDBusConnection *connection,
  	/* save copy for emitting signals */
  	engine->priv->connection = g_object_ref (connection);
  
@@ -135,7 +182,7 @@
  	/* connect to logind */
  	g_dbus_proxy_new (connection,
  			  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-@@ -2031,7 +2031,7 @@
+@@ -1883,7 +1883,7 @@ pk_engine_finalize (GObject *object)
  	if (engine->priv->connection != NULL)
  		g_object_unref (engine->priv->connection);
  
@@ -144,41 +191,6 @@
  	/* uninhibit */
  	if (engine->priv->logind_fd != 0)
  		close (engine->priv->logind_fd);
---- a/src/pk-dbus.c	2017-06-06 09:12:13.254370858 +0200
-+++ b/src/pk-dbus.c	2017-06-06 10:09:17.249409857 +0200
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <gio/gio.h>
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
-  #include <systemd/sd-login.h>
- #endif
- 
-@@ -177,7 +177,7 @@
- 	return cmdline;
- }
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_dbus_get_session_systemd:
-  **/
-@@ -220,7 +220,7 @@
- pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
- {
- 	gchar *session = NULL;
--#ifndef HAVE_SYSTEMD
-+#ifndef HAVE_SYSTEMD_SD_LOGIN_H
- 	g_autoptr(GError) error = NULL;
- #endif
- 	guint pid;
-@@ -250,7 +250,7 @@
- 	}
- 
- 	/* get session from systemd or ConsoleKit */
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- 	session = pk_dbus_get_session_systemd (pid);
- #else
- 	/* get session from ConsoleKit */
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch b/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
new file mode 100644
index 000000000000..542abd5e566c
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
@@ -0,0 +1,28 @@
+From f664bbc43d12f4b30431dfe2ecee4c9ebfaf00e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 1 Dec 2018 18:55:37 +0000
+Subject: [PATCH 1/2] lib/python/packagekit/Makefile.am: Use the detected
+ PYTHON version
+
+This will fix compilation in system where only the "python3"
+executable exists
+---
+ lib/python/packagekit/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/python/packagekit/Makefile.am b/lib/python/packagekit/Makefile.am
+index 617006647..a589cde17 100644
+--- a/lib/python/packagekit/Makefile.am
++++ b/lib/python/packagekit/Makefile.am
+@@ -1,7 +1,7 @@
+ BUILT_SOURCES = enums.py
+ 
+ enums.py: $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c
+-	python $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
++	$(PYTHON) $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
+ 
+ if HAVE_PYTHON_BACKEND
+ packagekitpythondir = ${PYTHON_PACKAGE_DIR}
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
deleted file mode 100644
index d7ec4b268c84..000000000000
--- a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/~Makefile.am	2016-06-29 10:59:14.178918032 +0200
-+++ b/src/Makefile.am	2016-06-29 11:02:50.739929627 +0200
-@@ -175,11 +175,7 @@ pk_self_test_CFLAGS =					\
- TESTS = pk-self-test
- 
- install-data-hook:
--	if test -w $(DESTDIR)$(prefix)/; then \
--		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
--		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
--		mkdir -p $(DESTDIR)$(localstatedir)/log; \
--	fi
-+
- 
- clean-local:
- 	rm -f *~
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index cf2c12a7ae0e..e7bddc8c7ca6 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 # PackageKit supports 3.2+, but entropy and portage backends are untested
-# Future note: use --enable-python3
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
@@ -25,6 +24,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )
 	vala? ( introspection )
+	entropy? ( $(python_gen_useflags 'python2*' ) )
 "
 
 # While not strictly needed, consolekit is the alternative to systemd-login
@@ -33,21 +33,25 @@ COMMON_DEPEND="
 	>=app-shells/bash-completion-2
 	dev-db/sqlite:3
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.46.0:2
-	>=sys-auth/polkit-0.98
+	>=dev-libs/glib-2.54.0:2
+	>=sys-auth/polkit-0.114
 	>=sys-apps/dbus-1.3.0
 	${PYTHON_DEPS}
 	elogind? ( >=sys-auth/elogind-229.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
-	systemd? ( >=sys-apps/systemd-204 )
+	systemd? ( >=sys-apps/systemd-213 )
 "
 # vala-common needed for eautoreconf
 DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
 	>=dev-cpp/glibmm-2.4
-	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	dev-libs/vala-common
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.35.0
+	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
@@ -66,11 +70,16 @@ PATCHES=(
 	# Fixes QA Notices:
 	# - https://github.com/gentoo/gentoo/pull/1760
 	# - https://github.com/hughsie/PackageKit/issues/143
-	"${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+	"${FILESDIR}"/${PV}-cache-qafix.patch
 
 	# Adds elogind support:
 	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
-	"${FILESDIR}"/${P}-elogind-support.patch
+	# - https://github.com/hughsie/PackageKit/pull/299
+	"${FILESDIR}"/${PV}-elogind-support.patch
+
+	# From master
+	"${FILESDIR}"/${PV}-use-autotool-python.patch
+	"${FILESDIR}"/${PV}-add-missing-config.h.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -86,15 +95,15 @@ src_prepare() {
 		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
 		-i lib/packagekit-glib2/pk-test-daemon.c || die
 	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
-	    -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
-	    -e 's:^\(.*/packagekit/backend\)://\1:' \
+		-e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+		-e 's:^\(.*/packagekit/backend\)://\1:' \
 		-i src/pk-self-test.c || die
 
 	eapply_user
 	use vala && vala_src_prepare
 	xdg_src_prepare
 
-	# Needed by elogind patch:
+	# Needed by elogind patch
 	eautoreconf
 }
 
@@ -123,8 +132,10 @@ src_configure() {
 }
 
 src_install() {
+	python_fix_shebang backends/portage/portageBackend.py
+
 	emake DESTDIR="${D}" install
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
 }