| 1 |
commit: 8a44ba018c02b632ab8424727f63f2d0ef13b81b |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 5 18:18:32 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 5 18:18:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a44ba01 |
| 7 |
|
| 8 |
sys-libs/glibc: Remove remaining occurrences of in_iuse |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 11 |
|
| 12 |
sys-libs/glibc/glibc-2.19-r2.ebuild | 10 +++++----- |
| 13 |
sys-libs/glibc/glibc-2.27-r2.ebuild | 10 +++++----- |
| 14 |
sys-libs/glibc/glibc-9999.ebuild | 10 +++++----- |
| 15 |
3 files changed, 15 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 18 |
index 1b071fb4d3d..b2b9a397b55 100644 |
| 19 |
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 20 |
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 21 |
@@ -895,8 +895,8 @@ glibc_do_configure() { |
| 22 |
--with-bugurl=https://bugs.gentoo.org/ |
| 23 |
--with-pkgversion="$(glibc_banner)" |
| 24 |
$(use_multiarch || echo --disable-multi-arch) |
| 25 |
- $(in_iuse systemtap && use_enable systemtap) |
| 26 |
- $(in_iuse nscd && use_enable nscd) |
| 27 |
+ $(use_enable systemtap) |
| 28 |
+ $(use_enable nscd) |
| 29 |
${EXTRA_ECONF} |
| 30 |
) |
| 31 |
|
| 32 |
@@ -904,8 +904,8 @@ glibc_do_configure() { |
| 33 |
myconf+=( $(use_enable vanilla timezone-tools) ) |
| 34 |
|
| 35 |
# These libs don't have configure flags. |
| 36 |
- ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) |
| 37 |
- ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) |
| 38 |
+ ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no) |
| 39 |
+ ac_cv_lib_cap_cap_init=$(usex caps || echo no) |
| 40 |
|
| 41 |
# There is no configure option for this and we need to export it |
| 42 |
# since the glibc build will re-run configure on itself |
| 43 |
@@ -1174,7 +1174,7 @@ glibc_do_src_install() { |
| 44 |
# With devpts under Linux mounted properly, we do not need the pt_chown |
| 45 |
# binary to be setuid. This is because the default owners/perms will be |
| 46 |
# exactly what we want. |
| 47 |
- if in_iuse suid && ! use suid ; then |
| 48 |
+ if ! use suid ; then |
| 49 |
find "${ED}" -name pt_chown -exec chmod -s {} + |
| 50 |
fi |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/sys-libs/glibc/glibc-2.27-r2.ebuild b/sys-libs/glibc/glibc-2.27-r2.ebuild |
| 54 |
index b45dd3a4921..3d2fa240025 100644 |
| 55 |
--- a/sys-libs/glibc/glibc-2.27-r2.ebuild |
| 56 |
+++ b/sys-libs/glibc/glibc-2.27-r2.ebuild |
| 57 |
@@ -894,8 +894,8 @@ glibc_do_configure() { |
| 58 |
--with-bugurl=https://bugs.gentoo.org/ |
| 59 |
--with-pkgversion="$(glibc_banner)" |
| 60 |
$(use_multiarch || echo --disable-multi-arch) |
| 61 |
- $(in_iuse systemtap && use_enable systemtap) |
| 62 |
- $(in_iuse nscd && use_enable nscd) |
| 63 |
+ $(use_enable systemtap) |
| 64 |
+ $(use_enable nscd) |
| 65 |
${EXTRA_ECONF} |
| 66 |
) |
| 67 |
|
| 68 |
@@ -903,8 +903,8 @@ glibc_do_configure() { |
| 69 |
myconf+=( $(use_enable vanilla timezone-tools) ) |
| 70 |
|
| 71 |
# These libs don't have configure flags. |
| 72 |
- ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) |
| 73 |
- ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) |
| 74 |
+ ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no) |
| 75 |
+ ac_cv_lib_cap_cap_init=$(usex caps || echo no) |
| 76 |
|
| 77 |
# There is no configure option for this and we need to export it |
| 78 |
# since the glibc build will re-run configure on itself |
| 79 |
@@ -1209,7 +1209,7 @@ glibc_do_src_install() { |
| 80 |
# With devpts under Linux mounted properly, we do not need the pt_chown |
| 81 |
# binary to be setuid. This is because the default owners/perms will be |
| 82 |
# exactly what we want. |
| 83 |
- if in_iuse suid && ! use suid ; then |
| 84 |
+ if ! use suid ; then |
| 85 |
find "${ED}" -name pt_chown -exec chmod -s {} + |
| 86 |
fi |
| 87 |
|
| 88 |
|
| 89 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 90 |
index 7c5d09ab85a..ee82933c663 100644 |
| 91 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 92 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 93 |
@@ -886,8 +886,8 @@ glibc_do_configure() { |
| 94 |
--with-bugurl=https://bugs.gentoo.org/ |
| 95 |
--with-pkgversion="$(glibc_banner)" |
| 96 |
$(use_multiarch || echo --disable-multi-arch) |
| 97 |
- $(in_iuse systemtap && use_enable systemtap) |
| 98 |
- $(in_iuse nscd && use_enable nscd) |
| 99 |
+ $(use_enable systemtap) |
| 100 |
+ $(use_enable nscd) |
| 101 |
${EXTRA_ECONF} |
| 102 |
) |
| 103 |
|
| 104 |
@@ -895,8 +895,8 @@ glibc_do_configure() { |
| 105 |
myconf+=( $(use_enable vanilla timezone-tools) ) |
| 106 |
|
| 107 |
# These libs don't have configure flags. |
| 108 |
- ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) |
| 109 |
- ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) |
| 110 |
+ ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no) |
| 111 |
+ ac_cv_lib_cap_cap_init=$(usex caps || echo no) |
| 112 |
|
| 113 |
# There is no configure option for this and we need to export it |
| 114 |
# since the glibc build will re-run configure on itself |
| 115 |
@@ -1201,7 +1201,7 @@ glibc_do_src_install() { |
| 116 |
# With devpts under Linux mounted properly, we do not need the pt_chown |
| 117 |
# binary to be setuid. This is because the default owners/perms will be |
| 118 |
# exactly what we want. |
| 119 |
- if in_iuse suid && ! use suid ; then |
| 120 |
+ if ! use suid ; then |
| 121 |
find "${ED}" -name pt_chown -exec chmod -s {} + |
| 122 |
fi |
Archives