Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
Date: Mon, 19 Apr 2021 20:56:50
Message-Id: 1618865799.c0f1dbc9f9a07513ae37252840fccc77cf30a217.polynomial-c@gentoo
1 commit: c0f1dbc9f9a07513ae37252840fccc77cf30a217
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 19 20:56:26 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 19 20:56:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f1dbc9
7
8 sys-apps/util-linux: Added "magic" USE flag for sys-apps/file dep
9
10 Bug: https://bugs.gentoo.org/784188
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/util-linux/util-linux-2.35.2.ebuild | 5 +++--
14 sys-apps/util-linux/util-linux-2.36.2.ebuild | 5 +++--
15 sys-apps/util-linux/util-linux-2.37_rc1.ebuild | 5 +++--
16 sys-apps/util-linux/util-linux-9999.ebuild | 5 +++--
17 4 files changed, 12 insertions(+), 8 deletions(-)
18
19 diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
20 index fe2ccfedf43..7a0ab5050bf 100644
21 --- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
22 +++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
23 @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
24
25 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
26 SLOT="0"
27 -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"
28 +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"
29
30 # Most lib deps here are related to programs rather than our libs,
31 # so we rarely need to specify ${MULTILIB_USEDEP}.
32 @@ -37,8 +37,8 @@ RDEPEND="
33 cryptsetup? ( sys-fs/cryptsetup )
34 hardlink? ( dev-libs/libpcre2:= )
35 ncurses? (
36 - sys-apps/file:0=
37 >=sys-libs/ncurses-5.2-r2:0=[unicode?]
38 + magic? ( sys-apps/file:0= )
39 )
40 nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
41 pam? ( sys-libs/pam )
42 @@ -167,6 +167,7 @@ multilib_src_configure() {
43 $(multilib_native_use_with slang)
44 $(multilib_native_use_with systemd)
45 $(multilib_native_use_with udev)
46 + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic')
47 $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
48 $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
49 $(multilib_native_use_with audit)
50
51 diff --git a/sys-apps/util-linux/util-linux-2.36.2.ebuild b/sys-apps/util-linux/util-linux-2.36.2.ebuild
52 index 59987ec8e8f..1e8eeb48330 100644
53 --- a/sys-apps/util-linux/util-linux-2.36.2.ebuild
54 +++ b/sys-apps/util-linux/util-linux-2.36.2.ebuild
55 @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
56
57 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
58 SLOT="0"
59 -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"
60 +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"
61
62 # Most lib deps here are related to programs rather than our libs,
63 # so we rarely need to specify ${MULTILIB_USEDEP}.
64 @@ -37,8 +37,8 @@ RDEPEND="
65 cryptsetup? ( sys-fs/cryptsetup )
66 hardlink? ( dev-libs/libpcre2:= )
67 ncurses? (
68 - sys-apps/file:0=
69 >=sys-libs/ncurses-5.2-r2:0=[unicode?]
70 + magic? ( sys-apps/file:0= )
71 )
72 nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
73 pam? ( sys-libs/pam )
74 @@ -163,6 +163,7 @@ multilib_src_configure() {
75 $(multilib_native_use_with slang)
76 $(multilib_native_use_with systemd)
77 $(multilib_native_use_with udev)
78 + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic')
79 $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
80 $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
81 $(multilib_native_use_with audit)
82
83 diff --git a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
84 index ee10c1819a4..3339774e6b9 100644
85 --- a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
86 +++ b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
87 @@ -26,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
88
89 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
90 SLOT="0"
91 -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"
92 +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"
93
94 # Most lib deps here are related to programs rather than our libs,
95 # so we rarely need to specify ${MULTILIB_USEDEP}.
96 @@ -38,8 +38,8 @@ RDEPEND="
97 cryptsetup? ( sys-fs/cryptsetup )
98 hardlink? ( dev-libs/libpcre2:= )
99 ncurses? (
100 - sys-apps/file:0=
101 >=sys-libs/ncurses-5.2-r2:0=[unicode?]
102 + magic? ( sys-apps/file:0= )
103 )
104 nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
105 pam? ( sys-libs/pam )
106 @@ -192,6 +192,7 @@ multilib_src_configure() {
107 $(multilib_native_use_with slang)
108 $(multilib_native_use_with systemd)
109 $(multilib_native_use_with udev)
110 + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic')
111 $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
112 $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
113 $(multilib_native_use_with audit)
114
115 diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
116 index ee10c1819a4..3339774e6b9 100644
117 --- a/sys-apps/util-linux/util-linux-9999.ebuild
118 +++ b/sys-apps/util-linux/util-linux-9999.ebuild
119 @@ -26,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
120
121 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
122 SLOT="0"
123 -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"
124 +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"
125
126 # Most lib deps here are related to programs rather than our libs,
127 # so we rarely need to specify ${MULTILIB_USEDEP}.
128 @@ -38,8 +38,8 @@ RDEPEND="
129 cryptsetup? ( sys-fs/cryptsetup )
130 hardlink? ( dev-libs/libpcre2:= )
131 ncurses? (
132 - sys-apps/file:0=
133 >=sys-libs/ncurses-5.2-r2:0=[unicode?]
134 + magic? ( sys-apps/file:0= )
135 )
136 nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
137 pam? ( sys-libs/pam )
138 @@ -192,6 +192,7 @@ multilib_src_configure() {
139 $(multilib_native_use_with slang)
140 $(multilib_native_use_with systemd)
141 $(multilib_native_use_with udev)
142 + $(multilib_native_usex ncurses "$(use_with libmagic magic)" '--without-libmagic')
143 $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
144 $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
145 $(multilib_native_use_with audit)
Report Message
Find on MARC Find on Google Groups