gentoo resync : 18.08.2019

8 files changed, 34 insertions, 82 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index e9a307c6f5e0..7618090641cd 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index a6bd63158514..a1f7eb3b6bb0 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -6,5 +6,4 @@ AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8d
 AUX acovea-5.1.1-underlinking.patch 327 BLAKE2B 3b611c70d306cce314baf45622e4a395fa48f0a29d663198098f8446a575176e852b878615fd5abd3460e660c25f8549492cfb0c2e6c60ed20fb6915082a18f3 SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883
 DIST libacovea-5.1.1.tar.gz 363048 BLAKE2B 61f894e99f3678f3b676e0926ff6d7a6bd376a654ad109d5b7f676d7053e4b975d90e0ac01d820b8498a6992db1cbd2fb5443fbe3871ef3f86bee280fd808352 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365
 EBUILD acovea-5.1.1-r2.ebuild 924 BLAKE2B 770d72ef6cfd95f1b4c344649e3538a5409eb5b637a5cc81013a4d2f2747ead9abccbd1cee4582533b2371d69d6f8fda56a959ba4a40135ca0504d28aa4c1b39 SHA512 f2c6cfb365cca5155435b901daf0408a7264f1f999401aa93db546959b25a160026d7ed43e1896d48cac789c9acf1dd59235a3c62f39c44894a8d646b11079e8
