commit:     761c4aad3fef5f33b6fc1cbe2d70c0b00c457516
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 11:52:09 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 11:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761c4aad

sys-auth/elogind: remove old

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-auth/elogind/Manifest                          |   2 -
 sys-auth/elogind/elogind-235.2-r2.ebuild           | 123 ---------------------
 sys-auth/elogind/elogind-235.5.ebuild              | 122 --------------------
 sys-auth/elogind/files/elogind-235.2-docs.patch    |  19 ----
 .../files/elogind-235.2-drop-logintest.patch       |  17 ---
 .../files/elogind-235.2-legacy-cgroupmode.patch    |  56 ----------
 6 files changed, 339 deletions(-)

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index e7c68002729..c3775e8c407 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,3 +1 @@
-DIST elogind-235.2.tar.gz 975652 BLAKE2B 
c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378
 SHA512 
6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-DIST elogind-235.5.tar.gz 990321 BLAKE2B 
03730f449e01ef74a92aa3313f59b93de3941425f95610e2d50dd6a0651682df5f2e245f9eeaeef5c5fd38300102fbccc980a55466ea12100e8904f126a5c44f
 SHA512 
8f12c576f291fb9768e343e8257c74c62686f1a67b10170715b678e0431692cec7b6382102467dd2598a331c20d823d935128d5ff36f5b074dc02802ffec863c
 DIST elogind-238.1.tar.gz 1074179 BLAKE2B 
3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3
 SHA512 
ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c

diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild 
b/sys-auth/elogind/elogind-235.2-r2.ebuild
deleted file mode 100644
index bae01cc02e4..00000000000
--- a/sys-auth/elogind/elogind-235.2-r2.ebuild
+++ /dev/null
@@ -1,123 +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}/${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/elogind-235.5.ebuild 
b/sys-auth/elogind/elogind-235.5.ebuild
deleted file mode 100644
index c2dbf0ad027..00000000000
--- a/sys-auth/elogind/elogind-235.5.ebuild
+++ /dev/null
@@ -1,122 +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.2-docs.patch"
-       "${FILESDIR}/${PN}-235.2-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"
-               -Dzshcompletiondir="${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.2-docs.patch 
b/sys-auth/elogind/files/elogind-235.2-docs.patch
deleted file mode 100644
index 7fbb4594bdc..00000000000
--- a/sys-auth/elogind/files/elogind-235.2-docs.patch
+++ /dev/null
@@ -1,19 +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,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))

diff --git a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch 
b/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
deleted file mode 100644
index 45f17f1b843..00000000000
--- a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/test/meson.build     2018-01-15 20:34:18.000000000 +0100
-+++ b/src/test/meson.build     2018-01-31 15:11:33.342989914 +0100
-@@ -868,10 +868,10 @@
- #          [],
- #          [threads]],
- #endif // 0
--
--        [['src/libelogind/sd-login/test-login.c'],
--         [],
--         []],
-+# Broken in chroot; needs elogind at runtime?
-+#        [['src/libelogind/sd-login/test-login.c'],
-+#         [],
-+#         []],
- ]
- 
- #if 0 /// UNNEEDED in elogind

diff --git a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch 
b/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch
deleted file mode 100644
index eb86e930f6f..00000000000
--- a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 003ece760231aba0c661e2390dfd11075d72a8da Mon Sep 17 00:00:00 2001
-From: Sven Eden <yamakuz...@gmx.net>
-Date: Thu, 18 Jan 2018 23:01:12 +0100
-Subject: [PATCH] Prep v235.3 : Fix cgroup hierarchy detection code
-
-There is no sub-grouping with elogind, so /sys/fs/cgroup/elogind is
-not needed to be mounted as cgroup fs in legacy mode.
-
-Fixes Bug https://bugs.gentoo.org/644834
----
- src/basic/cgroup-util.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 7f86c532c..cb60108ef 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -2550,28 +2550,31 @@ static int cg_unified_update(void) {
- 
-         if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC))
-                 unified_cache = CGROUP_UNIFIED_ALL;
-+#if 0 /// The handling of cgroups is a bit different with elogind
-         else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) {
-+#else
-+        else if (F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC)
-+              || F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) {
-+#endif // 0
-                 if (statfs("/sys/fs/cgroup/unified/", &fs) == 0 &&
-                     F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
-                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
-                         unified_systemd_v232 = false;
- #if 0 /// elogind uses its own name
-                 } else if (statfs("/sys/fs/cgroup/systemd/", &fs) == 0 &&
--                           F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
--                        unified_cache = CGROUP_UNIFIED_SYSTEMD;
--                        unified_systemd_v232 = true;
--                } else {
--                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
--                                return -errno;
- #else
-                 } else if (statfs("/sys/fs/cgroup/elogind/", &fs) == 0 &&
-+#endif // 0
-                            F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
-                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
-                         unified_systemd_v232 = true;
-                 } else {
--#endif // 0
-+#if 0 /// There is no sub-grouping within elogind
-+                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
-+                                return -errno;
-                         if (!F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC))
-                                 return -ENOMEDIUM;
-+#endif // 0
-                         unified_cache = CGROUP_UNIFIED_NONE;
-                 }
-         } else

Reply via email to