summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-auth/elogind/Manifest2
-rw-r--r--sys-auth/elogind/elogind-241.3.ebuild (renamed from sys-auth/elogind/elogind-238.2-r1337.ebuild)12
-rw-r--r--sys-auth/elogind/files/elogind-238.1-docs.patch23
-rw-r--r--sys-auth/elogind/files/elogind-241.1-docs.patch24
4 files changed, 31 insertions, 30 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 50b313eb..ff7b0c59 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1 +1 @@
-DIST elogind-238.2.tar.gz 1075847 BLAKE2B 17e4d8ffabb65a210f34076223e502c9019a7fa639f6cc12b1c8a0e186d8a6e97f115cd68487c86470915a8208dead6830577d2da3ffd85ed2e12c3a699ef2c5 SHA512 c66dd514d7c708a1d1c52ac9f25f34af839c4d4ff452302b40eb95c040c1d3d8d238b4e35c33d81af71f6aac22c8793951d91d005e6595e02124edb976baf640
+DIST elogind-241.3.tar.gz 1401391 BLAKE2B 90bc10af1b6d66bc6b6e15314cbc7005f270ebd04767a88d93605d81b199758c7f5423ea85f9810f8dfcde82c6c2b8094e2237cf2ca70a9dfc45a4a8e20b0439 SHA512 b33c0ed85c4a97216f8d56441207510be180258d4f4e5ff9dea07d59d53b84b03c27f5397f09214ce9fc880f38865e20d7c05b41255d4b762c33099b7ebb53eb
diff --git a/sys-auth/elogind/elogind-238.2-r1337.ebuild b/sys-auth/elogind/elogind-241.3.ebuild
index ee3e9fc9..3aa749fa 100644
--- a/sys-auth/elogind/elogind-238.2-r1337.ebuild
+++ b/sys-auth/elogind/elogind-241.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit linux-info meson pam udev xdg-utils
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+acl debug doc +pam +policykit selinux"
COMMON_DEPEND="
@@ -41,7 +41,7 @@ PDEPEND="
DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-PATCHES=( "${FILESDIR}/${PN}-238.1-docs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-241.1-docs.patch" )
pkg_setup() {
local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
@@ -80,11 +80,11 @@ src_configure() {
-Ddefault-hierarchy=${cgroupmode}
-Ddefault-kill-user-processes=false
-Dacl=$(usex acl true false)
- -Ddebug-extra=$(usex debug elogind false)
--buildtype $(usex debug debug release)
-Dhtml=$(usex doc auto false)
-Dpam=$(usex pam true false)
-Dselinux=$(usex selinux true false)
+ -Dutmp=$(usex elibc_musl false true)
)
meson_src_configure
@@ -100,5 +100,5 @@ src_install() {
sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
newconfd ${PN}.conf ${PN}
- rm -rf ${ED}lib/udev/rules.d/73-seat-late.rules
+ rm -rf ${ED}/lib/udev/rules.d/73-seat-late.rules
}
diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch
deleted file mode 100644
index 2288ddfe..00000000
--- a/sys-auth/elogind/files/elogind-238.1-docs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/meson.build 2018-06-25 16:41:00.000000000 +0200
-+++ b/meson.build 2018-06-30 21:45:52.139755680 +0200
-@@ -2928,11 +2928,6 @@
- # install_data('modprobe.d/systemd.conf',
- # install_dir : modprobedir)
- #endif // 0
--install_data('LICENSE.GPL2',
-- 'LICENSE.LGPL2.1',
-- 'NEWS',
-- 'README',
-- 'doc/CODING_STYLE',
- #if 0 /// irrelevant for elogind
- # 'doc/DISTRO_PORTING',
- # 'doc/ENVIRONMENT.md',
-@@ -2941,8 +2936,6 @@
- # 'doc/TRANSLATORS',
- # 'doc/UIDS-GIDS.md',
- #endif // 0
-- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-- install_dir : docdir)
-
- #if 0 /// UNNEEDED by elogind
- # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/elogind/files/elogind-241.1-docs.patch b/sys-auth/elogind/files/elogind-241.1-docs.patch
new file mode 100644
index 00000000..2e53c498
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-241.1-docs.patch
@@ -0,0 +1,24 @@
+--- a/meson.build 2019-02-22 19:22:44.395082783 +0100
++++ b/meson.build 2019-02-22 19:22:49.707082657 +0100
+@@ -3311,20 +3311,7 @@
+ # install_data('modprobe.d/systemd.conf',
+ # install_dir : modprobedir)
+ #endif // 0
+-install_data('LICENSE.GPL2',
+- 'LICENSE.LGPL2.1',
+- 'NEWS',
+- 'README',
+- 'docs/CODING_STYLE.md',
+-#if 0 /// irrelevant for elogind
+-# 'docs/DISTRO_PORTING.md',
+-# 'docs/ENVIRONMENT.md',
+-# 'docs/HACKING.md',
+-# 'docs/TRANSIENT-SETTINGS.md',
+-# 'docs/TRANSLATORS.md',
+-# 'docs/UIDS-GIDS.md',
+-#endif // 0
+- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
++install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+ install_dir : docdir)
+
+ #if 0 /// UNNEEDED by elogind