From 55c50bfc11ea2e460fd1643797b994576912ac38 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Dec 2018 01:51:42 +0000 Subject: sys-auth/elogind : version bump --- sys-auth/elogind/Manifest | 2 +- sys-auth/elogind/elogind-234.4-r2.ebuild | 89 --------------------- sys-auth/elogind/elogind-238.2-r1337.ebuild | 102 ++++++++++++++++++++++++ sys-auth/elogind/files/elogind-226.4-docs.patch | 15 ---- sys-auth/elogind/files/elogind-238.1-docs.patch | 23 ++++++ 5 files changed, 126 insertions(+), 105 deletions(-) delete mode 100644 sys-auth/elogind/elogind-234.4-r2.ebuild create mode 100644 sys-auth/elogind/elogind-238.2-r1337.ebuild delete mode 100644 sys-auth/elogind/files/elogind-226.4-docs.patch create mode 100644 sys-auth/elogind/files/elogind-238.1-docs.patch (limited to 'sys-auth/elogind') diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 881f2e6c..50b313eb 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1 +1 @@ -DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e +DIST elogind-238.2.tar.gz 1075847 BLAKE2B 17e4d8ffabb65a210f34076223e502c9019a7fa639f6cc12b1c8a0e186d8a6e97f115cd68487c86470915a8208dead6830577d2da3ffd85ed2e12c3a699ef2c5 SHA512 c66dd514d7c708a1d1c52ac9f25f34af839c4d4ff452302b40eb95c040c1d3d8d238b4e35c33d81af71f6aac22c8793951d91d005e6595e02124edb976baf640 diff --git a/sys-auth/elogind/elogind-234.4-r2.ebuild b/sys-auth/elogind/elogind-234.4-r2.ebuild deleted file mode 100644 index 36239eed..00000000 --- a/sys-auth/elogind/elogind-234.4-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools linux-info 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" -IUSE="acl debug 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}-226.4-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 - eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" - xdg_environment_reset -} - -src_configure() { - econf \ - --with-pamlibdir=$(getpam_mod_dir) \ - --with-udevrulesdir="$(get_udevdir)"/rules.d \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ - --with-rootprefix="${EPREFIX}/" \ - --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ - --enable-smack \ - --with-cgroup-controller=openrc \ - --disable-lto \ - --without-kill-user-processes \ - $(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} - - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die - newconfd ${PN}.conf ${PN} - - # workaround for "RUN{builtin}: 'uaccess' unknown /lib64/udev/rules.d/73-seat-late.rules:15" warning - # we can safely remove the rule since it's part of systemd, and eudev doesn't support ACL's anyway - # this should be fixed in >=sys-fs/eudev-3.3 and >=sys-auth/elogind-235.3 - rm -rf ${ED}lib/udev/rules.d/73-seat-late.rules -} diff --git a/sys-auth/elogind/elogind-238.2-r1337.ebuild b/sys-auth/elogind/elogind-238.2-r1337.ebuild new file mode 100644 index 00000000..083dde2a --- /dev/null +++ b/sys-auth/elogind/elogind-238.2-r1337.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 ) +" + +DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) + +PATCHES=( "${FILESDIR}/${PN}-238.1-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" + + use kernel_linux && linux-info_pkg_setup +} + +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" + -Dman=auto + -Dsmack=true + -Dcgroup-controller=openrc + -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) + ) + + 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} +} 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 4161f633..00000000 --- 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@ - - # ------------------------------------------------------------------------------ diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch new file mode 100644 index 00000000..2288ddfe --- /dev/null +++ b/sys-auth/elogind/files/elogind-238.1-docs.patch @@ -0,0 +1,23 @@ +--- 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)) -- cgit v1.2.3