-EBUILD acovea-5.1.1.ebuild 1057 BLAKE2B 8cfdcfd6c09b76e998ed17d7ad776b533ed8cc993a69a597dcb0d7938b11988ae8b0a7b90fa9126bfeac01216429df32d3f88acb450f4506313f90d6b353ef6a SHA512 54def173fd2bd5049bb044ce6e648ecdaee76ee9e0930bf41d1875105b2395554edcb31398c538f33db1b94ded703128287922cef38511d3b532472429ec272c
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
deleted file mode 100644
index 63623ba07e28..000000000000
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WANT_AUTOMAKE=1.9
-inherit autotools eutils
-
-DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
-HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
-SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libcoyotl-3.1.0
-	>=dev-libs/libevocosm-3.1.0
-	dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/lib${P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-free-fix.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-glibc-212.patch
-
-	if has_version ">=dev-libs/libevocosm-3.3.0"; then
-		epatch "${FILESDIR}"/${P}-libevocosm.patch
-	fi
-
-	eautomake
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index 3df213261711..da568c1fab41 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -1,6 +1,6 @@
 AUX Makefile.patch 348 BLAKE2B 016aba350938f561865925b5ac5aea0502b5db4a9799ecf72de26a51d1c522f37a7ddcd44a6d69d50f16bd179b185103514dabb10eb74e4dadc46ffe485af107 SHA512 e795a7f4179aee9a86d546845cb16c03770a93013c83186c46a9a759edff909c4d85a40ec2091d068496c289cb5bb015026796b060e6bdec44d72fa8e13c2518
 AUX bonnie-2.0.6-includes.patch 336 BLAKE2B 438e8bbd08e98e30c74981b31c5896ab17efcea190394a260c0913a5d8e4289321d4550fa9d40072c8686629497ea1c09db50508251ec044e82489c270047674 SHA512 ed5cadebfabf1efb7e0b5289cfb67627262d83f4f9650d020755b1c47f19601b845193892c502d9947316d639b6423d52a862224f1943dcae182a151e0c72a39
 AUX bonnie_man.patch 349 BLAKE2B 9251f607a2875912d9c27228f0e3889f44a4ac013616450f8ba7cc8424065a8220560a846841f199227e65c18e770bf3ef294c391bea2c96b9bc9fac2cc50998 SHA512 38d88dcba9ef17e2de843a6123a063203c8fa1c1b654109fba3c7bee54275e6fa0ebe1f3ce8986b07891fc5cbfca4b310f71d4bc4e564a20ec199ecafb58de64
-DIST bonnie.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
-EBUILD bonnie-2.0.6-r2.ebuild 648 BLAKE2B b38c96a6e08db06992a97e34485e9dbfb13d3622113ad1c8efe63660e6dfceaa2e366d7728f1c0aa2c3c8be61385476c4a939f5fd9d2aaec26e37628e6309f4a SHA512 bd6eb2a48f1e4af1183c331653765d6ee9bb6c93e6dd2c769c6b0d010bba55f56a0079412dafdb225a0ddb16942a5b7c864b55edaa13b1912d25ddb85e4fca40
+DIST bonnie-2.0.6.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
+EBUILD bonnie-2.0.6-r2.ebuild 660 BLAKE2B 8ec4c8e9344e0e572903ab6c731dbfad689df584f8f352161ca3c0a18b547cdecd828cf452dce9ed8bb283764ce57d4593ec8e4bc8b31fe945d7c9ea8ded8b7b SHA512 120ad7541cf82af3ea96632456170bb52ee6d7f34f0294a7f0293c1fdf289d19d483abba2f0826b8694295fdaa4fa8e0d57c28b5c54b2be680209e2aa4dcd4ec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
index e67da1923998..e385ae0eb113 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
 HOMEPAGE="http://www.textuality.com/bonnie/"
-SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
+SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
 
 LICENSE="bonnie"
 SLOT="0"
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index cc0a5ba56915..1de0cbec7e13 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,8 +1,8 @@
-DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
 DIST sysbench-1.0.16.tar.gz 1508595 BLAKE2B 0cd7818097fb617362d79f135a45942ddf3e55435364355b063eea22ec5f1666737d8e887baae237d8a895c1f8d9f0c1dd0d145c6c46f2827d8ce3eba696ca18 SHA512 f86db33dcb46c9a6f696418de6463a597c6635dc66aecb2e2e53948c299dd7d1d4dfcb7c37d78cd024113ae5484dfaf48ff1cc0a4aefbc586976a665b2df1ca6
-EBUILD sysbench-1.0.10.ebuild 1253 BLAKE2B 0a1033e2f0008f1772ba9f2bf19b41c8df53d76c7ac6f3984daf774c46498fa8d7fc8ec28c5cb7a76c876e9ce656aa2dcaee559f49416cd6052062eb980544cc SHA512 5c8db4a79072da2d776b8045e67648570c4635d7435e53fbe18be022176694a342014b105f0a6f7996b49f7eeb8d947aee10813b49ed4aa53b526dbcf2c8249a
+DIST sysbench-1.0.17.tar.gz 1509044 BLAKE2B 9dcffcd0ee74b75416a5421879c6413b9052d65a63c4c4ef76f6bce620a0df284bcaf67225249b8c549f2ff912dab2a5df224f73153433d359e1245b27d2d715 SHA512 95a6bb7ec9b0fb111bf2844e110b8fb51c006fd68b5bac75c1b80e2ed18e839d6f07f79d55fb5adef67b41d00f67bbf659d129d1cb593d4fd118092b15431815
 EBUILD sysbench-1.0.15.ebuild 1144 BLAKE2B d551c301dad666dc5bcda8fec49180bf9c7992c7465ba9a97f278ceaedfb64ce800cd5d28cf6cc047049010d3b368fa81523b363b89e036a4afd2561c9a8c81f SHA512 c9dee1c0b6e721b1c0c6aa4db62bb27f6730285e24273cf26a230389a456aad2f685c597cc185b2b9790239cc70dcdaa55fbf686ee112221168fddc39553197a
 EBUILD sysbench-1.0.16.ebuild 1146 BLAKE2B 98efe2cf1430525d0e22402d90ffcc43794c28fc8b273868af098e4349b1b1cc6d22278b0640765168e871ca022566c292d866005d4ee54e829cd881d55a8a33 SHA512 d55a37f5e7931cab459bdc8722b9ad9c6ea59385ccd1a42864116d18ee4dd02e390cf4e2ea1a835511e3b6210713e1070ab66b29402fd0fc7bd35bb01c92dc39
-EBUILD sysbench-9999.ebuild 1077 BLAKE2B fb8c2b8e9ea170ea546b012e93ac7d263e88e3f530aa5fa85c3783775eff3dd722500147ea2818fe75a869c6fb8f16f99e573716f84afc92bcec2ccaac6c7798 SHA512 82046f5c6c88f905751442a51633c366b79465b9dc8adacf5f8a69d64a9df83e46fb8fb13085c1b76f6939e545a17fb798422f0217fd0462c642a138850ddd26
+EBUILD sysbench-1.0.17.ebuild 1171 BLAKE2B 2631556d62bf05ead29eb255ba35e46aef9c866d5f452204c5c6bf893c37812c6ef67a04ed801b7f6ee71d1b79b67999a41a8d44343941d5eaa2dfc59d14ecec SHA512 e57f554aaa16333dbf78376f9ec60a64bd9774de0688fdef1754426fa65777872e776b2c4da322045c7878c16f0bbd987778648d1ee8b61f3f026aa6df87a5db
+EBUILD sysbench-9999.ebuild 1080 BLAKE2B 88fbaa15d56ee16893207090c4ef4a706b52bd2b1867e9a52af3e8a26ae2e5d8b6b8ae55830dcb57f966366c18926cac74123ddb0675be47afe383469df752c6 SHA512 acb0f80a81001b7394ccae7c5ad82f5f4c7226dcdcda2215b0c9a519ced5f37b1a0dbb9b0008dba96073cf6995ff8779b17e745dcfb281aa67cd71016141160c
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/sysbench-1.0.10.ebuild b/app-benchmarks/sysbench/sysbench-1.0.17.ebuild
index d9ea6b09ba68..95a24a98ccf6 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit pax-utils
+inherit autotools pax-utils
 
 DESCRIPTION="System performance benchmark"
 HOMEPAGE="https://github.com/akopytov/sysbench"
@@ -11,15 +11,15 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="aio mysql postgres test"
+RESTRICT="!test? ( 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
@@ -29,18 +29,16 @@ DEPEND="${RDEPEND}
 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
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable aio aio)
-		$(use_with mysql mysql)
+		$(use_enable aio)
+		$(use_with mysql)
 		$(use_with postgres pgsql)
 		--without-attachsql
 		--without-drizzle
