reinit the tree, so we can have metadata

6 files changed, 154 insertions, 0 deletions

diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
new file mode 100644
index 000000000000..dd753d5a5357
--- /dev/null
+++ b/app-benchmarks/bonnie++/Manifest
@@ -0,0 +1,9 @@
+AUX bonnie++-1.96-compile-flags.patch 611 SHA256 795dec4e5d537d7a769adb1ec1cebd54b4eeb4ab2b3d6c805e3b9366bb2832e6 SHA512 bc5acf12ba0231f8ed4708363dd4146bf9b07fb05c8367e1c572b1950a8334da413de0b2283bc185050cb57a4d5b2ec966072085f80b7bcd6f45d5a8b8ba7fee WHIRLPOOL 5e4e7f325d1439a7047b8839af438ca7efbdc2362eb8b434d88db5b3eb2f8984d127665715cbb0a64e01ba3673630878a1d555e246f4e5d281545c9cd1c548eb
+AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 SHA256 8a50c7121cf3726f1c7cbb30e1d031bfd7eeeec1a0e5152033c075d226c872c1 SHA512 f26a3873965d70c3cb1b0ce4422daa1a9b3152d189a532c81ec4764aac1a04fadf45f1c562fedaaa6de443eeadcdc176ed7b5c1353eeaa91ad340a1560e96d32 WHIRLPOOL 2d2d63062addc3b2d53ed263e319f73914d40e8c0ad64f6a383f121072648a29f3ac7e6fb24d5e302c351f9fbed566e059cc22703c707634fa148357f3984ce2
+DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
+DIST bonnie++-1.97.3.tgz 100166 SHA256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 WHIRLPOOL d889c059b0bd5fb77948fd60aee3d1926f2967464a72e4c287cd14d2946e8dc73059d775bb4cfe1c0065ecbe159543dfdd519d880207974e50ec978a666721af
+EBUILD bonnie++-1.97.2.ebuild 965 SHA256 cbd601f54d0240aa3c9635613cb846c34508e5ec5858e56b0ad994f02386c387 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b WHIRLPOOL efc2fcce1b58ac383ffbbc81e4cd2523af222249fae9b523bb70b19aafe8f71d9e1ec4a9a4c82bed9e7b606a68c735ca56627587e2530b7fdfe602315340804e
+EBUILD bonnie++-1.97.3.ebuild 968 SHA256 d07254ff8b94196e7b3f4ca800cdbedb34e980c04a4413cb6743e451ad925fbd SHA512 a889f091f76c8e26c07ac843699675f15cc0d1293f0da2a6d05cbcf064bf2c8b66293986a0bb30226c2f0c36ed1a79233cf938e261847e02074b08ad71fa3285 WHIRLPOOL 1f5792c0c07f17025068645fd356642033a4bc2dd7430a53ab76164572dcc4e65ceaac63edf316de2af4a8b0a3e7b0427685f87b1526bc36a1a42ce54ace2ff0
+MISC ChangeLog 6219 SHA256 41ad592e7d116226be01f0403f48189d31f87ec05c1de5d946d999d4486bb751 SHA512 02049d84691fc92247610d85c8b6b759fcd3a9ae2b3c59682a573485458a2b43cbda488f83d415dd6f145a70d6697d24c8021b7129cd60839206c6487c7960bb WHIRLPOOL 43ba359fe20064cb547e61c6a5d9ac417bb70b0cfaa6704c525bd61a954503e707ff939d8293cf5220ce8d17696b60e730994fb0a4eace37c109ad587e58e21b
+MISC ChangeLog-2015 6391 SHA256 3104a69df62423f66f37cd45aa8ce2828d774c3203372b07990eb5c463433aa9 SHA512 a589ebc39e14adbe8729ff33ac1612be6c63ccad132d290c5bc13f9b2a0992f058c3476f155a91d45b85c262b2dc065d56ddaf1baa78055c78c284d9c93e4927 WHIRLPOOL 4859d840cb4cf05c520cfba33bf2a31bfdd79fe3a074e971173aab6f3da535e6730ef226ee67663e4c1a60f67fc8a613e56e0090ca6fc006f89146a97dde4b7c
+MISC metadata.xml 610 SHA256 2f50dc1eff0c268e3d911156e41e22a799b6025465feb73e0d8cb220cff16bd9 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc WHIRLPOOL 5afaff884e68e762cbb29dbe3d15900d9000e4f33cba0011bbee8299d7fa92199cd985a50d712920affbdd31faaf5ba79355ebe79dab5744db9faedc3706645e
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
new file mode 100644
index 000000000000..129503e49533
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
new file mode 100644
index 000000000000..30084890cf15
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch
new file mode 100644
index 000000000000..05821f977ecc
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.in b/Makefile.in
+index 4f14819..1092891 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,9 +9,9 @@ prefix=@prefix@
+ eprefix=@exec_prefix@
+ #MORE_WARNINGS=-Weffc++
+ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
+-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
+-CXX=@CXX@ $(CFLAGS)
+-LINK=@CXX@
++CXXFLAGS += @debug@ -DNDEBUG $(WFLAGS)
++CXX=@CXX@ $(CXXFLAGS)
++LINK=@CXX@ $(LDFLAGS)
+ THREAD_LFLAGS=@thread_ldflags@
+ 
+ INSTALL=@INSTALL@
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
new file mode 100644
index 000000000000..3d92689541db
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
@@ -0,0 +1,35 @@
+From: Göktürk Yüksek <gokturk@binghamton.edu>
+Subject: [PATCH] Fix array indexing in Zcav::Read when max_loop > 1 and start_offset > 0
+
+In method Zcav::Read, the variable 'i' holds the block index. It is
+also used as an index to arrays of measurement values (read times and
+block counts) when (max_loops > 0). However, the blocks array and
+measurements arrays will be out of sync if some initial blocks are to
+be skipped (by having start_offset > 0). Using the same index value
+for arrays of different sizes causes segfaults. Fix it by substracting
+the start_offset properly when accessing the measurements arrays.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=309319
+
+--- a/zcav_io.cpp
++++ b/zcav_io.cpp
+@@ -108,7 +108,7 @@
+     double total_read_time = 0.0;
+     bool nextLoop = false;
+     for( ; !nextLoop && (!max_size || i < max_size)
+-              && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0))
++              && (loops == 0 || (m_times[i - start_offset] && m_times[i - start_offset][0] != -1.0))
+               && (!max_size || i < max_size); i++)
+     {
+       double read_time = access_data(i ? skip_rate - 1 : 0);
+@@ -135,8 +135,8 @@
+           m_times.push_back(new double[max_loops]);
+           m_count.push_back(0);
+         }
+-        m_times[i][loops] = read_time;
+-        m_count[i]++;
++        m_times[i - start_offset][loops] = read_time;
++        m_count[i - start_offset]++;
+       }
+     } // end loop for reading blocks
+ 
diff --git a/app-benchmarks/bonnie++/metadata.xml b/app-benchmarks/bonnie++/metadata.xml
new file mode 100644
index 000000000000..4d0566b2ee10
--- /dev/null
+++ b/app-benchmarks/bonnie++/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<longdescription>
+		Bonnie++ is based on the Bonnie hard drive benchmark by Tim Bray. This
+		program is used by ReiserFS developers, but can be useful for anyone
+		who wants to know how fast their hard drive or file system is.
+	</longdescription>
+</pkgmetadata>