gentoo resync : 25.11.2020

6 files changed, 165 insertions, 130 deletions

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index d704c82fd9fd..dc0bf8195b5a 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,6 @@
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
-DIST sysbench-1.0.19.tar.gz 1509412 BLAKE2B ac52c22bad2e7fb38ac53dbcf8df10c8aa2e1ab30cafa4ec747ad7442ed519c15e693314ae60371b2f4d8a9fe455047982121465fe54c3d02524934daca3e387 SHA512 1e88cb8dc679fa2b71dc3310fe058bcce7a154bcbc9d5e9b1936d61a11a27e4b6784157cefb1e3540f6abac5142aad4bbf4b470941cf4f1c6d55a967262c07be
+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.19.ebuild 1184 BLAKE2B d350a2f325faac23428095e0746db6a511e98ccb447db30792a68baa9b9643d9bb4d4dc6f72e8e06bedcffcb4a7cb2b0de36ec1ac15ff25b570949ea35dd5d31 SHA512 8d194aca1d64a246a9287ee36c2cb493decf9751aeffeae769b4b0c361889b5d3659e4a633d984dbdd07d8f07fd1a4c55f698b2de693ede56a4ffee470080093
-EBUILD sysbench-9999.ebuild 1084 BLAKE2B 27c2351d0628a875942f67279aef9086cd791f77513245daad6e94f3c199bf6c015392de2126038447e8daa9afb0f0c758520ad780dae5bb866dac1ba6bbdcaa SHA512 2b9c30f8804105e255718e36083a4e0ec54f8a05ebace6ae158e69780a95c5946f699015ae2b9dbb172eb293967d1410bd0cc25fd7e89649b411adf68a3df028
-MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
+EBUILD sysbench-1.0.20-r100.ebuild 1677 BLAKE2B 11f2671ffb3a753543c6ffd7538ffa9e986087f1c587d198125b64a7b2e069018d15d367fcbb634a0ed30cffa56256595aa9ac76081442f95c6344fffba74b73 SHA512 159b7554d644dd721915ff047e45ba84f069fe412ca8d3e03f2018d29819a8e29f6d6332ac883189aa3283f6cb2f2c02ef156e0249b300e6389516ce908cacba
+EBUILD sysbench-1.0.20.ebuild 1479 BLAKE2B 9a1cc2ab4e49f759389ad6ebc599256a40bc7db85bfce26142eaca3e928642cb303868021784d1c56214fe4bbc2788dfa19ccac4385cc99024ae37b1363bfc8e SHA512 6a31a56af3965b65bde1eea0b9f7f6267da8b4f2c32c369de9eeed8b9a1281f54b391875ebe06b8d2f6ba3c6968fa47e90935e7af5c98adf6b13cca0a60dc8da
+MISC metadata.xml 570 BLAKE2B 50304406adc2c29e47866fb18477df8634172731822204d034ecca98f81620d1f567507cec69f53765f44b51abb5773c5e882110ef5b01c31f89410deb6118c0 SHA512 d029a58fd65325cfd6b34ba69c9364a9e31d91f042e417cb1dedce459e78762a1873b550dff8f7d94265cbc78701c4865513f05606cd595ff3e405601cf03306
diff --git a/app-benchmarks/sysbench/metadata.xml b/app-benchmarks/sysbench/metadata.xml
index 828134c90a90..42ddffecca2c 100644
--- a/app-benchmarks/sysbench/metadata.xml
+++ b/app-benchmarks/sysbench/metadata.xml
@@ -2,15 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hydrapolic@gmail.com</email>
-		<name>Tomáš Mózes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<use>
-		<flag name="aio">Enable libaio support</flag>
+		<flag name="aio">Add support for AIO.</flag>
+		<flag name="attachsql">Add support for AttachSQL.</flag>
+		<flag name="drizzle">Add support for Drizzles.</flag>
+		<flag name="largefile">Add support for large files.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">akopytov/sysbench</remote-id>
diff --git a/app-benchmarks/sysbench/sysbench-1.0.19.ebuild b/app-benchmarks/sysbench/sysbench-1.0.19.ebuild
deleted file mode 100644
index bad79a67a164..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 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:2"
-DEPEND="${RDEPEND}
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	test? ( dev-util/cram )"
-BDEPEND="sys-devel/libtool
-	virtual/pkgconfig"
-
-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-r100.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
new file mode 100644
index 000000000000..7926abfdf9a3
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools lua-single 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 ~x86"
+IUSE="+aio attachsql drizzle +largefile mysql postgres test"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	aio? ( dev-libs/libaio )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	test? ( ${PYTHON_DEPS} )
+	${LUA_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
+"
+
+pkg_setup() {
+	lua-single_pkg_setup
+	use test && python-single-r1_pkg_setup
+}
+
+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
+		LUAJIT_CFLAGS="$(lua_get_CFLAGS)"
+		LUAJIT_LIBS="$(lua_get_LIBS)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
new file mode 100644
index 000000000000..3d882dede761
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 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 ~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/sysbench/sysbench-9999.ebuild b/app-benchmarks/sysbench/sysbench-9999.ebuild
deleted file mode 100644
index 20702594cf13..000000000000
--- a/app-benchmarks/sysbench/sysbench-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3 pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench"
-EGIT_REPO_URI="https://github.com/akopytov/sysbench.git"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-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)
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
-
-src_install() {
-	default
-
-	pax-mark m "${ED}"/usr/bin/${PN}
-}