Diff elogind-246.10-r3 with a elogind-252.9

/usr/portage/sys-auth/elogind/elogind-252.9.ebuild 2023-10-09 14:52:35.420368500 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
PYTHON_COMPAT=( python3_{10..12} )
7

  
6 8
if [[ ${PV} = *9999* ]]; then
7
	EGIT_BRANCH="v241-stable"
9
	EGIT_BRANCH="v252-stable"
8 10
	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
9 11
	inherit git-r3
10 12
else
11 13
	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
12
	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
14
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
13 15
fi
14 16

  
15
inherit linux-info meson pam udev xdg-utils
17
inherit linux-info meson pam python-any-r1 udev xdg-utils
16 18

  
17 19
DESCRIPTION="The systemd project's logind, extracted to a standalone package"
18 20
HOMEPAGE="https://github.com/elogind/elogind"
......
28 30
	app-text/docbook-xsl-stylesheets
29 31
	dev-util/gperf
30 32
	virtual/pkgconfig
33
	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
34
	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
31 35
"
32 36
DEPEND="
33 37
	audit? ( sys-process/audit )
......
46 50
	policykit? ( sys-auth/polkit )
47 51
"
48 52

  
49
DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
53
DOCS=( README.md)
50 54

  
51 55
PATCHES=(
52
	"${FILESDIR}/${PN}-243.7-nodocs.patch"
53
	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
54
	"${FILESDIR}/${P}-revert-polkit-automagic.patch"
55
	"${FILESDIR}/${P}-clang-undefined-symbol.patch"
56
	"${FILESDIR}/${P}-loong.patch"
57
	"${FILESDIR}/${P}-musl-selinux.patch"
56
	"${FILESDIR}/${P}-nodocs.patch"
57
	"${FILESDIR}/${PN}-252.9-musl-lfs.patch"
58 58
)
59 59

  
60
python_check_deps() {
61
	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
62
	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
63
}
64

  
60 65
pkg_setup() {
61 66
	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
62 67

  
......
64 69
}
65 70

  
66 71
src_prepare() {
72
	if use elibc_musl; then
73
		# Some of musl-specific patches break build on the
74
		# glibc systems (like getdents), therefore those are
75
		# only used when the build is done for musl.
76
		PATCHES+=(
77
			"${FILESDIR}/${P}-musl-sigfillset.patch"
78
			"${FILESDIR}/${P}-musl-statx.patch"
79
			"${FILESDIR}/${P}-musl-rlim-max.patch"
80
			"${FILESDIR}/${P}-musl-getdents.patch"
81
			"${FILESDIR}/${P}-musl-gshadow.patch"
82
			"${FILESDIR}/${P}-musl-strerror_r.patch"
83
			"${FILESDIR}/${P}-musl-more-strerror_r.patch"
84
		)
85
	fi
86

  
67 87
	default
68 88
	xdg_environment_reset
69 89
}
......
75 95
		cgroupmode="unified"
76 96
	fi
77 97

  
98
	python_setup
99

  
78 100
	local emesonargs=(
79 101
		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
80 102
		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
......
98 120
		-Dselinux=$(usex selinux true false)
99 121
		-Dtests=$(usex test true false)
100 122
		-Dutmp=$(usex elibc_musl false true)
123
		-Dmode=release
101 124
	)
102 125

  
103 126
	meson_src_configure
104 127
}
105 128

  
106 129
src_install() {
107
	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
108

  
109 130
	meson_src_install
110 131

  
111 132
	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
......
147 168
			elog "when the first service calls it via dbus."
148 169
		fi
149 170
	fi
171

  
172
	for version in ${REPLACING_VERSIONS}; do
173
		if ver_test "${version}" -lt 252.9; then
174
			elog "Starting with release 252.9 the sleep configuration is now done"
175
			elog "in the /etc/elogind/sleep.conf. Should you use non-default sleep"
176
			elog "configuration remember to migrate those to new configuration file."
177
		fi
178
	done
150 179
}
Thank you!