From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26A5F138331 for ; Sun, 14 Jan 2018 23:05:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 545FFE0876; Sun, 14 Jan 2018 23:05:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 272BAE0876 for ; Sun, 14 Jan 2018 23:05:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5ABBC335C66 for ; Sun, 14 Jan 2018 23:05:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D559C1AB for ; Sun, 14 Jan 2018 23:05:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515971094.1db7c7784460eb0ad23bdec0a67c9a0352f81ba6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/, sys-auth/elogind/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/elogind/Manifest sys-auth/elogind/elogind-235.1.ebuild sys-auth/elogind/files/elogind-235.1-docs.patch X-VCS-Directories: sys-auth/elogind/files/ sys-auth/elogind/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1db7c7784460eb0ad23bdec0a67c9a0352f81ba6 X-VCS-Branch: master Date: Sun, 14 Jan 2018 23:05:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 85d24af9-0935-46dc-8d2d-a295f02790fc X-Archives-Hash: 594074cc5bfad6b563e17e0c7c34b7ab commit: 1db7c7784460eb0ad23bdec0a67c9a0352f81ba6 Author: Sven Eden gmx net> AuthorDate: Sun Jan 14 22:52:49 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 14 23:04:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db7c778 sys-auth/elogind: 235.1 version bump, switched to meson Tests pass. Bug: https://bugs.gentoo.org/631932 Closes: https://bugs.gentoo.org/644600 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-auth/elogind/Manifest | 1 + sys-auth/elogind/elogind-235.1.ebuild | 125 ++++++++++++++++++++++++ sys-auth/elogind/files/elogind-235.1-docs.patch | 20 ++++ 3 files changed, 146 insertions(+) diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 881f2e6c750..9466285a938 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1 +1,2 @@ DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e +DIST elogind-235.1.tar.gz 975726 BLAKE2B 2497be9bfc89e8d7eef1cc0a0880b5801940df282ba1c8e62031dcf888bcc107d071fe6d61f0e383a779829eafb060f421140d8c3c998937eec1c333ed7d0d13 SHA512 96442d073f4437c4432419cfaed3dc6f0323fc6967ae01b64ee07ae9a91d99084ba0066825a723a8a58ffff4c0a47150d64d40ff4dcc15a6250423dd5c358c38 diff --git a/sys-auth/elogind/elogind-235.1.ebuild b/sys-auth/elogind/elogind-235.1.ebuild new file mode 100644 index 00000000000..ca89c99114d --- /dev/null +++ b/sys-auth/elogind/elogind-235.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info meson pam udev xdg-utils + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +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" +IUSE="+acl debug doc +pam +policykit selinux" + +COMMON_DEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + !sys-apps/systemd +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${P}-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + xdg_environment_reset +} + +src_configure() { + local emesonargs cgroupmode rccgroupmode + + rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" + cgroupmode="legacy" + + if [ "xhybrid" = "x${rccgroupmode}" ] ; then + cgroupmode="hybrid" + elif [ "xunified" = "x${rccgroupmode}" ] ; then + cgroupmode="unified" + fi + + emesonargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${P}" \ + -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" \ + -Dpamlibdir=$(getpam_mod_dir) \ + -Dudevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + -Drootlibdir="${EPREFIX}"/$(get_libdir) \ + -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + -Drootprefix="${EPREFIX}/" \ + -Dsmack=true \ + -Dman=auto \ + -Dhtml=$(usex doc auto false) \ + -Dcgroup-controller=openrc \ + -Ddefault-hierarchy=${cgroupmode} \ + -Ddebug=$(usex debug elogind false) \ + --buildtype $(usex debug debug release) \ + -Dacl=$(usex acl true false) \ + -Dpam=$(usex pam true false) \ + -Dselinux=$(usex selinux true false) + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" \ + -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" \ + ) + meson_src_configure +} + +src_install() { + meson_src_install + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/files/elogind-235.1-docs.patch b/sys-auth/elogind/files/elogind-235.1-docs.patch new file mode 100644 index 00000000000..bb28bf412d4 --- /dev/null +++ b/sys-auth/elogind/files/elogind-235.1-docs.patch @@ -0,0 +1,20 @@ +--- a/meson.build 2018-01-14 18:59:36.141461154 +0100 ++++ b/meson.build 2018-01-14 19:00:46.208461781 +0100 +@@ -2634,16 +2634,7 @@ + # install_data('modprobe.d/systemd.conf', + # install_dir : modprobedir) + #endif // 0 +-install_data('README', +- 'NEWS', +- 'CODING_STYLE', +-#if 0 /// UNNEEDED by elogind +-# 'DISTRO_PORTING', +-# 'ENVIRONMENT.md', +-#endif // 0 +- 'LICENSE.GPL2', +- 'LICENSE.LGPL2.1', +- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION', ++install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION', + install_dir : docdir) + + meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))