diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-03-15 19:13:48 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-03-15 19:13:48 +0000 |
| commit | fd33c0bd4bb58cf9f05649a6b744ea4a1859da9b (patch) | |
| tree | 1bb75e647d3f5522684c02e4b9f515ef43656102 | |
| parent | 2020-03-15 18:12:21 UTC (diff) | |
| parent | dev-lang/go: ppc64 stable wrt bug #711552 (diff) | |
| download | gentoo-fd33c0bd4bb58cf9f05649a6b744ea4a1859da9b.tar.gz gentoo-fd33c0bd4bb58cf9f05649a6b744ea4a1859da9b.tar.bz2 gentoo-fd33c0bd4bb58cf9f05649a6b744ea4a1859da9b.zip | |
Merge updates from master
63 files changed, 177 insertions, 1421 deletions
diff --git a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild index aa4b39bcdb89..d877620ac914 100644 --- a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild @@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="amd64" + KEYWORDS="amd64 x86" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" SLOT="0/${PV}" fi diff --git a/app-emulation/qemu/qemu-4.2.0-r2.ebuild b/app-emulation/qemu/qemu-4.2.0-r2.ebuild index 96c55e6942b4..e67734093dfb 100644 --- a/app-emulation/qemu/qemu-4.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-4.2.0-r2.ebuild @@ -25,7 +25,7 @@ if [[ ${PV} = *9999* ]]; then else SRC_URI="https://download.qemu.org/${P}.tar.xz https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.1.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.1.ebuild index 346d04ee8d77..909700ae97c4 100644 --- a/app-emulation/spice-protocol/spice-protocol-0.14.1.ebuild +++ b/app-emulation/spice-protocol/spice-protocol-0.14.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="" DEPEND="" diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild index 2cac3817d767..2f8904baec3a 100644 --- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild +++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="consolekit gtk selinux systemd" CDEPEND=" diff --git a/app-emulation/spice/spice-0.14.3.ebuild b/app-emulation/spice/spice-0.14.3.ebuild index b20c4219fe5a..0260ea4aec9c 100644 --- a/app-emulation/spice/spice-0.14.3.ebuild +++ b/app-emulation/spice/spice-0.14.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="libressl lz4 sasl smartcard static-libs gstreamer" # the libspice-server only uses the headers of libcacard diff --git a/app-misc/geneweb/geneweb-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild index d2fc16e08e35..d3f5624aba46 100644 --- a/app-misc/geneweb/geneweb-6.08.01.ebuild +++ b/app-misc/geneweb/geneweb-6.08.01.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+ocamlopt" RESTRICT="strip" diff --git a/app-portage/gentoopm/gentoopm-0.3.1.ebuild b/app-portage/gentoopm/gentoopm-0.3.1.ebuild index 441dde4196cf..c79f519324ee 100644 --- a/app-portage/gentoopm/gentoopm-0.3.1.ebuild +++ b/app-portage/gentoopm/gentoopm-0.3.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~x86" +KEYWORDS="amd64 arm ~mips x86" IUSE="" RDEPEND=" diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild index 36bd762514db..46378203a947 100644 --- a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild +++ b/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" LICENSE="vim" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="ignore-glep31" VIM_PLUGIN_HELPFILES="gentoo-syntax" diff --git a/dev-lang/go/go-1.13.8.ebuild b/dev-lang/go/go-1.13.8.ebuild index 3376d30ceb57..38cb703c628a 100644 --- a/dev-lang/go/go-1.13.8.ebuild +++ b/dev-lang/go/go-1.13.8.ebuild @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm ~arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" # The upstream tests fail under portage but pass if the build is # run according to their documentation [1]. # I am restricting the tests on released versions until this is diff --git a/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch new file mode 100644 index 000000000000..962566cd5b7f --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch @@ -0,0 +1,22 @@ +From 4f870752abbb756911d7b11405d49e9769d082bd Mon Sep 17 00:00:00 2001 +From: Emmanuel Leblond <emmanuel.leblond@gmail.com> +Date: Fri, 8 Apr 2016 22:13:36 +0200 +Subject: [PATCH] Fix #68 when reading file with only \0 char + +--- + src/iniparser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index be37fec..fb1b549 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -678,7 +678,7 @@ dictionary * iniparser_load(const char * ininame) + while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { + lineno++ ; + len = (int)strlen(line)-1; +- if (len==0) ++ if (len<=0) + continue; + /* Safety check against buffer overflows */ + if (line[len]!='\n' && !feof(in)) { diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild new file mode 100644 index 000000000000..3d8e93facd09 --- /dev/null +++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +AUTOTOOLS_AUTORECONF=1 +inherit autotools-utils autotools-multilib + +DESCRIPTION="A free stand-alone ini file parsing library" +HOMEPAGE="http://ndevilla.free.fr/iniparser/" + +SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples static-libs" + +DEPEND="doc? ( app-doc/doxygen ) + sys-devel/libtool" +RDEPEND="" + +# the tests are rather examples than tests, no point in running them +RESTRICT="test" + +S="${WORKDIR}/${PN}" + +DOCS=( AUTHORS README ) + +PATCHES=( + "${FILESDIR}/${PN}-3.0b-cpp.patch" + "${FILESDIR}/${PN}-3.0-autotools.patch" + "${FILESDIR}/${PN}-4.0-out-of-bounds-read.patch" +) + +src_install() { + autotools-multilib_src_install + + if use doc; then + emake -C doc + dohtml -r html/* + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins test/*.{c,ini,py} + fi +} diff --git a/dev-python/PyGithub/PyGithub-1.46.ebuild b/dev-python/PyGithub/PyGithub-1.46.ebuild index d25ebb155b5b..cc689d21ef9f 100644 --- a/dev-python/PyGithub/PyGithub-1.46.ebuild +++ b/dev-python/PyGithub/PyGithub-1.46.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/cmd2/cmd2-0.10.1.ebuild b/dev-python/cmd2/cmd2-0.10.1.ebuild index a8ce4475bb98..55daddb77aea 100644 --- a/dev-python/cmd2/cmd2-0.10.1.ebuild +++ b/dev-python/cmd2/cmd2-0.10.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-python/attrs[${PYTHON_USEDEP}] diff --git a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild index 74b6dcf32ae4..79a9f02c1ffd 100644 --- a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild +++ b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild @@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git" SRC_URI="" - KEYWORDS="amd64" + KEYWORDS="amd64 x86" RDEPEND="app-emulation/libvirt:=[-python(-)]" else SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" RDEPEND="app-emulation/libvirt:0/${PV}" fi S="${WORKDIR}/${P%_rc*}" diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild index 75a1fa816b25..086ed0263f6c 100644 --- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild +++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" inherit git-r3 else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/dev-util/catfish/catfish-1.4.13.ebuild b/dev-util/catfish/catfish-1.4.13.ebuild index 4ede1dcf2f23..b41dc7c49c69 100644 --- a/dev-util/catfish/catfish-1.4.13.ebuild +++ b/dev-util/catfish/catfish-1.4.13.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2" # yep, GPL-2 only LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND=" dev-libs/gobject-introspection diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild index 87693a7c4bb7..9bf6dd5f8f97 100644 --- a/dev-util/ninja/ninja-1.9.0.ebuild +++ b/dev-util/ninja/ninja-1.9.0.ebuild @@ -15,7 +15,7 @@ else MY_P="ninja-${KITWARE_VERSION}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" fi DESCRIPTION="A small build system similar to make" diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild index 051a9978464b..5ee7bb5b45f8 100644 --- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+chg emacs gpg test tk zsh-completion" BROKEN_PYTHON=" diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 9df0e1b93663..625abd0e9d12 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: autotools.eclass @@ -512,7 +512,7 @@ autotools_run_tool() { fi if ${m4flags} ; then - set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include) + set -- "${1}" $(autotools_m4dir_include) $(autotools_m4sysdir_include) "${@:2}" fi # If the caller wants to probe something, then let them do it directly. diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass index 467f955f5e9a..2b6e5be4683d 100644 --- a/eclass/fcaps.eclass +++ b/eclass/fcaps.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fcaps.eclass @@ -34,7 +34,10 @@ _FCAPS_ECLASS=1 IUSE="+filecaps" # We can't use libcap-ng atm due to #471414. -DEPEND="filecaps? ( sys-libs/libcap )" +case "${EAPI:-0}" in + [0-6]) DEPEND="filecaps? ( sys-libs/libcap )" ;; + *) BDEPEND="filecaps? ( sys-libs/libcap )" ;; +esac # @ECLASS-VARIABLE: FILECAPS # @DEFAULT_UNSET diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild index 67dd5e6ad8aa..fc48152454b4 100644 --- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="-* amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND=" app-arch/bzip2[abi_x86_32(-)] diff --git a/kde-misc/latte-dock/latte-dock-0.9.9.ebuild b/kde-misc/latte-dock/latte-dock-0.9.9.ebuild index 38a4cf1facba..f670080350f8 100644 --- a/kde-misc/latte-dock/latte-dock-0.9.9.ebuild +++ b/kde-misc/latte-dock/latte-dock-0.9.9.ebuild @@ -9,7 +9,7 @@ inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" fi DESCRIPTION="Elegant dock, based on KDE Frameworks" diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild index 667fcacb7c52..94291a78237b 100644 --- a/media-gfx/icoutils/icoutils-0.32.3.ebuild +++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls" BDEPEND=" diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild index 3a0bf4811784..96d89a0965ea 100644 --- a/media-sound/flacon/flacon-5.5.1.ebuild +++ b/media-sound/flacon/flacon-5.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" BDEPEND=" diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild index a742c24a2323..4ae930319422 100644 --- a/net-analyzer/nmap/nmap-7.80-r1.ebuild +++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" https://nmap.org/dist/${MY_P}.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" LICENSE="GPL-2" SLOT="0" diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild index 59574e2e3ce3..d41486493049 100644 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild @@ -16,7 +16,8 @@ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~s IUSE="ipv6 kerberos static-libs" RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone )" BDEPEND=" app-arch/xz-utils >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild index cb24fbda3a85..81b35c5ba82c 100644 --- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g LICENSE="LGPL-2.1" SLOT="0" SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl" # TODO: diff --git a/net-proxy/3proxy/3proxy-0.8.13.ebuild b/net-proxy/3proxy/3proxy-0.8.13.ebuild index 0dd28a699967..345db508eed8 100644 --- a/net-proxy/3proxy/3proxy-0.8.13.ebuild +++ b/net-proxy/3proxy/3proxy-0.8.13.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.3proxy.ru/" SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86" IUSE="" PATCHES=( diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild index 4c187a573ea9..df08cff0a07a 100644 --- a/net-proxy/squid/squid-4.10.ebuild +++ b/net-proxy/squid/squid-4.10.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86" IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ ecap esi ssl-crtd \ mysql postgres sqlite \ diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild index 0f05f9cc5063..4df870123633 100644 --- a/sys-apps/usbredir/usbredir-0.8.0.ebuild +++ b/sys-apps/usbredir/usbredir-0.8.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2 LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86" IUSE="static-libs" RDEPEND="virtual/libusb:1" diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 46884c72bb2a..a3833c2a78f4 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,7 +1,4 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae -DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb -DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c -DIST grub-2.05_alpha20200228.tar.xz 6619176 BLAKE2B 15f45495bfffab71f9e4bccd0c60b48dcedfec7da650ceb3bc66f64ad7331e8ab1f786d04893d81b6c2e61dab6fa1ff47a29afcaa7f92bb478c4b18312311604 SHA512 28e42b0125283d0ef3d415a69699416e83e3ee32d60ffe092b0d03765d150579bd3fb218ed2bbf4877bd802012b409a502e86e825c0d22265252097d20449957 +DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0 -DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 diff --git a/sys-boot/grub/files/2.02-X86_64_PLT32.patch b/sys-boot/grub/files/2.02-X86_64_PLT32.patch deleted file mode 100644 index 2c65cb78a5d5..000000000000 --- a/sys-boot/grub/files/2.02-X86_64_PLT32.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 02702bdfe14d8a04643a45b03715f734ae34dbac Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Sat, 17 Feb 2018 06:47:28 -0800 -Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 - -Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a - -x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for -32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as -R_X86_64_PC32. - -Signed-off-by: H.J. Lu <hjl.tools@gmail.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> - -Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa36700324cd3bde25875 -Last-Update: 2018-07-30 - -Patch-Name: R_X86_64_PLT32.patch ---- - grub-core/efiemu/i386/loadcore64.c | 1 + - grub-core/kern/x86_64/dl.c | 1 + - util/grub-mkimagexx.c | 1 + - util/grub-module-verifier.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c -index e49d0b6ff..18facf47f 100644 ---- a/grub-core/efiemu/i386/loadcore64.c -+++ b/grub-core/efiemu/i386/loadcore64.c -@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - err = grub_efiemu_write_value (addr, - *addr32 + rel->r_addend - + sym.off -diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c -index 440690673..3a73e6e6c 100644 ---- a/grub-core/kern/x86_64/dl.c -+++ b/grub-core/kern/x86_64/dl.c -@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_int64_t value; - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index e63f148e4..f20255a28 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_uint32_t *t32 = (grub_uint32_t *) target; - *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c -index 9179285a5..a79271f66 100644 ---- a/util/grub-module-verifier.c -+++ b/util/grub-module-verifier.c -@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { - -1 - }, (int[]){ - R_X86_64_PC32, -+ R_X86_64_PLT32, - -1 - } - }, diff --git a/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch b/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch deleted file mode 100644 index f20845d5a34b..000000000000 --- a/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001 -From: "David E. Box" <david.e.box@linux.intel.com> -Date: Fri, 15 Sep 2017 15:37:05 -0700 -Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI - systems - -On efi systems, make pmtimer based tsc calibration the default over the -pit. This prevents Grub from hanging on Intel SoC systems that power gate -the pit. - -Signed-off-by: David E. Box <david.e.box@linux.intel.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/kern/i386/tsc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c -index 2e85289d8..f266eb131 100644 ---- a/grub-core/kern/i386/tsc.c -+++ b/grub-core/kern/i386/tsc.c -@@ -68,7 +68,7 @@ grub_tsc_init (void) - #ifdef GRUB_MACHINE_XEN - (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode()); - #elif defined (GRUB_MACHINE_EFI) -- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); -+ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); - #elif defined (GRUB_MACHINE_COREBOOT) - (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode()); - #else --- -2.22.0 - diff --git a/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch b/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch deleted file mode 100644 index 9aa7f54f32ab..000000000000 --- a/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch +++ /dev/null @@ -1,126 +0,0 @@ -From ba84c8d1b4830e9fcb14d9f0e4a36e03ac40a09d Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Tue, 30 Jan 2018 14:08:26 +0000 -Subject: build: Capitalise *freetype_* variables - -Using FREETYPE_CFLAGS and FREETYPE_LIBS is more in line with the naming -scheme used by pkg-config macros. - -Bug-Debian: https://bugs.debian.org/887721 -Last-Update: 2018-02-11 - -Patch-Name: freetype-capitalise-variables.patch ---- - Makefile.am | 6 +++--- - Makefile.util.def | 4 ++-- - configure.ac | 24 ++++++++++++------------ - 3 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index f0ab1adc3..b47b4b1ac 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -71,7 +71,7 @@ endif - starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0 - - build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c -- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs) -+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) - CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT) - - garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c -@@ -80,11 +80,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT) - EXTRA_DIST += util/garbage-gen.c - - build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c -- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror -+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror - CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT) - - build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c -- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror -+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror - CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT) - - if COND_STARFIELD -diff --git a/Makefile.util.def b/Makefile.util.def -index 168acbe59..fa39d8bd1 100644 ---- a/Makefile.util.def -+++ b/Makefile.util.def -@@ -302,14 +302,14 @@ program = { - common = grub-core/kern/emu/argp_common.c; - common = grub-core/osdep/init.c; - -- cflags = '$(freetype_cflags)'; -+ cflags = '$(FREETYPE_CFLAGS)'; - cppflags = '-DGRUB_MKFONT=1'; - - ldadd = libgrubmods.a; - ldadd = libgrubgcry.a; - ldadd = libgrubkern.a; - ldadd = grub-core/gnulib/libgnu.a; -- ldadd = '$(freetype_libs)'; -+ ldadd = '$(FREETYPE_LIBS)'; - ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; - condition = COND_GRUB_MKFONT; - }; -diff --git a/configure.ac b/configure.ac -index cd1f49837..85c23bd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1505,12 +1505,12 @@ unset ac_cv_header_ft2build_h - - if test x"$grub_mkfont_excuse" = x ; then - # Check for freetype libraries. -- freetype_cflags=`$FREETYPE --cflags` -- freetype_libs=`$FREETYPE --libs` -+ FREETYPE_CFLAGS=`$FREETYPE --cflags` -+ FREETYPE_LIBS=`$FREETYPE --libs` - SAVED_CPPFLAGS="$CPPFLAGS" - SAVED_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $freetype_cflags" -- LIBS="$LIBS $freetype_libs" -+ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" -+ LIBS="$LIBS $FREETYPE_LIBS" - AC_CHECK_HEADERS([ft2build.h], [], - [grub_mkfont_excuse=["need freetype2 headers"]]) - AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]]) -@@ -1527,8 +1527,8 @@ else - enable_grub_mkfont=no - fi - AC_SUBST([enable_grub_mkfont]) --AC_SUBST([freetype_cflags]) --AC_SUBST([freetype_libs]) -+AC_SUBST([FREETYPE_CFLAGS]) -+AC_SUBST([FREETYPE_LIBS]) - - SAVED_CC="$CC" - SAVED_CPP="$CPP" -@@ -1566,12 +1566,12 @@ fi - - if test x"$grub_build_mkfont_excuse" = x ; then - # Check for freetype libraries. -- build_freetype_cflags=`$BUILD_FREETYPE --cflags` -- build_freetype_libs=`$BUILD_FREETYPE --libs` -+ BUILD_FREETYPE_CFLAGS=`$BUILD_FREETYPE --cflags` -+ BUILD_FREETYPE_LIBS=`$BUILD_FREETYPE --libs` - SAVED_CPPFLAGS_2="$CPPFLAGS" - SAVED_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $build_freetype_cflags" -- LIBS="$LIBS $build_freetype_libs" -+ CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS" -+ LIBS="$LIBS $BUILD_FREETYPE_LIBS" - AC_CHECK_HEADERS([ft2build.h], [], - [grub_build_mkfont_excuse=["need freetype2 headers"]]) - AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]]) -@@ -1595,8 +1595,8 @@ if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || tes - fi - fi - --AC_SUBST([build_freetype_cflags]) --AC_SUBST([build_freetype_libs]) -+AC_SUBST([BUILD_FREETYPE_CFLAGS]) -+AC_SUBST([BUILD_FREETYPE_LIBS]) - - CC="$SAVED_CC" - CPP="$SAVED_CPP" diff --git a/sys-boot/grub/files/2.02-freetype-pkg-config.patch b/sys-boot/grub/files/2.02-freetype-pkg-config.patch deleted file mode 100644 index 94437f073c4f..000000000000 --- a/sys-boot/grub/files/2.02-freetype-pkg-config.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 3eec911197081a63d9dae28f1784ad01a06fb60a Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Tue, 30 Jan 2018 21:54:17 +0000 -Subject: build: Use pkg-config to find FreeType - -pkg-config is apparently preferred over freetype-config these days (see -the BUGS section of freetype-config(1)). pkg-config support was added -to FreeType in version 2.1.5, which was released in 2003, so it should -comfortably be available everywhere by now. - -We no longer need to explicitly substitute FREETYPE_CFLAGS and -FREETYPE_LIBS, since PKG_CHECK_MODULES does that automatically. - -Fixes Debian bug #887721. - -Reported-by: Hugh McMaster <hugh.mcmaster@outlook.com> -Signed-off-by: Colin Watson <cjwatson@ubuntu.com> - -Bug-Debian: https://bugs.debian.org/887721 -Last-Update: 2018-02-11 - -Patch-Name: freetype-pkg-config.patch ---- - INSTALL | 11 +++++---- - configure.ac | 74 +++++++++++++++++++++++++----------------------------------- - 2 files changed, 37 insertions(+), 48 deletions(-) - -diff --git a/INSTALL b/INSTALL -index f3c20edc8..b370d7753 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -37,6 +37,7 @@ configuring the GRUB. - * GNU gettext 0.17 or later - * GNU binutils 2.9.1.0.23 or later - * Flex 2.5.35 or later -+* pkg-config - * Other standard GNU/Unix tools - * a libc with large file support (e.g. glibc 2.1 or later) - -@@ -52,7 +53,7 @@ For optional grub-emu features, you need: - - To build GRUB's graphical terminal (gfxterm), you need: - --* FreeType 2 or later -+* FreeType 2.1.5 or later - * GNU Unifont - - If you use a development snapshot or want to hack on GRUB you may -@@ -158,8 +159,8 @@ For this example the configure line might look like (more details below) - (some options are optional and included here for completeness but some rarely - used options are omitted): - --./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu --CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config -+./configure BUILD_CC=gcc BUILD_PKG_CONFIG=pkg-config --host=amd64-linux-gnu -+CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" PKG_CONFIG=amd64-linux-gnu-pkg-config - --target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc - TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6" - TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip" -@@ -176,7 +177,7 @@ corresponding platform are not needed for the platform in question. - 2. BUILD_CFLAGS= for C options for build. - 3. BUILD_CPPFLAGS= for C preprocessor options for build. - 4. BUILD_LDFLAGS= for linker options for build. -- 5. BUILD_FREETYPE= for freetype-config for build (optional). -+ 5. BUILD_PKG_CONFIG= for pkg-config for build (optional). - - - For host - 1. --host= to autoconf name of host. -@@ -184,7 +185,7 @@ corresponding platform are not needed for the platform in question. - 3. HOST_CFLAGS= for C options for host. - 4. HOST_CPPFLAGS= for C preprocessor options for host. - 5. HOST_LDFLAGS= for linker options for host. -- 6. FREETYPE= for freetype-config for host (optional). -+ 6. PKG_CONFIG= for pkg-config for host (optional). - 7. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional). - 8. Libfuse if any must be in standard linker folders (-lfuse) (optional). - 9. Libzfs if any must be in standard linker folders (-lzfs) (optional). -diff --git a/configure.ac b/configure.ac -index 85c23bd62..f102b7024 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,10 @@ AC_PREREQ(2.60) - AC_CONFIG_SRCDIR([include/grub/dl.h]) - AC_CONFIG_HEADER([config-util.h]) - -+# Explicitly check for pkg-config early on, since otherwise conditional -+# calls are problematic. -+PKG_PROG_PKG_CONFIG -+ - # Program name transformations - AC_ARG_PROGRAM - grub_TRANSFORM([grub-bios-setup]) -@@ -1493,29 +1497,22 @@ if test x"$enable_grub_mkfont" = xno ; then - grub_mkfont_excuse="explicitly disabled" - fi - --if test x"$grub_mkfont_excuse" = x ; then -- # Check for freetype libraries. -- AC_CHECK_TOOLS([FREETYPE], [freetype-config]) -- if test "x$FREETYPE" = x ; then -- grub_mkfont_excuse=["need freetype2 library"] -- fi --fi -- - unset ac_cv_header_ft2build_h - - if test x"$grub_mkfont_excuse" = x ; then - # Check for freetype libraries. -- FREETYPE_CFLAGS=`$FREETYPE --cflags` -- FREETYPE_LIBS=`$FREETYPE --libs` -- SAVED_CPPFLAGS="$CPPFLAGS" -- SAVED_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" -- LIBS="$LIBS $FREETYPE_LIBS" -- AC_CHECK_HEADERS([ft2build.h], [], -- [grub_mkfont_excuse=["need freetype2 headers"]]) -- AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]]) -- CPPFLAGS="$SAVED_CPPFLAGS" -- LIBS="$SAVED_LIBS" -+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [ -+ SAVED_CPPFLAGS="$CPPFLAGS" -+ SAVED_LIBS="$LIBS" -+ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" -+ LIBS="$LIBS $FREETYPE_LIBS" -+ AC_CHECK_HEADERS([ft2build.h], [], -+ [grub_mkfont_excuse=["need freetype2 headers"]]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], -+ [grub_mkfont_excuse=["freetype2 library unusable"]]) -+ CPPFLAGS="$SAVED_CPPFLAGS" -+ LIBS="$SAVED_LIBS" -+ ], [grub_mkfont_excuse=["need freetype2 library"]]) - fi - - if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then -@@ -1527,8 +1524,6 @@ else - enable_grub_mkfont=no - fi - AC_SUBST([enable_grub_mkfont]) --AC_SUBST([FREETYPE_CFLAGS]) --AC_SUBST([FREETYPE_LIBS]) - - SAVED_CC="$CC" - SAVED_CPP="$CPP" -@@ -1558,25 +1553,21 @@ AC_SUBST([BUILD_WORDS_BIGENDIAN]) - - if test x"$grub_build_mkfont_excuse" = x ; then - # Check for freetype libraries. -- AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config]) -- if test "x$BUILD_FREETYPE" = x ; then -- grub_build_mkfont_excuse=["need freetype2 library"] -- fi --fi -- --if test x"$grub_build_mkfont_excuse" = x ; then -- # Check for freetype libraries. -- BUILD_FREETYPE_CFLAGS=`$BUILD_FREETYPE --cflags` -- BUILD_FREETYPE_LIBS=`$BUILD_FREETYPE --libs` -- SAVED_CPPFLAGS_2="$CPPFLAGS" -- SAVED_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS" -- LIBS="$LIBS $BUILD_FREETYPE_LIBS" -- AC_CHECK_HEADERS([ft2build.h], [], -- [grub_build_mkfont_excuse=["need freetype2 headers"]]) -- AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]]) -- LIBS="$SAVED_LIBS" -- CPPFLAGS="$SAVED_CPPFLAGS_2" -+ SAVED_PKG_CONFIG="$PKG_CONFIG" -+ test -z "$BUILD_PKG_CONFIG" || PKG_CONFIG="$BUILD_PKG_CONFIG" -+ PKG_CHECK_MODULES([BUILD_FREETYPE], [freetype2], [ -+ SAVED_CPPFLAGS_2="$CPPFLAGS" -+ SAVED_LIBS="$LIBS" -+ CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS" -+ LIBS="$LIBS $BUILD_FREETYPE_LIBS" -+ AC_CHECK_HEADERS([ft2build.h], [], -+ [grub_build_mkfont_excuse=["need freetype2 headers"]]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], -+ [grub_build_mkfont_excuse=["freetype2 library unusable"]]) -+ LIBS="$SAVED_LIBS" -+ CPPFLAGS="$SAVED_CPPFLAGS_2" -+ ], [grub_build_mkfont_excuse=["need freetype2 library"]]) -+ PKG_CONFIG="$SAVED_PKG_CONFIG" - fi - - if test x"$enable_build_grub_mkfont" = xyes && test x"$grub_build_mkfont_excuse" != x ; then -@@ -1595,9 +1586,6 @@ if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || tes - fi - fi - --AC_SUBST([BUILD_FREETYPE_CFLAGS]) --AC_SUBST([BUILD_FREETYPE_LIBS]) -- - CC="$SAVED_CC" - CPP="$SAVED_CPP" - CFLAGS="$SAVED_CFLAGS" diff --git a/sys-boot/grub/files/2.02-gcc8.patch b/sys-boot/grub/files/2.02-gcc8.patch deleted file mode 100644 index 51ee7dc86c25..000000000000 --- a/sys-boot/grub/files/2.02-gcc8.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 -From: Michael Chang <mchang@suse.com> -Date: Mon, 26 Mar 2018 16:52:34 +0800 -Subject: Fix packed-not-aligned error on GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building with GCC 8, there are several errors regarding packed-not-aligned. - -./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] - -This patch fixes the build error by cleaning up the ambiguity of placing -aligned structure in a packed one. In "struct grub_btrfs_time" and "struct -grub_gpt_part_type", the aligned attribute seems to be superfluous, and also -has to be packed, to ensure the structure is bit-to-bit mapped to the format -laid on disk. I think we could blame to copy and paste error here for the -mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as -the name suggests. :) - -Signed-off-by: Michael Chang <mchang@suse.com> -Tested-by: Michael Chang <mchang@suse.com> -Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/btrfs.c | 2 +- - include/grub/efiemu/runtime.h | 2 +- - include/grub/gpt_partition.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4849c1c..be19544 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -175,7 +175,7 @@ struct grub_btrfs_time - { - grub_int64_t sec; - grub_uint32_t nanosec; --} __attribute__ ((aligned (4))); -+} GRUB_PACKED; - - struct grub_btrfs_inode - { -diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 9b6b729..36d2ded 100644 ---- a/include/grub/efiemu/runtime.h -+++ b/include/grub/efiemu/runtime.h -@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel - - struct efi_variable - { -- grub_efi_guid_t guid; -+ grub_efi_packed_guid_t guid; - grub_uint32_t namelen; - grub_uint32_t size; - grub_efi_uint32_t attributes; -diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 1b32f67..9668a68 100644 ---- a/include/grub/gpt_partition.h -+++ b/include/grub/gpt_partition.h -@@ -28,7 +28,7 @@ struct grub_gpt_part_type - grub_uint16_t data2; - grub_uint16_t data3; - grub_uint8_t data4[8]; --} __attribute__ ((aligned(8))); -+} GRUB_PACKED; - typedef struct grub_gpt_part_type grub_gpt_part_type_t; - - #define GRUB_GPT_PARTITION_TYPE_EMPTY \ --- -cgit v1.0-41-gc330 - diff --git a/sys-boot/grub/files/2.02-multiple-early-initrd.patch b/sys-boot/grub/files/2.02-multiple-early-initrd.patch deleted file mode 100644 index 74b576f8b007..000000000000 --- a/sys-boot/grub/files/2.02-multiple-early-initrd.patch +++ /dev/null @@ -1,177 +0,0 @@ -From a698240df0c43278b2d1d7259c8e7a6926c63112 Mon Sep 17 00:00:00 2001 -From: "Matthew S. Turnbull" <sparky@bluefang-logic.com> -Date: Sat, 24 Feb 2018 17:44:58 -0500 -Subject: grub-mkconfig/10_linux: Support multiple early initrd images - -Add support for multiple, shared, early initrd images. These early -images will be loaded in the order declared, and all will be loaded -before the initrd image. - -While many classes of data can be provided by early images, the -immediate use case would be for distributions to provide CPU -microcode to mitigate the Meltdown and Spectre vulnerabilities. - -There are two environment variables provided for declaring the early -images. - -* GRUB_EARLY_INITRD_LINUX_STOCK is for the distribution declare - images that are provided by the distribution or installed packages. - If undeclared, this will default to a set of common microcode image - names. - -* GRUB_EARLY_INITRD_LINUX_CUSTOM is for user created images. User - images will be loaded after the stock images. - -These separate configurations allow the distribution and user to -declare different image sets without clobbering each other. - -This also makes a minor update to ensure that UUID partition labels -stay disabled when no initrd image is found, even if early images are -present. - -This is a continuation of a previous patch published by Christian -Hesse in 2016: -http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00025.html - -Down stream Gentoo bug: -https://bugs.gentoo.org/645088 - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - docs/grub.texi | 19 +++++++++++++++++++ - util/grub-mkconfig.in | 8 ++++++++ - util/grub.d/10_linux.in | 33 +++++++++++++++++++++++++++------ - 3 files changed, 54 insertions(+), 6 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 137b894..65b4bbe 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -1398,6 +1398,25 @@ for all respectively normal entries. - The values of these options replace the values of @samp{GRUB_CMDLINE_LINUX} - and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries. - -+@item GRUB_EARLY_INITRD_LINUX_CUSTOM -+@itemx GRUB_EARLY_INITRD_LINUX_STOCK -+List of space-separated early initrd images to be loaded from @samp{/boot}. -+This is for loading things like CPU microcode, firmware, ACPI tables, crypto -+keys, and so on. These early images will be loaded in the order declared, -+and all will be loaded before the actual functional initrd image. -+ -+@samp{GRUB_EARLY_INITRD_LINUX_STOCK} is for your distribution to declare -+images that are provided by the distribution. It should not be modified -+without understanding the consequences. They will be loaded first. -+ -+@samp{GRUB_EARLY_INITRD_LINUX_CUSTOM} is for your custom created images. -+ -+The default stock images are as follows, though they may be overridden by -+your distribution: -+@example -+intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio -+@end example -+ - @item GRUB_DISABLE_LINUX_UUID - Normally, @command{grub-mkconfig} will generate menu entries that use - universally-unique identifiers (UUIDs) to identify the root filesystem to -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8496d2..35ef583 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -147,6 +147,12 @@ if [ x"$GRUB_FS" = xunknown ]; then - GRUB_FS="$(stat -f --printf=%T / || echo unknown)" - fi - -+# Provide a default set of stock linux early initrd images. -+# Define here so the list can be modified in the sourced config file. -+if [ "x${GRUB_EARLY_INITRD_LINUX_STOCK}" = "x" ]; then -+ GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio" -+fi -+ - if test -f ${sysconfdir}/default/grub ; then - . ${sysconfdir}/default/grub - fi -@@ -211,6 +217,8 @@ export GRUB_DEFAULT \ - GRUB_CMDLINE_NETBSD \ - GRUB_CMDLINE_NETBSD_DEFAULT \ - GRUB_CMDLINE_GNUMACH \ -+ GRUB_EARLY_INITRD_LINUX_CUSTOM \ -+ GRUB_EARLY_INITRD_LINUX_STOCK \ - GRUB_TERMINAL_INPUT \ - GRUB_TERMINAL_OUTPUT \ - GRUB_SERIAL_COMMAND \ -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index de9044c..faedf74 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -136,9 +136,13 @@ EOF - if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" -+ initrd_path= -+ for i in ${initrd}; do -+ initrd_path="${initrd_path} ${rel_dirname}/${i}" -+ done - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' -- initrd ${rel_dirname}/${initrd} -+ initrd $(echo $initrd_path) - EOF - fi - sed "s/^/$submenu_indentation/" << EOF -@@ -188,7 +192,15 @@ while [ "x$list" != "x" ] ; do - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -- initrd= -+ initrd_early= -+ for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ -+ ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do -+ if test -e "${dirname}/${i}" ; then -+ initrd_early="${initrd_early} ${i}" -+ fi -+ done -+ -+ initrd_real= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ -@@ -198,11 +210,22 @@ while [ "x$list" != "x" ] ; do - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do - if test -e "${dirname}/${i}" ; then -- initrd="$i" -+ initrd_real="${i}" - break - fi - done - -+ initrd= -+ if test -n "${initrd_early}" || test -n "${initrd_real}"; then -+ initrd="${initrd_early} ${initrd_real}" -+ -+ initrd_display= -+ for i in ${initrd}; do -+ initrd_display="${initrd_display} ${dirname}/${i}" -+ done -+ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 -+ fi -+ - config= - for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do - if test -e "${i}" ; then -@@ -216,9 +239,7 @@ while [ "x$list" != "x" ] ; do - initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` - fi - -- if test -n "${initrd}" ; then -- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 -- elif test -z "${initramfs}" ; then -+ if test -z "${initramfs}" && test -z "${initrd_real}" ; then - # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's - # no initrd or builtin initramfs, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} --- -cgit v1.0-41-gc330 - diff --git a/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch b/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch deleted file mode 100644 index 6c6a750b42f0..000000000000 --- a/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001 -From: Daniel Kiper <daniel.kiper@oracle.com> -Date: Tue, 29 May 2018 16:16:02 +0200 -Subject: xfs: Accept filesystem with sparse inodes - -The sparse inode metadata format became a mkfs.xfs default in -xfsprogs-4.16.0, and such filesystems are now rejected by grub as -containing an incompatible feature. - -In essence, this feature allows xfs to allocate inodes into fragmented -freespace. (Without this feature, if xfs could not allocate contiguous -space for 64 new inodes, inode creation would fail.) - -In practice, the disk format change is restricted to the inode btree, -which as far as I can tell is not used by grub. If all you're doing -today is parsing a directory, reading an inode number, and converting -that inode number to a disk location, then ignoring this feature -should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED - -I did some brief testing of this patch by hacking up the regression -tests to completely fragment freespace on the test xfs filesystem, and -then write a large-ish number of inodes to consume any existing -contiguous 64-inode chunk. This way any files the grub tests add and -traverse would be in such a fragmented inode allocation. Tests passed, -but I'm not sure how to cleanly integrate that into the test harness. - -Signed-off-by: Eric Sandeen <sandeen@redhat.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> -Tested-by: Chris Murphy <lists@colorremedies.com> ---- - grub-core/fs/xfs.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index c6031bd..3b00c74 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ - #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ - --/* We do not currently verify metadata UUID so it is safe to read such filesystem */ -+/* -+ * Directory entries with ftype are explicitly handled by GRUB code. -+ * -+ * We do not currently read the inode btrees, so it is safe to read filesystems -+ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. -+ * -+ * We do not currently verify metadata UUID, so it is safe to read filesystems -+ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. -+ */ - #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ - (XFS_SB_FEAT_INCOMPAT_FTYPE | \ -+ XFS_SB_FEAT_INCOMPAT_SPINODES | \ - XFS_SB_FEAT_INCOMPAT_META_UUID) - - struct grub_xfs_sblock --- -cgit v1.0-41-gc330 - diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild deleted file mode 100644 index e52a12f5f205..000000000000 --- a/sys-boot/grub/grub-2.02-r4.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -GRUB_AUTOGEN=1 -GRUB_AUTORECONF=1 - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_{6,7}} ) - inherit python-any-r1 -fi - -if [[ -n ${GRUB_AUTORECONF} ]]; then - WANT_LIBTOOL=none - inherit autotools -fi - -inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86" -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch - "${FILESDIR}"/2.02-multiple-early-initrd.patch - "${FILESDIR}"/2.02-freetype-capitalise-variables.patch - "${FILESDIR}"/2.02-freetype-pkg-config.patch - "${FILESDIR}"/2.02-xfs-sparse-inodes.patch - "${FILESDIR}"/2.02-X86_64_PLT32.patch - "${FILESDIR}"/2.02-gcc8.patch - "${FILESDIR}"/2.02-efi-tsc-pmtimer.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-9.0.06 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" -SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs" - -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE=" - grub_platforms_coreboot? ( fonts ) - grub_platforms_qemu? ( fonts ) - grub_platforms_ieee1275? ( fonts ) - grub_platforms_loongson? ( fonts ) -" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -COMMON_DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - sdl? ( media-libs/libsdl ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse:0 ) - truetype? ( media-libs/freetype:2= ) - ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - fonts? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) - ) - test? ( - app-admin/genromfs - app-arch/cpio - app-arch/lzop - app-emulation/qemu - dev-libs/libisoburn - sys-apps/miscfiles - sys-block/parted - sys-fs/squashfs-tools - ) - themes? ( - app-arch/unzip - media-libs/freetype:2 - virtual/pkgconfig - ) - truetype? ( virtual/pkgconfig ) -" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static ) - nls? ( sys-devel/gettext ) -" - -RESTRICT="strip !test? ( test )" - -QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*" -QA_WX_LOAD="usr/lib/grub/*" -QA_MULTILIB_PATHS="usr/lib/grub/.*" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - - sed -i -e /autoreconf/d autogen.sh || die - - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - - # Nothing in Gentoo packages 'american-english' in the exact path - # wanted for the test, but all that is needed is a compressible text - # file, and we do have 'words' from miscfiles in the same path. - sed -i \ - -e '/CFILESSRC.*=/s,american-english,words,' \ - tests/util/grub-fs-tester.in \ - || die - - if [[ -n ${GRUB_AUTOGEN} ]]; then - python_setup - bash autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - autopoint() { :; } - eautoreconf - fi -} - -grub_do() { - multibuild_foreach_variant run_in_build_dir "$@" -} - -grub_do_once() { - multibuild_for_best_variant run_in_build_dir "$@" -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi*) platform=efi ;; - xen*) platform=xen ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - case ${MULTIBUILD_VARIANT} in - *-32) - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=i386 - fi ;; - *-64) - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=x86_64 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - fi ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable themes grub-themes) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - # Set up font symlinks - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use themes; then - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi - - local ECONF_SOURCE="${S}" - econf "${myeconfargs[@]}" -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - use static && HOST_LDFLAGS+=" -static" - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY RANLIB STRIP - tc-export BUILD_CC # Bug 485592 - - MULTIBUILD_VARIANTS=() - local p - for p in "${GRUB_ALL_PLATFORMS[@]}"; do - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) - done - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) - grub_do grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - grub_do emake - use doc && grub_do_once emake -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - grub_do emake check -} - -src_install() { - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" - - einstalldocs - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub -} - -pkg_postinst() { - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may consider installing the following optional packages:" - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn - optfeature "Enable RAID device detection" sys-fs/mdadm - fi -} diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild deleted file mode 100644 index b0e9cfe178b0..000000000000 --- a/sys-boot/grub/grub-2.05_alpha20200110.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - GRUB_AUTORECONF=1 - GRUB_BOOTSTRAP=1 -fi - -if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - PYTHON_COMPAT=( python{2_7,3_{6,7}} ) - inherit python-any-r1 -fi - -if [[ -n ${GRUB_AUTORECONF} ]]; then - WANT_LIBTOOL=none - inherit autotools -fi - -inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -else - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-12.1.02 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" -SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" - -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE=" - grub_platforms_coreboot? ( fonts ) - grub_platforms_qemu? ( fonts ) - grub_platforms_ieee1275? ( fonts ) - grub_platforms_loongson? ( fonts ) -" - -BDEPEND=" - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - fonts? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - test? ( - app-admin/genromfs - app-arch/cpio - app-arch/lzop - app-emulation/qemu - dev-libs/libisoburn - sys-apps/miscfiles - sys-block/parted - sys-fs/squashfs-tools - ) - themes? ( - app-arch/unzip - media-libs/freetype:2 - virtual/pkgconfig - ) - truetype? ( virtual/pkgconfig ) -" -DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - sdl? ( media-libs/libsdl ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse:0 ) - truetype? ( media-libs/freetype:2= ) - ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) -" -RDEPEND="${DEPEND} - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !sys-boot/grub:0 !sys-boot/grub-static - nls? ( sys-devel/gettext ) -" - -RESTRICT="!test? ( test )" - -QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*" -QA_PRESTRIPPED="usr/lib/grub/.*" -QA_MULTILIB_PATHS="usr/lib/grub/.*" -QA_WX_LOAD="usr/lib/grub/*" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - pushd "${P}" >/dev/null || die - local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" - local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") - git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" - git-r3_checkout "${GNULIB_URI}" gnulib - popd >/dev/null || die - fi - default -} - -src_prepare() { - default - - sed -i -e /autoreconf/d autogen.sh || die - - # Nothing in Gentoo packages 'american-english' in the exact path - # wanted for the test, but all that is needed is a compressible text - # file, and we do have 'words' from miscfiles in the same path. - sed -i \ - -e '/CFILESSRC.*=/s,american-english,words,' \ - tests/util/grub-fs-tester.in \ - || die - - if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - python_setup - fi - - if [[ -n ${GRUB_BOOTSTRAP} ]]; then - eautopoint --force - AUTOPOINT=: AUTORECONF=: ./bootstrap || die - elif [[ -n ${GRUB_AUTOGEN} ]]; then - ./autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - eautoreconf - fi -} - -grub_do() { - multibuild_foreach_variant run_in_build_dir "$@" -} - -grub_do_once() { - multibuild_for_best_variant run_in_build_dir "$@" -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi*) platform=efi ;; - xen-pvh) platform=xen_pvh ;; - xen*) platform=xen ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - case ${MULTIBUILD_VARIANT} in - *-32) - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=i386 - fi ;; - *-64) - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=x86_64 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - fi ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable themes grub-themes) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use fonts; then - ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - fi - - if use themes; then - ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi - - local ECONF_SOURCE="${S}" - econf "${myeconfargs[@]}" -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY RANLIB STRIP - tc-export BUILD_CC # Bug 485592 - - MULTIBUILD_VARIANTS=() - local p - for p in "${GRUB_ALL_PLATFORMS[@]}"; do - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) - done - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) - grub_do grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - grub_do emake - use doc && grub_do_once emake -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - grub_do emake check -} - -src_install() { - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" - - einstalldocs - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub - - # https://bugs.gentoo.org/231935 - dostrip -x /usr/lib/grub -} - -pkg_postinst() { - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may consider installing the following optional packages:" - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn - optfeature "Enable RAID device detection" sys-fs/mdadm - fi -} diff --git a/sys-boot/grub/grub-2.05_alpha20200228.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild index d11a7ec3e895..d11a7ec3e895 100644 --- a/sys-boot/grub/grub-2.05_alpha20200228.ebuild +++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml index 68e6175af8d5..3e1c75953e44 100644 --- a/sys-boot/grub/metadata.xml +++ b/sys-boot/grub/metadata.xml @@ -23,10 +23,6 @@ <flag name="libzfs"> Enable support for <pkg>sys-fs/zfs</pkg> </flag> - <flag name="multislot"> - Allow concurrent installation of <pkg>sys-boot/grub</pkg> SLOT 0 and - <pkg>sys-boot/grub</pkg> SLOT 2 by renaming all programs. - </flag> <flag name="themes">Build and install GRUB themes (starfield)</flag> <flag name="truetype">Build and install grub-mkfont conversion utility</flag> </use> diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild index b3acf1b3c13d..334a9eaebf68 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 -sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 -sparc x86" IUSE="ncurses nls" RDEPEND=" diff --git a/sys-libs/pam/pam-1.3.1-r1.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild index f79b0b171ba5..0d8769b37abd 100644 --- a/sys-libs/pam/pam-1.3.1-r1.ebuild +++ b/sys-libs/pam/pam-1.3.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="|| ( BSD GPL-2 )" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs" +IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs" BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 @@ -20,17 +20,17 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 dev-libs/libxslt sys-devel/flex - virtual/pkgconfig[${MULTILIB_USEDEP}] - nls? ( sys-devel/gettext )" + sys-devel/gettext + virtual/pkgconfig[${MULTILIB_USEDEP}]" DEPEND=" virtual/libcrypt:=[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" + nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" @@ -65,7 +65,6 @@ multilib_src_configure() { $(use_enable cracklib) $(use_enable debug) $(use_enable nis) - $(use_enable nls) $(use_enable pie) $(use_enable selinux) $(use_enable static-libs static) diff --git a/sys-libs/pam/pam-1.3.1_p20200128.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild index fca700457b03..60b2db8d2493 100644 --- a/sys-libs/pam/pam-1.3.1_p20200128.ebuild +++ b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/$ LICENSE="|| ( BSD GPL-2 )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs" +IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs" BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 @@ -22,17 +22,17 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 dev-libs/libxslt sys-devel/flex - virtual/pkgconfig[${MULTILIB_USEDEP}] - nls? ( sys-devel/gettext )" + sys-devel/gettext + virtual/pkgconfig[${MULTILIB_USEDEP}]" DEPEND=" virtual/libcrypt:=[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" + nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" @@ -70,7 +70,6 @@ multilib_src_configure() { $(use_enable cracklib) $(use_enable debug) $(use_enable nis) - $(use_enable nls) $(use_enable pie) $(use_enable selinux) $(use_enable static-libs static) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a4707f6e53f6..b0fbf7e44700 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,3 @@ DIST chromium-80.0.3987.132.tar.xz 796975056 BLAKE2B 0da35d3218f4f44c15f05693336a034876764ef228f173cd00cedc045ebc06972416779a39458863b47a1863ab8f21b5d2dc11c6ed33ee81649cd0316bf31524 SHA512 10bf0d1efdf2ead9e94de90971ec135f5370f8c949acfd75ca953aed706510cc3a1464f1ff3c40275921bb24953d8ce65d095e38cb0d56488ccc2c7fa27516d4 DIST chromium-81.0.4044.62.tar.xz 785977660 BLAKE2B a9346e9e5761a1210cae245d955dce9ec807a21e3343de11e52581d161eaf8170876c4eb7f145453bf3736b54006b9142b09be834cb1fd7702a078f3ec0a2617 SHA512 f6728e2b8f81ccab0ffecc511a2364badba9f1d2149dc209de0c5f824108085afef4459f9e0bfbe571acd363405a8d77e80ea59150c4f9783717aa2f68f060e2 -DIST chromium-82.0.4077.0.tar.xz 793873940 BLAKE2B 9629ca475e135e68bf99bfae5566b49c1516b2abc78f1bdfc9cb2135802c994b4bfc3860d12797abc1c89fa478ab7aa9fdb60af2f5d080cb00093a5fb42d064d SHA512 b0b039f663257617e62e5620fd19272871f3bbe33b19a6adb23882fa7bccf358d3c09495caf96e37e2670321000ecf685588df8566451364931c6a3418eca91b +DIST chromium-82.0.4083.0.tar.xz 794521032 BLAKE2B 5437aaed6c81bab1bd6495db0665fe6c3fbd1058535272d19a6d6c9d34db0102ff3464e1f210461c0944dd84257bc036004aed412f91590a6ff951c1e3fb7925 SHA512 412757cd004ceb7946bd4b8f30afd9589f6b33595a9f231c4a43a7a6328547fec8bdf42d751ec4babc244c16d7b9bbd2448adeb155e4ac354d714180a69c0709 diff --git a/www-client/chromium/chromium-82.0.4077.0.ebuild b/www-client/chromium/chromium-82.0.4083.0.ebuild index 019d9968c0e0..e93d8f46ddbd 100644 --- a/www-client/chromium/chromium-82.0.4077.0.ebuild +++ b/www-client/chromium/chromium-82.0.4083.0.ebuild @@ -94,7 +94,7 @@ BDEPEND=" dev-lang/yasm ) dev-lang/perl - dev-util/gn + >=dev-util/gn-0.1726 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 @@ -148,6 +148,7 @@ PATCHES=( "${FILESDIR}/chromium-82-gcc-noexcept.patch" "${FILESDIR}/chromium-82-gcc-incomplete-type.patch" "${FILESDIR}/chromium-82-gcc-template.patch" + "${FILESDIR}/chromium-82-gcc-iterator.patch" "${FILESDIR}/chromium-82-clang-std.patch" ) diff --git a/www-client/chromium/files/chromium-82-gcc-iterator.patch b/www-client/chromium/files/chromium-82-gcc-iterator.patch new file mode 100644 index 000000000000..6405d52b3b28 --- /dev/null +++ b/www-client/chromium/files/chromium-82-gcc-iterator.patch @@ -0,0 +1,23 @@ +diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h +index b3c7624..85936aa 100644 +--- a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h ++++ b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h +@@ -5,6 +5,8 @@ + #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_NG_PHYSICAL_CONTAINER_FRAGMENT_H_ + #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_NG_PHYSICAL_CONTAINER_FRAGMENT_H_ + ++#include <iterator> ++ + #include "base/containers/span.h" + #include "third_party/blink/renderer/core/core_export.h" + #include "third_party/blink/renderer/core/layout/geometry/physical_rect.h" +@@ -31,7 +33,8 @@ class CORE_EXPORT NGPhysicalContainerFragment : public NGPhysicalFragment { + PostLayoutChildLinkList(wtf_size_t count, const NGLink* buffer) + : count_(count), buffer_(buffer) {} + +- class ConstIterator { ++ class ConstIterator : public std::iterator<std::input_iterator_tag, ++ NGLink> { + STACK_ALLOCATED(); + + public: diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch index 3d8117e4c065..840059b4f57d 100644 --- a/www-client/chromium/files/chromium-compiler-r12.patch +++ b/www-client/chromium/files/chromium-compiler-r12.patch @@ -1,6 +1,6 @@ -From 2e9a5f0e54d8968c4fab8f1cd00c225e387f0187 Mon Sep 17 00:00:00 2001 +From c2a95e376474298b01cb04f1d5b2c6e3c76ba268 Mon Sep 17 00:00:00 2001 From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 6 Mar 2020 17:10:30 +0000 +Date: Fri, 13 Mar 2020 20:20:06 +0000 Subject: [PATCH] Disable various compiler configs --- @@ -8,7 +8,7 @@ Subject: [PATCH] Disable various compiler configs 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index d4597c7..4c651ac 100644 +index 8f7fcc3..d27e71e 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -261,8 +261,6 @@ config("compiler") { @@ -47,7 +47,7 @@ index d4597c7..4c651ac 100644 # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -1442,6 +1420,12 @@ config("default_warnings") { +@@ -1437,6 +1415,12 @@ config("default_warnings") { cflags_cc += [ "-Wno-class-memaccess" ] } @@ -60,7 +60,7 @@ index d4597c7..4c651ac 100644 # -Wunused-local-typedefs is broken in gcc, # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872 cflags += [ "-Wno-unused-local-typedefs" ] -@@ -1563,7 +1547,7 @@ config("chromium_code") { +@@ -1558,7 +1542,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -69,7 +69,7 @@ index d4597c7..4c651ac 100644 if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1572,10 +1556,6 @@ config("chromium_code") { +@@ -1567,10 +1551,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -80,7 +80,7 @@ index d4597c7..4c651ac 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -1584,15 +1564,6 @@ config("chromium_code") { +@@ -1579,15 +1559,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -96,7 +96,7 @@ index d4597c7..4c651ac 100644 if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1984,7 +1955,8 @@ config("default_stack_frames") { +@@ -1979,7 +1950,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -106,7 +106,7 @@ index d4597c7..4c651ac 100644 if (is_win) { # Favor size over speed, /O1 must be before the common flags. # /O1 implies /Os and /GF. -@@ -2005,7 +1977,8 @@ config("optimize") { +@@ -2000,7 +1972,8 @@ config("optimize") { } # Turn off optimizations. @@ -116,7 +116,7 @@ index d4597c7..4c651ac 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2039,7 +2012,8 @@ config("no_optimize") { +@@ -2034,7 +2007,8 @@ config("no_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -126,7 +126,7 @@ index d4597c7..4c651ac 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2071,7 +2045,8 @@ config("optimize_max") { +@@ -2066,7 +2040,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -136,7 +136,7 @@ index d4597c7..4c651ac 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2096,7 +2071,8 @@ config("optimize_speed") { +@@ -2091,7 +2066,8 @@ config("optimize_speed") { } } @@ -146,7 +146,7 @@ index d4597c7..4c651ac 100644 cflags = [ "-O1" ] + common_optimize_on_cflags ldflags = common_optimize_on_ldflags visibility = [ ":default_optimization" ] -@@ -2212,7 +2188,8 @@ config("win_pdbaltpath") { +@@ -2207,7 +2183,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -156,7 +156,7 @@ index d4597c7..4c651ac 100644 if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2318,7 +2295,8 @@ config("symbols") { +@@ -2313,7 +2290,8 @@ config("symbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -166,16 +166,16 @@ index d4597c7..4c651ac 100644 if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2373,7 +2351,8 @@ config("minimal_symbols") { - } - - # No symbols. +@@ -2370,7 +2348,8 @@ config("minimal_symbols") { + # This configuration contains function names only. That is, the compiler is + # told to not generate debug information and the linker then just puts function + # names in the final debug information. -config("no_symbols") { +config("no_symbols") { } +config("xno_symbols") { - if (!is_win) { - cflags = [ "-g0" ] - asmflags = cflags + if (is_win) { + ldflags = [ "/DEBUG" ] + -- 2.24.1 diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index a94de66dfd7e..7e34a500474c 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1 +1 @@ -DIST google-chrome-unstable_82.0.4068.4-1_amd64.deb 68621040 BLAKE2B b2b3a7716dcbb1b46d4d4f90e3e69b1c9a4768afa9aa01bc37389c13dc8c7857e451039bafec410831fbc3dd9f8306a4395d175914ff2057afd316983bbb6c18 SHA512 893c67d2b1ca58d834a8874d57f9d8e6484ac37e115c44be2b1f4a581daadbf2075448b52ec95ed87e6e5f890e33de718951137bafe326e6332a3029c0dc24d7 +DIST google-chrome-unstable_82.0.4083.0-1_amd64.deb 68418162 BLAKE2B 8114a48e60f4e754879d512762a523ad25a3d00a6ebcbed9b2ca0bcf7430705e41a5d656a76f29047b8dc54e3a3c19028977182442622c7a6e67ccacbb3de6b2 SHA512 062ac16634e18a6a4ee262b4f9e5397c0593993a1e41f22c25d231435b1a2591e3048738da6063ed2dbf18187e31e685dd2e80248cae32c4599bb1f6f4c03bd5 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4068.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4083.0.ebuild index b5a38b97587d..b5a38b97587d 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4068.4.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4083.0.ebuild diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index b69b13540013..51095225c22c 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_81.0.4044.62-1_amd64.deb 66919578 BLAKE2B 4b228172a74b78e75bac4596c3c5a4aa795ec338eb3d83358fdb97d266eb43cd011cd9a8dfeabbb8ab4327acdb158dadddac008f01f054822fc05a47175fb101 SHA512 f3d1c76e949bd7507db827643b1a83dbfb23d28872162885bd5b1165a6e79da2be57106d4f50fd1ef0f722e10560860f15890672ad1135588158a9ec6c30f1f7 DIST google-chrome-stable_80.0.3987.132-1_amd64.deb 63597456 BLAKE2B 62285e7b7dbeb137135ec5ccd2245c542a3305e8867910666d2c11463936a764f2f91ca9076d735044046555e383e3f829e011a2c2fa454cddbc8f05ad5fb50e SHA512 d88a5cff2727113913f3342c6420d1560b38e09002a5f981da3b4f8cb8620abd270409bbd11cba9f7d3d49b1cf472c74b27385417b43144070497f29f20a18f4 -DIST google-chrome-unstable_82.0.4068.4-1_amd64.deb 68621040 BLAKE2B b2b3a7716dcbb1b46d4d4f90e3e69b1c9a4768afa9aa01bc37389c13dc8c7857e451039bafec410831fbc3dd9f8306a4395d175914ff2057afd316983bbb6c18 SHA512 893c67d2b1ca58d834a8874d57f9d8e6484ac37e115c44be2b1f4a581daadbf2075448b52ec95ed87e6e5f890e33de718951137bafe326e6332a3029c0dc24d7 +DIST google-chrome-unstable_82.0.4083.0-1_amd64.deb 68418162 BLAKE2B 8114a48e60f4e754879d512762a523ad25a3d00a6ebcbed9b2ca0bcf7430705e41a5d656a76f29047b8dc54e3a3c19028977182442622c7a6e67ccacbb3de6b2 SHA512 062ac16634e18a6a4ee262b4f9e5397c0593993a1e41f22c25d231435b1a2591e3048738da6063ed2dbf18187e31e685dd2e80248cae32c4599bb1f6f4c03bd5 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4068.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4083.0_alpha.ebuild index 50f2de431d29..50f2de431d29 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4068.4_alpha.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4083.0_alpha.ebuild diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.1.ebuild index 56fa5be1d613..b2eb610b37be 100644 --- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.1.ebuild +++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.1.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="utempter" RDEPEND=">=dev-libs/glib-2.38:2= diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.0.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.0.ebuild index 5324f9f1a342..b7a8dbddae5d 100644 --- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.0.ebuild +++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.0.ebuild @@ -8,7 +8,7 @@ DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings" HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform" SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" LICENSE="LGPL-2.1" SLOT="0" IUSE="" diff --git a/xfce-base/exo/exo-0.12.11.ebuild b/xfce-base/exo/exo-0.12.11.ebuild index d05e9ffceb91..83eae0e79f2c 100644 --- a/xfce-base/exo/exo-0.12.11.ebuild +++ b/xfce-base/exo/exo-0.12.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="gtk2" RDEPEND=">=dev-lang/perl-5.6 diff --git a/xfce-base/thunar/thunar-1.8.12.ebuild b/xfce-base/thunar/thunar-1.8.12.ebuild index f0a0028c1bde..d56945bf657d 100644 --- a/xfce-base/thunar/thunar-1.8.12.ebuild +++ b/xfce-base/thunar/thunar-1.8.12.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2+" SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks" GVFS_DEPEND=">=gnome-base/gvfs-1.18.3" diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild index ea3aebb75720..ffed406fa275 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="+gtk2 introspection vala" REQUIRED_USE="vala? ( introspection )" RESTRICT="!gtk2? ( test )" diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild index 0d8852ea9cf2..a1048d916b8e 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="elogind nls policykit systemd +xscreensaver" COMMON_DEPEND="x11-apps/iceauth diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild index f5dfbf30972e..be11f7579648 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier" RDEPEND=" diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild index 39d9d2939762..64d22d2e74d8 100644 --- a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild +++ b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="debug libnotify +thunar" RDEPEND=">=x11-libs/cairo-1.12 diff --git a/xfce-extra/tumbler/tumbler-0.2.8.ebuild b/xfce-extra/tumbler/tumbler-0.2.8.ebuild index 59462e5cb1fc..9421282d86ae 100644 --- a/xfce-extra/tumbler/tumbler-0.2.8.ebuild +++ b/xfce-extra/tumbler/tumbler-0.2.8.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="curl ffmpeg gstreamer jpeg odf pdf raw" COMMON_DEPEND=">=dev-libs/glib-2.42:2 diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild index ae9aaa62bee1..203d930b0b47 100644 --- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild +++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="" RDEPEND=" |