| 1 |
commit: fa0d9458e284f8b403aa746d288a49052833fb68 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 09:07:12 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 09:07:12 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0d9458 |
| 7 |
|
| 8 |
sys-apps/util-linux: remove userland_GNU |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/util-linux/util-linux-2.37.2-r1.ebuild | 39 +++++-------------------- |
| 13 |
sys-apps/util-linux/util-linux-2.37.2-r3.ebuild | 39 +++++-------------------- |
| 14 |
sys-apps/util-linux/util-linux-9999.ebuild | 39 +++++-------------------- |
| 15 |
3 files changed, 24 insertions(+), 93 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
| 18 |
index 46c6b0ce7ed2..619414e131e1 100644 |
| 19 |
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
| 20 |
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ |
| 28 |
|
| 29 |
LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" |
| 30 |
SLOT="0" |
| 31 |
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" |
| 32 |
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode" |
| 33 |
|
| 34 |
# Most lib deps here are related to programs rather than our libs, |
| 35 |
# so we rarely need to specify ${MULTILIB_USEDEP}. |
| 36 |
@@ -97,13 +97,6 @@ src_prepare() { |
| 37 |
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ |
| 38 |
tests/ts/uuid/uuidd || die "Failed to fix uuidd test" |
| 39 |
|
| 40 |
- if ! use userland_GNU ; then |
| 41 |
- # test runner is using GNU-specific xargs call |
| 42 |
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die |
| 43 |
- # test requires util-linux uuidgen (which we don't build) |
| 44 |
- rm tests/ts/uuid/oids || die |
| 45 |
- fi |
| 46 |
- |
| 47 |
if [[ ${PV} == 9999 ]] ; then |
| 48 |
po/update-potfiles |
| 49 |
eautoreconf |
| 50 |
@@ -132,14 +125,10 @@ python_configure() { |
| 51 |
--disable-bash-completion |
| 52 |
--without-systemdsystemunitdir |
| 53 |
--with-python |
| 54 |
+ --enable-libblkid |
| 55 |
+ --enable-libmount |
| 56 |
+ --enable-pylibmount |
| 57 |
) |
| 58 |
- if use userland_GNU ; then |
| 59 |
- myeconfargs+=( |
| 60 |
- --enable-libblkid |
| 61 |
- --enable-libmount |
| 62 |
- --enable-pylibmount |
| 63 |
- ) |
| 64 |
- fi |
| 65 |
mkdir "${BUILD_DIR}" || die |
| 66 |
pushd "${BUILD_DIR}" >/dev/null || die |
| 67 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 68 |
@@ -188,8 +177,7 @@ multilib_src_configure() { |
| 69 |
$(use_with ncurses tinfo) |
| 70 |
$(use_with selinux) |
| 71 |
) |
| 72 |
- # build programs only on GNU, on *BSD we want libraries only |
| 73 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 74 |
+ if multilib_is_native_abi ; then |
| 75 |
myeconfargs+=( |
| 76 |
--disable-chfn-chsh |
| 77 |
--disable-login |
| 78 |
@@ -236,13 +224,8 @@ multilib_src_configure() { |
| 79 |
--enable-libblkid |
| 80 |
--enable-libsmartcols |
| 81 |
--enable-libfdisk |
| 82 |
+ --enable-libmount |
| 83 |
) |
| 84 |
- if use userland_GNU ; then |
| 85 |
- # those libraries don't work on *BSD |
| 86 |
- myeconfargs+=( |
| 87 |
- --enable-libmount |
| 88 |
- ) |
| 89 |
- fi |
| 90 |
fi |
| 91 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 92 |
|
| 93 |
@@ -293,7 +276,7 @@ multilib_src_install() { |
| 94 |
# This needs to be called AFTER python_install call (#689190) |
| 95 |
emake DESTDIR="${D}" install |
| 96 |
|
| 97 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 98 |
+ if multilib_is_native_abi ; then |
| 99 |
# need the libs in / |
| 100 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
| 101 |
fi |
| 102 |
@@ -305,12 +288,6 @@ multilib_src_install_all() { |
| 103 |
# e2fsprogs-libs didnt install .la files, and .pc work fine |
| 104 |
find "${ED}" -name "*.la" -delete || die |
| 105 |
|
| 106 |
- if ! use userland_GNU ; then |
| 107 |
- # manpage collisions |
| 108 |
- # TODO: figure out a good way to keep them |
| 109 |
- rm "${ED}"/usr/share/man/man3/uuid* || die |
| 110 |
- fi |
| 111 |
- |
| 112 |
if use pam ; then |
| 113 |
newpamd "${FILESDIR}/runuser.pamd" runuser |
| 114 |
newpamd "${FILESDIR}/runuser-l.pamd" runuser-l |
| 115 |
|
| 116 |
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild |
| 117 |
index 9532360938eb..29ca2387ed7a 100644 |
| 118 |
--- a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild |
| 119 |
+++ b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild |
| 120 |
@@ -1,4 +1,4 @@ |
| 121 |
-# Copyright 1999-2021 Gentoo Authors |
| 122 |
+# Copyright 1999-2022 Gentoo Authors |
| 123 |
# Distributed under the terms of the GNU General Public License v2 |
| 124 |
|
| 125 |
EAPI=7 |
| 126 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ |
| 127 |
|
| 128 |
LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" |
| 129 |
SLOT="0" |
| 130 |
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU" |
| 131 |
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode" |
| 132 |
|
| 133 |
# Most lib deps here are related to programs rather than our libs, |
| 134 |
# so we rarely need to specify ${MULTILIB_USEDEP}. |
| 135 |
@@ -97,13 +97,6 @@ src_prepare() { |
| 136 |
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ |
| 137 |
tests/ts/uuid/uuidd || die "Failed to fix uuidd test" |
| 138 |
|
| 139 |
- if ! use userland_GNU ; then |
| 140 |
- # test runner is using GNU-specific xargs call |
| 141 |
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die |
| 142 |
- # test requires util-linux uuidgen (which we don't build) |
| 143 |
- rm tests/ts/uuid/oids || die |
| 144 |
- fi |
| 145 |
- |
| 146 |
if [[ ${PV} == 9999 ]] ; then |
| 147 |
po/update-potfiles |
| 148 |
eautoreconf |
| 149 |
@@ -132,14 +125,10 @@ python_configure() { |
| 150 |
--disable-bash-completion |
| 151 |
--without-systemdsystemunitdir |
| 152 |
--with-python |
| 153 |
+ --enable-libblkid |
| 154 |
+ --enable-libmount |
| 155 |
+ --enable-pylibmount |
| 156 |
) |
| 157 |
- if use userland_GNU ; then |
| 158 |
- myeconfargs+=( |
| 159 |
- --enable-libblkid |
| 160 |
- --enable-libmount |
| 161 |
- --enable-pylibmount |
| 162 |
- ) |
| 163 |
- fi |
| 164 |
mkdir "${BUILD_DIR}" || die |
| 165 |
pushd "${BUILD_DIR}" >/dev/null || die |
| 166 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 167 |
@@ -188,8 +177,7 @@ multilib_src_configure() { |
| 168 |
$(use_with ncurses tinfo) |
| 169 |
$(use_with selinux) |
| 170 |
) |
| 171 |
- # build programs only on GNU, on *BSD we want libraries only |
| 172 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 173 |
+ if multilib_is_native_abi ; then |
| 174 |
myeconfargs+=( |
| 175 |
--disable-chfn-chsh |
| 176 |
--disable-login |
| 177 |
@@ -236,13 +224,8 @@ multilib_src_configure() { |
| 178 |
--enable-libblkid |
| 179 |
--enable-libsmartcols |
| 180 |
--enable-libfdisk |
| 181 |
+ --enable-libmount |
| 182 |
) |
| 183 |
- if use userland_GNU ; then |
| 184 |
- # those libraries don't work on *BSD |
| 185 |
- myeconfargs+=( |
| 186 |
- --enable-libmount |
| 187 |
- ) |
| 188 |
- fi |
| 189 |
fi |
| 190 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 191 |
|
| 192 |
@@ -293,7 +276,7 @@ multilib_src_install() { |
| 193 |
# This needs to be called AFTER python_install call (#689190) |
| 194 |
emake DESTDIR="${D}" install |
| 195 |
|
| 196 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 197 |
+ if multilib_is_native_abi ; then |
| 198 |
# need the libs in / |
| 199 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
| 200 |
fi |
| 201 |
@@ -305,12 +288,6 @@ multilib_src_install_all() { |
| 202 |
# e2fsprogs-libs didnt install .la files, and .pc work fine |
| 203 |
find "${ED}" -name "*.la" -delete || die |
| 204 |
|
| 205 |
- if ! use userland_GNU ; then |
| 206 |
- # manpage collisions |
| 207 |
- # TODO: figure out a good way to keep them |
| 208 |
- rm "${ED}"/usr/share/man/man3/uuid* || die |
| 209 |
- fi |
| 210 |
- |
| 211 |
if use pam ; then |
| 212 |
# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt |
| 213 |
newpamd "${FILESDIR}/runuser.pamd" runuser |
| 214 |
|
| 215 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
| 216 |
index 8ba7230d848f..3fdf6c85b949 100644 |
| 217 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
| 218 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
| 219 |
@@ -1,4 +1,4 @@ |
| 220 |
-# Copyright 1999-2021 Gentoo Authors |
| 221 |
+# Copyright 1999-2022 Gentoo Authors |
| 222 |
# Distributed under the terms of the GNU General Public License v2 |
| 223 |
|
| 224 |
EAPI=7 |
| 225 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ |
| 226 |
|
| 227 |
LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" |
| 228 |
SLOT="0" |
| 229 |
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU" |
| 230 |
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode" |
| 231 |
|
| 232 |
# Most lib deps here are related to programs rather than our libs, |
| 233 |
# so we rarely need to specify ${MULTILIB_USEDEP}. |
| 234 |
@@ -92,13 +92,6 @@ src_prepare() { |
| 235 |
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ |
| 236 |
tests/ts/uuid/uuidd || die "Failed to fix uuidd test" |
| 237 |
|
| 238 |
- if ! use userland_GNU ; then |
| 239 |
- # test runner is using GNU-specific xargs call |
| 240 |
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die |
| 241 |
- # test requires util-linux uuidgen (which we don't build) |
| 242 |
- rm tests/ts/uuid/oids || die |
| 243 |
- fi |
| 244 |
- |
| 245 |
if [[ ${PV} == 9999 ]] ; then |
| 246 |
po/update-potfiles |
| 247 |
eautoreconf |
| 248 |
@@ -127,14 +120,10 @@ python_configure() { |
| 249 |
--disable-bash-completion |
| 250 |
--without-systemdsystemunitdir |
| 251 |
--with-python |
| 252 |
+ --enable-libblkid |
| 253 |
+ --enable-libmount |
| 254 |
+ --enable-pylibmount |
| 255 |
) |
| 256 |
- if use userland_GNU ; then |
| 257 |
- myeconfargs+=( |
| 258 |
- --enable-libblkid |
| 259 |
- --enable-libmount |
| 260 |
- --enable-pylibmount |
| 261 |
- ) |
| 262 |
- fi |
| 263 |
mkdir "${BUILD_DIR}" || die |
| 264 |
pushd "${BUILD_DIR}" >/dev/null || die |
| 265 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 266 |
@@ -183,8 +172,7 @@ multilib_src_configure() { |
| 267 |
$(use_with ncurses tinfo) |
| 268 |
$(use_with selinux) |
| 269 |
) |
| 270 |
- # build programs only on GNU, on *BSD we want libraries only |
| 271 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 272 |
+ if multilib_is_native_abi ; then |
| 273 |
myeconfargs+=( |
| 274 |
--disable-chfn-chsh |
| 275 |
--disable-login |
| 276 |
@@ -231,13 +219,8 @@ multilib_src_configure() { |
| 277 |
--enable-libblkid |
| 278 |
--enable-libsmartcols |
| 279 |
--enable-libfdisk |
| 280 |
+ --enable-libmount |
| 281 |
) |
| 282 |
- if use userland_GNU ; then |
| 283 |
- # those libraries don't work on *BSD |
| 284 |
- myeconfargs+=( |
| 285 |
- --enable-libmount |
| 286 |
- ) |
| 287 |
- fi |
| 288 |
fi |
| 289 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 290 |
|
| 291 |
@@ -288,7 +271,7 @@ multilib_src_install() { |
| 292 |
# This needs to be called AFTER python_install call (#689190) |
| 293 |
emake DESTDIR="${D}" install |
| 294 |
|
| 295 |
- if multilib_is_native_abi && use userland_GNU ; then |
| 296 |
+ if multilib_is_native_abi ; then |
| 297 |
# need the libs in / |
| 298 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
| 299 |
fi |
| 300 |
@@ -300,12 +283,6 @@ multilib_src_install_all() { |
| 301 |
# e2fsprogs-libs didnt install .la files, and .pc work fine |
| 302 |
find "${ED}" -name "*.la" -delete || die |
| 303 |
|
| 304 |
- if ! use userland_GNU ; then |
| 305 |
- # manpage collisions |
| 306 |
- # TODO: figure out a good way to keep them |
| 307 |
- rm "${ED}"/usr/share/man/man3/uuid* || die |
| 308 |
- fi |
| 309 |
- |
| 310 |
if use pam ; then |
| 311 |
# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt |
| 312 |
newpamd "${FILESDIR}/runuser.pamd" runuser |
Archives