diff options
20 files changed, 44 insertions, 31 deletions
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.4.2.ebuild index 9f2211232ee1..ed28f7e94aea 100644 --- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.4.2.ebuild +++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.4.2.ebuild @@ -41,7 +41,7 @@ SRC_URI=" IUSE="gnome java kde" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" # the = is correct, the debug info needs to fit the exact binary RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]" diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.3.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.3.4.2.ebuild index 2224164fd945..3bb5135f66b0 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-7.3.4.2.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-7.3.4.2.ebuild @@ -46,7 +46,7 @@ SRC_URI=" IUSE="gnome java kde" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" BIN_COMMON_DEPEND=" app-text/hunspell:0/1.7 diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.4.2.ebuild index 64f7946c271f..fe416c8dcd3c 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.4.2.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.4.2.ebuild @@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" IUSE="offlinehelp" # diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild index 779d228b8167..69c1eeb3133d 100644 --- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild @@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild index b3bb38e45c67..9ca02f2f13de 100644 --- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild +++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="jadetex" DEPEND=">=dev-lang/perl-5 diff --git a/app-text/poppler/poppler-22.06.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild index b7d83c0dd31b..097784a8ecfb 100644 --- a/app-text/poppler/poppler-22.06.0.ebuild +++ b/app-text/poppler/poppler-22.06.0.ebuild @@ -15,7 +15,7 @@ else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild index ece44c63b430..fd6ac25ac247 100644 --- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild +++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz" LICENSE="W3C" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" DEPEND="app-text/sgml-common diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild index 84890c9fc9b8..e4d106dd1969 100644 --- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild +++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/OCL-dev/ocl-icd" SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" # Does nothing now but by keeping it here we avoid having to have virtual/opencl # handle ebuilds both with and without this flag. diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild index 3a69e3949bbb..086fc4486004 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild index be0c974d8632..639f6fb14035 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild index 2b61340eae95..ea851bab85ab 100644 --- a/dev-libs/pocl/pocl-3.0.ebuild +++ b/dev-libs/pocl/pocl-3.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ppc64" # TODO: hsa tce IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test" # Tests not yet passing, fragile in Portage environment(?) diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild index dc2cb443735e..aaaad732504f 100644 --- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild +++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="examples opengl" DEPEND=">=virtual/opencl-2" diff --git a/dev-python/pytools/pytools-2022.1.12.ebuild b/dev-python/pytools/pytools-2022.1.12.ebuild index 2b7be207348c..8a9239f4c385 100644 --- a/dev-python/pytools/pytools-2022.1.12.ebuild +++ b/dev-python/pytools/pytools-2022.1.12.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~ppc64" # NB: numpy is now an "extra" (optional) dep -- we can remove it from # RDEPEND If revdeps don't need it diff --git a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild index 916a0e75b49e..7dc296a939a1 100644 --- a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild +++ b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ppc64 x86" S="${WORKDIR}"/${MY_P} diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index b0c30f81c956..7319326c7ad8 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -24,7 +24,7 @@ inherit toolchain-funcs # @FUNCTION: all-flag-vars # @DESCRIPTION: -# Return all the flag variables that our high level funcs operate on. +# Return all the flag variables that our high level functions operate on. all-flag-vars() { echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS } @@ -209,6 +209,7 @@ filter-flags() { # Remove flags that enable Large File Support. filter-lfs-flags() { [[ $# -ne 0 ]] && die "filter-lfs-flags takes no arguments" + # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html # _LARGEFILE_SOURCE: enable support for new LFS funcs (ftello/etc...) # _LARGEFILE64_SOURCE: enable support for 64bit variants (off64_t/fseeko64/etc...) @@ -254,7 +255,7 @@ append-cppflags() { # @CODE append-cflags() { [[ $# -eq 0 ]] && return 0 - # Do not do automatic flag testing ourselves. #417047 + # Do not do automatic flag testing ourselves, bug #417047 export CFLAGS+=" $*" return 0 } @@ -269,7 +270,7 @@ append-cflags() { # @CODE append-cxxflags() { [[ $# -eq 0 ]] && return 0 - # Do not do automatic flag testing ourselves. #417047 + # Do not do automatic flag testing ourselves, bug #417047 export CXXFLAGS+=" $*" return 0 } @@ -284,7 +285,7 @@ append-cxxflags() { # @CODE append-fflags() { [[ $# -eq 0 ]] && return 0 - # Do not do automatic flag testing ourselves. #417047 + # Do not do automatic flag testing ourselves, bug #417047 export FFLAGS+=" $*" export FCFLAGS+=" $*" return 0 @@ -295,7 +296,8 @@ append-fflags() { # Add flags that enable Large File Support. append-lfs-flags() { [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments" - # see comments in filter-lfs-flags func for meaning of these + + # See comments in filter-lfs-flags func for meaning of these append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE } @@ -322,9 +324,9 @@ append-ldflags() { append-flags() { [[ $# -eq 0 ]] && return 0 case " $* " in - *' '-[DIU]*) eqawarn 'please use append-cppflags for preprocessor flags' ;; + *' '-[DIU]*) eqawarn 'Please use append-cppflags for preprocessor flags' ;; *' '-L*|\ - *' '-Wl,*) eqawarn 'please use append-ldflags for linker flags' ;; + *' '-Wl,*) eqawarn 'Please use append-ldflags for linker flags' ;; esac append-cflags "$@" append-cxxflags "$@" @@ -572,6 +574,15 @@ _test-flag-PROG() { c+ld) in_ext='c' in_src='int main(void) { return 0; }' + + if is-ldflagq -fuse-ld=* ; then + # Respect linker chosen by user so we don't + # end up giving false results by checking + # with default linker. bug #832377 + fuse_ld_value=$(get-flag -fuse-ld=*) + cmdline_extra+=(${fuse_ld_value}) + fi + cmdline_extra+=(-xc) ;; esac @@ -581,7 +592,7 @@ _test-flag-PROG() { printf "%s\n" "${in_src}" > "${test_in}" || die "Failed to create '${test_in}'" # Currently we rely on warning-free output of a compiler - # before the flag to see if a flag prduces any warnings. + # before the flag to see if a flag produces any warnings. # This has a few drawbacks: # - if compiler already generates warnings we filter out # every single flag: bug #712488 @@ -607,7 +618,9 @@ _test-flag-PROG() { # -Werror makes clang bail out on unused arguments as well; # try to add -Qunused-arguments to work-around that # other compilers don't support it but then, it's failure like - # any other + # any other. + # + # See also bug #712488 and bug #714742. cmdline+=( -Qunused-arguments ) "${cmdline[@]}" &>/dev/null fi @@ -672,7 +685,7 @@ _test-flags-PROG() { while (( $# )); do case "$1" in - # '-B /foo': bug # 687198 + # '-B /foo': bug #687198 --param|-B) if test-flag-${comp} "$1" "$2"; then flags+=( "$1" "$2" ) @@ -858,7 +871,7 @@ raw-ldflags() { x=${x#-Wl,} set -- "$@" ${x//,/ } ;; - *) # Assume it's a compiler driver flag, so throw it away #441808 + *) # Assume it's a compiler driver flag, so throw it away, bug #441808 ;; esac done diff --git a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild index c0e115b06945..cb84120923f8 100644 --- a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild b/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild index 18e76d50a763..e9fa9afce5fc 100644 --- a/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild +++ b/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" src_install() { local files=( ${A} ) diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild index 5c66ea720e1d..4c0c1dc4be63 100644 --- a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild +++ b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/-} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86" IUSE="crypt" # cryptsetup is executed at runtime only, no libraries used AFAICT diff --git a/virtual/opencl/opencl-3-r1.ebuild b/virtual/opencl/opencl-3-r1.ebuild index e5b93e28bee0..e789c83b53ff 100644 --- a/virtual/opencl/opencl-3-r1.ebuild +++ b/virtual/opencl/opencl-3-r1.ebuild @@ -7,7 +7,7 @@ inherit multilib-build DESCRIPTION="Virtual for OpenCL API" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ppc64 x86" RDEPEND="|| ( dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] )" diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild index 546704008f08..1d7716acb32e 100644 --- a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild +++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="utempter" RDEPEND=" |