@@ -52,12 +50,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	default
-
-	pax-mark m "${S}/src/${PN}"
-}
-
 src_test() {
 	emake check test
 }
+
+src_install() {
+	default
+
+	pax-mark m "${ED}"/usr/bin/${PN}
+}
diff --git a/app-benchmarks/sysbench/sysbench-9999.ebuild b/app-benchmarks/sysbench/sysbench-9999.ebuild
index 6873945f546c..4787bb37870a 100644
--- a/app-benchmarks/sysbench/sysbench-9999.ebuild
+++ b/app-benchmarks/sysbench/sysbench-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit git-r3
+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? ( virtual/libmysqlclient )
 	postgres? ( dev-db/postgresql:= )
 	dev-lang/luajit:="
 DEPEND="${RDEPEND}
-	app-editors/vim-core
 	dev-libs/concurrencykit
 	dev-libs/libxslt
 	sys-devel/libtool
@@ -33,17 +32,14 @@ src_prepare() {
 	# remove bundled libs
 	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
 
-	./autogen.sh || die
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable aio aio)
-		$(use_with mysql mysql)
+		$(use_enable aio)
+		$(use_with mysql)
 		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
 		--with-system-luajit
 		--with-system-ck
 	)
@@ -54,3 +50,9 @@ src_configure() {
 src_test() {
 	emake check test
 }
+
+src_install() {
+	default
+
+	pax-mark m "${ED}"/usr/bin/${PN}
+}