From 7cf3666698369b081d2cae1c7cba0fbd1b71654e Mon Sep 17 00:00:00 2001
From: Sven Eden <sven.eden@prydeworx.com>
Date: Tue, 30 Apr 2024 14:41:11 +0200
Subject: sys-auth/elogind: add 255.5, drop 255.4-r2

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
---
 sys-auth/elogind/Manifest                |   4 +-
 sys-auth/elogind/elogind-255.4-r2.ebuild | 173 -------------------------------
 sys-auth/elogind/elogind-255.5.ebuild    | 172 ++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 175 deletions(-)
 delete mode 100644 sys-auth/elogind/elogind-255.4-r2.ebuild
 create mode 100644 sys-auth/elogind/elogind-255.5.ebuild

(limited to 'sys-auth')

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 1c456ab..61f0043 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -6,9 +6,9 @@ AUX elogind-252.9-musl-lfs.patch 2152 BLAKE2B cad592f4cec32add7acc62ba1de3d9706f
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 710 BLAKE2B e8ea4bd17525080cf34c122cdfc14318a136e2b15ffcb1066b0945d65c9854e9964d73215dfd405bd4b1a7e6cbd1aad317bf221832d4f17c5ee60c42e981c691 SHA512 ef0a89dbfbc8571c2fa04c0ee24cab1f4afaa4608e57a748242d82ee5ae3ab4fc3917c7a3a27bcf1b2f645e4bf7f75e58412746a2fe21c454e9f2d2fd7a309c7
 DIST elogind-252.23.tar.gz 1934299 BLAKE2B a54064118c785c907905a7a0fdfb51f41c419d69eb95b68cb04eaf5f9f1b9cb3f9e5d021b7706e071f4e04cb5fa3ae34ecd9d3a68e76c00da5a2bfc5469adf74 SHA512 6e3161f3f977c3535219b8823f92606cb1a24b628d011a16d0e0a6f583148c66a11cbac03901e12ae0ae80ee0d1690f978372178a036f3e5b78e02baf73cdec4
-DIST elogind-255.4-r2.tar.gz 2122457 BLAKE2B 4bea66fcec3ff9dabd8bc6f16a6e87c5f2ccffc52a2a54dafe7410ad0aea95f8885cab25c2490759db510bb5b9e3a10769c8bb8401ef6f056b101032fcad47b0 SHA512 cc440c7d5c8459f575cf9b4e62789bd61f64b492f1046e273e54e5ffc523ae36387cfadbbf710bcf3f06e4050bbf6ad8fe7683cb668c430c7df6e4e884068d48
+DIST elogind-255.5.tar.gz 2127126 BLAKE2B 395352fc24bc815d1e39c2d5722eb09c2e3378873e2ea4173d8c209cd66c28a9b94ebe62ab3efbd5dccd822d99b86a6c1a871620adefb1215cb6d4ceee78a9f9 SHA512 dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
 EBUILD elogind-252.23-r1.ebuild 4750 BLAKE2B e2d4620b8de5bfe62c23420381d8c98e847f2692eb02e8c098d63630df4577447f0f6e21b5cbb87a52ec25c59ed1d3bc9d59487d70f4dfbd13cbd5f8801fa585 SHA512 b5afa0b182b5a3dbbc2eb8efb1c6407fdb7696fc5f094c47984eae1be4495f4198508d39de748313ccc6beb169a93c810694290501d258178aec3caf24957828
 EBUILD elogind-252.9999.ebuild 4374 BLAKE2B c765b18de937d1619959206b6de1dd48bbe39e29509c58a2d6b685c6672c9e345e07deac0ec587eafd1b7dc180be1361fe093ef4dda1cc25a0c6c192223009b8 SHA512 45cdc92bb5565aaa8534a0ccc77acf18089e00727cebcd75d0d7f9b6a709d91a49379bb5b8a179d936cef56a3e03cd079ffa9d8fd27116f1b3473518f1c5bdb5
