gentoo resync : 28.04.2018

3 files changed, 2 insertions, 71 deletions

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 47755a650e04..2c3663ac45ce 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,9 +1,7 @@
 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
+DIST sysbench-1.0.14.tar.gz 1507008 BLAKE2B b2e5e53e65c4993b844f45cbf1dd648b8c67a4e00c6c7e713a032a15f5af7176d7fccf14120f1a485fe984e704386ec84d17391a9f7951584cc5072dcd153a45 SHA512 9030b1f40f6800d85ba4c7bf38041a509769983db4bce82b5cab097a5e4439e1ede5d8933f276779172537c961e6f670680bee106fcac3723ef99f361fdcc4f1
 EBUILD sysbench-1.0.10.ebuild 1253 BLAKE2B 0a1033e2f0008f1772ba9f2bf19b41c8df53d76c7ac6f3984daf774c46498fa8d7fc8ec28c5cb7a76c876e9ce656aa2dcaee559f49416cd6052062eb980544cc SHA512 5c8db4a79072da2d776b8045e67648570c4635d7435e53fbe18be022176694a342014b105f0a6f7996b49f7eeb8d947aee10813b49ed4aa53b526dbcf2c8249a
-EBUILD sysbench-1.0.12.ebuild 1200 BLAKE2B 2892cf2095bea5e6b058a71ef590e22a4f0842cf6f32b7626c2a2243238901754e140c7a5734baf882d5106c9297a38bf8b8386aa064371c17f443962a9068b1 SHA512 97287721c7022ea8ec83f17c57078cb4503c82cc9fc9a6f059d59f3fb5d86ea478e5729848ad2dc137d791abaa4514522286f30a5e42b64ea2f6e3e5e1fa4ece
-EBUILD sysbench-1.0.7.ebuild 1253 BLAKE2B 0a1033e2f0008f1772ba9f2bf19b41c8df53d76c7ac6f3984daf774c46498fa8d7fc8ec28c5cb7a76c876e9ce656aa2dcaee559f49416cd6052062eb980544cc SHA512 5c8db4a79072da2d776b8045e67648570c4635d7435e53fbe18be022176694a342014b105f0a6f7996b49f7eeb8d947aee10813b49ed4aa53b526dbcf2c8249a
+EBUILD sysbench-1.0.14.ebuild 1149 BLAKE2B c0f991318d95baa7eb9da555f02440e0629bd89ab6dfd121c9e4989271f2bb1aab021ba171e87f0ca5b0e4c47957a2184a2e0dc27147bdbacd165ba614d7e4ad SHA512 bb8cf2a874cd0894c17c145f37321de3a45c69829d89b870a9bdd0e814459232306026af9ca2f220ef2a35ae66d0adc5990f538a19f4f79ab6f14281e6625981
 EBUILD sysbench-9999.ebuild 1077 BLAKE2B fb8c2b8e9ea170ea546b012e93ac7d263e88e3f530aa5fa85c3783775eff3dd722500147ea2818fe75a869c6fb8f16f99e573716f84afc92bcec2ccaac6c7798 SHA512 82046f5c6c88f905751442a51633c366b79465b9dc8adacf5f8a69d64a9df83e46fb8fb13085c1b76f6939e545a17fb798422f0217fd0462c642a138850ddd26
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/sysbench-1.0.12.ebuild b/app-benchmarks/sysbench/sysbench-1.0.14.ebuild
index bde2254ca9fb..58a949c87462 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.12.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.14.ebuild
@@ -25,10 +25,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-util/cram )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-htmldir-fix.patch"
-)
-
 src_prepare() {
 	default
 
diff --git a/app-benchmarks/sysbench/sysbench-1.0.7.ebuild b/app-benchmarks/sysbench/sysbench-1.0.7.ebuild
deleted file mode 100644
index d9ea6b09ba68..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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:= )
-	dev-lang/luajit:="
-DEPEND="${RDEPEND}
-	app-editors/vim-core
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( dev-util/cram )"
-
-src_prepare() {
-	default
-
-	sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
-
-	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
-
-	./autogen.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable aio aio)
-		$(use_with mysql mysql)
-		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	pax-mark m "${S}/src/${PN}"
-}
-
-src_test() {
-	emake check test
-}