From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94825158089 for ; Mon, 25 Sep 2023 03:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B69AA2BC02C; Mon, 25 Sep 2023 03:29:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BADA2BC028 for ; Mon, 25 Sep 2023 03:29:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B3E9335C7A for ; Mon, 25 Sep 2023 03:29:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1D8910AB for ; Mon, 25 Sep 2023 03:29:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1695612569.7aaf9bca2a43fb025591756fec8095901c17e8ab.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libcgroup/libcgroup-3.1.0.ebuild X-VCS-Directories: dev-libs/libcgroup/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7aaf9bca2a43fb025591756fec8095901c17e8ab X-VCS-Branch: master Date: Mon, 25 Sep 2023 03:29:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d057a1d2-4261-4c90-8e0b-753318e7d8bb X-Archives-Hash: 9eba9d42ad4fc43218efd07432801cd8 commit: 7aaf9bca2a43fb025591756fec8095901c17e8ab Author: Sam James gentoo org> AuthorDate: Mon Sep 25 03:28:31 2023 +0000 Commit: Sam James gentoo 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 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