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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FB38158013 for ; Tue, 5 Dec 2023 10:54:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 718CB2BC016; Tue, 5 Dec 2023 10:54:14 +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 474452BC016 for ; Tue, 5 Dec 2023 10:54:14 +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 31EA2335DCC for ; Tue, 5 Dec 2023 10:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65B76AE2 for ; Tue, 5 Dec 2023 10:54:11 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1701773640.a0ff82d513b952a0cd7764ffe8958806499c981d.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.38.1-r2.ebuild sys-apps/util-linux/util-linux-2.38.1-r3.ebuild sys-apps/util-linux/util-linux-2.39.2-r1.ebuild sys-apps/util-linux/util-linux-2.39.2.ebuild sys-apps/util-linux/util-linux-2.39.3-r1.ebuild sys-apps/util-linux/util-linux-2.39.3.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: a0ff82d513b952a0cd7764ffe8958806499c981d X-VCS-Branch: master Date: Tue, 5 Dec 2023 10:54:11 +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: 53e1f5eb-e53c-46c1-81c9-18e8804b9bed X-Archives-Hash: 69235a2a26e8b3f988e89001125f5d95 commit: a0ff82d513b952a0cd7764ffe8958806499c981d Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Dec 5 10:52:56 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Dec 5 10:54:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ff82d5 sys-apps/util-linux: Cut dependency loop in stage1 build Signed-off-by: Andreas K. Hüttel gentoo.org> ...-2.38.1-r2.ebuild => util-linux-2.38.1-r3.ebuild} | 20 ++++++++++++++++---- ...nux-2.39.2.ebuild => util-linux-2.39.2-r1.ebuild} | 20 ++++++++++++++++---- ...nux-2.39.3.ebuild => util-linux-2.39.3-r1.ebuild} | 20 ++++++++++++++++---- 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.38.1-r2.ebuild rename to sys-apps/util-linux/util-linux-2.38.1-r3.ebuild index 48a7610afb48..dd3d6ec43259 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild @@ -55,8 +55,10 @@ RDEPEND=" rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + )" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) @@ -207,8 +209,6 @@ multilib_src_configure() { $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with readline) $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') @@ -221,6 +221,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.39.2.ebuild rename to sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index 1996b460e1b3..f1a98bd3395c 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -55,8 +55,10 @@ RDEPEND=" rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= ) + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) " BDEPEND=" virtual/pkgconfig @@ -220,8 +222,6 @@ multilib_src_configure() { $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with readline) $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') @@ -235,6 +235,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh diff --git a/sys-apps/util-linux/util-linux-2.39.3.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.39.3.ebuild rename to sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index 6655149f15a6..8c83d7e9c777 100644 --- a/sys-apps/util-linux/util-linux-2.39.3.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild @@ -55,8 +55,10 @@ RDEPEND=" rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= ) + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) " BDEPEND=" virtual/pkgconfig @@ -220,8 +222,6 @@ multilib_src_configure() { $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with readline) $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') @@ -235,6 +235,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh