[patch] [reviewed] Patch in elogind-support to packagekit-base-1.1.5.ebuild

add_elogind_to_ebuild.patch (text/plain), 2.48 KB, created by Sven Eden on 2017-06-14 08:00:49 UTC

--- a/packagekit-base-1.1.5.ebuild	2017-05-10 20:33:50.502093611 +0200
+++ b/packagekit-base-1.1.5-r1.ebuild	2017-06-14 08:12:10.341348146 +0200
@@ -8,7 +8,7 @@
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 multilib python-single-r1 systemd vala xdg
+inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
 
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}
@@ -20,14 +20,15 @@
 LICENSE="GPL-2"
 SLOT="0/18"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="connman cron command-not-found +introspection networkmanager entropy systemd test vala"
+IUSE="connman cron command-not-found elogind +introspection networkmanager entropy systemd test vala"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )
 	vala? ( introspection )
 "
 
 # While not strictly needed, consolekit is the alternative to systemd-login
-# to get current session's user.
+# or elogind to get current session's user.
 COMMON_DEPEND="
 	>=app-shells/bash-completion-2
 	dev-db/sqlite:3
@@ -37,6 +38,7 @@
 	>=sys-apps/dbus-1.3.0
 	${PYTHON_DEPS}
 	connman? ( net-misc/connman )
+	elogind? ( >=sys-auth/elogind-229.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
 	networkmanager? ( >=net-misc/networkmanager-0.6.4:= )
 	systemd? ( >=sys-apps/systemd-204 )
@@ -54,17 +56,23 @@
 	>=app-portage/layman-2[${PYTHON_USEDEP}]
 	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
 	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
-	!systemd? ( sys-auth/consolekit )
+	!systemd? ( !elogind? ( sys-auth/consolekit ) )
 "
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
+PATCHES=(
 	# Fixes QA Notices:
 	# - https://github.com/gentoo/gentoo/pull/1760
 	# - https://github.com/hughsie/PackageKit/issues/143
-	eapply "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+	"${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+
+	# Adds elogind support:
+	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
+	"${FILESDIR}"/${P}-elogind.patch
+)
 
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
 	# Disable unittests not working with portage backend
 	# console: requires terminal input
 	sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
@@ -82,6 +90,9 @@
 	eapply_user
 	use vala && vala_src_prepare
 	xdg_src_prepare
+
+	# Needed by elogind patch:
+	eautoreconf
 }
 
 src_configure() {
@@ -99,6 +110,7 @@
 		$(use_enable command-not-found) \
 		$(use_enable connman) \
 		$(use_enable cron) \
+		$(use_enable elogind) \
 		$(use_enable entropy) \
 		$(use_enable introspection) \
 		$(use_enable networkmanager) \