gentoo resync : 29.01.2021

10 files changed, 7 insertions, 202 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 7392b44e6225..31bf81d78dcc 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/hyperfine/Manifest b/app-benchmarks/hyperfine/Manifest
index c7adca83674b..b8e02ab9828a 100644
--- a/app-benchmarks/hyperfine/Manifest
+++ b/app-benchmarks/hyperfine/Manifest
@@ -73,5 +73,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD hyperfine-1.11.0.ebuild 1825 BLAKE2B 0f1749881330a80cd2e497bf050508d98d4cceb7be99a3e084a7d0087ed386ebd1a9ec2acbc54e68800fdaba7907553772ea7305b613afd16a8ffafec995cb12 SHA512 3196c87ae389fa8e83ef2e4f1e6fa3e6c70b2717bf11734049b722c11098ef89b0f761021bcff56444603303f78bbb43664c114c18a136cee7f485ae6ce6587d
+EBUILD hyperfine-1.11.0.ebuild 1836 BLAKE2B a3b135c1f46427d52b7c82cbb034b7e0739893d4f97b1a2214ee503bdc10217b978108427bc483ba683293f5cacbb0f96d3a9865fdb1d584a7cbcdcf8824c4da SHA512 e539329dbe56cfe14c02a57910de3aea785a48336ab32d9698824b5f4f9fca2963d0a887e88b7c5028272827c26956df304ab360c1368d0af54018d88da715b6
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild b/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
index b0346471163a..dabb4ca5b89b 100644
--- a/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
+++ b/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 76146610e22a..c657e6bb699e 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,4 +1,3 @@
 DIST sysbench-1.0.20.tar.gz 1509630 BLAKE2B 9b63c1c2703fc2311e03561c8dde2c39b249b6aadffebddfd99cdcfb5319606a484132e9dcb23a4365aecfc1148c5c5c56c918ac8c363ffcb1beece26aaf15c7 SHA512 510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f
-EBUILD sysbench-1.0.20-r100.ebuild 1689 BLAKE2B c07cca0efda25f21dc923a46cd883a7b147c6985d13605e57105eb3942e65985ad8108ef7b941aa8f543932e6d77a1b17b66ac2bcea66570801a52d3034d8a15 SHA512 acacc268c44cdfa0ce475565c393c1e0cb2928a80c7fc588a4ee0cee3785028d99c2f200cc2368fce718e3019956ed66d213423a07806d05cf86311bbb56af7a
-EBUILD sysbench-1.0.20.ebuild 1489 BLAKE2B da20acc0bf92ecedf772d55f0df10ab1c6a7505de16153b03fb6192972568e9bf36c2043220593177ad9ad049f01de455f7426c7e857d95478b71c671ac904de SHA512 9bfd01b07b58372fb70658b64274e547b4300a6f9d50283eacca1846b87d8527556a27f5ace61d9d8616ee0a9e5b995f12d0ee8cae10b08323901ff007566375
+EBUILD sysbench-1.0.20-r100.ebuild 1687 BLAKE2B d40c0286add6625f9ca33d5f7affcda915fed95c42bcd4f841a45501aa7c55217bc0a7324dc584c1d4b16330eb98cc00af4866d626228ab9406dcf1d8aa9fc06 SHA512 09d0b8bb105773b4048d3224654e72d8ee6f4344025f4422096c0d63853ae2cd2e4592282e00704b4b8d9b4a3b67f500f306dca953b679ff5886789e9487f978
 MISC metadata.xml 570 BLAKE2B 50304406adc2c29e47866fb18477df8634172731822204d034ecca98f81620d1f567507cec69f53765f44b51abb5773c5e882110ef5b01c31f89410deb6118c0 SHA512 d029a58fd65325cfd6b34ba69c9364a9e31d91f042e417cb1dedce459e78762a1873b550dff8f7d94265cbc78701c4865513f05606cd595ff3e405601cf03306
diff --git a/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
index 99ba14356815..7f37239b120d 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+aio attachsql drizzle +largefile mysql postgres test"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
deleted file mode 100644
index d985c12d2a3d..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="A scriptable multi-threaded benchmark tool based on LuaJIT"
-HOMEPAGE="https://github.com/akopytov/sysbench"
-SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+aio attachsql drizzle +largefile mysql postgres test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/luajit:2
-	aio? ( dev-libs/libaio )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	test? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	test? (
-		$(python_gen_cond_dep '
-			dev-util/cram[${PYTHON_USEDEP}]
-		')
-	)
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	rm -r third_party/{concurrency_kit/ck,cram,luajit/luajit} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Current versions of 'dev-db/oracle-instantclient' aren't supported.
-	# See: https://github.com/akopytov/sysbench/issues/390.
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable aio)
-		$(use_enable largefile)
-		$(use_with attachsql)
-		$(use_with drizzle)
-		$(use_with mysql)
-		$(use_with postgres pgsql)
-		--with-system-ck
-		--with-system-luajit
-		--without-oracle
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 4ea84d1052e8..7aa6219700ac 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,6 +1,4 @@
 AUX wrk-4.1.0-r100-makefile.patch 1509 BLAKE2B d03fcc70c201777cc0f75e81e827ef941ac9a2128b05118ceae5256c481065ed21f1bf5290b05c304a03fe765b7576a91d882392d376ceed19d2d1fc89c9f894 SHA512 a4d035c7114a8876b10435936db30068ba7232516b5e21f9577832e7ffed28144b0f5864b25e9df72ced0937c6d687117cdee42234fcba2a1cfa20b9bd1e31c0
