From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Mar 2018 16:53:27 +0000 Subject: gentoo resync : 09.03.2018 --- sys-auth/elogind/Manifest | 4 +- sys-auth/elogind/elogind-235.2-r1.ebuild | 128 ------------------------ sys-auth/elogind/elogind-235.2-r2.ebuild | 123 +++++++++++++++++++++++ sys-auth/elogind/files/elogind-235.1-docs.patch | 20 ---- sys-auth/elogind/files/elogind-235.2-docs.patch | 19 ++++ 5 files changed, 144 insertions(+), 150 deletions(-) delete mode 100644 sys-auth/elogind/elogind-235.2-r1.ebuild create mode 100644 sys-auth/elogind/elogind-235.2-r2.ebuild delete mode 100644 sys-auth/elogind/files/elogind-235.1-docs.patch create mode 100644 sys-auth/elogind/files/elogind-235.2-docs.patch (limited to 'sys-auth/elogind') diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 081c9698ad54..c9928fbde43f 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,8 +1,8 @@ -AUX elogind-235.1-docs.patch 714 BLAKE2B 93271996cbff4cc8f1cb222c83672f491d3473839fffea4818e7a7341fdb0060de23cca70576d81d0c6783fc796d998b0b70a38237ec7ab14dd8e2521659d49e SHA512 2e530aa318d3ba0de3a1fceb4d8316f8215e1a8d769b077cf4b223ae2f8103c62c2852dd3fd45540646ad6272b0edbb4b23d70a379a2601765c61b4d78b4d81e +AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011 AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313 -EBUILD elogind-235.2-r1.ebuild 3480 BLAKE2B dda1cbaaa5dc3f355eb9d407df64c4d10e740071f575acdd9c47123c68eaae31c696dd6c150ee8d07dc2e2a57328de330450cef0feff6cc926a633916dd7ba18 SHA512 85d5d135c93599cdb77157aeefedf0b2670f38c5859433a1a611095feefc670b1114c743bdd34725aa0db275089e8aeeaef421798adf613e8de15e13a3ec5a86 +EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68 diff --git a/sys-auth/elogind/elogind-235.2-r1.ebuild b/sys-auth/elogind/elogind-235.2-r1.ebuild deleted file mode 100644 index 0a887ba050c1..000000000000 --- a/sys-auth/elogind/elogind-235.2-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# 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}/${PN}-235.1-docs.patch" - "${FILESDIR}/${P}-legacy-cgroupmode.patch" - "${FILESDIR}/${P}-drop-logintest.patch" # bug 645156 -) - -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 rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" - local cgroupmode="legacy" - - if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then - cgroupmode="hybrid" - elif [[ "xunified" = "x${rccgroupmode}" ]] ; then - cgroupmode="unified" - fi - - local 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/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild new file mode 100644 index 000000000000..bae01cc02e4f --- /dev/null +++ b/sys-auth/elogind/elogind-235.2-r2.ebuild @@ -0,0 +1,123 @@ +# 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" + "${FILESDIR}/${P}-legacy-cgroupmode.patch" + "${FILESDIR}/${P}-drop-logintest.patch" # bug 645156 +) + +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 rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" + local cgroupmode="legacy" + + if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then + cgroupmode="hybrid" + elif [[ "xunified" = "x${rccgroupmode}" ]] ; then + cgroupmode="unified" + fi + + local emesonargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/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}/" + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" + -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" + -Dman=auto + -Dsmack=true + -Dcgroup-controller=openrc + -Ddefault-hierarchy=${cgroupmode} + -Ddefault-kill-user-processes=false + -Dacl=$(usex acl true false) + -Ddebug=$(usex debug elogind false) + --buildtype $(usex debug debug release) + -Dhtml=$(usex doc auto false) + -Dpam=$(usex pam true false) + -Dselinux=$(usex selinux true false) + ) + + meson_src_configure +} + +src_install() { + DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) + + 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 + elog "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 +} diff --git a/sys-auth/elogind/files/elogind-235.1-docs.patch b/sys-auth/elogind/files/elogind-235.1-docs.patch deleted file mode 100644 index bb28bf412d4a..000000000000 --- a/sys-auth/elogind/files/elogind-235.1-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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)) diff --git a/sys-auth/elogind/files/elogind-235.2-docs.patch b/sys-auth/elogind/files/elogind-235.2-docs.patch new file mode 100644 index 000000000000..7fbb4594bdc4 --- /dev/null +++ b/sys-auth/elogind/files/elogind-235.2-docs.patch @@ -0,0 +1,19 @@ +--- 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,5 @@ + # 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_dir : docdir) + + meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) -- cgit v1.2.3