commit: eadc4f710b6783d509cb6d9b2b5b475069e16391 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Apr 16 19:32:25 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Apr 16 19:34:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadc4f71
dev-libs/libgcrypt: always enable O-flag-munging Exposing this as a USE flag is mostly pointless, and results in silly bug reports from users who disable it by accident. Users can disable it using EXTRA_ECONF if so desired. Bug: https://bugs.gentoo.org/629410 Bug: https://bugs.gentoo.org/707330 Closes: https://bugs.gentoo.org/838472 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild | 3 +-- dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild | 5 ++--- dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild | 3 +-- dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild | 3 +-- dev-libs/libgcrypt/metadata.xml | 1 - 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild index 00b641cf2b84..6f87ade79161 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs" +IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs" # Build system only has --disable-arm-crypto-support right now # If changing this, update src_configure logic too. @@ -92,7 +92,6 @@ multilib_src_configure() { $(use_enable cpu_flags_x86_sse4_1 sse41-support) # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) - $(use_enable !custom-cflags O-flag-munging) # disabled due to various applications requiring privileges # after libgcrypt drops them (bug #468616) diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild index 45f5a784c691..517bba1e65af 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc o-flag-munging static-libs" +IUSE="doc static-libs" RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" @@ -51,7 +51,6 @@ multilib_src_configure() { # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) - $(use_enable o-flag-munging O-flag-munging) # http://trac.videolan.org/vlc/ticket/620 # causes bus-errors on sparc64-solaris diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild index 98812288ba3c..d286856c172a 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc o-flag-munging static-libs" +IUSE="doc static-libs" RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" @@ -62,7 +62,6 @@ multilib_src_configure() { # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) - $(use_enable o-flag-munging O-flag-munging) # http://trac.videolan.org/vlc/ticket/620 # causes bus-errors on sparc64-solaris diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild index 8a228b0fe2c4..6c29e69188e1 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs" +IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs" # Build system only has --disable-arm-crypto-support right now # If changing this, update src_configure logic too. @@ -93,7 +93,6 @@ multilib_src_configure() { $(use_enable cpu_flags_x86_sse4_1 sse41-support) # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) - $(use_enable !custom-cflags O-flag-munging) # disabled due to various applications requiring privileges # after libgcrypt drops them (bug #468616) diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml index afd8e678af72..5ec9f7d1803a 100644 --- a/dev-libs/libgcrypt/metadata.xml +++ b/dev-libs/libgcrypt/metadata.xml @@ -14,6 +14,5 @@ </upstream> <use> <flag name="asm">Enable assembly for optimization</flag> - <flag name="o-flag-munging">Enable O-flag mangling during build</flag> </use> </pkgmetadata>
