gentoo Easter resync : 12.04.2020

3 files changed, 6 insertions, 69 deletions

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index d889e4e4afb5..d704c82fd9fd 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,8 +1,6 @@
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
-DIST sysbench-1.0.16.tar.gz 1508595 BLAKE2B 0cd7818097fb617362d79f135a45942ddf3e55435364355b063eea22ec5f1666737d8e887baae237d8a895c1f8d9f0c1dd0d145c6c46f2827d8ce3eba696ca18 SHA512 f86db33dcb46c9a6f696418de6463a597c6635dc66aecb2e2e53948c299dd7d1d4dfcb7c37d78cd024113ae5484dfaf48ff1cc0a4aefbc586976a665b2df1ca6
-DIST sysbench-1.0.17.tar.gz 1509044 BLAKE2B 9dcffcd0ee74b75416a5421879c6413b9052d65a63c4c4ef76f6bce620a0df284bcaf67225249b8c549f2ff912dab2a5df224f73153433d359e1245b27d2d715 SHA512 95a6bb7ec9b0fb111bf2844e110b8fb51c006fd68b5bac75c1b80e2ed18e839d6f07f79d55fb5adef67b41d00f67bbf659d129d1cb593d4fd118092b15431815
+DIST sysbench-1.0.19.tar.gz 1509412 BLAKE2B ac52c22bad2e7fb38ac53dbcf8df10c8aa2e1ab30cafa4ec747ad7442ed519c15e693314ae60371b2f4d8a9fe455047982121465fe54c3d02524934daca3e387 SHA512 1e88cb8dc679fa2b71dc3310fe058bcce7a154bcbc9d5e9b1936d61a11a27e4b6784157cefb1e3540f6abac5142aad4bbf4b470941cf4f1c6d55a967262c07be
 EBUILD sysbench-1.0.15-r1.ebuild 1175 BLAKE2B 6b2f6010d22d768d81ac5091d6aa8a4108a333e0c1f5b7b6a7c8551acdcff371d7cc3d0727c73788ef1058dfab7d066129ef2dc970221cc503e664e71c4330fc SHA512 1c7f37d2c8452b9f9928b40371297e3f0d603052c0746bc677becf41c6fc9dcb6fde1359669cb77c6cf0045a53d1f4d96a28038edbf870f08adf1cd05b8b40bb
-EBUILD sysbench-1.0.16-r1.ebuild 1175 BLAKE2B 210eced1ba2eac368c1258e9ead694f70a790e297470d5fddbe29e5f80d5298a19baf191b6a0b17b455565e0bcb66aad727d989d96ee7b79425916198dfab71b SHA512 4032fe48c210ee1c877de842ca2274042925c636349392b8f024292a043562b8c3844ad24a9533ecc1c5c0c0bd2c9911fe0359c0c6f5a2573270f7c8c32c528b
-EBUILD sysbench-1.0.17-r1.ebuild 1175 BLAKE2B 210eced1ba2eac368c1258e9ead694f70a790e297470d5fddbe29e5f80d5298a19baf191b6a0b17b455565e0bcb66aad727d989d96ee7b79425916198dfab71b SHA512 4032fe48c210ee1c877de842ca2274042925c636349392b8f024292a043562b8c3844ad24a9533ecc1c5c0c0bd2c9911fe0359c0c6f5a2573270f7c8c32c528b
+EBUILD sysbench-1.0.19.ebuild 1184 BLAKE2B d350a2f325faac23428095e0746db6a511e98ccb447db30792a68baa9b9643d9bb4d4dc6f72e8e06bedcffcb4a7cb2b0de36ec1ac15ff25b570949ea35dd5d31 SHA512 8d194aca1d64a246a9287ee36c2cb493decf9751aeffeae769b4b0c361889b5d3659e4a633d984dbdd07d8f07fd1a4c55f698b2de693ede56a4ffee470080093
 EBUILD sysbench-9999.ebuild 1084 BLAKE2B 27c2351d0628a875942f67279aef9086cd791f77513245daad6e94f3c199bf6c015392de2126038447e8daa9afb0f0c758520ad780dae5bb866dac1ba6bbdcaa SHA512 2b9c30f8804105e255718e36083a4e0ec54f8a05ebace6ae158e69780a95c5946f699015ae2b9dbb172eb293967d1410bd0cc25fd7e89649b411adf68a3df028
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild
deleted file mode 100644
index 9bfef687b507..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.17-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=7
-
-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.16-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.19.ebuild
index 9bfef687b507..bad79a67a164 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.19.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
@@ -18,13 +18,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="aio? ( dev-libs/libaio )
 	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
-	dev-lang/luajit:="
+	dev-lang/luajit:2"
 DEPEND="${RDEPEND}
 	dev-libs/concurrencykit
 	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
 	test? ( dev-util/cram )"
+BDEPEND="sys-devel/libtool
+	virtual/pkgconfig"
 
 src_prepare() {
 	default