Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
Date: Wed, 10 Jan 2018 10:00:43
Message-Id: 1515578418.4797314667201f17ea79d75f790d023d3aa34cbd.asturm@gentoo
1 commit: 4797314667201f17ea79d75f790d023d3aa34cbd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 10 09:58:51 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 10 10:00:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47973146
7
8 sys-auth/elogind: Drop old
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 sys-auth/elogind/Manifest | 1 -
13 sys-auth/elogind/elogind-233.7-r1.ebuild | 113 ---------------------
14 .../elogind/files/elogind-233.7-xlocale.h.patch | 27 -----
15 3 files changed, 141 deletions(-)
16
17 diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
18 index 70f5c680764..881f2e6c750 100644
19 --- a/sys-auth/elogind/Manifest
20 +++ b/sys-auth/elogind/Manifest
21 @@ -1,2 +1 @@
22 -DIST elogind-233.7.tar.gz 957308 BLAKE2B 65361c349771bdb3e28b417e5f5c180505209f215edce316e8131bdc78cb7a1b56c0285df8aa3fd6998c6ea2c349d9892a4f791b59f9ae245819492783099d61 SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78
23 DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
24
25 diff --git a/sys-auth/elogind/elogind-233.7-r1.ebuild b/sys-auth/elogind/elogind-233.7-r1.ebuild
26 deleted file mode 100644
27 index bd3cac33ad8..00000000000
28 --- a/sys-auth/elogind/elogind-233.7-r1.ebuild
29 +++ /dev/null
30 @@ -1,113 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -inherit autotools linux-info pam udev xdg-utils
37 -
38 -DESCRIPTION="The systemd project's logind, extracted to a standalone package"
39 -HOMEPAGE="https://github.com/elogind/elogind"
40 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
41 -
42 -LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
43 -SLOT="0"
44 -KEYWORDS="~amd64 ~arm ~x86"
45 -IUSE="acl debug pam policykit selinux"
46 -
47 -COMMON_DEPEND="
48 - sys-apps/util-linux
49 - sys-libs/libcap
50 - virtual/libudev:=
51 - acl? ( sys-apps/acl )
52 - pam? ( virtual/pam )
53 - selinux? ( sys-libs/libselinux )
54 - !sys-apps/systemd
55 -"
56 -DEPEND="${COMMON_DEPEND}
57 - app-text/docbook-xml-dtd:4.2
58 - app-text/docbook-xml-dtd:4.5
59 - app-text/docbook-xsl-stylesheets
60 - dev-util/gperf
61 - dev-util/intltool
62 - sys-devel/libtool
63 - virtual/pkgconfig
64 -"
65 -RDEPEND="${COMMON_DEPEND}
66 - !sys-apps/systemd
67 -"
68 -PDEPEND="
69 - sys-apps/dbus
70 - policykit? ( sys-auth/polkit )
71 -"
72 -
73 -PATCHES=(
74 - "${FILESDIR}/${PN}-226.4-docs.patch"
75 - "${FILESDIR}/${P}-xlocale.h.patch"
76 -)
77 -
78 -pkg_setup() {
79 - local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
80 - ~SIGNALFD ~TIMERFD"
81 -
82 - if use kernel_linux; then
83 - linux-info_pkg_setup
84 - fi
85 -}
86 -
87 -src_prepare() {
88 - default
89 - eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
90 - xdg_environment_reset
91 -}
92 -
93 -src_configure() {
94 - econf \
95 - --with-pamlibdir=$(getpam_mod_dir) \
96 - --with-udevrulesdir="$(get_udevdir)"/rules.d \
97 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
98 - --with-rootlibdir="${EPREFIX}"/$(get_libdir) \
99 - --with-rootprefix="${EPREFIX}/" \
100 - --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
101 - --enable-smack \
102 - --with-cgroup-controller=openrc \
103 - --disable-lto \
104 - --without-kill-user-processes \
105 - $(use_enable debug debug elogind) \
106 - $(use_enable acl) \
107 - $(use_enable pam) \
108 - $(use_enable selinux)
109 -}
110 -
111 -src_install() {
112 - default
113 - find "${D}" -name '*.la' -delete || die
114 -
115 - newinitd "${FILESDIR}"/${PN}.init ${PN}
116 -
117 - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
118 - newconfd ${PN}.conf ${PN}
119 -}
120 -
121 -pkg_postinst() {
122 - if [ "$(rc-config list boot | grep elogind)" != "" ]; then
123 - ewarn "elogind is currently started from boot runlevel."
124 - elif [ "$(rc-config list default | grep elogind)" != "" ]; then
125 - ewarn "elogind is currently started from default runlevel."
126 - ewarn "Please remove elogind from the default runlevel and"
127 - ewarn "add it to the boot runlevel by:"
128 - ewarn "# rc-update del elogind default"
129 - ewarn "# rc-update add elogind boot"
130 - else
131 - ewarn "elogind is currently not started from any runlevel."
132 - ewarn "You may add it to the boot runlevel by:"
133 - ewarn "# rc-update add elogind boot"
134 - fi
135 - ewarn "Alternatively you can leave elogind out of any"
136 - ewarn "runlevel. It will then be started automatically"
137 - if use pam; then
138 - ewarn "when the first service calls it via dbus, or the"
139 - ewarn "first user logs into the system."
140 - else
141 - ewarn "when the first service calls it via dbus."
142 - fi
143 -}
144
145 diff --git a/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch b/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
146 deleted file mode 100644
147 index c95890aac40..00000000000
148 --- a/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
149 +++ /dev/null
150 @@ -1,27 +0,0 @@
151 -From 96eb328e90fa272a66b2feb0bfb57c73154dbd9c Mon Sep 17 00:00:00 2001
152 -From: Matija Skala <mskala@×××.com>
153 -Date: Wed, 15 Mar 2017 13:21:10 +0100
154 -Subject: [PATCH] fix includes
155 -
156 -linux/sockios.h is needed for the SIOCGSTAMPNS macro
157 -
158 -xlocale.h is included indirectly in glibc and doesn't even exist in
159 -other libcs
160 ----
161 - src/basic/parse-util.c | 3 ---
162 - 1 file changed, 3 deletions(-)
163 -
164 -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
165 -index cfdb29aba..c38e14d96 100644
166 ---- a/src/basic/parse-util.c
167 -+++ b/src/basic/parse-util.c
168 -@@ -23,9 +23,6 @@
169 - #include <stdio.h>
170 - #include <stdlib.h>
171 - #include <string.h>
172 --#if defined(__GLIBC__)
173 --# include <xlocale.h>
174 --#endif // defined(__GLIBC__)
175 -
176 - #include "alloc-util.h"
177 - //#include "extract-word.h"