-AUX wrk-4.1.0-r2-makefile.patch 1503 BLAKE2B b6af00447a19a1fba571e662a4e9abac812909c2fb309b298d922f1ad7d63a78c626f57f125371dabc65e27758f938f1b3c6a69d56a801dca5296a99a0fd9e1c SHA512 195301271570e539d5ee009315fcda1c1280fc6ca0de0eb89a66bb39bacfae721e7d7d03ab212f01ad0ac331502732350a67da52217ae24cb87a85d12dbb8650
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-4.1.0-r100.ebuild 922 BLAKE2B cfbcf479e34f55dfbc9e44dc08ab5da90fae1aef7270ea705b3dd852f922d231ab64130b2375c33478c865ed61e957f557f71117e021a624531e3761e3881bd0 SHA512 251038bb0ba7c0271836524685470b1d73f4b791304bd39f655513b1b273d5d33edca4b42c15ac98d4083fbf767519864fd67e2eed5b64dc0c9a50e93f8fd923
-EBUILD wrk-4.1.0-r2.ebuild 911 BLAKE2B 5487c95c9c6b4764214a9919c95e10c29312223a44328c375836675e3f0049ba4a09d4c4401523d2160a381326fa6cf5e268bebe0336dd1a770a9e07cdcca7cf SHA512 0c9e01a168a4c29b2a25618256fe0a1e55516dfa3ffc5015809c954bb2e3a260896e31e92e014bcf2909476ddcadd9bd74e0770cf4e23361e62efcac7d3eb778
+EBUILD wrk-4.1.0-r100.ebuild 920 BLAKE2B 2169abb35f8a845533f93edfdc9d050693f73867c22e3f78a96084e80275cbd4b1b85d399ea33bf180b74874da641ed907da06aa97fa0936f86da05400e565e9 SHA512 6dcde60ccc94cc2c7199fa5cf7456a1692c1c69fbd503f2b7e2a735f45c87e6e1f384dc9310c346d6ad0aaa66947d527b4981a09ff41f0249c100aeb80dc7431
 MISC metadata.xml 753 BLAKE2B 394af58d15030f33d953c4afae440cad777ba3e5fb4f95ec4a06cc6124929365bbcb2117734e7bb6e3d45cf9a42acee152a556f280fcf04244c0d8103e8f161f SHA512 5e262656536bd745faca708024430a5fc321dfea12ab61fdf74bae90df9b1d8237737db5a09afffdbfa278e29a9eb250292c2023263e4540f3fdd4cfe4984ade
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch
deleted file mode 100644
index 85de3eaf3c3e..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
--CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
--LIBS    := -lpthread -lm -lssl -lcrypto
-+CFLAGS  += -std=c99 -Wall -D_REENTRANT
-+LIBS    := -lm -lssl -lcrypto -lpthread
- 
- TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
- 
-@@ -24,15 +24,13 @@
- 
- ODIR := obj
- OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o
--LIBS := -lluajit-5.1 $(LIBS)
-+LIBS := $(shell pkg-config luajit --libs) $(LIBS)
- 
- DEPS    :=
- CFLAGS  += -I$(ODIR)/include
--LDFLAGS += -L$(ODIR)/lib
- 
- ifneq ($(WITH_LUAJIT),)
- 	CFLAGS  += -I$(WITH_LUAJIT)/include
--	LDFLAGS += -L$(WITH_LUAJIT)/lib
- else
- 	CFLAGS  += -I$(ODIR)/include/luajit-2.1
- 	DEPS    += $(ODIR)/lib/libluajit-5.1.a
-@@ -40,7 +38,6 @@
- 
- ifneq ($(WITH_OPENSSL),)
- 	CFLAGS  += -I$(WITH_OPENSSL)/include
--	LDFLAGS += -L$(WITH_OPENSSL)/lib
- else
- 	DEPS += $(ODIR)/lib/libssl.a
- endif
-@@ -51,15 +48,14 @@
- 	$(RM) -rf $(BIN) obj/*
- 
- $(BIN): $(OBJ)
--	@echo LINK $(BIN)
--	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
- 
- $(ODIR):
- 	@mkdir -p $@
- 
--$(ODIR)/bytecode.o: src/wrk.lua
-+$(ODIR)/bytecode.c: src/wrk.lua
- 	@echo LUAJIT $<
- 	@$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@'
- 
-@@ -67,8 +63,7 @@
- 	@echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
- 
- $(ODIR)/%.o : %.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- # Dependencies
- 
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
index b41fa3314fab..065b55d6d59b 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A HTTP benchmarking tool"
 HOMEPAGE="https://www.github.com/wg/wrk"
 SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="libressl"
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
deleted file mode 100644
index 34bc8be4849a..000000000000
--- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A HTTP benchmarking tool"
-HOMEPAGE="https://www.github.com/wg/wrk"
-SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE="libressl"
-
-CBUILD="dev-lang/luajit:2"
-
-DEPEND="
-	dev-lang/lua:0
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-
-RDEPEND="
-	${CBUILD}
-	${RDEPEND}
-"
-
-BDEPEND="
-	${CBUILD}
-	virtual/pkgconfig
-"
-
-DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
-
-PATCHES=( "${FILESDIR}/${P}-r2-makefile.patch" )
-
-src_compile() {
-	myemakeargs=(
-		CC="$(tc-getCC)"
-		VER="${PV}"
-		WITH_LUAJIT="/usr"
-		WITH_OPENSSL="/usr"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	dobin wrk
-
-	insinto /usr/share/wrk
-	doins -r scripts
-
-	einstalldocs
-}