Merge updates from master

10 files changed, 70 insertions, 8 deletions

diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
index 47c3c7362ce4..26ab92bbdc3a 100644
--- a/dev-libs/libinput/libinput-1.18.0.ebuild
+++ b/dev-libs/libinput/libinput-1.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild
index 61d7a20c4368..f1cb154fe319 100644
--- a/media-libs/glu/glu-9.0.2.ebuild
+++ b/media-libs/glu/glu-9.0.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild
index df605cbfa7ee..5471c80ed2b6 100644
--- a/media-libs/mesa/mesa-21.1.4.ebuild
+++ b/media-libs/mesa/mesa-21.1.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index f8c83e5e75a5..b858314a1549 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -14,3 +14,4 @@ DIST storcli-7.1410.zip 34424559 BLAKE2B cb0b613d0ccbf6ac36d1aace9174286ffe89d06
 DIST storcli-7.1508.zip 35678755 BLAKE2B 9fb8da35be491afaea3a288b5c4c1ed0806fa9d6831e9a6dbf14d4c00469b1ce6e9d8fe9a98ce64505580420b5c145f002338d3029794af4c54779d9f324ec56 SHA512 43565cc695e9e7a7725474ab8091ea00de8fde7fabffe708c45e4c0e8713b1fcb1a5a25963bba44974b7787bebc06a59f3b8180416fefb0a54b4fd403c6152be
 DIST storcli-7.1613.zip 35016341 BLAKE2B 046651c696e5a20bcd0488c3cb495c7260e7665e3cb93052fce7fc79de019cb310ac7b1615f4ee4cc59a3bddcb81e548b82098a5ba051b1ba94f721115e95ff9 SHA512 5c90bce5502ec725a41c670438acd2e1eb07d21edba6e940f00f568f63a2e9e9095817eb50a4995d1ff8482a60ab77a633f01df0dc0a1abe7b767ce24b38b79b
 DIST storcli-7.1715.zip 40965278 BLAKE2B 044cf3e7b7bc9853ce7ff06050c59ceb877e88ffece2f6494561fcd416e00b41d033ff1ffe0e18b63e55edf2443296bdd3f817c09c48a0e0d69365d41cdd43fd SHA512 79dbd5f2ded4897a3d867bbab76d415b8532a647fc12f369f667e11e772b398954a2d762a011c37ab7a18b4759c3c1f8408d129ceb9b1ae62bce4671380eb988
+DIST storcli-7.1804.zip 41197159 BLAKE2B ade40bce515a3b1715243877f7b255c368296c153232ec268b95d9a61d79b538403da160c0ecfe20e6d5ab80f1d631fd459fba7391cfeb3041c42ed641474b2f SHA512 fd47759c757f61193fd449cb5ea6d33ccfb9ec239176fa4f4d5997afc62e168f0cd24fe9910d8c8fd3a65d2386fbbaa78ac13d53fca2e82c294eea2f45219a3b
diff --git a/sys-block/storcli/storcli-7.1804.ebuild b/sys-block/storcli/storcli-7.1804.ebuild
new file mode 100644
index 000000000000..f3cd616aa398
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1804.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils toolchain-funcs
+
+# Upstream is still using strange version numbers
+MY_PV="00${PV}.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI-PUL.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/${PV:0:4}"
+KEYWORDS="-* amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+	popd &>/dev/null || die
+
+	rm -rf srcfiles || die
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.xz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+	newexe storcli64 storcli
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
index 9c308ccfea51..4245e106ef12 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
index 280f61547b7b..2733f781a3a1 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.11.0:0="
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index 848b6ade703a..17c989025960 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index d27d24510b94..f5b628733f7e 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
index 5b0de90716c7..f6965e30115f 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="