From aa0210884756d6af2bffb67b3770caf5b707db6c Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 26 Jun 2017 23:07:51 +0200 Subject: [PATCH] app-admin/packagekit-base: Revision bump (bug #622104) Temporary workaround to fix elogind support patch. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=622104 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- .../files/packagekit-base-elogind-support.patch | 6 ++++-- ...base-1.1.5-r1.ebuild => packagekit-base-1.1.5-r2.ebuild} | 0 2 files changed, 4 insertions(+), 2 deletions(-) rename app-admin/packagekit-base/{packagekit-base-1.1.5-r1.ebuild => packagekit-base-1.1.5-r2.ebuild} (100%) diff --git a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch index bed2a0de4494..df7675761d49 100644 --- a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch +++ b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch @@ -21,7 +21,7 @@ AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir]) fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"]) -@@ -267,6 +266,22 @@ +@@ -267,6 +266,24 @@ AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes]) dnl --------------------------------------------------------------------------- @@ -31,12 +31,14 @@ + enable_elogind=$enableval,enable_elogind=no) +if test x$enable_elogind = xyes; then + PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no]) ++else ++ have_elogind=no +fi + +dnl --------------------------------------------------------------------------- +dnl --- Is systemd/sd-login.h, either from systemd or elogind, available? +dnl --------------------------------------------------------------------------- -+if test "x$have_systemd" != "xno" -o "x$have_elogind" != "xno" ; then ++if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then + AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code]) +fi + diff --git a/app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild similarity index 100% rename from app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild rename to app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild -- 2.26.2