From 4f97d509bba291616d5df50add0d4c486d1f1f56 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 26 May 2020 14:20:52 +0200 Subject: [PATCH] sys-auth/elogind: Drop 243.4 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- sys-auth/elogind/Manifest | 1 - sys-auth/elogind/elogind-243.4.ebuild | 137 ------------------ .../elogind/files/elogind-243.4-nodocs.patch | 29 ---- ...logind-243.4-selinux-missing-headers.patch | 36 ----- 4 files changed, 203 deletions(-) delete mode 100644 sys-auth/elogind/elogind-243.4.ebuild delete mode 100644 sys-auth/elogind/files/elogind-243.4-nodocs.patch delete mode 100644 sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 8fca8b1be191..8bb9d4b5ee29 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,2 +1 @@ -DIST elogind-243.4.tar.gz 1335747 BLAKE2B 37c4eb1c476f97948aed44901fbd61ee1b1b8215d3167b368be00c542c64cdcb8b1e8e2725515820df4542d800079810e95f59469e3c6f5229932e55de4a3c1f SHA512 9751a3d0ed65dd73d9363097ee1752d437d5636db2a4137395596e0c81e04d4715f314568d1d7c6f367f1ecbda011086cb165bd4dc207302626b16e693cd0a02 DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472 diff --git a/sys-auth/elogind/elogind-243.4.ebuild b/sys-auth/elogind/elogind-243.4.ebuild deleted file mode 100644 index 9b5b3ebd4f36..000000000000 --- a/sys-auth/elogind/elogind-243.4.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_BRANCH="v241-stable" - EGIT_REPO_URI="https://github.com/elogind/elogind.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -fi - -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" - -LICENSE="CC0-1.0 LGPL-2.1+ public-domain" -SLOT="0" -IUSE="+acl debug doc +pam +policykit selinux" - -BDEPEND=" - 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 - virtual/pkgconfig -" -DEPEND=" - sys-apps/util-linux - sys-libs/libcap - virtual/libudev:= - acl? ( sys-apps/acl ) - pam? ( sys-libs/pam ) - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${DEPEND} - !sys-apps/systemd -" -PDEPEND=" - sys-apps/dbus - policykit? ( sys-auth/polkit ) -" - -DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) - -PATCHES=( - "${FILESDIR}/${P}-nodocs.patch" - "${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116 - "${FILESDIR}/${P}-selinux-missing-headers.patch" # bug 711432 -) - -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 ${EPREFIX}/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="${EPREFIX}$(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) - --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 -} - -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 - elog "elogind is currently not started from any runlevel." - elog "You may add it to the boot runlevel by:" - elog "# rc-update add elogind boot" - elog - elog "Alternatively, you can leave elogind out of any" - elog "runlevel. It will then be started automatically" - if use pam; then - elog "when the first service calls it via dbus, or" - elog "the first user logs into the system." - else - elog "when the first service calls it via dbus." - fi - fi -} diff --git a/sys-auth/elogind/files/elogind-243.4-nodocs.patch b/sys-auth/elogind/files/elogind-243.4-nodocs.patch deleted file mode 100644 index c83611a4ef6f..000000000000 --- a/sys-auth/elogind/files/elogind-243.4-nodocs.patch +++ /dev/null @@ -1,29 +0,0 @@ -We don't want the build system to install to docdir for us. - ---- a/meson.build 2020-01-20 08:22:09.000000000 +0100 -+++ b/meson.build 2020-02-02 16:16:00.074882830 +0100 -@@ -3342,15 +3342,11 @@ - # install_data('modprobe.d/systemd.conf', - # install_dir : modprobedir) - #endif // 0 --install_data('LICENSE.GPL2', -- 'LICENSE.LGPL2.1', - #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless - # 'NEWS', - # 'README', - #else -- 'README.md', - #endif // 0 -- 'docs/CODING_STYLE.md', - #if 0 /// irrelevant for elogind - # 'docs/DISTRO_PORTING.md', - # 'docs/ENVIRONMENT.md', -@@ -3359,8 +3355,6 @@ - # 'docs/TRANSLATORS.md', - # 'docs/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-243.4-selinux-missing-headers.patch b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch deleted file mode 100644 index 7cc46fd05ebd..000000000000 --- a/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1cd3fe4083eb8784fa2a125e4af0edb80e6928b5 Mon Sep 17 00:00:00 2001 -From: Sven Eden -Date: Thu, 12 Mar 2020 20:31:00 +0100 -Subject: [PATCH] basic/selinux-util.c : Uncomment missing includes (#157) - -Compiling on Debian unstable failed using gcc 9.2.1 and libc6 2.29. -Uncommenting the two commented includes in basic/selinux-util.c -fixes the compilation issues. - -Bug: #157 -Closes: #157 -Signed-off-by: Sven Eden ---- - src/basic/selinux-util.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c -index 40a85feec..3be9f2c0d 100644 ---- a/src/basic/selinux-util.c -+++ b/src/basic/selinux-util.c -@@ -1,13 +1,13 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - - #include --//#include -+#include - #include - #include - #include - #include - #include --//#include -+#include - #include - #include - -- 2.26.2