diff options
author | Sven Eden <sven.eden@gmx.de> | 2017-06-29 14:24:46 +0200 |
---|---|---|
committer | Sven Eden <sven.eden@gmx.de> | 2017-06-29 14:24:46 +0200 |
commit | 6b9b011b864a8d96dbb3a24e79a619e5637f1ee7 (patch) | |
tree | ed4bb46720d122503482b9da7ccf373ae999a988 | |
parent | app-admin/packagekit-base : Make elogind support truely opt-in (diff) | |
download | seden-6b9b011b864a8d96dbb3a24e79a619e5637f1ee7.tar.gz seden-6b9b011b864a8d96dbb3a24e79a619e5637f1ee7.tar.bz2 seden-6b9b011b864a8d96dbb3a24e79a619e5637f1ee7.zip |
sys-auth/elogind-231.3 : Finally released!
-rw-r--r-- | profiles/package.mask/elogind | 3 | ||||
-rw-r--r-- | sys-auth/elogind/Manifest | 1 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-229.9999.ebuild | 23 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-231.3.ebuild | 84 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-231.9999.ebuild (renamed from sys-auth/elogind/elogind-230.9999.ebuild) | 27 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-226.4-docs.patch | 15 |
6 files changed, 109 insertions, 44 deletions
diff --git a/profiles/package.mask/elogind b/profiles/package.mask/elogind index d4cd76c..befa2cc 100644 --- a/profiles/package.mask/elogind +++ b/profiles/package.mask/elogind @@ -4,6 +4,7 @@ =gnome-base/gvfs-1.30.4-r1 =sys-apps/accountsservice-0.6.43-r5 =sys-auth/elogind-229.9999 -=sys-auth/elogind-230.9999 +=sys-auth/elogind-231.3 +=sys-auth/elogind-231.9999 =sys-process/procps-3.3.12-r2 =x11-apps/xinit-1.3.4-r3 diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest new file mode 100644 index 0000000..f5c491e --- /dev/null +++ b/sys-auth/elogind/Manifest @@ -0,0 +1 @@ +DIST elogind-231.3.tar.gz 812502 SHA256 e319ba11966c21708d8a12338b81542fca471b54703a81dcaa74cf8d70a487d1 SHA512 764b9b81e60404a7635d68e49e644d22fc7aaccca5b6b3a05200dcba5b2ed8945253c12592d8b8fe56f5d6efdf8a55d3c3da35519eb6b8e62378bd9de34c3560 WHIRLPOOL 324066eeff351cfb178bde4fa73bd6694b6df0542ebaf7916721e40015e08d50f06d8545e12acc57a9db4eb3c9593a6106e1908cc5f6f5c2eebd41089aa42337 diff --git a/sys-auth/elogind/elogind-229.9999.ebuild b/sys-auth/elogind/elogind-229.9999.ebuild index 961b1fd..663e5b6 100644 --- a/sys-auth/elogind/elogind-229.9999.ebuild +++ b/sys-auth/elogind/elogind-229.9999.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -16,19 +15,16 @@ SLOT="0" KEYWORDS="" IUSE="acl debug pam policykit selinux" -COMMON_DEPEND=" +RDEPEND=" sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus !sys-apps/systemd " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets @@ -37,11 +33,12 @@ DEPEND="${COMMON_DEPEND} sys-devel/libtool virtual/pkgconfig " -PDEPEND="policykit? ( sys-auth/polkit )" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" -PATCHES=( - "${FILESDIR}/${PN}-docs.patch" -) +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK @@ -80,9 +77,9 @@ src_install() { } pkg_postinst() { - if [ "$(rc-config list default | grep elogind)" = "" ]; then + if [ "$(rc-config list boot | grep elogind)" = "" ]; then ewarn "To enable the elogind daemon, elogind must be" - ewarn "added to the default runlevel:" - ewarn "# rc-update add elogind default" + ewarn "added to the boot runlevel:" + ewarn "# rc-update add elogind boot" fi } diff --git a/sys-auth/elogind/elogind-231.3.ebuild b/sys-auth/elogind/elogind-231.3.ebuild new file mode 100644 index 0000000..fb722cd --- /dev/null +++ b/sys-auth/elogind/elogind-231.3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +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 pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + 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 +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --enable-smack \ + --with-cgroup-controller=openrc \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" = "" ]; then + ewarn "To enable the elogind daemon, elogind must be" + ewarn "added to the boot runlevel:" + ewarn "# rc-update add elogind boot" + fi +} diff --git a/sys-auth/elogind/elogind-230.9999.ebuild b/sys-auth/elogind/elogind-231.9999.ebuild index c787dd8..b988b42 100644 --- a/sys-auth/elogind/elogind-230.9999.ebuild +++ b/sys-auth/elogind/elogind-231.9999.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -9,26 +8,23 @@ inherit autotools git-r3 linux-info pam udev DESCRIPTION="The systemd project's logind, extracted to a standalone package" HOMEPAGE="https://github.com/elogind/elogind" EGIT_REPO_URI="https://github.com/elogind/elogind.git" -EGIT_BRANCH="dev_v231" +EGIT_BRANCH="v231-stable" LICENSE="CC0-1.0 LGPL-2.1+ public-domain" SLOT="0" KEYWORDS="" IUSE="acl debug pam policykit selinux" -COMMON_DEPEND=" +RDEPEND=" sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus !sys-apps/systemd " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets @@ -37,11 +33,12 @@ DEPEND="${COMMON_DEPEND} sys-devel/libtool virtual/pkgconfig " -PDEPEND="policykit? ( sys-auth/polkit )" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" -PATCHES=( - "${FILESDIR}/${PN}-docs.patch" -) +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK @@ -64,7 +61,7 @@ src_configure() { --libdir="${EPREFIX}"/usr/$(get_libdir) \ --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ --enable-smack \ - --disable-kdbus \ + --with-cgroup-controller=openrc \ $(use_enable debug debug elogind) \ $(use_enable acl) \ $(use_enable pam) \ @@ -80,9 +77,9 @@ src_install() { } pkg_postinst() { - if [ "$(rc-config list default | grep elogind)" = "" ]; then + if [ "$(rc-config list boot | grep elogind)" = "" ]; then ewarn "To enable the elogind daemon, elogind must be" - ewarn "added to the default runlevel:" - ewarn "# rc-update add elogind default" + ewarn "added to the boot runlevel:" + ewarn "# rc-update add elogind boot" fi } diff --git a/sys-auth/elogind/files/elogind-226.4-docs.patch b/sys-auth/elogind/files/elogind-226.4-docs.patch deleted file mode 100644 index 4161f63..0000000 --- a/sys-auth/elogind/files/elogind-226.4-docs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.am 2017-02-16 13:22:56.764985896 +0100 -+++ b/Makefile.am 2017-02-16 13:23:04.998986057 +0100 -@@ -194,12 +194,6 @@ - bin_PROGRAMS = - rootlibexec_PROGRAMS = - --dist_doc_DATA = \ -- README \ -- NEWS \ -- LICENSE.LGPL2.1 \ -- LICENSE.GPL2 -- - @INTLTOOL_POLICY_RULE@ - - # ------------------------------------------------------------------------------ |