-EBUILD elogind-255.4-r2.ebuild 5078 BLAKE2B eaafb24d0e2e86cb34afc81c2299357ad57af20aac3f37a62dcecad7ee32313eb1714076a43747210af69288a8592ab6414d2b429193de6a55682484d14d36d4 SHA512 bea260cbb5ba6627e7cb1a0e1a067be7e8bf383c5c97b28a5abeefd28be7a399fbf873ace390be29e8262b056a6e18000ad0f8b74bbf4e7ee48af1c39c7a1da7
+EBUILD elogind-255.5.ebuild 5041 BLAKE2B e65198e7cfabfd4a924958ab1e590b03170f2b3d5717337debe3b786f077e0c2a558a490279fe1ea630247db8910ca8330c95ef3e0c5a2ade3ec7466ce335cdf SHA512 df48b5f5ce005df59a40c94d679823925f5778e0ce9835ff1604a334d25f24d44fdcfd2c26cad3cbfcbf5defccf799611538c2e613d3c9a22223914619b69752
 EBUILD elogind-255.9999.ebuild 4726 BLAKE2B 07e013d24bcd5eb419f544e87d16cdd0ba2fe15a7dd3a3cfc76b3b8edc0f8db7410d26b7999d628da1a45fe036cd9a4708185e87475445ef4dc1193c50b031ae SHA512 291f2a58571a06c33f6fd0fd5d6b68f09b2e913e050a1b1bb910ccef3ac302f95132e4dbdb91671c84d8e97a631fff77d143c1dc4d2265c3e8f3557d1f5a578c
 MISC metadata.xml 552 BLAKE2B c801fe77decc4a39a013cabf0a183b00c08fbc5ba109baf484a336d441ee2136a7e0f009e9a31b48efe9cdf0ab088009e1592102f58dcec3393b2133f8712740 SHA512 5987809781334a1bd775e6272634b49386594a21004b868de7e0213277c28eb38f8c7f08e87ec1b630d29a19cfe1f0112b757668066b8e86857165761004aead
