[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/

["Sam James" <sam@gentoo.org>]

commit:     7aaf9bca2a43fb025591756fec8095901c17e8ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 03:28:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 03:29:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaf9bca

dev-libs/libcgroup: fix 3.1.0

Closes: https://bugs.gentoo.org/914623
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild
index 9fdbb7a5bde3..2459a7f98d46 100644
--- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild
+++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild
@@ -12,26 +12,22 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+daemon pam static-libs test +tools"
+IUSE="+daemon pam static-libs systemd test +tools"
 REQUIRED_USE="daemon? ( tools )"
 
 # Test failure needs investigation
 RESTRICT="!test? ( test ) test"
 
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
 DEPEND="
 	elibc_musl? ( sys-libs/fts-standalone )
 	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-configure-bashism.patch"
-	"${FILESDIR}/${PN}-3.0.0-musl-strerror_r.patch"
-)
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS"
@@ -45,7 +41,7 @@ src_prepare() {
 	default
 
 	# Change rules file location
-	find src -name '*.c' -o -name '*.h' -0 \
+	find src -name '*.c' -o -name '*.h' -print0 \
 		| xargs -0 sed -i '/^#define/s:/etc/cg:/etc/cgroup/cg:'
 	sed -i 's:/etc/cg:/etc/cgroup/cg:' \
 		doc/man/cg* samples/config/*.conf README* || die "sed failed"
@@ -67,12 +63,17 @@ src_configure() {
 		append-ldflags -lfts
 	fi
 
+	# Needs flex+bison
+	unset LEX YACC
+
 	local myconf=(
-		"$(use_enable static-libs static)"
-		"$(use_enable daemon)"
-		"$(use_enable pam)"
-		"$(use_enable tools)"
-		"$(use_enable test tests)"
+		--disable-python
+		$(use_enable static-libs static)
+		$(use_enable daemon)
+		$(use_enable pam)
+		$(use_enable systemd)
+		$(use_enable tools)
+		$(use_enable test tests)
 	)
 
 	if use pam; then
@@ -96,7 +97,7 @@ src_install() {
 	insinto /etc/cgroup
 	doins samples/config/cgconfig.conf
 	doins samples/config/cgrules.conf
-	doins samples/config/cgsnapshot_blacklist.conf
+	doins samples/config/cgsnapshot_denylist.conf
 
 	keepdir /etc/cgroup/cgconfig.d
 	keepdir /etc/cgroup/cgrules.d