gentoo resync : 30.12.2017

5 files changed, 15 insertions, 84 deletions

diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index cca68db57db1..3df213261711 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -1,8 +1,6 @@
-AUX Makefile.patch 443 BLAKE2B e335fe11acf7466dd5270e8148a61e43f120b661f30f935c6c93ac74093c9480a059f558276c1feef49dee08fa56e7c9f96743f0b4e3f1f9dc044c20fc5ffaea SHA512 393120573ab84e87acff8d94bbb5d733378594c5bb1af9b26faec1fa7f24bee914d0c56cc07de3671a47b8ed27fb9abc174fd228c25b0fce609513f31121988d
+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-r1.ebuild 721 BLAKE2B f0b4cb6bdc1be8f214e871650a7daace6d662db17632b441577edc48a03d7ba0373a3f47b215e589c407391c8404c148555420f48666748b1626e8ba0e7cf178 SHA512 85c9d5ce22c0a6287c25c4de9f2b428826d5d9303095d5e7d7372612deba8e604993e1769401a72f4fe0f864391dba89961adec3aba811aeba17eddbd9fbd02e
-EBUILD bonnie-2.0.6-r2.ebuild 692 BLAKE2B d3da8edf6aeb218ba2684bd52a43db5bf92387eacffdf7fefa553c0137395fd6ea2d29ccc679cf3c48fb74da1acdcacbd3b260205647283eb5975f2e48cb8335 SHA512 d2f0cc1d0bbecd8364bb4ddf7aa28f3f9f05b77512d18f9b5e35b8996b1981d1ada5ea7fe8df9fe20e29ad3577a36239a35aa53ce2f0961e3d49d7168a999985
-EBUILD bonnie-2.0.6.ebuild 684 BLAKE2B 260f08bbf390a30a2c35d2e0d0345a7b48259923e8a0cff50f15ad0f934572c27888ce2f2f60309524eafa66da85bdf98abcbb3101c0fc6c56d206f8d26a2c99 SHA512 065f7ec012dda7784096637e0c3dc56bc57e16064da13868e3e31d1e8acaf41880ee416d68655fc159a07110e8b0c4da9d43e9c1b8edf84eacc481fef96e2cef
+EBUILD bonnie-2.0.6-r2.ebuild 648 BLAKE2B b38c96a6e08db06992a97e34485e9dbfb13d3622113ad1c8efe63660e6dfceaa2e366d7728f1c0aa2c3c8be61385476c4a939f5fd9d2aaec26e37628e6309f4a SHA512 bd6eb2a48f1e4af1183c331653765d6ee9bb6c93e6dd2c769c6b0d010bba55f56a0079412dafdb225a0ddb16942a5b7c864b55edaa13b1912d25ddb85e4fca40
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
deleted file mode 100644
index b62e0aa42e4e..000000000000
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils 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"
-
-LICENSE="bonnie"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/bonnie_man.patch \
-		"${FILESDIR}"/Makefile.patch \
-		"${FILESDIR}"/${P}-includes.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	newbin Bonnie bonnie
-	doman bonnie.1
-	dodoc Instructions
-}
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
index c9fdf5a2ddb6..e67da1923998 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
 HOMEPAGE="http://www.textuality.com/bonnie/"
@@ -11,17 +11,19 @@ SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
 
 LICENSE="bonnie"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
 
-PATCHES=( "${FILESDIR}/bonnie_man.patch"
-	  "${FILESDIR}/Makefile.patch"
-	  "${FILESDIR}/${P}-includes.patch" )
+PATCHES=(
+	"${FILESDIR}"/bonnie_man.patch
+	"${FILESDIR}"/Makefile.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
 
-src_compile() {
-	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
deleted file mode 100644
index ddb11ff6ad17..000000000000
--- a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-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"
-
-LICENSE="bonnie"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A} || die
-	epatch "${FILESDIR}"/bonnie_man.patch
-	epatch "${FILESDIR}"/Makefile.patch
-}
-
-src_compile() {
-	make SYSFLAGS="${CFLAGS}" || die
-	mv Bonnie bonnie
-}
-
-src_install() {
-	doman bonnie.1
-	dodoc Instructions
-	dobin bonnie
-}
diff --git a/app-benchmarks/bonnie/files/Makefile.patch b/app-benchmarks/bonnie/files/Makefile.patch
index c4367087b8b5..d803bd077ced 100644
--- a/app-benchmarks/bonnie/files/Makefile.patch
+++ b/app-benchmarks/bonnie/files/Makefile.patch
@@ -1,9 +1,8 @@
---- a/Makefile	1996-08-29 03:45:37.000000000 +0200
-+++ b/Makefile	2011-08-25 16:07:10.757629898 +0200
-@@ -1,11 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,9 @@
 -CFLAGS = -O $(SYSFLAGS)
-+CFLAGS = $(SYSFLAGS)
- 
+-
  bsd:	
  	@echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
  	@echo 'If you get messages about missing functions, try "make SysV."'