diff --git a/sys-auth/elogind/elogind-255.4-r2.ebuild b/sys-auth/elogind/elogind-255.4-r2.ebuild
deleted file mode 100644
index 7cfc108..0000000
--- a/sys-auth/elogind/elogind-255.4-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_BRANCH="v255-stable"
-	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}-r2.tar.gz -> ${P}-r2.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-${PV}-r2"
-fi
-
-inherit linux-info meson pam python-any-r1 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 audit debug doc +pam +policykit selinux test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-DEPEND="
-	audit? ( sys-process/audit )
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-252-docs.patch"
-)
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-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() {
-	python_setup
-
-	# Removed -Ddefault-hierarchy=${cgroupmode}
-	# -> It is completely irrelevant with "-Dcgroup-controller=openrc".
-	local emesonargs=(
-		$(usex debug "-Ddebug-extra=elogind" "")
-		-Dbuildtype=$(usex debug debug release)
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--libexecdir="${EPREFIX}"/$(get_libdir)/elogind
-		--localstatedir="${EPREFIX}"/var
-		--sysconfdir="${EPREFIX}"/etc
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Ddbuspolicydir="${EPREFIX}"/usr/share/dbus-1/system.d
-		-Ddbussystemservicedir="${EPREFIX}"/usr/share/dbus-1/system-services
-		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dacl=$(usex acl enabled disabled)
-		-Daudit=$(usex audit enabled disabled)
-		-Dcgroup-controller=openrc
-		-Ddefault-kill-user-processes=true
-		-Defi=false
-		-Dhtml=$(usex doc auto disabled)
-		-Dinstall-sysconfdir=true
-		-Dman=auto
-		-Dmode=release
-		-Dpam=$(usex pam enabled disabled)
-		-Dselinux=$(usex selinux enabled disabled)
-		-Dsmack=true
-		-Dtests=$(usex test true false)
-		-Dutmp=$(usex elibc_musl false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	keepdir /var/lib/elogind
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	udev_reload
-	if ! use pam; then
-		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
-		ewarn "In other words, it will be useless for most applications."
-		ewarn
-	fi
-	if ! use policykit; then
-		ewarn "loginctl will not be able to perform privileged operations without"
-		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
-		ewarn
-	fi
-	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"
-	fi
-	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
-
-	for version in ${REPLACING_VERSIONS}; do
-		if ver_test "${version}" -lt 252.9; then
-			elog "Starting with release 255.4 the sleep configuration is now done"
-			elog "in the /etc/elogind/sleep.conf while the elogind additions have"
-			elog "been moved to /etc/elogind/sleep.conf.d/10-elogind.conf."
-			elog "Should you use non-default sleep configuration remember to migrate"
-			elog "those to a new configuration file in /etc/elogind/sleep.conf.d/."
-		fi
-	done
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-auth/elogind/elogind-255.5.ebuild b/sys-auth/elogind/elogind-255.5.ebuild
new file mode 100644
index 0000000..7be9bec
--- /dev/null
+++ b/sys-auth/elogind/elogind-255.5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v255-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	EGIT_SUBMODULES=()
+	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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit linux-info meson pam python-any-r1 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 audit debug doc +pam +policykit selinux test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+DEPEND="
+	audit? ( sys-process/audit )
+	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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-252-docs.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+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() {
+	python_setup
+
+	# Removed -Ddefault-hierarchy=${cgroupmode}
+	# -> It is completely irrelevant with "-Dcgroup-controller=openrc".
+	local emesonargs=(
+		$(usex debug "-Ddebug-extra=elogind" "")
+		-Dbuildtype=$(usex debug debug release)
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX}"/$(get_libdir)/elogind
+		--localstatedir="${EPREFIX}"/var
+		--sysconfdir="${EPREFIX}"/etc
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Ddbuspolicydir="${EPREFIX}"/usr/share/dbus-1/system.d
+		-Ddbussystemservicedir="${EPREFIX}"/usr/share/dbus-1/system-services
+		-Dpamlibdir=$(getpam_mod_dir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		-Dacl=$(usex acl enabled disabled)
+		-Daudit=$(usex audit enabled disabled)
+		-Dcgroup-controller=openrc
+		-Ddefault-kill-user-processes=true
+		-Defi=false
+		-Dhtml=$(usex doc auto disabled)
+		-Dinstall-sysconfdir=true
+		-Dman=auto
+		-Dmode=release
+		-Dpam=$(usex pam enabled disabled)
+		-Dselinux=$(usex selinux enabled disabled)
+		-Dsmack=true
+		-Dtests=$(usex test true false)
+		-Dutmp=$(usex elibc_musl false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	keepdir /var/lib/elogind
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	udev_reload
+	if ! use pam; then
+		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
+		ewarn "In other words, it will be useless for most applications."
+		ewarn
+	fi
+	if ! use policykit; then
+		ewarn "loginctl will not be able to perform privileged operations without"
+		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
+		ewarn
+	fi
+	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"
+	fi
+	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
+
+	for version in ${REPLACING_VERSIONS}; do
+		if ver_test "${version}" -lt 252.9; then
+			elog "Starting with release 255.4 the sleep configuration is now done"
+			elog "in the /etc/elogind/sleep.conf while the elogind additions have"
+			elog "been moved to /etc/elogind/sleep.conf.d/10-elogind.conf."
+			elog "Should you use non-default sleep configuration remember to migrate"
+			elog "those to a new configuration file in /etc/elogind/sleep.conf.d/."
+		fi
+	done
+}
+
+pkg_postrm() {
+	udev_reload
+}
-- 
cgit v1.2.3-65-gdbad