gentoo resync : 27.01.2018

3 files changed, 88 insertions, 0 deletions

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 0c63c0395411..d9afdc086ef9 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,9 @@
+AUX sysbench-1.0.12-htmldir-fix.patch 647 BLAKE2B c3d61f9c370b6e29d2f7c2b039c2292a4368f84021410b8c2132cb64f6809180ce91ca1138816ca2aa38c07cf2d7c3a66244f4b9fb6afd5424f0ab4843b4b144 SHA512 1a9af5fee72e3dd08089fce64836ea9af18348176435cc0ef0283cbd4d22ff790c953ccef1f3d91794b4c17221a6b837714dbcfb53adefccef6d1b88013cf43e
 DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
+DIST sysbench-1.0.12.tar.gz 1506013 BLAKE2B 940e2978b81362d66cf0de31b9a0a5a844fd31e19cad47a7538f8f2e2f0a46b08c0d5b80a334da277f0558aaf8316b2a2b91753f30163362c6b6bc25e556e88b SHA512 e4f9d909ac3df31b128fc1ddc4b55cb62c579205439c806d2bfe2579641a9d5e94f159d99cfc8e84680aca1c6af0769f838792dc4b37c57b1e03943ea8211bec
 DIST sysbench-1.0.7.tar.gz 1494571 BLAKE2B 56b351cbc1af687b48cce0a98e07301c0d8d35104199adb1e05076091e06e363fd465caec14eb3b1572297f97d35e8fc5eb23eab5ecb70bb4bdb2b2886bc77e2 SHA512 0b32ad27180ab02df9c2e5e85a8b9bec231338cfb20d7337dd80f1e0628b48bae480fde9d69cd21730aa0ab7c65fecbede9c10cd4b96d0dcf44cd012afa10d65
 EBUILD sysbench-1.0.10.ebuild 1256 BLAKE2B d5d726931e768d61f947772ec53c65502f5b4e47a606645d865eb2a5a8d4a87d882d9fe6c5e1a561185a5e5e20efc7685b80916ad780b2ffe0f4511691927e18 SHA512 8f1e1da773fcf7ed68d8e5467de91096eb8f70ec63a58111acbf6caf8682863f2b09e17a7cc024256853a68fad2849927b0a9329f680f935dcd77ad5dcff03b8
+EBUILD sysbench-1.0.12.ebuild 1202 BLAKE2B 52222cae7301fc80cd764d416710dfaa8085c9634ad5c9b9d07c48e1b99b1f6168a8ea5ccea2e5a3f76b86d94b9b332a235f91ae2281ca8f25d9a5d0b9109e68 SHA512 f302988d844de77138e31c5edde0db0ce958e75bfe4f8e5a2e4ba22de58a662650e255fd8d3163b846b8daa6e89004f8bc5fe40131cbce7e8e03109f709b8762
 EBUILD sysbench-1.0.7.ebuild 1255 BLAKE2B 0999b1d683b47e6e3958f8a80e5faa10e9de052242e9bd2480363d0a31bb438db32b993b38dbc59ae5ee346f9cf5478f5a6ef7aa9593b1f31aa069f98e04efeb SHA512 4ca05385888089b471af38ea33861ff0b275494ccfafa090c8ae6893c206f842139aa2ce2be51f091eb0a16f903ea4c4a67ea55351bfc2702ca5a3fe9a7be88d
 EBUILD sysbench-9999.ebuild 1079 BLAKE2B dbf775776602edaff8ea8b12e1e1f895e7334c352be5ec6fec17400142a8e5dff1b3e3fbc89a19dad0ba86ea84a613b3d080261dafa8317471c1ce25603584ec SHA512 9bc554eaf47f3ddb41d8aa0590d686f9fd724dcf98445610a7bebe6fbd8f0b40a815c0cf5c4f0378a6424c1222ba117163c1c7e27bf5c7e717d3825aaa8193a2
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch b/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch
new file mode 100644
index 000000000000..00022f271577
--- /dev/null
+++ b/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch
@@ -0,0 +1,21 @@
+From c4ddab7660e2a26a6fdb333db8f4b5bb7aad66ca Mon Sep 17 00:00:00 2001
+From: Tomas Mozes <tmozes@sygic.com>
+Date: Wed, 17 Jan 2018 13:29:34 +0100
+Subject: [PATCH] Drop htmldir as it defaults to docdir if unset.
+
+---
+ doc/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 100a4012..fe441467 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -4,7 +4,6 @@ XHTML_STYLESHEET=$(srcdir)/xsl/xhtml.xsl
+ CHUNK_XHTML_STYLESHEET=$(srcdir)/xsl/xhtml-chunk.xsl
+ XML_CATALOG_FILES=$(srcdir)/xsl/catalog.xml
+ 
+-htmldir = $(prefix)/share/doc/sysbench
+ dist_html_DATA = manual.html
+ 
+ EXTRA_DIST=manual.xml
diff --git a/app-benchmarks/sysbench/sysbench-1.0.12.ebuild b/app-benchmarks/sysbench/sysbench-1.0.12.ebuild
new file mode 100644
index 000000000000..e3972cf8d005
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )"
+DEPEND="${RDEPEND}
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-htmldir-fix.patch"
+)
+
+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}
+}