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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B58F01382C5 for ; Mon, 19 Apr 2021 20:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 158B0E0848; Mon, 19 Apr 2021 20:56:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF764E0848 for ; Mon, 19 Apr 2021 20:56:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFD37335D53 for ; Mon, 19 Apr 2021 20:56:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F4C3634 for ; Mon, 19 Apr 2021 20:56:47 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1618865799.c0f1dbc9f9a07513ae37252840fccc77cf30a217.polynomial-c@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.35.2.ebuild sys-apps/util-linux/util-linux-2.36.2.ebuild sys-apps/util-linux/util-linux-2.37_rc1.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c0f1dbc9f9a07513ae37252840fccc77cf30a217 X-VCS-Branch: master Date: Mon, 19 Apr 2021 20:56:47 +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: f2510517-7306-4339-93e7-38e825f609a9 X-Archives-Hash: cf30c4ae9099395f10f3e74c06b842ee commit: c0f1dbc9f9a07513ae37252840fccc77cf30a217 Author: Lars Wendler gentoo org> AuthorDate: Mon Apr 19 20:56:26 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Apr 19 20:56:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f1dbc9 sys-apps/util-linux: Added "magic" USE flag for sys-apps/file dep Bug: https://bugs.gentoo.org/784188 Signed-off-by: Lars Wendler gentoo.org> sys-apps/util-linux/util-linux-2.35.2.ebuild | 5 +++-- sys-apps/util-linux/util-linux-2.36.2.ebuild | 5 +++-- sys-apps/util-linux/util-linux-2.37_rc1.ebuild | 5 +++-- sys-apps/util-linux/util-linux-9999.ebuild | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild index fe2ccfedf43..7a0ab5050bf 100644 --- a/sys-apps/util-linux/util-linux-2.35.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -37,8 +37,8 @@ RDEPEND=" cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( - sys-apps/file:0= >=sys-libs/ncurses-5.2-r2:0=[unicode?] + magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -167,6 +167,7 @@ multilib_src_configure() { $(multilib_native_use_with slang) $(multilib_native_use_with systemd) $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_use_with audit) diff --git a/sys-apps/util-linux/util-linux-2.36.2.ebuild b/sys-apps/util-linux/util-linux-2.36.2.ebuild index 59987ec8e8f..1e8eeb48330 100644 --- a/sys-apps/util-linux/util-linux-2.36.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.36.2.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -37,8 +37,8 @@ RDEPEND=" cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( - sys-apps/file:0= >=sys-libs/ncurses-5.2-r2:0=[unicode?] + magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -163,6 +163,7 @@ multilib_src_configure() { $(multilib_native_use_with slang) $(multilib_native_use_with systemd) $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_use_with audit) diff --git a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild index ee10c1819a4..3339774e6b9 100644 --- a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild @@ -26,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -38,8 +38,8 @@ RDEPEND=" cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( - sys-apps/file:0= >=sys-libs/ncurses-5.2-r2:0=[unicode?] + magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -192,6 +192,7 @@ multilib_src_configure() { $(multilib_native_use_with slang) $(multilib_native_use_with systemd) $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_use_with audit) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index ee10c1819a4..3339774e6b9 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -26,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -38,8 +38,8 @@ RDEPEND=" cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( - sys-apps/file:0= >=sys-libs/ncurses-5.2-r2:0=[unicode?] + magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -192,6 +192,7 @@ multilib_src_configure() { $(multilib_native_use_with slang) $(multilib_native_use_with systemd) $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_use_with audit)