gentoo resync : 22.01.2021

6 files changed, 5 insertions, 68 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index f682fcb8c836..7392b44e6225 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 24d5f17bdb45..161251678197 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 AUX stress-ng-0.11.23-makefile.patch 1635 BLAKE2B 6fd6b90ea16080d5f131724dd9f7128c712e7d6e912d2c8d420fa5c4ff6840e5fffddc18db4977133b0f36f34c5f67e35f106adaef685c0b428d97d37c0e3291 SHA512 15f28bf02fb36e08bdef49b75e413577d226d2e3287560f19c3ce9bb807b3923d7832166156627f5557ca0a1e8e67b9a42177042ad9f1909ec5364e72544d3d3
-DIST stress-ng-0.12.01.tar.xz 514028 BLAKE2B c90a07291b8ceae44619d5a8853a01c571a1b8b9bd87f0d53be76385a97c93731d89ce4122fdc1a31f36c7e7729f7c59ece2bbb6424144c57b5f74231437d979 SHA512 c5e19b8f4f0f7fe3dd81b4de3ffcbb4c50ba352665b2409fcbf179e2d749130477ca5cd5d9d71370740f735376b2c97407d19d69163a258c03daf885f00d90e9
-EBUILD stress-ng-0.12.01.ebuild 856 BLAKE2B f601d8aeaddf9b3cf3ca007056105d0904df24ec19080b899e7f070437a1ff79b6181bf24b385c67bfe7a2f4f3c0df83909988719131278c3fba211c992bc61e SHA512 95489828b73f7ff2b175817cdd7face6cb46a59ff593fb2e93dd74405188ee7a56ff910a05cfbd3d3e4a6db357c7a21fd7d7a53f8d75b454518235913d23c912
+DIST stress-ng-0.12.02.tar.xz 519476 BLAKE2B a56f5e186083fdd2675a13c8ed0e128cb30f0c16787f24dff5db484dbf318d00fe2d9887947b54122e83e8aee3c203c2c8fda4adf6c7c28d0e68b357acb58641 SHA512 074baa898cce4dad898e628e86d7cf29eeef4226bdceddd7e3b05a68327f8fa98df5875434599985049e280f649d2df9a2e0fa7ff32482a800a9fb0ff0c91b7c
+EBUILD stress-ng-0.12.02.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.01.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
index a01d58d2dda5..01aaca45b7b8 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.01.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 9eb2335fdb37..76146610e22a 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,4 @@
-DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
 DIST sysbench-1.0.20.tar.gz 1509630 BLAKE2B 9b63c1c2703fc2311e03561c8dde2c39b249b6aadffebddfd99cdcfb5319606a484132e9dcb23a4365aecfc1148c5c5c56c918ac8c363ffcb1beece26aaf15c7 SHA512 510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f
-EBUILD sysbench-1.0.15-r1.ebuild 1175 BLAKE2B 6b2f6010d22d768d81ac5091d6aa8a4108a333e0c1f5b7b6a7c8551acdcff371d7cc3d0727c73788ef1058dfab7d066129ef2dc970221cc503e664e71c4330fc SHA512 1c7f37d2c8452b9f9928b40371297e3f0d603052c0746bc677becf41c6fc9dcb6fde1359669cb77c6cf0045a53d1f4d96a28038edbf870f08adf1cd05b8b40bb
 EBUILD sysbench-1.0.20-r100.ebuild 1689 BLAKE2B c07cca0efda25f21dc923a46cd883a7b147c6985d13605e57105eb3942e65985ad8108ef7b941aa8f543932e6d77a1b17b66ac2bcea66570801a52d3034d8a15 SHA512 acacc268c44cdfa0ce475565c393c1e0cb2928a80c7fc588a4ee0cee3785028d99c2f200cc2368fce718e3019956ed66d213423a07806d05cf86311bbb56af7a
-EBUILD sysbench-1.0.20.ebuild 1491 BLAKE2B 5c793d06c26af2a89dbcf14c02ebd80055ac4ffbbf393913526ff65fd076241ccbd303fe71824a5b3ff0d015c761ca5ae9606b1c977ce1f078a6ce61480fd3cd SHA512 a344cd1d5832a921bece9aeb0d74817885ceca7af9fb5fe69339830b16bd3e50c9de6434753a9d868a21eda357c8f16c084e805ac18b9179753a95bc658a0ce8
+EBUILD sysbench-1.0.20.ebuild 1489 BLAKE2B da20acc0bf92ecedf772d55f0df10ab1c6a7505de16153b03fb6192972568e9bf36c2043220593177ad9ad049f01de455f7426c7e857d95478b71c671ac904de SHA512 9bfd01b07b58372fb70658b64274e547b4300a6f9d50283eacca1846b87d8527556a27f5ace61d9d8616ee0a9e5b995f12d0ee8cae10b08323901ff007566375
 MISC metadata.xml 570 BLAKE2B 50304406adc2c29e47866fb18477df8634172731822204d034ecca98f81620d1f567507cec69f53765f44b51abb5773c5e882110ef5b01c31f89410deb6118c0 SHA512 d029a58fd65325cfd6b34ba69c9364a9e31d91f042e417cb1dedce459e78762a1873b550dff8f7d94265cbc78701c4865513f05606cd595ff3e405601cf03306
diff --git a/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
deleted file mode 100644
index 0b38fa7ccf3c..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pax-utils
-
-DESCRIPTION="System performance benchmark"
-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 x86"
-IUSE="aio mysql postgres test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="aio? ( dev-libs/libaio )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-lang/luajit:="
-DEPEND="${RDEPEND}
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( dev-util/cram )"
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable aio)
-		$(use_with mysql)
-		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
-
-src_install() {
-	default
-
-	pax-mark m "${ED%/}"/usr/bin/${PN}
-}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
index f5d54ecf2935..d985c12d2a3d 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
@@ -13,7 +13,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="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"