Gentoo Archives: gentoo-commits

From: Ettore Di Giacinto <mudler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/packagekit-base/, app-admin/packagekit-base/files/
Date: Mon, 26 Jun 2017 21:18:20
Message-Id: 1498511860.aa0210884756d6af2bffb67b3770caf5b707db6c.mudler@gentoo
1 commit: aa0210884756d6af2bffb67b3770caf5b707db6c
2 Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 26 21:07:51 2017 +0000
4 Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 26 21:17:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa021088
7
8 app-admin/packagekit-base: Revision bump (bug #622104)
9
10 Temporary workaround to fix elogind support patch.
11
12 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=622104
13 Package-Manager: Portage-2.3.5, Repoman-2.3.2
14
15 .../packagekit-base/files/packagekit-base-elogind-support.patch | 6 ++++--
16 ...kagekit-base-1.1.5-r1.ebuild => packagekit-base-1.1.5-r2.ebuild} | 0
17 2 files changed, 4 insertions(+), 2 deletions(-)
18
19 diff --git a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
20 index bed2a0de449..df7675761d4 100644
21 --- a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
22 +++ b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
23 @@ -21,7 +21,7 @@
24 AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
25 fi
26 AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
27 -@@ -267,6 +266,22 @@
28 +@@ -267,6 +266,24 @@
29 AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
30
31 dnl ---------------------------------------------------------------------------
32 @@ -31,12 +31,14 @@
33 + enable_elogind=$enableval,enable_elogind=no)
34 +if test x$enable_elogind = xyes; then
35 + PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no])
36 ++else
37 ++ have_elogind=no
38 +fi
39 +
40 +dnl ---------------------------------------------------------------------------
41 +dnl --- Is systemd/sd-login.h, either from systemd or elogind, available?
42 +dnl ---------------------------------------------------------------------------
43 -+if test "x$have_systemd" != "xno" -o "x$have_elogind" != "xno" ; then
44 ++if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then
45 + AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
46 +fi
47 +
48
49 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
50 similarity index 100%
51 rename from app-admin/packagekit-base/packagekit-base-1.1.5-r1.ebuild
52 rename to app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild