reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-benchmarks
155 files changed, 4035 insertions, 0 deletions
diff --git a/app-benchmarks/acovea-gtk/Manifest b/app-benchmarks/acovea-gtk/Manifest
new file mode 100644
index 000000000000..ec5ca2c66f74
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/Manifest
@@ -0,0 +1,9 @@
+AUX acovea-gtk-1.0.1-gcc4.3.patch 455 SHA256 7b4481f811095e3e068c1e529982f67bf75c61bc729714e9e42d22830e203fea SHA512 a1312e06ff5bebb8f66a27b34cbdf9cb05879e6dc51951bb683746e2ad20a9cbaddc6d43165face16d1c130262bfd38a29ff645809f884ac88fc66f3d7f19462 WHIRLPOOL c5022bf82bb8841d7ab2afc58509f8908fd104960cb7264ad3f280b23bdc995b579fe7d04af4568c3d3cf13e338df14afb01c49cf6e1050f77df8376b167b801
+AUX acovea-gtk-1.0.1-libbrahe.patch 351 SHA256 12e1284698e4ad84f4ded7135d1dde136a2b68a77d500405d1356121f3bb18ff SHA512 a12b61a07f1d68c56fe13840e9bfd54ebfce1f6205bd0f7d3a98c7a505b7c6dfba33eb159f51c73d64ffabd0f1053c54213ddd01c9a438de35a9a4e00b71282c WHIRLPOOL 17b8c01048a42f5828c5b9457b0d619c7c73e212398b3a00af3edd8e088c35da260194efd2bb7b9c319861f7b6ab0103a8c8c6747585d6016c74e06edce28a8f
+AUX acovea-gtk-1.0.1-libsigc.patch 6753 SHA256 fe354c439af36f94228bf7956eed8fc0bc9ec8d2885dc3b700450eeeb517ba12 SHA512 0f8463b8cec994a8fe1fe2a3971c9cc3f3d1427b7f3925cfdeb3a23ebcecfe324512830a80532ca904896c3314a72e75180dae9b10c2d0711d503c8bfc081ec0 WHIRLPOOL 1448f011da30ab9715d37365718c3935697699563f3c073052e3edd6c64ae58dc806d933c6f57f434efc4312a7bd7411880ec62786d6c5783bfcf1f08ea5d78e
+AUX acovea-gtk-1.0.1-unicode.patch 385 SHA256 348a0d087708a798ca5f514c39aa5403e517b5085e57cd8ca06f1e9780865b83 SHA512 ea792ec464cc5d844eba769bb4246a7396b393d214834c6eaf8890ebf2d0de2d36e0e89dc89efdf753d046d1d3f032dc3806a20bf4360810bb8e1af56fc4d66e WHIRLPOOL 23c9a72713c1232a03c0a6e5991ec5098ae555e1a622d25f0cd43a258470b7b88f1f11dcdcf1f96b8060d2099c16719e6a3c66c242312baecc7e420c85d550d3
+DIST acovea-gtk-1.0.1.tar.gz 407230 SHA256 9214168a66c69d3a76251c265a31a8a87220cd1e9d5865785e92f00cd4f8bae8 SHA512 c26eb0059b0f6a8a77ebff2f9cad9a9d543a2932f035e520c40bc3b917d1570533be934571528b7e2e53932e56afa77eff108a1ac51678a514960563a775c2ed WHIRLPOOL 66e8f6653d2ffbb9ec50cf3654f5522bd73f8fc709887e4b5dd6f0ee863583a7c5be6770f412bc7ae8c58d41314333f4d505d55de3eb0078e0d05ea992e2fd00
+EBUILD acovea-gtk-1.0.1.ebuild 785 SHA256 6390e774a2e7dfaaa8981bd40f1918de355579afaa280de167fca432eb3a5cac SHA512 c0a3df2942f9131796858ab77450eb5ab2aeb47b2b2ed969dbc132ac266e766961c0bab75964a27019d8930e60f6ef39211f8162f2b2efab261032598ab6775d WHIRLPOOL 986b5c7530ad4ce6c84b62b57b5f6d4d69bdfdf2c5aab8ddbb4b68c6ab0b14a4f188d5ee61192ea79d856f77b30de00943bf02468467c3f16af938c0aae993af
+MISC ChangeLog 2755 SHA256 28619472742300150b52da763bde32eb3f39fc1cf1f0c9d96e2530654367ad64 SHA512 d77ae9aeeef083d2c08d3626c861a187f2866c26e0d57209c5fcd3e85cc1240934caea161e69fb462c7a95eb9127ce46e059a16b38f30e3e807d6e5d58b084e1 WHIRLPOOL 37f32353566ff1a1d86f7024500644d2ef47e811b5bf42767c09b6dc30e848e4a9649a9acc10b178102526cbcb69f9e8aeb30db078c8fb7aa8d05c85ca3a5533
+MISC ChangeLog-2015 863 SHA256 551120e97101bd595959714f5dd8e8eebcfa778f0303b5b923f1366b0ed3a811 SHA512 44f143439a3600d020c4fd7b343c0f58e370f1e471b7d58439d572f3a09d7784af6c162d2b16f4e54c4e7263b8b7576af90236a0fa493f3515c44d56cd7ba066 WHIRLPOOL 69bb9e94c194a786db5b0dabcaacbc196a7c80179c5e4684c4a69dbd86d530d48b929ac175fd1e67d8f09606abb946d63f537078e0f816e43eb809160f8b2478
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
new file mode 100644
index 000000000000..b4cb99ed03b9
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI"
+HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
+SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND=">=app-benchmarks/acovea-5
+	dev-cpp/gtkmm:2.4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	use unicode && epatch "${FILESDIR}"/${P}-unicode.patch
+	epatch "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
+	append-cxxflags -std=c++11
+	eautoreconf
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" Acovea-gtk \
+		/usr/share/acovea-gtk/pixmaps/acovea_icon_064.png System
+}
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
new file mode 100644
index 000000000000..30bfc96ab3fa
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
@@ -0,0 +1,23 @@
+--- a/src/settings_window.cc
++++ b/src/settings_window.cc
+@@ -6,6 +6,7 @@
+ // This file is for your program, I won't touch it again!
+ 
+ #include <gtkmm.h>
++#include <cstring>
+ #include "config.h"
+ #include "settings_window.hh"
+ 
+
+--- a/src/main_window.cc
++++ b/src/main_window.cc
+@@ -9,6 +9,8 @@
+ #include <gtkmm.h>
+ #include <gtkmm/main.h>
+ #include <iomanip>
++#include <cstring>
++#include <sys/stat.h>
+ #include "config.h"
+ #include "main_window.hh"
+ 
+
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch
new file mode 100644
index 000000000000..4511f23e92f5
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch
@@ -0,0 +1,8 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,4 +22,4 @@
+ AM_CXXFLAGS = @GTKMM_CFLAGS@	
+ 
+ acovea_gtk_LDFLAGS =  -pthread -L//usr/lib
+-acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lacovea -lexpat 
++acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lbrahe -lacovea -lexpat 
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
new file mode 100644
index 000000000000..aa60489ae630
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
@@ -0,0 +1,101 @@
+--- a/src/about_box_glade.cc
++++ b/src/about_box_glade.cc
+@@ -1530,8 +1530,8 @@
+    hbuttonbox1->show();
+    vbox3->show();
+    about_box->show();
+-   about_close_button->signal_clicked().connect(SigC::slot(*this, &about_box_glade::on_about_close_button_clicked), false);
+-   about_box->signal_realize().connect(SigC::slot(*this, &about_box_glade::on_about_box_realize), false);
++   about_close_button->signal_clicked().connect(sigc::mem_fun(*this, &about_box_glade::on_about_close_button_clicked), false);
++   about_box->signal_realize().connect(sigc::mem_fun(*this, &about_box_glade::on_about_box_realize), false);
+ }
+ 
+ about_box_glade::~about_box_glade()
+--- a/src/main_window_glade.cc
++++ b/src/main_window_glade.cc
+@@ -998,19 +998,19 @@
+    main_status->show();
+    vbox1->show();
+    main_window->show();
+-   menu_set_run_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_set_run_options_activate), false);
+-   menu_save_options_default->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_default_activate), false);
+-   menu_load_default_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_load_default_options_activate), false);
+-   menu_save_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_activate), false);
+-   save_load_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_load_options_activate), false);
+-   menu_quit->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_quit_activate), false);
+-   menu_run->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_run_activate), false);
+-   menu_stop->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_stop_activate), false);
+-   menu_save_output->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_output_activate), false);
+-   menu_about->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_about1_activate), false);
+-   toolbar_settings_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
+-   toolbar_run_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
+-   toolbar_stop_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
++   menu_set_run_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_set_run_options_activate), false);
++   menu_save_options_default->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_default_activate), false);
++   menu_load_default_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_load_default_options_activate), false);
++   menu_save_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_activate), false);
++   save_load_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_load_options_activate), false);
++   menu_quit->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_quit_activate), false);
++   menu_run->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_run_activate), false);
++   menu_stop->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_stop_activate), false);
++   menu_save_output->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_output_activate), false);
++   menu_about->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_about1_activate), false);
++   toolbar_settings_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
++   toolbar_run_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
++   toolbar_stop_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
+ }
+ 
+ main_window_glade::~main_window_glade()
+--- a/src/settings_window_glade.cc
++++ b/src/settings_window_glade.cc
+@@ -391,11 +391,11 @@
+    hbuttonbox3->show();
+    vbox6->show();
+    settings_window->show();
+-   settings_benchmark_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
+-   settings_config_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
+-   settings_seed_check->signal_toggled().connect(SigC::slot(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
+-   settings_cancel_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
+-   settings_okay_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
++   settings_benchmark_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
++   settings_config_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
++   settings_seed_check->signal_toggled().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
++   settings_cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
++   settings_okay_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
+ }
+ 
+ settings_window_glade::~settings_window_glade()
+--- a/src/about_box_glade.cc
++++ b/src/about_box_glade.cc
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+--- a/src/main_window_glade.cc
++++ b/src/main_window_glade.cc
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+--- a/src/settings_window_glade.cc
++++ b/src/settings_window_glade.cc
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
new file mode 100644
index 000000000000..a81d90282f38
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
@@ -0,0 +1,12 @@
+--- a/src/main_window.cc
++++ b/src/main_window.cc
+@@ -488,7 +488,7 @@
+ {
+     Glib::RefPtr<Gtk::TextBuffer> buffer = main_window_output->get_buffer();
+     Gtk::TextIter end = buffer->end();
+-    buffer->insert(buffer->end(),text->c_str());
++    buffer->insert(buffer->end(),Glib::convert (text->c_str(), "UTF-8", "ISO-8859-1"));
+ } 
+ 
+ void main_window::set_ui_running(bool running)
+
diff --git a/app-benchmarks/acovea-gtk/metadata.xml b/app-benchmarks/acovea-gtk/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
new file mode 100644
index 000000000000..24cb884f28e6
--- /dev/null
+++ b/app-benchmarks/acovea/Manifest
@@ -0,0 +1,12 @@
+AUX acovea-5.1.1-asneeded.patch 365 SHA256 f588beca58a484c73cb7430ba2315d61cb7de8bb0655a63046d28fb4fecb4a42 SHA512 be35c0d09951819c757508043de1d73ffa9465ed959413c396bf6d66fd9f1bfaef6c179b4de7179f8ae01fab916162ddb939845c3dc9eb66c9248687a5490e66 WHIRLPOOL 9ea592f20cdbbd6350cb438f3ac263b260d4247a008050af706d29032c3cf0ec998925f7b17f400ffbb07264898c66edf8c036023e36514d9f5039e475e49e87
+AUX acovea-5.1.1-free-fix.patch 267 SHA256 ecfa5e0620ad8d07c67fa4cd1dc49291b935fce36231814d378e5af8520dc76c SHA512 29cf58e1cb2c7b81237aba22965f3d9265e2b9267336537757e20f54c60ba1dc45760d7d74f16797edc1205b24c0a174d4cd8a986b7e8886afe494a1ef1d7fff WHIRLPOOL 35e23663ae0fa84f90477693e577fd4a10a2fc3d09a9b96e7c1e9c1a84c238843b6b0334961788a913a2706d2752814dae04731c5a9c2b5e31f72439aa17ee06
+AUX acovea-5.1.1-gcc44.patch 281 SHA256 f492170e2b95eedd669ce23ba69dafa500b746c2936fb2be5e0ff88dfcbe86ca SHA512 90b5d7237cb1387248b4e1a688df228bb7c258830654fea661b121a481e81bc201391be11eeaea7bb05a537fa59fdac5d278f6f5fdb596c228d8ed10ce05d267 WHIRLPOOL 049d999e7a669a47f07fc35f751a1a18f91c5a84822dab5e95d369e6001aa805f8da858eb924511471c75b71ba4e7c075adf761ee6a5214134b05b8ec401e6f2
+AUX acovea-5.1.1-glibc-212.patch 231 SHA256 6f0e34d65bf4a4938357f04489360ff555192c13f66eda1244ceaeaddf7fce83 SHA512 c126096e8d92a8954136ef30f29aef110c427079d1fcf5b836ac2e53a9c6903b76675e3c5e2f3caf18ef73754fdd5d314d55665fa94c6bdd782faa4b97770775 WHIRLPOOL 119d32d85921c31efee79f5d5b467ad5d70b304a87987ee4554577ea2abc0d227fe8fcc61cb8b6254d009a622f65350d8830f7975e7c816f8160a166eadae528
+AUX acovea-5.1.1-libevocosm.patch 3527 SHA256 18ae32d3cfb70265d5a30b48d6111fc177ccb446b16416d39f3de425a1a40ee0 SHA512 f5161d0b9b76dbaea3708c3a2947966e13da12e9430c347efe75e069dff769812628c6225f42263e3a735ca829e38e4329ab14e80d1cfffce98ca8b61b03cafb WHIRLPOOL a9e75d01836053f5ac2eb0a7a835c2e9c313d016eb9cff97433d0e1d53a7c93d208b75aeded1b6a617f328e7c140d49027c1b6d65be4cabaa94fd46f9252e6c2
+AUX acovea-5.1.1-underlinking.patch 327 SHA256 4bcf41bd35dc04048eaef383c2beb67306850ddc9499e8afe70cdcd1ddf8094d SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883 WHIRLPOOL 9068015e8133626d9d170f46e009c79ae498ccb680b5657f6ff8e2d6094f6fdbccb7f07ef54ed8402fa7a33e55cbcb3b4b98beb57b0c33e3f395ac23c7ee3a74
+DIST libacovea-5.1.1.tar.gz 363048 SHA256 e84167ac683e6bf7720bd3edf1fc60e77961eb489d31fa2c1d0a34e7d67ae079 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365 WHIRLPOOL 420b6ec243a0e94a532091c1efebd37e42775db7c3402066849003f5325bf81ff0b87c64e6d0771dc1ccd6615484aebe1d40fec5e7ab19879596454a3cb95a4f
+EBUILD acovea-5.1.1-r1.ebuild 1099 SHA256 6c8d20deac5b49b696d2cf1aca5980d331888c671bab09b4e809c62f20240acd SHA512 8738f812088fd73c3583f17cce6af8885f87a65de608a688592c19d941505239719cda161eb2062215704d1b5380842f7b92cdc1a0966ed7b983415e2a0af82c WHIRLPOOL c7f7d93719981e56d3e96db923fc8a42caedcaf96593d5c4a6efce2278911a5ec872608c9abf4b0ddc57fa2b1d5d0e6715b7d1db4b1f8a0eda11bd82d7d9cc43
+EBUILD acovea-5.1.1.ebuild 1057 SHA256 5f63e0c902ba5683273062d0fb955f5eda265422f3835998eee004a6d776a030 SHA512 54def173fd2bd5049bb044ce6e648ecdaee76ee9e0930bf41d1875105b2395554edcb31398c538f33db1b94ded703128287922cef38511d3b532472429ec272c WHIRLPOOL 672c32c4bb928be55a5469e9c72e5fbc8929fd04e6c7dbe06a09955d86f376cbc6a2b61c0f7fff4b6f27c2dc7b35587e7d8e811d959868f7fc779fa05eb32c18
+MISC ChangeLog 2712 SHA256 a69345c84bdd814e338c6efaac4479f263b361dc18fbb81eef931d4d07ba3598 SHA512 1a020272ba4692566175723483617abaa2e0c21b66692ad8e9fef641775b81562ecddd34bdd791164c2ade827376cd809be1b33f2b50ae030919805aa221ae7b WHIRLPOOL 07140dc545ee7f3e4fda7641e377d7542489847ff9a08e2fc4b39d23bd957ca80a61e68028724e6bc36b87682fc9838a532afd1f7d6dfdbb700b6cabbce17477
+MISC ChangeLog-2015 3142 SHA256 b47ba0f5059970e5ae2bb779038d8330be0b6b898557bfa2b807994b908f61ab SHA512 35bdf9143a45c22ef00c6a9d9b4d8d3ffd525ebacc64c59aaa87f04d5df24fe469180a740f54989240de4f172c7e805b08bd93ab6f7a5235407b07968dee0ce9 WHIRLPOOL 9b20374629b5051f0e68345affc328e04bdd646ff72ab928ee3d0e3c4acf99a33fcd33c3a008fe6942243d0cdc38a313dd8472054d6a7940aeed24a0d6960587
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..5e0202450e7d
--- /dev/null
+++ b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+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 \
+		"${FILESDIR}"/${P}-underlinking.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/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
new file mode 100644
index 000000000000..63623ba07e28
--- /dev/null
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -0,0 +1,47 @@
+# 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/acovea/files/acovea-5.1.1-asneeded.patch b/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
new file mode 100644
index 000000000000..8bfb8a175550
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
@@ -0,0 +1,16 @@
+--- cmdline/Makefile.am
++++ cmdline/Makefile.am
+@@ -7,4 +7,4 @@
+ 
+ runacovea_SOURCES = runacovea.cpp
+ 
+-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lexpat
++LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
+--- libacovea/Makefile.am
++++ libacovea/Makefile.am
+@@ -16,3 +16,5 @@
+ library_include_HEADERS = $(h_sources)
+ 
+ DEFS=-I. -I$(srcdir)
++
++LIBS = -lexpat
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch b/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
new file mode 100644
index 000000000000..55b3b00e8897
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
@@ -0,0 +1,12 @@
+--- benchmarks/treebench.c
++++ benchmarks/treebench.c
+@@ -201,8 +201,8 @@
+         if (page->m_links[n] != NULL)
+             recursive_destroy_page(page->m_links[n]);
+         
+-        free(page);
+     }
++    free(page);
+ }
+ 
+ static void free_btree(btree * btree)
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
new file mode 100644
index 000000000000..c5e5392b2f99
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
@@ -0,0 +1,14 @@
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
+@@ -44,10 +44,11 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+ #include <vector>
++#include <cstdio>
+ #include <cstring>
+ #include <sstream>
+ #include <iostream>
+ #include <iomanip>
+ #include <stdexcept>
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch b/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch
new file mode 100644
index 000000000000..9763951a672a
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/336260
+
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
+@@ -44,6 +44,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ 
+ #include <vector>
+ #include <cstring>
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
new file mode 100644
index 000000000000..f801b8c68bcb
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
@@ -0,0 +1,119 @@
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
+@@ -86,7 +86,7 @@
+ // randomize settings of this option
+ void option::randomize()
+ {
+-    m_enabled = (g_random.get_rand_real2() < 0.5);
++    m_enabled = (g_random.get_real() < 0.5);
+ }
+ 
+ // mutate this option
+@@ -246,7 +246,7 @@
+         m_step = 1;
+     
+     // possibly adjust value to randomize populations
+-    size_t choice = g_random.get_rand_index(3);
++    size_t choice = g_random.get_index(3);
+     
+     switch (choice)
+     {
+@@ -304,12 +304,12 @@
+ void tuning_option::mutate()
+ {
+     // select our mutation
+-    if (g_random.get_rand_real2() < 0.5)
++    if (g_random.get_real() < 0.5)
+         option::mutate();
+     else
+     {
+         // mutate value of this option, up or down randomly
+-        if (g_random.get_rand_real2() < 0.5)
++        if (g_random.get_real() < 0.5)
+             m_value -= m_step;
+         else
+             m_value += m_step;
+@@ -335,7 +335,7 @@
+ enum_option::enum_option(const vector<string> & a_choices, bool a_enabled)
+   : option(a_enabled),
+     m_choices(a_choices),
+-    m_setting(g_random.get_rand_index(a_choices.size()))    
++    m_setting(g_random.get_index(a_choices.size()))    
+ {
+     // nada
+ }
+@@ -344,7 +344,7 @@
+ enum_option::enum_option(const char ** a_choices, size_t a_num_choices, bool a_enabled)
+   : option(a_enabled),
+     m_choices(),
+-    m_setting(g_random.get_rand_index(a_num_choices))    
++    m_setting(g_random.get_index(a_num_choices))    
+ {
+     for (int n = 0; n < a_num_choices; ++n)
+         m_choices.push_back(string(a_choices[n]));
+@@ -369,7 +369,7 @@
+         token = strtok(NULL,"|");
+     }
+     
+-    m_setting = g_random.get_rand_index(m_choices.size());
++    m_setting = g_random.get_index(m_choices.size());
+     
+     free(choices);
+ }
+@@ -407,17 +407,17 @@
+ void enum_option::randomize()
+ {
+     // randomize enabled
+-    m_enabled = (g_random.get_rand_real2() < 0.5);
++    m_enabled = (g_random.get_real() < 0.5);
+     
+     // randomize setting
+-    m_setting = g_random.get_rand_index(m_choices.size());
++    m_setting = g_random.get_index(m_choices.size());
+ }
+ 
+ // mutate this option
+ void enum_option::mutate()
+ {
+     // select our mutation
+-    if (g_random.get_rand() & 1)
++    if (g_random.get_real() < 0.5)
+         option::mutate();
+     else
+     {
+@@ -435,7 +435,7 @@
+         
+             // find a different setting
+             while (new_setting == m_setting)
+-                new_setting = g_random.get_rand_index(m_choices.size());
++                new_setting = g_random.get_index(m_choices.size());
+             
+             m_setting = new_setting;
+         }
+@@ -915,7 +915,7 @@
+     // randomly pick an option from one of the parents
+     for (int n = 0; n < a_parent1.size(); ++n)
+     {
+-        if (g_random.get_rand() & 1)
++        if (g_random.get_real() < 0.5)
+             child.push_back(a_parent1[n]->clone());
+         else
+             child.push_back(a_parent2[n]->clone());
+@@ -931,7 +931,7 @@
+ {
+     for (int n = 0; n < a_options.size(); ++n)
+     {
+-        if (g_random.get_rand_real2() < a_mutation_chance)
++        if (g_random.get_real() < a_mutation_chance)
+             a_options[n]->mutate();
+     }
+ }
+@@ -1096,7 +1096,7 @@
+             acovea_organism * child;
+ 
+             // do we crossover?
+-            if (g_random.get_rand_real2() <= m_crossover_rate)
++            if (g_random.get_real() <= m_crossover_rate)
+             {
+                 // select a second parent
+                 size_t second_index = first_index;
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch b/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch
new file mode 100644
index 000000000000..06ef410b6cc6
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch
@@ -0,0 +1,10 @@
+diff --git a/cmdline/Makefile.am b/cmdline/Makefile.am
+index f3c763e..8e18d9c 100644
+--- a/cmdline/Makefile.am
++++ b/cmdline/Makefile.am
+@@ -7,4 +7,4 @@ bin_PROGRAMS = runacovea
+ 
+ runacovea_SOURCES = runacovea.cpp
+ 
+-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
++LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lbrahe
diff --git a/app-benchmarks/acovea/metadata.xml b/app-benchmarks/acovea/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/app-benchmarks/acovea/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
new file mode 100644
index 000000000000..f813879d20d6
--- /dev/null
+++ b/app-benchmarks/bashmark/Manifest
@@ -0,0 +1,8 @@
+AUX bashmark-0.6.2-as-needed.patch 362 SHA256 e15a0052cb6ca674369f979926cb6974962ec57e810599b50059c92e1c1506af SHA512 123afc84ec7131492054d28d6e41f32730328298fcb5f13055a56277d1c286352a3ff70d759fb307dc960fba413ad31102f04bf5b5df55d6052743d26b7bcad4 WHIRLPOOL 648d5620a55b1c1de8b023b0dcfca82be399fc65681824f30ee32972b301ecce7dc70c45bdfface961eef65d079df75493b7869d4f0a8b47346746a6c4431eda
+AUX bashmark-0.6.2-gcc43.patch 2034 SHA256 72018c7fe756c8caa375acb43fc640d4ffb5989e773dcdcea8f370f66af08fb6 SHA512 48d1d0b2924d3640e8939f44989528a9a83fb56e436da21abb9301bbbbed28dbf2fa5e46b6631ac09531ed1ef218da685d21d5b3aeb48f147d56a1aa161bf09c WHIRLPOOL e0d21716c80be20c12310a77d42cb17f19ba9616e29c16dd4f0a6f5eac40dc6b5115001e6c4a85018df8d4ff35768745e3931b18a2421fd26ee4c50f68c518db
+AUX bashmark-0.6.2-gcc47.patch 631 SHA256 089fed2a3c7200dbf6a4eaf647079dce41f172d984c43d1c283869fd5d1ea69c SHA512 60b1c1dd529d7dcac0893f1cc5d74e5fdcecb2bfd5735e33c6445d9fbaa843258b9aaaee9627ba98db1f8237f4567b8868f4be483b681b130d5a34943d2d24b6 WHIRLPOOL c79364639556eaa5b65229791dabc7eca053e3e2a0cb80cfa3ad11e698d51c9449c8b6b6494984df5907aac1aadf463db6ce285374458ebb6a315897ad8b0b0d
+DIST bashmark-0.6.2.tar.bz2 21944 SHA256 cdef5531069ccb9242a6c0ae3298be85053784782c4fe4a9d9518215dd2f085f SHA512 43935b44c1b871d724aca0e1a6dfd99c73c29ec276c4127186e8dc6c7b27d57554b8b32a7e2372cd0b78eb584df7ee169f51f47e6666f61eaacbe35c5d4074f8 WHIRLPOOL 93b0596d69819fecf2969edb132466d24fba4cc9a1f5d2ba5cac5a95735dd34af133afb01beca8f9588f62812c76b043acf13554dacec148636f4bbed1deff9d
+EBUILD bashmark-0.6.2.ebuild 541 SHA256 81551012cfe276fb2622ba96b427646e7a3894cf4ed3d1f691dac50819b4b371 SHA512 cfdce168c7343f0903b4bd5cb66bfdf7383d5f00263d1b2aba335d9535fbeb5023b30b3a9eb860ec7d7d139c0316fd8db16c7e95d40897205da42811a59d67c7 WHIRLPOOL 2c842883d38171400d3a44afce766bbd5b4fd03ffb55724bb4279c4ae30a6dba08a4db8dfcef8d8b8396dd6e836a00303bfc70a5583410cb9f0eeca19072f2ae
+MISC ChangeLog 2576 SHA256 3ec8a774820fe83ee9a785ad032cb9a713a67821400a2802275648adf5885d16 SHA512 1ddc6ed1e1303fcfb373f167a0b4d5436080312ba616c14b2435ed5db249b91c20e9421c727bba0613f9c680a1518f368a9121d466c867c6db2f7c9246f1c317 WHIRLPOOL 5009635558e501d274b40c7a1f1a78711ca354c4549d2749a497b8b7e7ca5dd466731778f4a3923ac8f7761c60b442c585e03bb28bd1d924128ae344af39c674
+MISC ChangeLog-2015 2283 SHA256 aaf36e7dd907ee895cdfcbf38b61d24ac2468f6cd60ade9a521006a072eedd05 SHA512 e35619656400dc642e4497df4c6e848e9a9d932421295123199698a1c2b91617b91c9c8365f0419f2d650c718e75786f2ffa65af6f06f9d9198357cdd1408f8c WHIRLPOOL fad647c2066a19e1566049f85ce7fd7e3c700cb9572154d24934c27dcecd852742f6bc59cc615f435e678cae2a0f1d58f1606b7975ee4d7e59a125adf4279750
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
new file mode 100644
index 000000000000..c50dd20f0339
--- /dev/null
+++ b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Geno's cross platform benchmarking suite"
+HOMEPAGE="http://bashmark.coders-net.de"
+
+SRC_URI="http://bashmark.coders-net.de/download/src/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_install() {
+	dobin bashmark
+	dodoc ChangeLog
+}
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
new file mode 100644
index 000000000000..6c01fd934e5d
--- /dev/null
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
@@ -0,0 +1,12 @@
+diff -ru bashmark-0.6.2-orig/makefile bashmark-0.6.2/makefile
+--- bashmark-0.6.2-orig/makefile	2007-10-08 23:01:06.000000000 +0300
++++ bashmark-0.6.2/makefile	2007-10-08 23:01:22.000000000 +0300
+@@ -10,7 +10,7 @@
+ BIN = bashmark
+ 
+ $(BIN):  $(OBJ)
+-	$(LD) $(LDFLAGS) $(CXXFLAGS) $(OBJ) -o $(BIN)
++	$(LD) $(CXXFLAGS) $(OBJ) $(LDFLAGS) -o $(BIN)
+ 
+ 
+ Benchmark.o:
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
new file mode 100644
index 000000000000..625abdab397b
--- /dev/null
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
@@ -0,0 +1,48 @@
+diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
+--- bashmark-0.6.2.orig/Benchmark.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/Benchmark.cpp	2008-06-29 11:54:02.000000000 +0200
+@@ -15,11 +15,11 @@
+  *                                                                         *
+  * You should have received a copy of the GNU General Public License       *
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+-#include <string>
++#include <cstring>
+ #include "Benchmark.hpp"
+ #include "Stopwatch.hpp"
+ #include "Main.hpp"
+ 
+ 
+diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
+--- bashmark-0.6.2.orig/main.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/main.cpp	2008-06-29 11:56:40.000000000 +0200
+@@ -17,10 +17,11 @@
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+ 
+ #include <sstream>
++#include <cstring>
+ using std::stringstream;
+ 
+ 
+ #include "Output.hpp"
+ #include "Sysinfo.hpp"
+diff -NrU5 bashmark-0.6.2.orig/Sysinfo.cpp bashmark-0.6.2/Sysinfo.cpp
+--- bashmark-0.6.2.orig/Sysinfo.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/Sysinfo.cpp	2008-06-29 11:55:58.000000000 +0200
+@@ -15,11 +15,12 @@
+  *                                                                         *
+  * You should have received a copy of the GNU General Public License       *
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+- 
++
++#include <cstring> 
+ #include "Sysinfo.hpp"
+ 
+ using Geno::Sysinfo;
+ using Geno::Cpu_Info;
+ 
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch
new file mode 100644
index 000000000000..cb26d32b1fd6
--- /dev/null
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch
@@ -0,0 +1,29 @@
+ https://bugs.gentoo.org/422577
+
+ error: 'usleep' was not declared in this scope
+
+ 
+ Benchmark.cpp | 1 +
+ main.cpp      | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/Benchmark.cpp
++++ b/Benchmark.cpp
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+ #include <cstring>
++#include <unistd.h>
+ #include "Benchmark.hpp"
+ #include "Stopwatch.hpp"
+ #include "Main.hpp"
+--- a/main.cpp
++++ b/main.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <sstream>
+ #include <cstring>
++#include <unistd.h>
+ using std::stringstream;
+ 
+ 
diff --git a/app-benchmarks/bashmark/metadata.xml b/app-benchmarks/bashmark/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/bashmark/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
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>
diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
new file mode 100644
index 000000000000..6c4b1592e239
--- /dev/null
+++ b/app-benchmarks/bonnie/Manifest
@@ -0,0 +1,10 @@
+AUX Makefile.patch 443 SHA256 baa6769e3b3b1f789336ecd9884488c5a63e13e9e408fb49fee5f921130a1e19 SHA512 393120573ab84e87acff8d94bbb5d733378594c5bb1af9b26faec1fa7f24bee914d0c56cc07de3671a47b8ed27fb9abc174fd228c25b0fce609513f31121988d WHIRLPOOL c3332f0d76141574f35ebca88007a791691d837c502335a92bbaa757011e817c9e7d1d44cd0acfde05be473a9fa24722e970849f79a342d37d0419b8686b1876
+AUX bonnie-2.0.6-includes.patch 336 SHA256 e1c0c75832d97e5e7a6d168856fc146f1302340dd6efb27195e531e22d8734ee SHA512 ed5cadebfabf1efb7e0b5289cfb67627262d83f4f9650d020755b1c47f19601b845193892c502d9947316d639b6423d52a862224f1943dcae182a151e0c72a39 WHIRLPOOL 772639706a38a9f99760db5bbbd827e7b50e604fd54650fe1069a568487e4f31a0a9879dc0b98290d130d21275e551e6c3cab7201e17981b642c9aa1f2b1d481
+AUX bonnie_man.patch 349 SHA256 2ac780eaa9d744c9e17d068c206c6227ae6e5d0006c5b5fc4bd1aeb951f1c696 SHA512 38d88dcba9ef17e2de843a6123a063203c8fa1c1b654109fba3c7bee54275e6fa0ebe1f3ce8986b07891fc5cbfca4b310f71d4bc4e564a20ec199ecafb58de64 WHIRLPOOL d2d833b88da9d13fef09604960e0b2b92ba129c299247ea018acef15f65ffeb32a91af453951f17750bf150732623c671eb25dc79070854978bf44a435d3df6a
+DIST bonnie.tar.gz 7140 SHA256 e420ca9275ddd9aa5fdb27d86851a57eea5ff94e8ccf6ba71352d35546842937 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f WHIRLPOOL fee140ff6110edef099ae9d1b3bc50341730c4e53bef39db8a2b63451e8dcf12322e3b74c2537c3bebf86a230de5b75c6393dd915d13ba891363493331844876
+EBUILD bonnie-2.0.6-r1.ebuild 721 SHA256 30d86685669a7b0f86d0184318f7c407740ce5491e244bd7ebd46d5718fef8fd SHA512 85c9d5ce22c0a6287c25c4de9f2b428826d5d9303095d5e7d7372612deba8e604993e1769401a72f4fe0f864391dba89961adec3aba811aeba17eddbd9fbd02e WHIRLPOOL 43f009b86b1bb0322371ac87a6eb7d065affd75aaee7de69e8763cd21b2fbd3f71a9b35197e94f9682dedebf3ae91c971a7d247473aa963782f34c1daa725d97
+EBUILD bonnie-2.0.6-r2.ebuild 692 SHA256 b4dd596e43a8ba1f77fd060df396ea078397238d7afc71197da77225962eb7f0 SHA512 d2f0cc1d0bbecd8364bb4ddf7aa28f3f9f05b77512d18f9b5e35b8996b1981d1ada5ea7fe8df9fe20e29ad3577a36239a35aa53ce2f0961e3d49d7168a999985 WHIRLPOOL 832cc06e828923221e195fae3bef8e271844a627fb9d6df05fbbb65018017047197c9c96ffe9cbd8fd08deb729fcf86097846a03faa3eeaf4992e574910c257a
+EBUILD bonnie-2.0.6.ebuild 684 SHA256 43d08db8f0d74bf4bb6bd4caa22162484810fe9b1a31b4cfb634ce2215925f84 SHA512 065f7ec012dda7784096637e0c3dc56bc57e16064da13868e3e31d1e8acaf41880ee416d68655fc159a07110e8b0c4da9d43e9c1b8edf84eacc481fef96e2cef WHIRLPOOL f533eafed0b362345412bb61d48c10be6efa16e33f665cab4a4cdadccd932265ba37e9548b94e689651a1281dd755bfb92af97898ec12f3f9960abd97ccc1d18
+MISC ChangeLog 2601 SHA256 0be652ab0628e9f338533a88c3d6d9e16c734728cd25c64c1de325143f71abf1 SHA512 f5a22e81d16345ac3f94c4f8df4ea277d51cac1b17358a1920617deb2d623e7f44f383ed79c74432c19917e0ca6ceeecae45469cad90e4432f5a20637019944c WHIRLPOOL 49899aacd85f5fff3bf5cfd9148f425beabcd7bf19fa66ac633ef3479c990861c258c42d58e6be9a4ea465dd81159016b84868e48592823a1222e586031ca5ae
+MISC ChangeLog-2015 2204 SHA256 7371567f1c0e3544e4f96943556fabca92469011bc8e142bb8d14d7cf86092ee SHA512 52ba451e303a795d4c57a874006504c0bb8432baee971e15f319de778c062502a8d98fe53ef76aa9c42de25a669e5d3d3b872be59d5b3ebc58d39eb618902e81 WHIRLPOOL 12150e3f6cf7de06d6ee6fcb7244aa990718ee75429dec3473ade6e7451bfc4391518f9ce2f9c9afa8fe9616d1e2d3cdc45ff8ff43fa95ef8e88491f23bf6645
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..b62e0aa42e4e
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
@@ -0,0 +1,34 @@
+# 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
new file mode 100644
index 000000000000..c9fdf5a2ddb6
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+
+PATCHES=( "${FILESDIR}/bonnie_man.patch"
+	  "${FILESDIR}/Makefile.patch"
+	  "${FILESDIR}/${P}-includes.patch" )
+
+src_compile() {
+	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	newbin Bonnie bonnie
+	doman bonnie.1
+	dodoc Instructions
+}
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
new file mode 100644
index 000000000000..ddb11ff6ad17
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
@@ -0,0 +1,34 @@
+# 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
new file mode 100644
index 000000000000..c4367087b8b5
--- /dev/null
+++ b/app-benchmarks/bonnie/files/Makefile.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	1996-08-29 03:45:37.000000000 +0200
++++ b/Makefile	2011-08-25 16:07:10.757629898 +0200
+@@ -1,11 +1,11 @@
+-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."'
+-	make Bonnie 
++	$(MAKE) Bonnie 
+ 
+ SysV:	
+-	make Bonnie 'SYSFLAGS=-DSysV'
++	$(MAKE) Bonnie 'SYSFLAGS=-DSysV'
+ 
+ Bonnie:	
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
new file mode 100644
index 000000000000..cfefe953c6f1
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
@@ -0,0 +1,13 @@
+--- a/Bonnie.c	1996-08-28 18:23:49.000000000 +0200
++++ b/Bonnie.c	2010-10-12 20:15:26.000000000 +0200
+@@ -29,6 +29,10 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <time.h>
++#include <string.h>
++#include <stdlib.h>
++#include <sys/wait.h>
+ #if defined(SysV)
+ #include <limits.h>
+ #include <sys/times.h>
diff --git a/app-benchmarks/bonnie/files/bonnie_man.patch b/app-benchmarks/bonnie/files/bonnie_man.patch
new file mode 100644
index 000000000000..e4b2fe0a12e3
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie_man.patch
@@ -0,0 +1,16 @@
+--- a/bonnie.1	2003-01-07 14:19:29.000000000 -0600
++++ b/bonnie.1	2003-01-07 14:20:19.000000000 -0600
+@@ -60,11 +60,11 @@
+ .fi
+ .in
+ ..
+-.TH Bonnie 1 "2.0.6" Textuality
++.TH bonnie 1 "2.0.6" Textuality
+ .SH NAME
+ Bonnie - File system benchmark
+ .SH "SYNOPSIS"
+-.B Bonnie
++.B bonnie
+ .RI "[-d\ scratch-dir]"
+ .RI "[-html]"
+ .RI "[-m\ machine-label]"
diff --git a/app-benchmarks/bonnie/metadata.xml b/app-benchmarks/bonnie/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/bonnie/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
new file mode 100644
index 000000000000..17647a2b68ce
--- /dev/null
+++ b/app-benchmarks/bootchart2/Manifest
@@ -0,0 +1,7 @@
+AUX bootchart2-0.14.7-sysmacros.patch 816 SHA256 3d2d42b67477b78c7ef6ac2e81264fd1fc31178e9d34219e63f9a8c4889d7892 SHA512 f10323b69ae1fac964f46c92931464d6398baad30cc41d4aec8315a3c13eae4a8423b7830868eb8a772ee8f93d6da3251d55236bd359205925100ec092aee099 WHIRLPOOL 4513270b6480e1c925665805b8b80daa8bdb89ddcce4b0a9e4a7cb11cb0439ec2514db197828355d173354915621d2451c6db98821d00042c26449cb667c88e7
+AUX bootchart2.init 693 SHA256 4a4be28f096b8389ee34ce2ee2f15528ec78633fd922f8590746523b8b082a22 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b WHIRLPOOL 8974905cd28a95403f89ecdbef3296091f62315bb18e882d77cb83a909e1cb71af1670d0ecbc0361b899708feaaa3009c00b05b2cc3e9560dcbd799d4f94839f
+DIST bootchart2-0.14.7.tar.gz 1175145 SHA256 abce617f0392b05619ee18f6a118f3445892bcedba6b762cdf467bafab2276a9 SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541 WHIRLPOOL 32b6cff0db49ccb3db0bf21b6b9fc05301a7fa0cd741149a118a41e2c12e82f5345f1a9e4c83aed53d48cf9809193554a583b3ccf37862b8af9277a458f42d58
+EBUILD bootchart2-0.14.7-r1.ebuild 1906 SHA256 8421c605e0d510e691fe6314687fc3fe3c1db0f81f6625521cb8b57a3c0f7bf2 SHA512 66071bc7926f4be1a14fd6ace9e4690ecc4928b66d949f7bace426b8e3d5caad5b82aaaa1dc1755fca53411fc757e296177b42a5e4d921e4afd5336d0aefa642 WHIRLPOOL 6dcd145e158784b2d84722744b7a795734490e6626e61c4f076d83265a1c18dd08a80ae05dc6992f5b5201be2b5c0ce05fce3af31055e318f5c84cf394de77e2
+MISC ChangeLog 2779 SHA256 31c56b615dbfb6efcc38e12bdbbcb04e69868f6910613b7476ca278a97561758 SHA512 213188fe394377e0e563c501380453165cc373fbe941d026159285b765d13848732a9d1038933ea754b45bef6fbab9ac6d4889a0fbaa8ce274d2f5e116f0b462 WHIRLPOOL 0c6a3c5ca30f626291cf0abe506111170ff32f7a79f4d49cdea986f0a1f17fb6696f5691e7e48db5b0842ae118c2b46c0ef683cb65c023830cbfc5f849be4764
+MISC ChangeLog-2015 3926 SHA256 7724fea9e4b0be5932da81347d58df2d7bc64db76edf890f5c1651ae02ec3202 SHA512 9b02a7af23c9517e116f603dcd645ac46caba3fd6af705c13c20953f5cd7d616351b1ee5f6544251fcf50290a4e1cbce6e2cce41e47ed02669ff4204d13e0369 WHIRLPOOL 6b40ab7712bcb67d0c38d29769f0bf21cd67b34e79c7b19545ddaac84eef1bb0477fa1d848c58e13dae5aeda3091c27ecdc8534b7dfdee1741748e62e9dd534e
+MISC metadata.xml 304 SHA256 bd19240541e0e09337c5dad236a7d2cd2c9188cab7cce52d416d93e1ed5fb47c SHA512 a32bf175ccbaf61207413ae249aa66e72c7704abc0e1c41e9a6eb5fbbc21ea143f45588490ef53bbc8a5ffa0145880de87308ed33df9354a1433016f6540f46e WHIRLPOOL 561f0c6cacf17dc412b66202f7f95559722a873e87d77da7310b789fd6d7ed1fd26ac4af31ebc698746bd7e0317446355346cb6ef0d57a52e5372913e8161cdb
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
new file mode 100644
index 000000000000..08018cc91c6b
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit linux-info python-r1 systemd toolchain-funcs
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="https://github.com/mmeeks/bootchart/"
+SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="svg test X"
+
+REQUIRED_USE="
+	X? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X )"
+
+RDEPEND="
+	!app-benchmarks/bootchart
+	X? (
+		dev-python/pycairo[svg(+)?,${PYTHON_USEDEP}]
+		dev-python/pygtk[$(python_gen_usedep 'python2*')]
+		${PYTHON_DEPS}
+		)
+	sys-apps/lsb-release"
+DEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}"/${PN%2}-${PV}
+
+CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch #579922
+	tc-export CC
+	sed \
+		-e "/^install/s:py-install-compile::g" \
+		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
+		-i Makefile || die
+	sed \
+		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
+		-i bootchartd.conf bootchartd.in || die
+}
+
+src_test() {
+	python_foreach_impl emake test
+}
+
+src_install() {
+	export DOCDIR=/usr/share/doc/${PF}
+	default
+
+	# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
+	# just change it. Since no libraries are installed, /lib is fine.
+	keepdir /lib/bootchart/tmpfs
+
+	installation() {
+		python_domodule pybootchartgui
+
+		python_newscript pybootchartgui.py pybootchartgui
+	}
+	use X && python_foreach_impl installation
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+}
+
+pkg_postinst() {
+	elog "If you are using an initrd during boot"
+	echo
+	elog "please add the init script to your default runlevel"
+	elog "rc-update add bootchart2 default"
+	echo
+}
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
new file mode 100644
index 000000000000..de6e4112b685
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/579922
+
+From add58c3b57064afd6f7d2fd5f09006d28a3e770e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 21 Apr 2016 00:19:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
+Linux C libraries are updating to drop the implicit include, so we need
+to include it explicitly.
+---
+ collector/collector.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/collector/collector.c b/collector/collector.c
+index cfdcb26..2f3ce6b 100644
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -33,6 +33,7 @@
+ #include "common.h"
+ 
+ #include <sys/mount.h>
++#include <sys/sysmacros.h>
+ #include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
+-- 
+2.7.4
+
diff --git a/app-benchmarks/bootchart2/files/bootchart2.init b/app-benchmarks/bootchart2/files/bootchart2.init
new file mode 100644
index 000000000000..3e5d968c0376
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2.init
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use localmount
+}
+
+start() {
+	if /bin/grep -q "rdinitrd=/sbin/bootchartd" /proc/cmdline; then
+		if /bin/pidof bootchart-collector> /dev/null 2>&1; then
+			ebegin "Scheduling termination of Bootchart"
+			/sbin/bootchartd start
+			/sbin/bootchartd wait &
+			eend $?
+		fi
+	else
+		einfo "No bootchart process found!"
+		eindent
+		einfo "This script does not start bootchart, but only schedules its termination."
+		einfo "Bootchart should be started from the kernel command line."
+		einfo "Please check the README on how to do that."
+		eoutdent
+		eend 0
+	fi	
+}
diff --git a/app-benchmarks/bootchart2/metadata.xml b/app-benchmarks/bootchart2/metadata.xml
new file mode 100644
index 000000000000..59b22aee67c9
--- /dev/null
+++ b/app-benchmarks/bootchart2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mmeeks/bootchart</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/contest/Manifest b/app-benchmarks/contest/Manifest
new file mode 100644
index 000000000000..e575e3a69b74
--- /dev/null
+++ b/app-benchmarks/contest/Manifest
@@ -0,0 +1,7 @@
+AUX contest-0.61-fix-buildsystem.patch 581 SHA256 bc751bbdb01de61146fbed711b6e9672166748e5d2448b83393eebd769909925 SHA512 35abe08432d62020a1c9daa2c9bae18dd2d8db99d3f938f9eb423d89b30c9d67441922bef5376c9e4b5be1744fb62b6e7c0163033f006225638f95c097f484a3 WHIRLPOOL 1f4e705f2f2faba865dfefca9460704bca1dec8deb15a83326b1b347e86a500c4fdb8cede301ca580469ccfdda05f1d4e4755e61adf37cab89eefb3270fd62e0
+AUX contest-fortify_sources.patch 376 SHA256 753f7934646497ea897b4b1b9e17859a9203cb0d3cdb15829b0d9bf3b5091ac8 SHA512 71bb1d0b594bfa2342622c5495ea0306829ced109fd606bdfb5e1aecc17b11270235f83606961067819097863ba3bff66e5c37c5496028ccce3f1701ee9bdb2f WHIRLPOOL 8844d8f4ab791d37e975fcb939e8dc6cf7ebfefa1c5ab29791688fe313c77d710955b55283b1820342fa0b87a87c221c95e6c592c9b4e8509bcf366b1256abe4
+DIST contest-0.61.tar.bz2 29204 SHA256 d98d2811bcab0dd3e3e8623daf99bd4625234615cda18a113a34e55c2d5ba140 SHA512 34fb83a3b37d67d9729ce14fdd066010c7360a401d21f3566be8dae7271a30f01cc5b84092405ddfb6961a2284af0a18ce6709ab6d4ab68607aa98f975815131 WHIRLPOOL 0cd4eb0793391bac2db3297d0fd61dfd2564d966f7125de68aa2de73f789a35d6874d4709780551d04ead4b90c6f45eea7cea15f28858d9710aa7d88aa4f1afc
+EBUILD contest-0.61-r1.ebuild 752 SHA256 0d9df65af64805c6ca0e49beb4b7683ca7c74d41e3b8879f6c93d9d478f255de SHA512 f81082c98be91b791686bf0688706129bb149260021b5acf4f24ec998eddcd1c0059b369528996c8370b8feca5d512b259fb9813ec5c51599efec353216b3119 WHIRLPOOL 178253fe6f9a24021460342f245406f3e04333a389324b60059ac3df3f00fb234e06a2fbe32ec99d5a9d525c0bfa194c91bdefbec2355a3f3194a64cedea2eb1
+MISC ChangeLog 3461 SHA256 1551ea30ea45aa088d2ee8e5faaa18bf79e84ad879a875d77670b06f34d28e50 SHA512 a737a9470ac80de3541c788f56290b7180bf14d11efb5011fbf9834c3fc79d22a96196cad45f7ef28be2e57c2a1bc30aad81dc379d350f78f649879b2975881c WHIRLPOOL c4ab624b05ff4686ad2713b5e5efcd1008638b96a401356cf9a463ebdd3dc40ac782666e79a8e164e5b7ce47d2d7b5624871ae51ea7507a7fb87bc87c14de6d0
+MISC ChangeLog-2015 1388 SHA256 13dd9de90f7ab6354a1a2538533049c135579e2647d3443db35625e56eb4193a SHA512 c5873077706160ff709895ff336f79e5b343c45b31100981b43e5be952f78c65dce6e9a44c37ab7ee2c87c64c9d449cf0f80dbdb4b360c30ed3fac44cb49353b WHIRLPOOL e113f3bb263915a88a984b167502bdacd7b64b069116887a3f41529f8c5b990c5fff183f7a019102d0210f19393114e5409515a60e29a86cacc7c705b50e9133
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/contest/contest-0.61-r1.ebuild b/app-benchmarks/contest/contest-0.61-r1.ebuild
new file mode 100644
index 000000000000..a2254a708dd5
--- /dev/null
+++ b/app-benchmarks/contest/contest-0.61-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Test system responsiveness to compare different kernels"
+HOMEPAGE="http://users.tpg.com.au/ckolivas/contest/"
+SRC_URI="http://www.tux.org/pub/kernel/people/ck/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND=">=app-benchmarks/dbench-2.0"
+PATCHES=(
+	"${FILESDIR}/${PN}-fortify_sources.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare () {
+	# fix #570250 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	tc-export CC
+}
+src_compile() {
+	emake
+}
+
+src_install() {
+	dobin contest
+	doman contest.1
+	dodoc README
+}
diff --git a/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
new file mode 100644
index 000000000000..7e8c6b7eb6a2
--- /dev/null
+++ b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
@@ -0,0 +1,22 @@
+--- contest-0.61/Makefile
++++ contest-0.61/Makefile
+@@ -1,8 +1,8 @@
+ INSTPATH=/usr
+ BIN=$(INSTPATH)/bin
+ MAN=$(INSTPATH)/man
+-CC=gcc
+-CFLAGS= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
++CC?=gcc
++CFLAGS?= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
+ 	-g -O2
+ 
+ ifeq ($(shell uname),FreeBSD)
+@@ -14,7 +14,7 @@
+      list_load.o
+ 
+ contest: $(objs)
+-	$(CC) $(CFLAGS) -o $@ $(objs) $(KVM)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) $(KVM)
+ contest.1.gz: contest.1
+ 	gzip -c contest.1 > contest.1.gz
+ install: contest contest.1.gz
diff --git a/app-benchmarks/contest/files/contest-fortify_sources.patch b/app-benchmarks/contest/files/contest-fortify_sources.patch
new file mode 100644
index 000000000000..042065822612
--- /dev/null
+++ b/app-benchmarks/contest/files/contest-fortify_sources.patch
@@ -0,0 +1,11 @@
+--- contest-0.61/bmark.c	2009-02-27 23:13:44.000000000 +0000
++++ contest-0.61/bmark.c	2009-02-27 23:12:44.000000000 +0000
+@@ -47,7 +47,7 @@
+ 	}
+ 	/* child */
+ 
+-	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC))==-1){
++	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR))==-1){
+ 		printsys("Could not open temporary file\n");
+ 	}
+ 	if(dup2(tmpfd, TMP_FD)==-1){
diff --git a/app-benchmarks/contest/metadata.xml b/app-benchmarks/contest/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/contest/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
new file mode 100644
index 000000000000..a92da3438451
--- /dev/null
+++ b/app-benchmarks/cpuburn/Manifest
@@ -0,0 +1,8 @@
+AUX 01-variables.patch 879 SHA256 7022b7191746cc5a159fe4db7de556f8f36b95e9e2aa6d214a80c179f55c61dc SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7 WHIRLPOOL ac124c94bc81252946151fe87b31597dd9c9bc509c4285de482a0c318aed35c810df7b8b8baecebdc58825ddea06bb241838d3a09b86035dc3cf8ca50b3be09c
+AUX cpuburn-1.4a-flags.patch 250 SHA256 478217b059d351cde2d16b57d6c058abbdcf02b68d12d572212f173c845c85ff SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668 WHIRLPOOL d92639812dfd181f57365be7973fe6a09a07a7713d3692fb44fd7e53ef466c8cd4c337ff4016f71855dc47d35172d343e8ad040906221839ad014a999a5108ea
+DIST cpuburn-1.4a.tar.gz 9277 SHA256 eb191ce9bfbf453d30c218c3419573df102a3588f96c4a43686c84bb9da4bed6 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce WHIRLPOOL e119aeaf3453357125fb0f203fdbd0bb68f52479213d6cf6462fcaf53636cb4a13b16f5350cc4b9a382ff9ccc362535f362f6b5b78165c683dcd432e281c7b46
+EBUILD cpuburn-1.4a-r1.ebuild 719 SHA256 c034d8b0102e50d0917072d0b25a00088cf1d0550d1367821790e0c838cefd80 SHA512 0516ac5c4b275e6a62269827271d321c259894540e558c9f4e15615d7b63496b8e3a75b36d69aeb2bf8558c5903e86381a3b7af64e2c17812e176b35a4fc726a WHIRLPOOL a7b4c02d8a7a251c12c4e909a4a18d0224bed2ddf9f729b77b5ebc31d31b25e151852c8aebd437f8fbae49b6e9de0d04ef3d36d01454351d279781afa6bff3fe
+EBUILD cpuburn-1.4a.ebuild 678 SHA256 522f36460264fe9db21b3e7f8e15fe69957207739d1b0e1a6caf19f579ebf14c SHA512 a432d3d79af4cd0d104d5332a2947d60c5f70ab1e108663be104929f03acfe4e5612b6409acea7496b2a6a8003ff4f0305284a4e67613edec42f235cbd1c131a WHIRLPOOL 34adad6040cef307b3590e2a479273ba7ee2d1901cf789360b61badf60c417890156b69a5a2cbdfd8240a885242dcecc89bf0fcc200f119350a00a01cbae1ecf
+MISC ChangeLog 2625 SHA256 79df897a78b7bf9839cdda286e9391e108a4346360677c4b77739f40306795d6 SHA512 a7f5d0c42c6e763d5934af217e79b6a18d1577750cdaa049859ad7c52c08ce0e3d491280be9f69b720bceb43a589ae9dd9e37f0d075b8b3248a7499746bc1c80 WHIRLPOOL bf62fd3166661ab880b060f13cbe6ab438df96915227d70aa6e0d718ea19d85b6fd3f40c9b731b9e01624bba22e4ed4fccfebc242853890f7ce4598d01dd3e1b
+MISC ChangeLog-2015 2417 SHA256 79d0d4eac7048a9e1336fa3d694f1768e214bc665526c465b711844bef0443b1 SHA512 9816f0619fe2938f70895b56d2c249c6096c7cab613aad1f5e43d1a5a554372ee89065a20a97f471c991ef00e2cc10fac92ad2e918be5b8ac7f7be70d9a57203 WHIRLPOOL a8d4ba72ad3f4be680fe1581e91123decc309ab6cb2a62dc444078036845c10717e737b49311828fa71643af4510d165925d19f2e68610663fac0aae473e5078
+MISC metadata.xml 405 SHA256 54628093392b67140d830984646c4eb7fd7c67eba9a88ab49fbce2f18430f4f9 SHA512 64ecdaee9bef3fc3e4305f318905aa50424c003d1daf3262cf190a0129c1b7b5e3b15f95de5abc0a37bfdcc86ceb3973179869b13a80c5f9e0aee9bf53529cbd WHIRLPOOL 681824c3e94ae3ff152611cf3ee817fa4e31774c47eadb0806fcfd4b07aec8b2c1cb0e5e24182126c1536da8831d950c5f435d95bd1f6fef29f36e199616e465
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
new file mode 100644
index 000000000000..3a72f5ced7c5
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${PV/./_}"
+
+DESCRIPTION="Designed to heavily load CPU chips [testing purposes]"
+HOMEPAGE="http://pages.sbcglobal.net/redelm/"
+#SRC_URI="http://pages.sbcglobal.net/redelm/cpuburn_${MY_P}_tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/01-variables.patch
+	use amd64 && append-flags -m32 #65719
+	tc-export CC
+}
+
+src_install() {
+	dodoc Design README
+	dobin burn{BX,K6,K7,MMX,P5,P6}
+}
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild
new file mode 100644
index 000000000000..8d719d7385fc
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${PV/./_}"
+
+DESCRIPTION="Designed to heavily load CPU chips [testing purposes]"
+HOMEPAGE="http://pages.sbcglobal.net/redelm/"
+#SRC_URI="http://pages.sbcglobal.net/redelm/cpuburn_${MY_P}_tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	use amd64 && append-flags -m32 #65719
+	tc-export CC
+}
+
+src_install() {
+	dodoc Design README
+	dobin burn{BX,K6,K7,MMX,P5,P6}
+}
diff --git a/app-benchmarks/cpuburn/files/01-variables.patch b/app-benchmarks/cpuburn/files/01-variables.patch
new file mode 100644
index 000000000000..3e8b666c29ec
--- /dev/null
+++ b/app-benchmarks/cpuburn/files/01-variables.patch
@@ -0,0 +1,40 @@
+--- cpuburn-1.4a.orig/burnK7.S
++++ cpuburn-1.4a/burnK7.S
+@@ -74,6 +74,7 @@ int_exit:
+ 	push	%eax
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ 	.fill 64
+ half:	.long 0x7fffffff,0
+--- cpuburn-1.4a.orig/burnP5.S
++++ cpuburn-1.4a/burnP5.S
+@@ -77,6 +77,7 @@ crunch:
+ #else
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0xffffffff,0x3fdfffff
+ one:	.long 0xffffffff,0x3fefffff
+--- cpuburn-1.4a.orig/burnP6.S
++++ cpuburn-1.4a/burnP6.S
+@@ -69,6 +69,7 @@ int_exit:			# error abort
+ 	push	%eax		# *BSD syscall
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0x7fffffff,0
+ e:	.long 0xffffffff,0x3fdfffff
+--- cpuburn-1.4a.orig/burnK6.S
++++ cpuburn-1.4a/burnK6.S
+@@ -68,6 +68,7 @@ int_exit:
+ 	push	%eax
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0x7fffffff,0
+ e:	.long 0xffffffff,0x3fdfffff
diff --git a/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch b/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch
new file mode 100644
index 000000000000..97b8836c0af4
--- /dev/null
+++ b/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch
@@ -0,0 +1,7 @@
+--- Makefile.orig	2001-06-16 05:39:17.000000000 +0200
++++ Makefile	2010-10-12 20:31:38.000000000 +0200
+@@ -1,3 +1,3 @@
+ all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX
+ .S:
+-	gcc -s -nostdlib -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -nostdlib -o $@ $<
diff --git a/app-benchmarks/cpuburn/metadata.xml b/app-benchmarks/cpuburn/metadata.xml
new file mode 100644
index 000000000000..32e5e6f68d6a
--- /dev/null
+++ b/app-benchmarks/cpuburn/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+		CPUBurn is the ultimate stability testing tool for overclockers. The
+		program heats up any x86 CPU to the maximum possible operating
+		temperature that is achievable by using ordinary software.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
new file mode 100644
index 000000000000..86c0a7a2f051
--- /dev/null
+++ b/app-benchmarks/dbench/Manifest
@@ -0,0 +1,5 @@
+DIST dbench-4.0.tar.gz 2055359 SHA256 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f WHIRLPOOL f39d17ec5ec6e8618045337c408f7c7dc722a8c54c68872ca5a03c8affd35de1f6e6d5e842e90dcb889816fc7891f31b9217d2591ec2e90c056d92fdca90da89
+EBUILD dbench-4.0.ebuild 835 SHA256 40e583df16b41e018c33a7f9c43ca1834b01c55e511cd7327b7c758c920ba08c SHA512 ee4d0f96706a23019c9d2308f5fd085972e207ffed82e595bd2dca443e8040a24d74a50a54e5a5340b87f99e3dcb0dff8bd7754bd182c7052d90ebbcba3d6c77 WHIRLPOOL af2f5505538e2f5eb0b7b9a64738aab5d3c2f68a03cec3d26b97146ffca6a402414a778bfc46fcfce61110a8e302c10a91657abe041d2a0018246c1703e028b7
+MISC ChangeLog 2426 SHA256 10aca6e5717470711cc84501b3456df9185301c7aa5a0151cd30e1a861039a67 SHA512 f2e1b20b203248ddb557622051ef66cc25f5595e99c023dd3ec50978d59448585faa3c5e6a1b84088368a85362c13b5e9fe9d4b1b55c2900026c118e188d2109 WHIRLPOOL d1e685e354d75651297006f50bc33df16b231bb0f9c5a371f60a7a32cf0d8f8dd62e8c0c616385411f5541138dde52ff2f9455ead676099ca590916be9147889
+MISC ChangeLog-2015 4116 SHA256 9b209b3c7633ad2100c477fd5ec541dbd0115e08c4f5df08ead2bb926cc7be8f SHA512 4b5340ba57de8689b63e202d1849e4d8e0619263c0e41a7aa68347078d2e35610f17f4ea9edd0604ce7997914d219d5c544ab866911c538f8725fda1e33f5240 WHIRLPOOL 38158ecf6413eae2bce30909889979820230e1c1afaa529bcab0e4121140eca21a9f1bbafa4de705b52524d31954580d7a9f7b13ea8f3e5beee9aa4131ccdc3d
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
new file mode 100644
index 000000000000..9b96984d3e1f
--- /dev/null
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Popular filesystem benchmark"
+SRC_URI="ftp://ftp.samba.org/pub/tridge/dbench/${P}.tar.gz"
+HOMEPAGE="http://samba.org/ftp/tridge/dbench/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/popt"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoheader
+	eautoconf
+	sed -i -e \
+		"s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" \
+		Makefile.in || die
+	eautoreconf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin dbench tbench tbench_srv
+	dodoc README INSTALL
+	doman dbench.1
+	insinto /usr/share/dbench
+	doins client.txt
+}
+
+pkg_postinst() {
+	elog "You can find the client.txt file in ${ROOT}usr/share/dbench."
+}
diff --git a/app-benchmarks/dbench/metadata.xml b/app-benchmarks/dbench/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/app-benchmarks/dbench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/filebench/Manifest b/app-benchmarks/filebench/Manifest
new file mode 100644
index 000000000000..9d7a5ad6a573
--- /dev/null
+++ b/app-benchmarks/filebench/Manifest
@@ -0,0 +1,6 @@
+AUX filebench-fix-automagic-libtecla-dependency.patch 1088 SHA256 71fed7d911228aa38458e7be94a20bc1ef98890bcaec1cda1e409a4bdd85b3ce SHA512 8c04b18d77749757bb98718ddc086637c9f541c48a2651e28b0d48586d4794feaa86eff1dafbe0c2c93bfe7ac2d090ab8fb38216f5999152309118ff3247b35d WHIRLPOOL 77379d8ce1816d13571899e3beda83a51567f90fa7df822b17736a0f933e8f6d2eab8f927968025224576e43d27df5ee03d32f27902bbac2af16c73efd86115b
+DIST filebench-1.4.9.1.tar.gz 349535 SHA256 a1d1516083a1d46bccf6246caf709e800e93eccf17572583343e77726b720678 SHA512 a6400aba4266fcf98e46c4824796a594adc5d5e7f9605f6e1ab01973ce448e27948991e453b186947a8d89f8603a69a3ba955edf2a1abccd2935196af7b6f0d1 WHIRLPOOL 5d5a5c1a2d9eeaaaaf14cd97725ce8ba47ed1f06e1713a6315320697a37a5b12027aa09f819c3e3b1a75cc435823d661e532e7ca319009eb928dc62a778b9bf4
+EBUILD filebench-1.4.9.1-r1.ebuild 667 SHA256 2f1cbb65e89a8b710554f9b055ee8043e2b4af7f18d5a9e3658b48cd7b52b5ea SHA512 228a7297e0018c5616d34da4cf8151ca475e0b74f9ac3eecf2747687483cc6137899e77f4c5d4de8f16bde5f8f01eb802856ba97685ff654c35659da3526178b WHIRLPOOL 55592c1f6b177d334048e76e15b64cdbd13de1ba918a8419eeed464b306eaa8db2f4a045c6822c6f26f159d3ea96425b2439fa77e37ea018fc654110e167ba08
+MISC ChangeLog 4518 SHA256 68aea16a3c5062c650b070c425ae8c1f4347f927514d9ecaba71f4301c452c2c SHA512 3d595fca287c3c919a75693d1d4102d865235544575cf8691d78314a1e9e3c856a295749a3f93a4d438200c83c4811d0a54693a8e063ac1de58b359d98570912 WHIRLPOOL a51459f4a6cf8d1c2271d1bf09af67539ad80396fd8c12dd54261c229e6fb2107fa011bd4fb3a762d010bd3b3df14c36c0213c5eb821caf1fc3bbd0b028c445c
+MISC ChangeLog-2015 1115 SHA256 d31c61eb600917fabcd88c0f95b822cdc75b2d389a208a75e3a3eb61c01f93f5 SHA512 b69087da3b7e4f1dac44d23470b2411dfec61ccb5d19a4864aabc95e69d48090929708e32b50ed7cc640e4fdd8ea3bf96a70b566442a5f688845661284993d64 WHIRLPOOL 54b8ab0567f255ba6e588381b9074e89305234a0b5006855cc6694991a00ae058ba51b4edb08f15751db8228790caa268be4cc753b2f9e08a1f142aceebce768
+MISC metadata.xml 581 SHA256 2d017d9af7cb9d83cf7aea5eb350476ab9378236d06654a6d9bbd42ddad12bc8 SHA512 50dc3bd8023e3fd0f667d10cd6f9504f0a471a3db1aba76986e9e24db3049c7865f3b485896da720e8661a19a45cb65e1e3d0a045bcc20401ddae85ee316fce3 WHIRLPOOL 4e9a857c3fb7fd7daacef716fbe6fc7834a1c98844ad89af092bbf3d73425157ce737f4b9db237d5e02d612b215cb57742a854ddfb760b4398df0f249779a1f4
diff --git a/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
new file mode 100644
index 000000000000..44380cce37a5
--- /dev/null
+++ b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Filebench - A Model Based File System Workload Generator"
+HOMEPAGE="https://sourceforge.net/projects/filebench/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="auto-completion"
+
+RDEPEND="
+	auto-completion? ( dev-libs/libtecla )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-fix-automagic-libtecla-dependency.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with auto-completion libtecla)
+}
diff --git a/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch
new file mode 100644
index 000000000000..8d24a62a89d6
--- /dev/null
+++ b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch
@@ -0,0 +1,22 @@
+From: Göktürk Yüksek <gokturk@binghamton.edu>
+Subject: [PATCH] Fix automagic dependency on libtecla
+
+Replace the unconditional AC_CHECK_LIB logic with AC_ARG_WITH to
+eliminate the automagic dependency on libtecla.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,8 +164,11 @@
+ AC_CHECK_LIB([kstat], [kstat_open])
+ # Use libtecla for autocompletion if it is available. If it
+ # is, then conditionally compile auto_comp.c (see Makefile.am)
+-AC_CHECK_LIB([tecla], [cpl_add_completion])
+-AM_CONDITIONAL(AUTOCOMP_LIBTECLA, test "$ac_cv_lib_tecla_cpl_add_completion" = yes)
++AC_ARG_WITH([libtecla], AS_HELP_STRING([--with-libtecla], [Build with libtecla for autocompletion support (default: test)]))
++AS_IF([test "x$with_libtecla" != "xno"], [
++	AC_CHECK_LIB([tecla], [cpl_add_completion])
++])
++AM_CONDITIONAL([AUTOCOMP_LIBTECLA], [test "x$ac_cv_lib_tecla_cpl_add_completion" = "xyes"])
+ # Check that librt is installed and supports async IO. First line
+ # allows to add librt to the linkers path, second one checks
+ # if aio_wait() is in it, third one checks if aio_waitn() is there (usually
diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml
new file mode 100644
index 000000000000..27f791779acc
--- /dev/null
+++ b/app-benchmarks/filebench/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+	<use>
+	  <flag name="auto-completion">
+	    Enable command-line autocompletion using
+	    <pkg>dev-libs/libtecla</pkg>.
+	  </flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">filebench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/forkbomb/Manifest b/app-benchmarks/forkbomb/Manifest
new file mode 100644
index 000000000000..762cb96c1b2a
--- /dev/null
+++ b/app-benchmarks/forkbomb/Manifest
@@ -0,0 +1,5 @@
+DIST forkbomb-1.4.tar.gz 4718 SHA256 729b937e44c8408ad743fb243ee98580d01c9223a6716e8b25e0e1099097f1b6 SHA512 3f5404ed6b3fe70b970e79ffc5f75aef2f9b92d0087895e1ae7d3a5409f28475569dbbb00e5bcb66882f56ce34e18ce388babfbe7cfeb7729a688519663d016e WHIRLPOOL 2de05c595e62957f3e50cf3dbc8ce2aa5f201b66719bb9b7787ef4699531b5b4139e28a410acb6758cb58deee6b0ff446ba70c92e55bc8038b5907497a33821b
+EBUILD forkbomb-1.4-r1.ebuild 499 SHA256 d6426a08be429915fd35e2fa5785d54f408f5766b4a5b6243e6c4b023ba720e8 SHA512 b10703223fcfe6c5ba23e418788e6a296fa3094c57a5654a2482fdd9d450db89b9e98ced85dcf7c61be6900d6a951481ce01d6377be9a01bb0020b7e4add4b53 WHIRLPOOL 810a605f772caa1e2eef31c63d01c194b89c07c6552a483f95c349f963bd7f52022cad2f494e288eac71e2d2c58752ed7acefd16c444cad674b2a2f48f09e92f
+MISC ChangeLog 2461 SHA256 846636491b63de871cedce0902dc69276e255082e372daf8dc7a526a3702f3c2 SHA512 d7c5692db94343891338af535ee3975b1fd5bb4e28fc1c2ca3ba5f8dc11ae2a8e17159d81cec98477078b343dd97dacb34143142fe87cf37e845d51bb2f104a4 WHIRLPOOL a48fb2a46bf23f69014a2f5bcac89afc9f5184620d27e5fc78e7da667b2f4145c14ff668986d00c34944e968a8c0b9654117eaa2603203ea00c45ab0faaab226
+MISC ChangeLog-2015 434 SHA256 3fd7ca2ff808d6b39a57c64839a24d28e1f846e121b1496041fca4aefc69926c SHA512 75fc2b42b107d2ee90c7a44514140ee83575826c0690f1797fc6bc7cf7d1a147f4719617a444045f3677c5466e82fdad4165f762bb7c3afa2a3b3c84b3c5484e WHIRLPOOL 1ee4aad548dca03969e6a3aae329385a0d9702ef494b7a5bd61caa51d02c68bf83080d7be4d58d5915d83eeb2f6c8de3ef825c5569c4de564515afbbfca153f0
+MISC metadata.xml 262 SHA256 297af55d22135a18398516ec605d1fff4a73287ea567304353810ccb2c2b7fc4 SHA512 333932260d8f347e9ce590d0f0bc03f775d87d01ca98bb921f172815c18de2d792a6d6d9b44f33efd735bf43155c8684946e64c6746fd57990962c6cc2676ff4 WHIRLPOOL 1511d8ca50ae34edc7f89000045b69fd27d1e8c84f7a24731335cb2f5699574de2632b96744d7cbeb3d5b956944b965a1ea9c878bc73643f05999f4fc0463c75
diff --git a/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild b/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild
new file mode 100644
index 000000000000..67adb9ea3706
--- /dev/null
+++ b/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Controlled fork() bomber for testing heavy system load"
+HOMEPAGE="http://home.tiscali.cz:8080/~cz210552/forkbomb.html"
+SRC_URI="http://home.tiscali.cz:8080/~cz210552/distfiles/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+src_prepare() {
+	sed -i '/^all/s/tags//' Makefile || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.8
+}
diff --git a/app-benchmarks/forkbomb/metadata.xml b/app-benchmarks/forkbomb/metadata.xml
new file mode 100644
index 000000000000..f9f759bf905b
--- /dev/null
+++ b/app-benchmarks/forkbomb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+	Controlled fork() bomber for testing heavy system load
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/gtkperf/Manifest b/app-benchmarks/gtkperf/Manifest
new file mode 100644
index 000000000000..58beaebeb23e
--- /dev/null
+++ b/app-benchmarks/gtkperf/Manifest
@@ -0,0 +1,6 @@
+AUX gtkperf-0.40-gentoo.patch 1008 SHA256 3e61d74d9b11dcccc5065767717f09882583c83864e5a0cbcbb4accb9f7025d5 SHA512 f0feb9f17471167b352d79dfde1439ef0cdb5d2961a191bb9716a2b75a6c5dd2067a80ab3dcaf5669f335b9b0200803c234b228bc64d3152578ab3f3ab21564d WHIRLPOOL 5cc19b1f137e38828af41f906a52ceb0b70de2fcbd2b25feeb1a2c65853639431c324a88c3afbd890d712b663834946c8d92570d84910634c8999905aeb47c3b
+DIST gtkperf_0.40.tar.gz 402982 SHA256 9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b SHA512 d406955b38c0450c3c6a6a7e9fb1fa7b326932325360353001cab6be63c8deaaea487123512740b57cdc28579ee84aabce789df5ce7dfaa92f8d9010f0a6d7be WHIRLPOOL efecc92235b827301bea813478338ff80514e332ba5df889090d4b93dc022618695bba23e13621dddaecf04ff0140d17c9396a75e489667f3339c5f63960318f
+EBUILD gtkperf-0.40-r1.ebuild 724 SHA256 eac4fbbb32220995061004b02b63b1c1ea8a5ec4d4c35c33caf26d41888e6395 SHA512 3bd350a934e5d2b21af8eb0b404f5eade82dcbff5994605fcfdd01b25c2e9950897cadf713f87152096b658e25bf13a85f9cbbd5e7cf9fc29005c3d0e6c47c2c WHIRLPOOL e81f94dab138689a76a3503c2a2cc27a7b0ff6b89a09b0bd33dd7b05e44db130cd8d26c34dd7db699cdf21bc66440759a77eb7116736c2deb2d2fd1e77670558
+MISC ChangeLog 2220 SHA256 3cacef41b0e16750e46deafb04ddbd19679a023d692c952ae5e523cb04963ca0 SHA512 1a2bb58250b1291657bd414b3e273ca9bc86d9b0e40a564513b86c7a93f7147fe957862e6959100c684663cf4c98e8812ee8a1b5751cb14b5b7ea3825ddfb585 WHIRLPOOL ef4b2275f704261b9f9b39e2b07bb717f207c5b80a1f39b278adf336a05521dcda7467424bcfa2ac7e8004943035191c06aecff9fdd64eec11d7ee3b23f99c8a
+MISC ChangeLog-2015 1231 SHA256 7de4a32a7caa3d4c49a4992c74f901fa445c23f507e8e7d5395eb172464b7922 SHA512 31548704abfb8589603f9e17990a2f51ba80f202d97a54c845942ef82b4d96c1b6f0bb43bf2a75c1e00c8942969e75ebacb3d3a68a6fda3cc6f2809a6a5fa904 WHIRLPOOL 3ba4baf1a00934813a1884679009f2c9411c6f705bb232cec7945901f231a4ecb9bbc446defd067f74166fbb20774e1a485ca475e5a0cf60f915884c90a7f302
+MISC metadata.xml 592 SHA256 e63f2b1783dbf2935553124dcda17cf1c89478d501600ba6efe8151c2db7ed88 SHA512 1b8e9e427468d498f3e064184f48886b43370328d5640cc14d38603a03bb90ab8467e95783d8d5ea12ab211f3643c369400d0571f5e181cdd9131a19f48a524a WHIRLPOOL 8d55c40286cf5e1fbc93a4b6019411d5c61950b968532966fe556dc960670df1d0857f3eb42ae4da263cee80779017f8eb26c9f6d33abf49f901dead595eacc4
diff --git a/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
new file mode 100644
index 000000000000..eee7faf43b61
--- /dev/null
+++ b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
@@ -0,0 +1,47 @@
+--- gtkperf-0.40/work/gtkperf/configure.in
++++ gtkperf-0.40/work/gtkperf/configure.in
+@@ -8,7 +8,6 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+-CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+--- gtkperf-0.40/work/gtkperf/src/timing.c
++++ gtkperf-0.40/work/gtkperf/src/timing.c
+@@ -97,7 +97,7 @@
+ 	gtk_text_buffer_insert (appdata->textview_info_buffer, &iter,
+ 				timestring, -1);
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ 
+ }
+ 
+@@ -129,7 +129,7 @@
+ 	gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ 			    " Test Finished");
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ 
+ }
+ 
+@@ -154,5 +154,5 @@
+ 	gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ 			    " Running tests...");
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ }
+--- gtkperf-0.40/work/gtkperf/src/main.c
++++ gtkperf-0.40/work/gtkperf/src/main.c
+@@ -5,6 +5,7 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
++#include <stdlib.h>
+ 
+ #ifdef HILDONIZED
+ #include <libosso.h>
diff --git a/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
new file mode 100644
index 000000000000..bc948128ccae
--- /dev/null
+++ b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Application designed to test GTK+ performance"
+HOMEPAGE="http://gtkperf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	make_desktop_entry ${PN} ${PN} duck
+
+	rm -rf "${D}/usr/doc" || die
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-benchmarks/gtkperf/metadata.xml b/app-benchmarks/gtkperf/metadata.xml
new file mode 100644
index 000000000000..101920d3572d
--- /dev/null
+++ b/app-benchmarks/gtkperf/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+	GtkPerf is an application designed to test GTK+ performance. The point
+	is to create common testing platform to run predefined GTK+ widgets
+	(opening comboboxes, toggling buttons, scrolling text yms.) and this
+	way define the speed of device/platform.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gtkperf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
new file mode 100644
index 000000000000..4d23d0586f5a
--- /dev/null
+++ b/app-benchmarks/httperf/Manifest
@@ -0,0 +1,5 @@
+DIST httperf-0.9.1_p20161228.tar.gz 106357 SHA256 45cf5e92d30cd4191015fff2d0d066b780b54c45e614690bf0e70926633715ed SHA512 e5dbb400e4ab0db3cc1621731d99af9261574a8a1da4279c722ebbd80537d0aae2a3d662f4d51eb9130bc98823c2786710c7819a0144f4ae3f8cf153e28d7dfa WHIRLPOOL 2d0e5ee38b965f8d378cf45038c03782bb64d73981432a24968d6e0b870bacd64e947ee6c0120b2d7927780c4096cf3725ff1866f5f77042498f278cc84683d6
+EBUILD httperf-0.9.1_p20161228.ebuild 871 SHA256 712825082402b60114e729c81fa29c036b8b2aa7ec4ade58f7c9944d3a2f243d SHA512 5fde46f6ab920265df114cce8341a772f46e5d9712932eda4e4c5b7593be5f0603fefc08c860d356eb2881656d7f817c0323dbe803e06026d2024077068c10c4 WHIRLPOOL 1844ee5579ee0fdd417422d597bd3408bbe2005d9186400db5806e82aea4eeab186d5a1ed3776763ad1d7bc26bebd8d8e0a9d469292818ab0732ee5f50786911
+MISC ChangeLog 3639 SHA256 32893a69e0c5dc7599f00adee0e76d345c0b636787f42e170bf04ed1f906210c SHA512 a7fcd233ab9becc8c3114d71563f5ca556f61e96f0eeb38c85a5435098e4e3d2b2af6bcdedaf966dd5919f30fac25747fa509612f79a1d9607c82f715139b56c WHIRLPOOL a30772d48e562eb611864d10c2ccfe987b74e0e3d748c9df2c48e7a6aef5a31ace5b7468595ce683956bb1dace5465e087c9e45ec154eb018ca418ac736ade03
+MISC ChangeLog-2015 2908 SHA256 dddf13382ad95365c2ee148c65cd5bd1c94df953dfc11a645fa1de6942112884 SHA512 9be189f9b5bfd0abd44eec5cfebefaa24a87fd2f5ba43df773e4fbbbfd4abd0e23275df1de5194e03e719b71bbdfde0105244383ed98e05d6b1e743fccb2c1e1 WHIRLPOOL 90a57ed8e92fa616bceccec367a81723e89dcd34141082464525ec554aaf5349584d40a496a13c181621ab001f465a1980e2de9a3c491f2ac20ee436df939db2
+MISC metadata.xml 1011 SHA256 dc68ae6c241b6ae15fc9fae3d093557986db393b384e853c97a81594996f6599 SHA512 86a8ef9ea287532d89d5833abf29d71aae7e9aca494d6e40ebd6f43cb0eb766e63b769bc2218f8e374f13045d2b3445283dac68d384d9fb449e5a0800caf1dfb WHIRLPOOL 343463a6981363ffef102dba5ed783b71acce7806cc206a35157ece6d76b9d8192b160f7fd331020710dacd4effc1a6f8dcf00fd95845ee50d7320c62cd431b1
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild
new file mode 100644
index 000000000000..a2c8547ee1c9
--- /dev/null
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vcs-snapshot
+
+MY_COMMIT_HASH="cc888437e4572ec29a4a7209f34fbd39c31600f5"
+
+DESCRIPTION="A tool from HP for measuring web server performance"
+HOMEPAGE="https://github.com/httperf/httperf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
+IUSE="debug libressl idleconn"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	idleconn? ( dev-libs/libevent:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/usr/bin
+		$(use_enable debug)
+		$(use_enable idleconn)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
new file mode 100644
index 000000000000..2f4bf73d81f3
--- /dev/null
+++ b/app-benchmarks/httperf/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Httperf is a tool for measuring web server
+		performance. It provides a flexible facility for generating various HTTP
+		workloads and for measuring server performance. The focus of httperf is
+		not on implementing one particular benchmark but on providing a robust,
+		high-performance tool that facilitates the construction of both micro-
+		and macro-level benchmarks. The three distinguishing characteristics of
+		httperf are its robustness, which includes the ability to generate and
+		sustain server overload, support for the HTTP/1.1 and SSL protocols, and
+		its extensibility to new workload generators and performance
+		measurements.</longdescription>
+	<use>
+		<flag name="idleconn">Build with the idleconn program</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">httperf/httperf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
new file mode 100644
index 000000000000..9d4b6cca0f57
--- /dev/null
+++ b/app-benchmarks/i7z/Manifest
@@ -0,0 +1,13 @@
+AUX fix-insecure-tempfile.patch 3615 SHA256 0ca3a67b5793b0be84c26993bea2a5d300e14ddbe685c67b42fba1f6d57f0a07 SHA512 ec07232656ea18602f062562af9182be5cc6b5e4a073b15f7d5308bf9632e2abf546de2006f4e4bd4cf4bd8314d9df521235e2b3c4720d0dee88e4430705978c WHIRLPOOL 37d0bd9a0060a55513bde0b28d51a94222c33ced302cf49803a03a3a09c20d49d9fe3bfb242e1e0ab2e6efb21e973c3d8b882c56febff56f8df648b00ef2f879
+AUX fix_cpuid_asm.patch 924 SHA256 78d6b44d5f5a93fea6ebf10f704925b21bf51d92c090dc5cad9ff836cda0b254 SHA512 ad0ea8751e753340b541fc13849c2cb5b2be1c3c297a7b40e508d2ac9abdd1b153918ef507d89db1d4b15ec1e1eedfe7cb3619376649a10abfb1f5880f6d187c WHIRLPOOL f2a40ca53fb96cfb2447e6403c0fce1cb7a76b986fd86bf5f3544430df3a52ef4af5e5acd8629d11d7f6a8bec0be7a130b88263e7b5099da6ac2ba53cdfa9365
+AUX gcc5.patch 1866 SHA256 dec3a0a3e7b3584003c71e3607b06c24b697926228c797f0345b12b07337fc88 SHA512 ad9a752bf3604136f2f3110c6053274581f6e5f6db56cede31fee2091d9b989b93f43d4658ca12f77bdf7c6ed78a0a06d8368ebea3ef20239fe707ae8e1a707a WHIRLPOOL 17c21c1c6876cba8a87806e4360589993a83c3582ba4f69b8b06b324356fcba79ab17d1314fa0f91e4d40abbe960b62e7e57d752e2a0664d2121b2b741b1884e
+AUX hyphen-used-as-minus-sign.patch 2470 SHA256 6bb8466ac41d9de4cae0ea84508e0919cb99da24098c12c1517d23322c0a3f5f SHA512 05544e9f682bb6ccc1166182985ff4a4d19481ba555f63a0f030487ccc231cea9b2d1dfff83a95e9a2bcbf9d7dcc31cd331397cf84ef2ed253dac23fe9ecaa99 WHIRLPOOL f24fc7c8608ad9ab45cc0680923f90ebf0df5859f3b0a83e66cb2ed5f8ce7d390d9519a4ff559ef897abeac6aabb7cab895b8e4698957876b2b01c294704d70d
+AUX i7z-0.27.2-ncurses.patch 825 SHA256 0286dbda73a37b6c3300c98150eafdc23276c1dbebe17ee85659ee00a1457f57 SHA512 6bf1773ccdf8b310be575eccdbbe351db5661bb4fef2621d2cf46dac073c627f27441e3a879b558c607305a5d73d53ef3687c98d49a2f0db7a1048019bd41a1a WHIRLPOOL e96caaddf76932bc97f26c31de3d3352ba81df66c2a21e2a78bbe7d08c45a323db90bf68890977920cfdbbd5cfdbc415ca19953826efbeca6a5b4dddd2ece6dd
+AUX install-i7z_rw_registers.patch 802 SHA256 469b26bd44cd8d87c9aa11b3abf7884857447f66b5689e6228a77ae62ae392d1 SHA512 677df9ea9884d138f1eecb88b49ab96ac16f49cb63caf11fa63892940815e3c31e2170afadd0c73a2a571ff62b824be6109c0cda72779d76e03907da546f48d9 WHIRLPOOL 679cb65021c797c01b77472fb84a60fb93e5ee46dfcf7d08ef8033527444269919a0bacf7271f5abcb9f525dc4a36b0161c0f41eedc8c8d23d7070aff0c9c182
+AUX qt5.patch 365 SHA256 e52f2c47cdd071ffefab9550ba816100f1d1ea367654bd5752655aef9680bcd6 SHA512 fc38423e82f774aff588023b45154ea3bf3fd553ee6bc4261dcd0e7911d1d589754461a1734e0da969d03d6d94e2b844da6f09a388ce4508090d4ba5c75c7df0 WHIRLPOOL a7d82af960b539aacd6ce59e44ae4c1fd755141a4a7ce64d06ca3df9087ef6168a02675ee822971294729719e2fa16020324d4982bce9268499569f189648e8d
+AUX use_stdbool.patch 885 SHA256 8eb552d74fd4fda6cecbcf390843174d9c879f5c6b1459a9f7d3d1780cd9c351 SHA512 5df3d042a580268971e6da0878bd070d2054e9a9732b518a88a489d6b3d62acae58f697fe44634ee6c847b108cae25df6592ed9e1f20ea4d7c6b36adb516830d WHIRLPOOL 8132f9de4ca0ea788615267402072674b6af35798d706a0475ecc14f30952e90a9ca1b0c283dccb903072595c46b4ffdea8cb0b40d679dd66b08fe558631efa5
+DIST i7z-93_p20131012.tar.gz 879969 SHA256 e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a WHIRLPOOL f46d7c3ae19920315e68d6c3264d14613f457201e1107c07b6c74632fff13c1cdb75747add8f1618937c5b4430a476dfc5f5d30fc01df16579fd843e4516faab
+EBUILD i7z-93_p20131012-r1.ebuild 1480 SHA256 4fbeac2e00751f6ad017d6d143d943c2b5f79d86f8eb17f5e00b4933f441c749 SHA512 866ba126d0743b1ec3c5fb57cad73729d43be1b9a61417208bca19a6ef50df092bad82c772ed86234b6eb46d538e3729fa298ca02986999795ce34874c80a91e WHIRLPOOL 62a00f3197980bff8879ebbe0e69ca03481a94b38e8d1dcbb2f34c6b65f87befaed80757ac18e9a5d121eeed7a33d406fd8a644ea46989984b5ca92f0952f356
+MISC ChangeLog 4014 SHA256 64a3b023679bf9ea00d64abc77b8623e6a46f359ec67afa88a609a61812a4b62 SHA512 3da78548747d451e1d10377aebd303e07b794e4008bed35d4bc3e965b078b86da4fad9648a31eefb69285b0efac1079dba52c6664b95b2d5795f897eaec213d4 WHIRLPOOL e56ba8cd76c70f272e0fdddb23b7daff7c0fc865f0098f24f1492ee3fb0b996a6d280138e219833daa96287eb5d9131cfa51e730055242f59c2fd062644c7d8f
+MISC ChangeLog-2015 2822 SHA256 ec9e1b30916c1f1ab8b6f25768c798a8dcfd20d06303dea39afa55ad592da678 SHA512 5bac6a648afb861d3f15515a2fc00ef3749c6b8fcbe6c4cc173456d32c72403a2623cac16d27586d993317fed341e8231ffa66353f72e3c93b8bf2e701645762 WHIRLPOOL b28dc3a83e1f22ff810b77559ab25106c803047f11f69c61996b91b32c34cc26c22668905849289f8ff50c5ae98ed4ffecb316a2e1c063db54ef149f015d3ad9
+MISC metadata.xml 296 SHA256 72bf9740931ce4ae544571807aa69b16e4a502b3697156ada6510dc20c108493 SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668 WHIRLPOOL 72b17f382c9b6f33673c3d465920da662d41cb1183e148a47188d0c34f11f11ed5fa7f5a429728ff664f01be2cab3a437a893b1dfcb539b0e04e53ef5d298abf
diff --git a/app-benchmarks/i7z/files/fix-insecure-tempfile.patch b/app-benchmarks/i7z/files/fix-insecure-tempfile.patch
new file mode 100644
index 000000000000..fb027158434b
--- /dev/null
+++ b/app-benchmarks/i7z/files/fix-insecure-tempfile.patch
@@ -0,0 +1,76 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix insecure temfile usage: /tmp/cpufreq.txt
+ switch from system() + fopen() to popen()
+ disable other insecure tempfiles that may be generated but not used
+Bug-Debian: http://bugs.debian.org/718418
+
+diff --git a/GUI/i7z_GUI.cpp b/GUI/i7z_GUI.cpp
+index 2705e84..60eaeb2 100644
+--- a/GUI/i7z_GUI.cpp
++++ b/GUI/i7z_GUI.cpp
+@@ -171,18 +171,17 @@ MyThread::run ()
+     //CPUINFO is wrong for i7 but correct for the number of physical and logical cores present
+     //If Hyperthreading is enabled then, multiple logical processors will share a common CORE ID
+     //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
+-    system ("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail -n 1 > /tmp/cpufreq.txt");
+-    system ("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numPhysical.txt");
+-    system ("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numLogical.txt");
++    //system ("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numPhysical.txt");
++    //system ("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numLogical.txt");
+ 
+ 
+-    //Open the parsed cpufreq file and obtain the cpufreq from /proc/cpuinfo
++    // obtain the cpufreq from /proc/cpuinfo
+     FILE *tmp_file;
+-    tmp_file = fopen ("/tmp/cpufreq.txt", "r");
++    tmp_file = popen ("sed -n '/MHz/ { s/cpu\\sMHz\\s*:\\s//p; q }' /proc/cpuinfo", "r");
+     char tmp_str[30];
+     fgets (tmp_str, 30, tmp_file);
++    pclose (tmp_file);
+     double cpu_freq_cpuinfo = atof (tmp_str);
+-    fclose (tmp_file);
+ 
+     unsigned int numPhysicalCores, numLogicalCores;
+     numPhysicalCores = socket_0.num_physical_cores + socket_1.num_physical_cores;
+diff --git a/helper_functions.c b/helper_functions.c
+index 2f8da87..906c298 100644
+--- a/helper_functions.c
++++ b/helper_functions.c
+@@ -531,16 +531,13 @@ double cpufreq_info()
+     //CPUINFO is wrong for i7 but correct for the number of physical and logical cores present
+     //If Hyperthreading is enabled then, multiple logical processors will share a common CORE ID
+     //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
+-    system
+-    ("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail -n 1 > /tmp/cpufreq.txt");
+ 
+-
+-    //Open the parsed cpufreq file and obtain the cpufreq from /proc/cpuinfo
++    // obtain the cpufreq from /proc/cpuinfo
+     FILE *tmp_file;
+-    tmp_file = fopen ("/tmp/cpufreq.txt", "r");
++    tmp_file = popen ("sed -n '/MHz/ { s/cpu\\sMHz\\s*:\\s//p; q }' /proc/cpuinfo", "r");
+     char tmp_str[30];
+     fgets (tmp_str, 30, tmp_file);
+-    fclose (tmp_file);
++    pclose (tmp_file);
+     return atof(tmp_str);
+ }
+ 
+diff --git a/i7z_Single_Socket.c b/i7z_Single_Socket.c
+index 015f154..d0afee0 100644
+--- a/i7z_Single_Socket.c
++++ b/i7z_Single_Socket.c
+@@ -823,10 +823,13 @@ void print_i7z_single ()
+ 	  //CPUINFO is wrong for i7 but correct for the number of physical and logical cores present
+ 	  //If Hyperthreading is enabled then, multiple logical processors will share a common CORE ID
+ 	  //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
++ERROR INSECURE TMPFILE
+ 	  system
+ 		("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail -n 1 > /tmp/cpufreq.txt");
++ERROR INSECURE TMPFILE
+ 	  system
+ 		("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numPhysical.txt");
++ERROR INSECURE TMPFILE
+ 	  system
+ 		("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > /tmp/numLogical.txt");
+ 	  //At this step, /tmp/numPhysical contains number of physical cores in machine and
diff --git a/app-benchmarks/i7z/files/fix_cpuid_asm.patch b/app-benchmarks/i7z/files/fix_cpuid_asm.patch
new file mode 100644
index 000000000000..27739a64523e
--- /dev/null
+++ b/app-benchmarks/i7z/files/fix_cpuid_asm.patch
@@ -0,0 +1,21 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix cpuid inline assembly
+ the old code zeroed the upper half of %rbx
+
+--- a/helper_functions.c
++++ b/helper_functions.c
+@@ -101,13 +101,7 @@ static inline void cpuid (unsigned int i
+                           unsigned int *ecx, unsigned int *edx)
+ {
+     unsigned int _eax = info, _ebx, _ecx, _edx;
+-    asm volatile ("mov %%ebx, %%edi;" // save ebx (for PIC)
+-                  "cpuid;"
+-                  "mov %%ebx, %%esi;" // pass to caller
+-                  "mov %%edi, %%ebx;" // restore ebx
+-                  :"+a" (_eax), "=S" (_ebx), "=c" (_ecx), "=d" (_edx)
+-                  :      /* inputs: eax is handled above */
+-                  :"edi" /* clobbers: we hit edi directly */);
++    asm volatile ("cpuid\n\t" : "+a" (_eax), "=b" (_ebx), "=c" (_ecx), "=d" (_edx) : : );
+     if (eax) *eax = _eax;
+     if (ebx) *ebx = _ebx;
+     if (ecx) *ecx = _ecx;
diff --git a/app-benchmarks/i7z/files/gcc5.patch b/app-benchmarks/i7z/files/gcc5.patch
new file mode 100644
index 000000000000..dd3ed99a1c7b
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc5.patch
@@ -0,0 +1,40 @@
+diff -Nuar i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp 
+i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp
+--- i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp	2013-10-12 20:59:19.000000000 +0000
++++ i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp	2017-03-06 18:27:54.825756111 +0000
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <math.h>
++#include <cmath>
+ 
+ #include <QApplication>
+ #include <QPushButton>
+@@ -382,7 +382,7 @@
+ 
+             //C1_time[i] -= C3_time[i] + C6_time[i];
+ 			C1_time[i] = c1_time - (C3_time[i] + C6_time[i]) ;
+-            if (!isnan(c1_time) && !isinf(c1_time)) {
++            if (!std::isnan(c1_time) && !std::isinf(c1_time)) {
+                 if (C1_time[i] <= 0) {
+                     C1_time[i]=0;
+                 }
+@@ -642,13 +642,13 @@
+ 
+     for (i = 0; i < (int)numCPUs; i++)
+     {
+-        if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!isnan(mythread->FREQ[i])) &&
+-                (!isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_0.socket_num) ) {
++        if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!std::isnan(mythread->FREQ[i])) &&
++                (!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_0.socket_num) ) {
+             Max_Freq_socket0 = mythread->FREQ[i];
+             num_socket0_cpus++;
+         }
+-        if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!isnan(mythread->FREQ[i])) &&
+-                (!isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_1.socket_num) ) {
++        if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!std::isnan(mythread->FREQ[i])) &&
++                (!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_1.socket_num) ) {
+             Max_Freq_socket1 = mythread->FREQ[i];
+             num_socket1_cpus++;
+         }
diff --git a/app-benchmarks/i7z/files/hyphen-used-as-minus-sign.patch b/app-benchmarks/i7z/files/hyphen-used-as-minus-sign.patch
new file mode 100644
index 000000000000..f908b934621e
--- /dev/null
+++ b/app-benchmarks/i7z/files/hyphen-used-as-minus-sign.patch
@@ -0,0 +1,26 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix hyphen abuse
+
+--- a/doc/i7z.man
++++ b/doc/i7z.man
+@@ -7,15 +7,15 @@
+ i7z runs the i7z, ncurses based, program without any options. i7z will print out the C-states and temperature for i3, i5 and i7 based Core processors from Intel (including Nehalems, Sandy Bridge and Ivy Bridge). 
+ .SH OPTIONS
+ .TP
+-\fB-h, --help \fPshow the list of options available with the i7z tool.
++\fB\-h, \-\-help \fPshow the list of options available with the i7z tool.
+ .TP
+-\fB-w  [a|l],  --write  [a,l] \fPLogging of the frequencies can be turned on with this options. Option "-w a" or "--write a" will append to the  log file. Option "-w l" or "--write l" will replace the log file.
++\fB\-w  [a|l],  \-\-write  [a,l] \fPLogging of the frequencies can be turned on with this options. Option "\-w a" or "\-\-write a" will append to the  log file. Option "\-w l" or "\-\-write l" will replace the log file.
+ .TP
+-\fB-l,  --logfile  [FILENAME] \fPChange  the  log file name to the specified FILENAME. Default logging file is cpu_freq_log.txt (single  socket) or cpu_freq_log_dual%d.txt (dual socket, %d is either 0, 1).
++\fB\-l,  \-\-logfile  [FILENAME] \fPChange  the  log file name to the specified FILENAME. Default logging file is cpu_freq_log.txt (single  socket) or cpu_freq_log_dual%d.txt (dual socket, %d is either 0, 1).
+ .TP
+-\fB--socket0  [SOCKETNUM], --socket1 [SOCKETNUM] \fPThe tool can print information for about 2 sockets at once at the most. The top view  will  be, by  default, of the first socket (controlled by --socket0) and the bottom view will be of the second socket (controlled by --socket1). Supply the appropriate value of 0 or 1 or more for SOCKETNUM (if there are more sockets on the machine) to show in the top and bottom view.
++\fB\-\-socket0  [SOCKETNUM], \-\-socket1 [SOCKETNUM] \fPThe tool can print information for about 2 sockets at once at the most. The top view  will  be, by  default, of the first socket (controlled by \-\-socket0) and the bottom view will be of the second socket (controlled by \-\-socket1). Supply the appropriate value of 0 or 1 or more for SOCKETNUM (if there are more sockets on the machine) to show in the top and bottom view.
+ .TP
+-\fB--nogui \fPDisable the GUI. Useful when the only need is logging.
++\fB\-\-nogui \fPDisable the GUI. Useful when the only need is logging.
+ .SH Example
+ To print for two sockets and also change the log file (log to /tmp/logfilei7z)
+ 
diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
new file mode 100644
index 000000000000..72695a951f7e
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -0,0 +1,22 @@
+Index: Makefile
+===================================================================
+--- a/Makefile	(revision 109)
++++ b/Makefile	(working copy)
+@@ -19,7 +19,7 @@
+ 
+ CC       ?= gcc
+ 
+-LIBS  += -lncurses -lpthread -lrt -lm
++LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
+ INCLUDEFLAGS = 
+ 
+ BIN	= i7z
+@@ -42,7 +42,7 @@
+ 
+ #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
+ static-bin: message $(OBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
+ 
+ # perfmon-bin: message $(OBJ)
+ # 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS)
diff --git a/app-benchmarks/i7z/files/install-i7z_rw_registers.patch b/app-benchmarks/i7z/files/install-i7z_rw_registers.patch
new file mode 100644
index 000000000000..65c36e9a26f6
--- /dev/null
+++ b/app-benchmarks/i7z/files/install-i7z_rw_registers.patch
@@ -0,0 +1,26 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: install the i7z_rw_registers script and fix the hashbang
+
+--- a/i7z_rw_registers.rb
++++ b/i7z_rw_registers.rb
+@@ -1,3 +1,5 @@
++#!/usr/bin/ruby
++
+ #* ----------------------------------------------------------------------- *
+ # *
+ # *   Under GPL v3
+@@ -7,7 +9,6 @@
+ # *
+ # * ----------------------------------------------------------------------- */
+ 
+-#!/usr/bin/ruby
+ 
+ def print_command_list()
+ 	print "Do you need help? \n"
+--- a/Makefile
++++ b/Makefile
+@@ -61,3 +61,4 @@
+ 	install -D -m 755 $(BIN) $(DESTDIR)$(sbindir)$(BIN)
+ 	install -d $(DESTDIR)$(docdir)
+ 	install -m 0644 README.txt put_cores_offline.sh put_cores_online.sh MAKEDEV-cpuid-msr $(DESTDIR)$(docdir)
++	install -m 0755 i7z_rw_registers.rb $(DESTDIR)$(sbindir)/i7z_rw_registers
diff --git a/app-benchmarks/i7z/files/qt5.patch b/app-benchmarks/i7z/files/qt5.patch
new file mode 100644
index 000000000000..9e9b162d9e85
--- /dev/null
+++ b/app-benchmarks/i7z/files/qt5.patch
@@ -0,0 +1,13 @@
+diff -Naur a/GUI/i7z_GUI.pro b/GUI/i7z_GUI.pro
+--- a/GUI/i7z_GUI.pro	2013-10-12 21:59:19.000000000 +0100
++++ b/GUI/i7z_GUI.pro	2016-11-05 13:54:30.118655672 +0000
+@@ -3,7 +3,8 @@
+ ######################################################################
+ 
+ TEMPLATE = app
+-TARGET = 
++TARGET = i7z_GUI
++QT += widgets
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ CONFIG += debug
diff --git a/app-benchmarks/i7z/files/use_stdbool.patch b/app-benchmarks/i7z/files/use_stdbool.patch
new file mode 100644
index 000000000000..4aa84ac091c9
--- /dev/null
+++ b/app-benchmarks/i7z/files/use_stdbool.patch
@@ -0,0 +1,40 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: use a consistent bool type
+Bug-Debian: #749724
+
+--- a/i7z.h
++++ b/i7z.h
+@@ -11,18 +11,13 @@
+  * ----------------------------------------------------------------------- */
+ 
+ #include <sys/time.h>
++#include <stdbool.h>
+ 
+ #define i7z_VERSION_INFO "svn-r93-(27-MAY-2013)"
+ 
+ //structure to store the information about the processor
+ #define proccpuinfo "/proc/cpuinfo"
+ 
+-#ifndef bool
+-#define bool int
+-#endif
+-#define false 0
+-#define true 1
+-
+ #define MAX_PROCESSORS  128
+ #define MAX_HI_PROCESSORS    MAX_PROCESSORS
+ #define MAX_SK_PROCESSORS    (MAX_PROCESSORS/4)
+--- a/cpuinfo.c
++++ b/cpuinfo.c
+@@ -2,10 +2,8 @@
+ #include "string.h"
+ #include "stdlib.h"
+ #include "assert.h"
++#include <stdbool.h>
+ #define MAX_PROCESSORS  32
+-#define bool int
+-#define false 0
+-#define true 1
+ 
+ #define MAX_HI_PROCESSORS    MAX_PROCESSORS
+ 
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
new file mode 100644
index 000000000000..d555d4c41fa5
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="https://github.com/ajaiantilal/i7z"
+SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="qt5"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
+	"${FILESDIR}"/qt5.patch
+	"${FILESDIR}"/gcc5.patch
+
+	# From Debian
+	"${FILESDIR}"/fix-insecure-tempfile.patch
+	"${FILESDIR}"/fix_cpuid_asm.patch
+	"${FILESDIR}"/hyphen-used-as-minus-sign.patch
+	"${FILESDIR}"/install-i7z_rw_registers.patch
+	"${FILESDIR}"/use_stdbool.patch
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+	# The GUI segfaults with -O1. None of the documented flags make a
+	# difference. There may not be a specific flag for the culprit.
+	# Looks to work fine for me with -O2 (pacho - 20170530)
+#	filter-flags "-O*"
+
+	tc-export CC
+	cd GUI || die
+
+	use qt5 && eqmake5 ${PN}_GUI.pro
+}
+
+src_compile() {
+	default
+
+	if use qt5; then
+		emake -C GUI clean
+		emake -C GUI
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
+
+	if use qt5; then
+		dosbin GUI/i7z_GUI
+	fi
+}
diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
new file mode 100644
index 000000000000..78dfd9b514c5
--- /dev/null
+++ b/app-benchmarks/i7z/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ajaiantilal/i7z</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/ioping/Manifest b/app-benchmarks/ioping/Manifest
new file mode 100644
index 000000000000..8a7357542929
--- /dev/null
+++ b/app-benchmarks/ioping/Manifest
@@ -0,0 +1,8 @@
+AUX ioping-0.9-sysmacros.patch 711 SHA256 91729e0391d0e4ae8545b182c0e573931d77d6cc06f7db63f6a84034459137f6 SHA512 93f3a64610bff6970b9a9add9266766953aef1c2ec50afc683154617ddf7698cb72438ece6bfa08609fc5ca2d92b1291b75cca853ebf995b67c0279ea4420557 WHIRLPOOL 9c81e24634671e698caaeade58d810e6a52a10a8a3cb75b23fabed0c61b73ed0ee03121d2c226d292bc03bfb36e9a81a3d5cef85c4ae02262753b6f2ccf7b54a
+DIST ioping-0.9.tar.gz 23695 SHA256 951e430875987c8cfe0ed85a0bcfe1081788121a34102eb6f7c91330c63a775d SHA512 609e19c31a16a5961be0e468255f2853311162ad988d07404a8198042bec1e20cab37e192ad148536a0772efe8034a94d594671ec6fde7d37badee859796de1c WHIRLPOOL e9dec9d139b1b85f379c65d99676bfbbda30b78bf8cfa9a2a238db0e9eb43f6a2cb119ba64e35f9a81dc530b29015062b6e9585661f97449a22c35dc930dbcdd
+DIST ioping-1.0.tar.gz 28824 SHA256 db999abb0f9de00bce800267965cdd9b826ebce6052e905b12d9f40076157088 SHA512 a6763ac800e98c819a74af80634ac723f413ffa183297918389e1e1f5fc83713b683d53b594f5bd20f11d168c21de5da9d42a215d78531ee8b619aff8b9b0b84 WHIRLPOOL cd3c4d373b705300e27a66b5858ec265f4de1d0f9530830a4a55f3b326135fa4608a010e973121f51e6a5ffc5713b0797988fbb20bc54b5fa08a091e6f6641bb
+EBUILD ioping-0.9.ebuild 788 SHA256 74ca2e7798dd9d431a7615840557c12b6dba2627b6e3b8d81fc642f173fa5b9f SHA512 ddfa5c09cdcd32011ef6b16480008d5df66c826e37168a27443d876704597c8ba5ca4af4f0cd4c9b3928f2eaa7d904362b39c804a670e7a65a886583a2b3ffab WHIRLPOOL 8e77c69fec86b1fd832190cb0f66ffdf4a2b5951046aa73aab0c704c82f0c0745a0bcf46d361ec70b841177aad9a9f97a2062cdc0a6ec07c2094be717abbcf29
+EBUILD ioping-1.0.ebuild 637 SHA256 d4a5c3f63958d5d403f10ba7630511f55e9aca5c5908e32f17e155c2c90f52da SHA512 a4e9cb7dcaa6537698ea75674a8557a7c2d3e7ab5dafbd60a334d426dd76298aa9f0f7a2e105704287cc2d153d816e7e72fecc58ac038f65b78708d644036b7a WHIRLPOOL e51653854afea2eded5ba308d9ef8a771795c4ce188b7840bf80bf99e61e1882eadecf8c2801852aaaeb91bac16a9738cc982d539826c6eac06ad6496e4e30e3
+MISC ChangeLog 3524 SHA256 4253d4f080a45ce85d2bd14d53aaa18fdef5b3dc1514f31d693e4cb37d883f9f SHA512 de651f10f547f57e517b8ceadba628023ad2e7ac777166399d0014c8f3a25895ccfeb63f0a9d4c22dab6780300228a58b135d4d94289217260d078e02ebaebc1 WHIRLPOOL e9a8d2cd35112f420c916c8d832f1fc6e3564ce8ae77b5a7f081dd75d22aafef68d2ba425bb2d71f2eb9f7dfb1b9ed575ab088149a975d69ce2af14ad2c84ce6
+MISC ChangeLog-2015 1152 SHA256 bf8b545819ce8d7817ae95df152b0e806776b5c1ee639b51a9a1a665d9b63e92 SHA512 29aff4e8d227b2ddb02317ad04d6ea1a1581eb8c7dae32278df3c19eb2062801a1a61bd44b427b5bf385d9fd6466848c47c10721a272f787ace347f11a46ef2e WHIRLPOOL 9f1b4f71bc085d2b56bf303b84aee941b0920daa879a80aab9d99abf2053455a037f3310627a43746eafdf51c2cee256c5c9ef801e5dab2d45086b0e2a76b5fa
+MISC metadata.xml 486 SHA256 a88e69e2f42a783b2ef767114d81307a445eae892fd4779f447f439ff5d7af45 SHA512 4721668f3a6db1babe573c90b283eda592bde150928cb33c05826518afb61f3009aa9d556254e78bbd56a1693898629c555e7a74483f920606920ebda0c8522e WHIRLPOOL 36d5df7b9260dd516d866065b0e4cf6fb815019b6c3a7ff06b3eae67e16411b1a1178c87d1da0f9edcd883beabc2b93280176b9f66d834ca2c56904c9e8e0402
diff --git a/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch b/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch
new file mode 100644
index 000000000000..837d395201b7
--- /dev/null
+++ b/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/579982
+
+From c56a8a442e79a8837074e0e573f6319efa492ba8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 02:44:33 -0400
+Subject: [PATCH] ioping: include sys/sysmacros.h for makedev
+
+The makedev prototype is in sys/sysmacros.h, so include it.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ioping.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ioping.c b/ioping.c
+index aae4704..80f4bb4 100644
+--- a/ioping.c
++++ b/ioping.c
+@@ -48,6 +48,7 @@
+ #ifdef __linux__
+ # include <sys/ioctl.h>
+ # include <sys/mount.h>
++# include <sys/sysmacros.h>
+ # define HAVE_POSIX_FADVICE
+ # define HAVE_POSIX_MEMALIGN
+ # define HAVE_DIRECT_IO
+-- 
+2.7.4
+
diff --git a/app-benchmarks/ioping/ioping-0.9.ebuild b/app-benchmarks/ioping/ioping-0.9.ebuild
new file mode 100644
index 000000000000..d069cc5afeca
--- /dev/null
+++ b/app-benchmarks/ioping/ioping-0.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Simple disk I/0 latency measuring tool"
+HOMEPAGE="https://github.com/koct9i/ioping"
+SRC_URI="https://github.com/koct9i/ioping/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
+
+src_prepare() {
+	default
+	sed \
+		-e 's: -g : :g' \
+		-e 's: $(LDFLAGS) : :g' \
+		-e 's: -o : $(LDFLAGS) -o :g' \
+		-e 's:-s -m:-m:g' \
+		-e 's:LICENSE::g' \
+		-e 's:-O2.*::g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/app-benchmarks/ioping/ioping-1.0.ebuild b/app-benchmarks/ioping/ioping-1.0.ebuild
new file mode 100644
index 000000000000..86ec4f40c9ba
--- /dev/null
+++ b/app-benchmarks/ioping/ioping-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Simple disk I/0 latency measuring tool"
+HOMEPAGE="https://github.com/koct9i/ioping"
+SRC_URI="https://github.com/koct9i/ioping/archive/v1.0.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	default
+	sed \
+		-e 's:LICENSE::g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/app-benchmarks/ioping/metadata.xml b/app-benchmarks/ioping/metadata.xml
new file mode 100644
index 000000000000..24e9747fb52f
--- /dev/null
+++ b/app-benchmarks/ioping/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">ioping</remote-id>
+    <remote-id type="github">koct9i/ioping</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
new file mode 100644
index 000000000000..3349a750ca73
--- /dev/null
+++ b/app-benchmarks/iozone/Manifest
@@ -0,0 +1,9 @@
+DIST iozone3_397.tar 1679360 SHA256 213d8dcc6f70ca93a903b5fbb92cf758fd25617db4c65d188d29594f12b30d30 SHA512 e154b56735c922173e7cf23344fa0a478982d202b3b831fd605481f69a77295281be121aa57a0164dc12edf5975f231339f6516da5c40906586d48ebacec7c23 WHIRLPOOL 3c041e9c0b094b0e995341d11ef1da746faa0c0dcf615905d16cead7dd9ab84d5d6d301a70358d3a64ceac80a1331054ad31ca6771dd68e5135e7a92f7662d9c
+DIST iozone3_408.tar 1822720 SHA256 2112f8a125df8c627760ee2d6d2bd68617ca18e5a312da74175747f225b3fdf5 SHA512 ebc808468c741fff8d7909abd7eb41303c2a68c21ed7754e12bb6f859a88a9f9d040e0cdde42cb320958fbd453ba6014ba46fb7cfb200155f55a6fa7803f5d44 WHIRLPOOL 670a725e68f64f4029a5168839007af35d874b027e770e2cb1b20487a34be2f283b1a4371784b6108beab75952b55684600d146157ec0421e5540def654d9935
+DIST iozone3_430.tar 1832960 SHA256 e8388238326dc29359e5cb9f790d193f1e1bdadfbf260e010c50fa682387faed SHA512 f513c1a34bcdfadca0d01a942d55c7494e5646cf17384140df42643259456d41e40a54453ab3b9a1f1ebdeb456a9b4b1f836f979927cac57391b9a20ecdbcb55 WHIRLPOOL bf8074ddfdf63879a84176d5cde3fb00f2fa5f84d7adfce777b8ffa53fa33c97bff7ad37aec45e8271b9cbf723e57fbb0704720ee6d06193deee96ca841b9203
+EBUILD iozone-3.397.ebuild 1849 SHA256 2dcf2726fe3ffd76d5cd92232d2cfb14b818e40aa16da4968049ade704ed663c SHA512 91fd4ee4a261fd1b6344076a285ed763641efefb1c7e497eef8504bd7aba221a96c8a9ddd6dceafb814998d70878029f3b39b9f8dd9601ce0f27b63853626f8b WHIRLPOOL 029277a1628a00a63bc170e1d8dc8cd514a3def3c760eb62979169c96688c007c0ee2493b7dddf2e25cbf93094a1cf7ba5dd1b998e7352b17131b22add45af4c
+EBUILD iozone-3.408.ebuild 1856 SHA256 d03ec7f6699e28cf14d82114b062c615ccd5c8c34f72abf9c4f73d0d3237c2b0 SHA512 40a906fefe5d6581ed8e38346d175983986be5a1618e16a364bc47070b81ca591519756553b2054ad0ff7e92610dc14815e9447341dfd4560fc0c82d327dcba3 WHIRLPOOL 93ee30d0deca1ac071e15f8345a0775f24f95d3e91efbef80f3f58326b3a875dcfb388fbdbe28cca927fbfb07f085f6a7c06ca2914572927c66131f92c2b867b
+EBUILD iozone-3.430.ebuild 1883 SHA256 b408bf945fab77bd90b9faa2395788f76b28dec06e633bae8959701c4c9091de SHA512 77f474621bcf4b5f2e98b913a3c3c9c557f4b2febc8a9c07faf504a9998cf26bdb5a120ebd53a5515cafb832b7bf8fa8db0779240e4b9350ba1dfd26b05e9d43 WHIRLPOOL c60bc5d2ff7a0fbf32f3c3796e215e207977b922cf661fd365b514b60d268d569ac3c691a4e2b23b97eeda5192c127b255e9e052fcb7df87a3b103b3e4c768e4
+MISC ChangeLog 2991 SHA256 7d7047276dc9c138c017fe4e5771a9912ed0b231b187873d3272070d7cbcec1a SHA512 ecb4004475250213e47f0c0f6c99cf16a4df5e27028279ce2a176fce33b717b1b94dd99892b94cdd14fe0d5862e6e3a28fddc37a178813738e26744b1c10101a WHIRLPOOL ebbd7701bb95ad899871eea83f45597b322f4fe27c2899b69be69256446b97829bf686042fab2e5dba38b39948862f3f784438a9131cda52f3f59c3f4f40ca64
+MISC ChangeLog-2015 7391 SHA256 e0a6e27182e6e5329889d66825f7d5820885e2d7282d3e9b25be9546f17ee348 SHA512 71c1e9f810664d0f8b8d33c42a8508a83a2c3d4fbd8c5cf28a2b98a6b108e1ad833f7563cb61b5fd965329c6f30c8fd169e63d605606b4210907a4418749a5e2 WHIRLPOOL 3b250aac317303bf332a4d79a354cae0feb1a97fc946278161cf309e6188e9723f164933a1083a1bf300d609c5c2c45257aedce3c9fa7a11d15c73551a349e7e
+MISC metadata.xml 306 SHA256 60810e4967ccf12acbbfb8282634d8508d72c088329a78a60c06e73823834727 SHA512 b2db363d799f0d8187556e0331125111473b2d60296a76495e5e228c776e5e18cbad4ded48e5a596ea66885d01ad0fd54d2929857b8f5eb7e6e87e3c95d253cc WHIRLPOOL 7c221d3561a7dfc9b6f20adf49f92ed41b246f7830465d7f62d3e7db0a24633ae40b0da21c713c645053a009d8c997bf590d82cfe3fb0bacb3cd391288a25bd1
diff --git a/app-benchmarks/iozone/iozone-3.397.ebuild b/app-benchmarks/iozone/iozone-3.397.ebuild
new file mode 100644
index 000000000000..173cc7a0b7b9
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.397.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-powerpc64      (64bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~ia64 ~s390 alpha(?) x86-fbsd
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Filesystem benchmarking program"
+HOMEPAGE="http://www.iozone.org/"
+SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV/./_}
+
+src_compile() {
+	cd src/current
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" makefile
+
+	case ${ARCH} in
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		ppc64)		PLATFORM="linux-powerpc64";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-ia64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)			PLATFORM="linux-${ARCH}";;
+	esac
+
+	emake ${PLATFORM} || die "Compile failed"
+}
+
+src_install() {
+	dosbin src/current/iozone
+	dodoc docs/I*
+	dodoc docs/Run_rules.doc
+	dodoc src/current/Changes.txt
+	doman docs/iozone.1
+
+	insinto /usr/share/doc/${PF}
+	cd src/current
+	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
+
+src_test() {
+	cd "${T}"
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
diff --git a/app-benchmarks/iozone/iozone-3.408.ebuild b/app-benchmarks/iozone/iozone-3.408.ebuild
new file mode 100644
index 000000000000..83d5240d5675
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.408.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-powerpc64      (64bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~ia64 ~s390 alpha(?) x86-fbsd
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Filesystem benchmarking program"
+HOMEPAGE="http://www.iozone.org/"
+SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV/./_}
+
+src_compile() {
+	cd src/current
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" makefile
+
+	case ${ARCH} in
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		ppc64)		PLATFORM="linux-powerpc64";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-ia64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)			PLATFORM="linux-${ARCH}";;
+	esac
+
+	emake ${PLATFORM} || die "Compile failed"
+}
+
+src_install() {
+	dosbin src/current/iozone
+	dodoc docs/I*
+	dodoc docs/Run_rules.doc
+	dodoc src/current/Changes.txt
+	doman docs/iozone.1
+
+	insinto /usr/share/doc/${PF}
+	cd src/current
+	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
+
+src_test() {
+	cd "${T}"
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
diff --git a/app-benchmarks/iozone/iozone-3.430.ebuild b/app-benchmarks/iozone/iozone-3.430.ebuild
new file mode 100644
index 000000000000..ef238c5b9a76
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.430.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-powerpc64      (64bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~ia64 ~s390 alpha(?) x86-fbsd
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Filesystem benchmarking program"
+HOMEPAGE="http://www.iozone.org/"
+SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV/./_}
+
+src_compile() {
+	cd src/current
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" makefile
+
+	case ${ARCH} in
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		ppc64)		PLATFORM="linux-powerpc64";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-ia64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)			PLATFORM="linux-${ARCH}";;
+	esac
+
+	emake ${PLATFORM} || die "Compile failed"
+}
+
+src_install() {
+	dosbin src/current/iozone
+	dosbin src/current/fileop
+	dodoc docs/I*
+	dodoc docs/Run_rules.doc
+	dodoc src/current/Changes.txt
+	doman docs/iozone.1
+
+	insinto /usr/share/doc/${PF}
+	cd src/current
+	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
+
+src_test() {
+	cd "${T}"
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
diff --git a/app-benchmarks/iozone/metadata.xml b/app-benchmarks/iozone/metadata.xml
new file mode 100644
index 000000000000..ae3cf8b035be
--- /dev/null
+++ b/app-benchmarks/iozone/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+    <description>A Filesystem benchmark tool</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/libc-bench/Manifest b/app-benchmarks/libc-bench/Manifest
new file mode 100644
index 000000000000..e95ee054cc04
--- /dev/null
+++ b/app-benchmarks/libc-bench/Manifest
@@ -0,0 +1,6 @@
+AUX respect-flags.patch 528 SHA256 01a5f665ef3c2194dfa4aa259be08434ca33db5d09fcae17407757a94f4961c7 SHA512 3f30d849ab7a52c0e16ea1e53e068d6761b782aab65cd47dfe6ba775257f858c2f4e3d3b1db920d45c8904b4973b45f013199adb93c1fb92e79c48bf7b89db09 WHIRLPOOL 435f7d6c4bbcba050ea899c48a4e6862fc61365a7bdb939cf631fd881e48ad3831e732ef4b7f8ced14821b8dcc53b24cae9e91ac08b11482aa5c8bf1d3281b23
+DIST libc-bench-20110206.tar.gz 3135 SHA256 6825260aa5f15f4fbc7957ec578e9c859cbbe210e025ec74c4a0d05677523794 SHA512 72f68616ab189f39f766c98afbb83bf3470a4e14ccb1dfe139a9006227262197546897da8f360bf48ba2c8854730aa385ca16270ec2e6cf2b531205550726f38 WHIRLPOOL 4145b3e55ae3fa22b14055deb9d5948b6bd891cd62da99199136c82cda4285d0332a8ee48764c32ecf47703e9f20825af064bb34448e0f124bd48987b67e0050
+EBUILD libc-bench-20110206.ebuild 601 SHA256 d596a16839ebb2d8538bcfd836d72676fc97d567c357120a303def06805e7291 SHA512 06acb3e505d2c9cd4375d31153d123e3015dd6376b1f9a815a0ea91ecfdbaf3f4b4fdb1ff2ac07c1cbfa3770637ca55f1699a84b11dc4149f1a486a9ff7dbf08 WHIRLPOOL 9d43206fd0e5f462fa124c8bdf3b99aeba8f838568e59c46c7bd66169c2daae641224f31057a6925527a5fe4aba857df6b0f78bc07024be96a6102e43f536f52
+MISC ChangeLog 2225 SHA256 9b5d3ccec61d2cef8fc3420b80713c70f06046c4c69cda4280f1222a61508a22 SHA512 138c057997d20c95ff0e3eb6fa3e2607ed2f09426ccbc52b03a3ef2caa7951bb3328e6b80450b8620dcaad3717a9c38de2719796d344b3758fde661fe9a9a937 WHIRLPOOL 598a3e861910231fa9631933af984e9d61c35ab86f6be51429061ae3f94bbe8295c8be22184f42584266c345cb93ce54b21fbd5244f81631e72120fdecc068eb
+MISC ChangeLog-2015 532 SHA256 022b2b64ade4f7ec079773886ac084257a0958cd2b7dcf50407cfd89e74602e4 SHA512 beb5d953fcba9d506e4c1ea39f988d453c08e579326059a8362b07423f13f0e3a66f24f7e737d0746f302c85fc3ad1de8040113cf7b12e7217d791a093849901 WHIRLPOOL cdda587c48818327eb0e04bc2fcc8243cfc069f60d0acc43018bb019dd98c5fbef2d9c2a3626c29d509c4e29ac56a6d25e035d60ee697bcadd235614a39546c0
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/app-benchmarks/libc-bench/files/respect-flags.patch b/app-benchmarks/libc-bench/files/respect-flags.patch
new file mode 100644
index 000000000000..19958fd1c91b
--- /dev/null
+++ b/app-benchmarks/libc-bench/files/respect-flags.patch
@@ -0,0 +1,23 @@
+diff -Naur libc-bench-20110206.orig//Makefile libc-bench-20110206/Makefile
+--- libc-bench-20110206.orig//Makefile	2011-01-31 02:13:00.000000000 -0500
++++ libc-bench-20110206/Makefile	2012-08-09 22:12:24.000000000 -0400
+@@ -2,8 +2,7 @@
+ SRCS = $(sort $(wildcard *.c))
+ OBJS = $(SRCS:.c=.o)
+ 
+-CFLAGS = -Os
+-LDFLAGS = -static
++LDFLAGS += -static
+ LIBS = -lpthread -lrt -lpthread
+ 
+ 
+@@ -12,9 +11,6 @@
+ clean:
+ 	rm -f $(OBJS) libc-bench
+ 
+-test: all
+-	./libc-bench
+-
+ libc-bench: $(OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
diff --git a/app-benchmarks/libc-bench/libc-bench-20110206.ebuild b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild
new file mode 100644
index 000000000000..72efbc992efa
--- /dev/null
+++ b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Time and memory-efficiency tests of various C/POSIX standard library functions"
+HOMEPAGE="http://www.etalabs.net/libc-bench.html http://git.musl-libc.org/cgit/libc-bench/"
+SRC_URI="http://www.etalabs.net/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-flags.patch
+}
+
+src_configure() {
+	tc-export CC
+	CFLAGS+=" ${CPPFLAGS}"
+}
+
+src_install() {
+	dobin libc-bench
+}
diff --git a/app-benchmarks/libc-bench/metadata.xml b/app-benchmarks/libc-bench/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/app-benchmarks/libc-bench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/metadata.xml b/app-benchmarks/metadata.xml
new file mode 100644
index 000000000000..c7ff9093b3ee
--- /dev/null
+++ b/app-benchmarks/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-benchmarks category contains benchmarking software.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-benchmarks contiene programas para pruebas.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-benchmarks enthält Benchmark-Software.
+	</longdescription>
+	<longdescription lang="ja">
+		app-benchmarksカテゴリにはベンチマークソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-benchmarks categorie bevat benchmarking applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-benchmarks chứa các ứng dụng benchmark.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-benchmarks contiene programmi per l'analisi delle prestazioni.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-benchmarks contém programas para benchmarking.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-benchmarks zawiera oprogramowanie służące do testowania
+		wydajności.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
new file mode 100644
index 000000000000..905464e6d64d
--- /dev/null
+++ b/app-benchmarks/nbench/Manifest
@@ -0,0 +1,6 @@
+AUX nbench-2.2.3-Makefile.patch 709 SHA256 b58a2e2213efa31d2a8683e315afb7d330830eaf73024c036092918e209d65de SHA512 f2d30abaf00baba8afc01c921dac5cc493ad98bf6c76d3cb203444a991519bbbfe521cfdc5aa7cd4f6ffd5cd89e9d13dcce30a84675f1715687e1e1ba8e95198 WHIRLPOOL 63ce05da859b19bb3d1b790e7ef3b24a2e92b0bfdba7864d4d760d6b169b48a663c42ea832a7e290e6a52ad8139304872881d6c5fa47258e83e5e643d5c89773
+DIST nbench-byte-2.2.3.tar.gz 111791 SHA256 723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac SHA512 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8 WHIRLPOOL a7433d75364920a44dd3d94966601ddb08422175b81d25412d0f74913caa44b20a2865e911d8dbd693d83fb29ad4ca68e02b1c156ba2650dec76418d46060cf9
+EBUILD nbench-2.2.3-r1.ebuild 1014 SHA256 747a64329c898169e5e9167a9c40f6585a76a2cac9ff7e6439ffe1703b27d39d SHA512 133757ee20e26bcae413cd5bd74c0c4771a7dc6df8cf706deed52d349201f3996a52cd7ea296f4f1efea08d4b9a4765c705958cf717528f11a1e45810b56be2e WHIRLPOOL 1eab3f7116f8cfb2798d3f36f6d318e594f45136755dbeb61a3487de4e191f6a656fa348738f31aa68188aaac329da2b804fcd8d6645fc74c0b0e5bb0337e2f8
+MISC ChangeLog 2221 SHA256 d759925cdb0b499d46d31ece0d8662564db5f81ac6bde724bc7fa58a40a68641 SHA512 505b706111106aff7fe93e8157f09f23e6355add06ee8f8fd3de25ef49aa4a5ae192f2a6076589869b88fc23922bfb5bd730f26ba5be237409154446f9add310 WHIRLPOOL c121040880a6eef218f1c2645ab83b40ffb17deed3686b58708de2bbae96b0159bf3d18cf4a023a6647633760532eeaa4eda4228969f0e23a84e109e1182b161
+MISC ChangeLog-2015 4587 SHA256 aa0030c042e38f79b42faf9b327a813c697f43ce29db2ba3ddeaff1a533f9971 SHA512 72458ab94595e077d012cde779eb185b82ab3936415c55bff09350adb955fa1ccbe9c567dbadf83cde84b823cd4037151909faf99a6fea5d1243c0c41cbcd032 WHIRLPOOL 9a68741d3c1863740ad2e0fa0e9c854ca78f18d2baf50169fc11c77459d8c3bc043054e9f66030f189547b90f1933c6eb9bc60012623077b274c9e21736750e6
+MISC metadata.xml 244 SHA256 a65bfec176330796e1eeb3bb589b78ff60a123b947537decd4705ea71ca4e906 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db WHIRLPOOL 1164de6a99d8931ca3ae60cbb397be80b802eb473943ef777dbe8473d8d665a5f93d8b99175709bf09d8af856b3ea7aaf7c95a87aad37e48b85c06e618431a1f
diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
new file mode 100644
index 000000000000..c41fd07557b7
--- /dev/null
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -0,0 +1,24 @@
+--- Makefile.org	2004-12-30 03:23:30.000000000 +0100
++++ Makefile	2009-12-14 13:31:18.000000000 +0100
+@@ -19,10 +19,10 @@
+ # You should leave -static in the CFLAGS so that your sysinfo can be
+ # compiled into the executable.
+ 
+-CC = gcc
++#CC = gcc
+ 
+ # generic options for gcc
+-CFLAGS = -s -static -Wall -O3
++#CFLAGS = -s -static -Wall -O3
+ 
+ # if your gcc lets you do it, then try this one
+ #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops
+@@ -126,7 +126,7 @@
+ 	if [ "4" = `./pointer` ] ; then touch pointer.h ;\
+ 	else echo "#define LONG64" >pointer.h ; fi
+ 
+-misc.o: misc.h misc.c Makefile
++misc.o: misc.h misc.c pointer.h Makefile
+ 	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
+ 		-c misc.c
+ 
diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/app-benchmarks/nbench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..d8b2ba1301cd
--- /dev/null
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}-byte-${PV}"
+DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
+HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html"
+SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	sed \
+		-e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \
+		-i sysinfo.sh || die "patching sysinfo.sh failed"
+	sed -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' \
+		-i nbench1.h || die "patching nbench1.h failed"
+}
+
+src_compile() {
+	emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	dobin nbench
+	insinto /usr/share/nbench
+	doins NNET.DAT
+	dodoc Changes README* bdoc.txt
+}
diff --git a/app-benchmarks/os-autoinst/Manifest b/app-benchmarks/os-autoinst/Manifest
new file mode 100644
index 000000000000..2dded4e86aa0
--- /dev/null
+++ b/app-benchmarks/os-autoinst/Manifest
@@ -0,0 +1,4 @@
+EBUILD os-autoinst-9999.ebuild 723 SHA256 62e11f2e7079b97c163e2fcd66ca9b05fc4a84bda001afcebb665afccee05c14 SHA512 40aae61c2c6517ad5e48f038285afab920106becdad880e355c821e9417580714470fa44003ba6772a9aa18917428195cd713c886adb924c64224ca3c72e18b5 WHIRLPOOL 38bfd41abd64567aacde132d327ab1547f994fb8b7acf71698ad6a459536d12e4d54cc63b8587620828e294bf99da346fe9ce14dc189cc1028a686ef70a5b105
+MISC ChangeLog 2443 SHA256 55b673e76a15623dd697b626c8f2281615949f078e80d27ba4603a063ba4b73d SHA512 ad0445226203aa9858a49b18e120cf052276e7c012c260df5fdc2d7de8a331ecde3b241ad405ea883308e2c88928bcd9c1f03c922325bdadd530027c5f620d97 WHIRLPOOL ef567dd2d8ad4e8a6e0c4b29ccbbe30ce00a9957b701cb8c265ba7a1f367db4e568dffc54b02d6dd469e89e67f7df14c20325f0cff55acfa8ce7b5a21dbf1165
+MISC ChangeLog-2015 1371 SHA256 f4879de5415b2acc9767941a3b98ee93d574fc45de3181b099653be8e164042f SHA512 657d850cc3df2197848fd2ea48c3abc33ab54b262437add26aa2f14af1aafd15ec953be7ea76ca799702d09884ba9b162a191343e70b0da78ced8f748ff4478d WHIRLPOOL 15f2d4eca4e5c35ea94a8492034f716459d5c2c2c7cbce3c20d29ef3d802c83f6c1a327f31e3b65d7d79d7d9ac8a5a9c465a3608bbb051e06630b7a54125ee04
+MISC metadata.xml 232 SHA256 cae43e94e79a01960721d205a44935817243a3778791d1ba4c8c041c4a9d501b SHA512 23824ca618f16dec558197c0c853f3ebf5c0f1b034635242282bd40f01beea59cbac3b416e86f2eb4337942d9db945a2e1fd4fe52c88762b65749855762769fa WHIRLPOOL 774b24967a2336d4cc213a21ac9c89d0b11c17d626a93badaf1e98dec218db09edc4b73a30e47121a1f1cdd588c7ee9859da00b319d09707b05d802dcb134891
diff --git a/app-benchmarks/os-autoinst/metadata.xml b/app-benchmarks/os-autoinst/metadata.xml
new file mode 100644
index 000000000000..c78052713743
--- /dev/null
+++ b/app-benchmarks/os-autoinst/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
new file mode 100644
index 000000000000..2f46d77f4b83
--- /dev/null
+++ b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+EGIT_REPO_URI="git://gitorious.org/os-autoinst/os-autoinst.git"
+
+inherit git-2 autotools eutils
+
+DESCRIPTION="automated testing of Operating Systems"
+HOMEPAGE="http://os-autoinst.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	>=media-libs/opencv-2.4
+"
+RDEPEND="${DEPEND}
+	dev-lang/perl[ithreads]
+	dev-perl/JSON
+	app-emulation/qemu
+	app-text/gocr
+	media-gfx/imagemagick
+	media-video/ffmpeg2theora
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-benchmarks/pipebench/Manifest b/app-benchmarks/pipebench/Manifest
new file mode 100644
index 000000000000..afe9c7562d1b
--- /dev/null
+++ b/app-benchmarks/pipebench/Manifest
@@ -0,0 +1,6 @@
+DIST pipebench-0.40.tar.gz 11542 SHA256 ca764003446222ad9dbd33bbc7d94cdb96fa72608705299b6cc8734cd3562211 SHA512 bace18d73425cf56bc3fd95eea4db47b3010cc82c16d9b433390d0ee4593046ab10101ce73df451596b34ace89fa92e93a92bb625286edb9cdfb809e630788cd WHIRLPOOL 4f580ac6fac6695d499332f68c09cacdc37d10e7ba2e5b86af35f18d6a0d2faaa002ed9d46390dfb54b7f7febf11df757fa57ba3d80fa111f658b3d00abc4a7a
+EBUILD pipebench-0.40-r2.ebuild 802 SHA256 29c18b37e59998175fba7828d274aec79c2139f90af1cba4a6831e28b5cdb3c5 SHA512 794dc3dc8389a531e3d7043179ba836b4ec8041386fa4fbfc308a2727a541870fcf2112b08a0b959417527cb6c0e107d5c4e6715f4823b1ad041d3448cf0917d WHIRLPOOL ca477f64c59e399a25c8c83688bf7103ad4ef82e0af427fa503f3103f50ba5067ad064bf105bbef12a0fa175e4febad1e731999af7645b23b1c97ef7f46096e8
+EBUILD pipebench-0.40.ebuild 772 SHA256 2bcae15a4022574e5a7c8207543c589e2b29401ae3036725c60830d13c257aa2 SHA512 6d108e9a26d1aad998cda31b0db885b9fcb5d4c98b5eb2b206d369bfbaff5794755a4c58e5536e9fcf3fc18b4317dca337f361260071bdafb1cf3729cf2b97bb WHIRLPOOL c979b253af10f50c55088791f62d8e417abc3462a45e30652bb8dc89c7d9abbeef8b3a71df61f3a7a44403b10b5a984995745024d7bcc2ccce5509271cff356c
+MISC ChangeLog 2526 SHA256 5802bf647a8cb504a9b4076fa08e31fe6bc49ee2d272d7a986bc12ca9225e4fe SHA512 8868cc011812f3c0124231e91008967939b90e13561203aff69eceb0299164db547722dcbaba644c707222bceb92800bc104a7918119a91e1e3e9c2ab49ef42d WHIRLPOOL 43796024389129ce898ae5a3931018c45660c8471166b9405914e8acbf5d475650285e045dc0141fe5602c604522ec6f49a2d264dabd5e97c825e1eea4d04fa9
+MISC ChangeLog-2015 1743 SHA256 9a547f8c4933a85e8cc9bcc87874532fbfc1edfc2e53b8a1608278a2d5d4cc6d SHA512 18c76513c4d01d8b0d3d078b9d967141c45ff1387dccae6ba9147a597540254e82b992b564e4d1cd6cc74e1260b9932d5272705c7b6871f6ddff3023fb6fb8ee WHIRLPOOL 38e2d98f7930314646bb37aadaf018ab870a3a5ab1f632f36de61df2912b222533f667c5bc4ca66c5e9f3953977b346e4cf0e918636e4eddf949636f73f937fe
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/pipebench/metadata.xml b/app-benchmarks/pipebench/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/pipebench/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
new file mode 100644
index 000000000000..610bcc5df90d
--- /dev/null
+++ b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Measures the speed of stdin/stdout communication"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench"
+SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's:CFLAGS=-Wall:CFLAGS+= -Wall:' \
+		-e 's:$(CFLAGS) -o:$(LDFLAGS) &:g' \
+		-e "s:/usr/local/bin/:${ED}/usr/bin:" \
+		-e "s:/usr/local/man/man1/:${ED}/usr/share/man/man1:" \
+		|| die "sed Makefile"
+	default
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dodir /usr/{bin,share/man/man1}
+	emake install
+	dodoc README
+}
diff --git a/app-benchmarks/pipebench/pipebench-0.40.ebuild b/app-benchmarks/pipebench/pipebench-0.40.ebuild
new file mode 100644
index 000000000000..b975c39122b1
--- /dev/null
+++ b/app-benchmarks/pipebench/pipebench-0.40.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Measures the speed of stdin/stdout communication"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench"
+SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die "Manual configure failed"
+	cp Makefile Makefile.orig
+	sed \
+		-e "s:CFLAGS=-Wall:CFLAGS=${CFLAGS} -Wall:" \
+		-e "s:/usr/local/bin/:${D}/usr/bin:" \
+		-e "s:/usr/local/man/man1/:${D}/usr/share/man/man1:" \
+		Makefile.orig > Makefile
+}
+
+src_compile() {
+	make || die
+}
+
+src_install() {
+	dodir /usr/{bin,share/man/man1}
+	make install || die
+	dodoc README
+}
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
new file mode 100644
index 000000000000..cc78645f99c8
--- /dev/null
+++ b/app-benchmarks/ramspeed/Manifest
@@ -0,0 +1,5 @@
+DIST ramsmp-3.5.0.tar.gz 79481 SHA256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e WHIRLPOOL 2e35adb0aa58a2d5ec81d64ab50bcfc3a7c831798aa13c62d80d2bfb907dcb048087047fd68fe9e7ccbd838848235bca5ee44ba6b203ac07c9945a7ea88a7447
+EBUILD ramspeed-3.5.0-r2.ebuild 1343 SHA256 7eb5cc9798fc828bd1a941cdb73a8407035074538968451d3545c6c34672252b SHA512 17da178a4ea32d1b4ebe39762e13dcb252eafbddc7c2f4ee7a5db8d8d28455038d981872636f6b67670a39f87c2bc1da0b981cd36ace22b7ed4a069f08d1574f WHIRLPOOL 9d7c5a435b07dcb0635d1522693b7d1bf02b8599ccc93f8911c5e30689f887cd48e79f4827b872d7a2aa71466847e7e57a4b527fb5e5798dfeaca148ca7f3365
+MISC ChangeLog 2191 SHA256 d65325c0407834f99e8f7c1961e2afb5f03d99474d0fff2f5d5f2b84d39f9110 SHA512 7d0f81d6ccb4e59c8f80cfd5f0bd379903e0eaf0f88916eb6352c6e4074a6c4f95afaabbfe6b80d7246845e9457acbf773a39b8dd861e50a4f1b9b7e97c4b172 WHIRLPOOL 28df2db4b2d6448f90af65b83dd6729691dd117c4c84f9993c863206b3e338a8cd7422d22d0e66223d5114e0585e6396e02e852d6f040ed8b90fe793f418a425
+MISC ChangeLog-2015 2295 SHA256 e9f30af8f1fb36c0a2baa7dbc4c460d0ac507fea2fe09e328dbb7236704ba6c2 SHA512 9588cd78beb44f380498b25e43e146c614e7414d02ebd552aea24aee5228295ddc9b0f23e9ddfd9309f100a151c98c2fe663747f5bb1797f4c1ed0ce18a9546b WHIRLPOOL 6e68acc457ccb61c405a755dc61c81cd25ccbf66bd57abf234c49e3f551c50d091aca3ea5261b0ad2d2bccc81cfceea552ac053e27634f18b2f23bbf5d5adb89
+MISC metadata.xml 354 SHA256 9ae7d31bbec489d95de2b3b760c6f1568ce019647897b926c8191ab6aa6fc708 SHA512 38abbd2b91db1482fb69ccb45150c2f03331e4e4730754c1374a68f0e6b58bdf98a965a802e666473323894c7a91d8aa5a164bc929b3fbcd435163ed9c3d2306 WHIRLPOOL 56533c05cd220fec7d7c9dd356e6280fddbb4b80867ba84fe3b8056f3e3f81046de2b372b8f7e2a3593e1ae6e2928f9eec73e90697a37adf0df5c6a3a9dace58
diff --git a/app-benchmarks/ramspeed/metadata.xml b/app-benchmarks/ramspeed/metadata.xml
new file mode 100644
index 000000000000..d84a11e08048
--- /dev/null
+++ b/app-benchmarks/ramspeed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <use>
+    <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
new file mode 100644
index 000000000000..cf2ff261ad0b
--- /dev/null
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="ramsmp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Benchmarking for memory and cache"
+HOMEPAGE="http://www.alasir.com/software/ramspeed/"
+SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Alasir"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cpu_flags_x86_sse pic"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	local obj
+	local arch_prefix=./
+
+	use x86 && arch_prefix=i386/
+	use amd64 && arch_prefix=amd64/
+
+	tc-export CC AS
+
+	#fix the stack
+	append-ldflags -Wl,-z,noexecstack
+	obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
+
+	use pic && append-ldflags -nopie
+
+	if use amd64; then
+		sed -i \
+			-e 's/call.*free/call\tfree@PLT/' \
+			-e 's/call.*gettimeofday/call\tgettimeofday@PLT/' \
+			-e 's/call.*malloc/call\tmalloc@PLT/' \
+			${arch_prefix}/*.s || die
+	fi
+
+	use x86 && obj+=( ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
+
+	if use cpu_flags_x86_sse; then
+		use x86 && append-flags "-DLINUX -DI386_ASM"
+		use amd64 && append-flags "-DLINUX -DAMD64_ASM"
+		obj+=( ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
+	fi
+
+	echo "ramsmp: ${obj[@]}" > Makefile
+}
+
+src_install(){
+	dobin ramsmp
+	dosym ramsmp /usr/bin/ramspeed
+	dodoc HISTORY README
+}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
new file mode 100644
index 000000000000..00b0ab80f6da
--- /dev/null
+++ b/app-benchmarks/siege/Manifest
@@ -0,0 +1,10 @@
+AUX siege.bash-completion 659 SHA256 cb6863bc78487b02b4d3be7d05f1c94b1b6c9f8ae918cdb94a40b73f1ea83912 SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8 WHIRLPOOL 2fd9ba3d68bd8d5adf89654c968c4550d33c1ae419184f88eb33c2f84c7d7d1e9ccd8c5e171d424743c831ab9af14037452be3a2ba18d9cbef151270dfd7b524
+DIST siege-3.0.6.tar.gz 496002 SHA256 78b79964e3d6772e532c6008a084700f830a02a00ca80b44f3e71380b4908c5b SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b WHIRLPOOL 0c94eb828681b2ab67cab13bbaf802f25804e976f4f1eac6cb3cb45160ee6dd2f73d726c39f9ab6be6e4243ac4c6c79d76f406eba72d3fe4a929fb24838b1de0
+DIST siege-3.1.3.tar.gz 527862 SHA256 4d3932ea23cbf6d1d22df7c7ee6e7a6bc9f591b604ab582393eeb62f393f5a33 SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b WHIRLPOOL 48e9bb9cd6c66005d17fc8bde1de62d18148114aca48700f26fd3b4710d6dd912dd2e022bbacb3b9adc636fb7003c2a6f561340794aef8142f33fcfe29baa8d9
+DIST siege-3.1.4.tar.gz 530149 SHA256 0436970ca81ade76eb419bc42d3f8460b475079eb5d8f199d2fa83328893099d SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068 WHIRLPOOL 2081e4661a1272d99f16ff350d241c4ba26a6cec7ba34a0968d8db94e2195e0d3f9b1b5b47b5c0575b6b9af0d02d386b020dbcc46ebccdff47bed8e9cd5bd8eb
+EBUILD siege-3.0.6.ebuild 1137 SHA256 bdbb48813d6d84682911154742c4ebbfe393a1320fe60321950a1a88d60c8b54 SHA512 51a1a5650f81440fa974b17479acf13e6ab58a96b74708a2169e0d42cdd459e68f7de4e1bc471635b4e28bff5d7a1006db3949a468f91c8af64baa43f986d2e7 WHIRLPOOL 2e73e194739a6d6dd78ff3cfbc5f1c5f617d0780b9440bae443fede4593327b98687c7ecccfda9ada25a0edc810281851da52076805fd0fcf863d434a52cbf8c
+EBUILD siege-3.1.3.ebuild 1192 SHA256 8cf276cfc449cdf011695891005235eb3004fd54e931710dae0431a162156e5a SHA512 46650e12d37c45bd994ee7806d9130639d1591028fb3d9f3000a55747f177a7521bb666a871741ed9cdd245606d957873d5de77700f573854cf341ae3c613e00 WHIRLPOOL 95563ed28edd502e090879bb195dc6117920eeaf60660c6d8f66a0c345395d8c76a269c308e6e50a300c0ef4697759317737ca28a843a616ae56c48649357344
+EBUILD siege-3.1.4.ebuild 1192 SHA256 8cf276cfc449cdf011695891005235eb3004fd54e931710dae0431a162156e5a SHA512 46650e12d37c45bd994ee7806d9130639d1591028fb3d9f3000a55747f177a7521bb666a871741ed9cdd245606d957873d5de77700f573854cf341ae3c613e00 WHIRLPOOL 95563ed28edd502e090879bb195dc6117920eeaf60660c6d8f66a0c345395d8c76a269c308e6e50a300c0ef4697759317737ca28a843a616ae56c48649357344
+MISC ChangeLog 2997 SHA256 fb23d638cb3345a130f88b6fcd6879932383305cb24c065dcfcdba70695ade4d SHA512 91e935c1cd437fd1f595add45d2151362a504f5606e94b4ead78e6c31ee994531d378d9b6f203cff0888cdfda5531bb506d3d0c108be5e60d263c060aaab75db WHIRLPOOL 86affd20ecaf69481ba9b8dc965ea5f2ef14d60b78ac857bf27ffb3c23f274e0d110ae6946d9bd94a2712cbc501f3a7de974566a01f9bc047598aaa3e2838781
+MISC ChangeLog-2015 9188 SHA256 3d8818d1d9296a781ded7faaf65aa54a991825e5e312155a09588c004a85f310 SHA512 06f60ab915c270beb8cfc4b229eff6ad64d6dd01e694eee42008a6653b905efe7f9864ad634b77a4d4288197fa5df9951d6677a00fe4cdfae3413b93e0f2ce1c WHIRLPOOL 7d3ba84322ab2e51922b43491f5e7ed970d7bbe514eb61b6cee9eb48f8f0f6c476c3549f7f2c9400e1768219a6732e70fe1a949801d9d07ce68045b2803ad9a8
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/siege/files/siege.bash-completion b/app-benchmarks/siege/files/siege.bash-completion
new file mode 100644
index 000000000000..cc100e5ee6a1
--- /dev/null
+++ b/app-benchmarks/siege/files/siege.bash-completion
@@ -0,0 +1,24 @@
+# siege completion
+
+_siege() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="-V --version -h --help -C --config -v --verbose -g --get \
+    -c --concurrent -i --internet -d --delay -b --benchmark -r --reps \
+    -t --time -l --log -m --mark -H --header -R --rc -f --file -u --url"
+
+    if [[ "${cur}" == -* ]] || [ ${COMP_CWORD} -eq 1 ]; then
+		COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+    fi
+
+    case "${prev}" in
+		-R|--rc|-f|--file)
+			COMPREPLY=($(compgen -o filenames -A file -- ${cur}))
+			;;
+    esac		
+}
+complete -F _siege siege
+
+# vim: set ft=sh tw=80 ts=4 sw=4 :
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/siege/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-benchmarks/siege/siege-3.0.6.ebuild b/app-benchmarks/siege/siege-3.0.6.ebuild
new file mode 100644
index 000000000000..1002d516d110
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.0.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
+SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~x64-macos"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	# bundled macros break recent libtool
+	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
+	econf ${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
+		doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/siege/siege-3.1.3.ebuild b/app-benchmarks/siege/siege-3.1.3.ebuild
new file mode 100644
index 000000000000..b08e5a9b4f55
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.1.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home/"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	# bundled macros break recent libtool
+	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
+		doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/siege/siege-3.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild
new file mode 100644
index 000000000000..b08e5a9b4f55
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home/"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	# bundled macros break recent libtool
+	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
+		doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/spew/Manifest b/app-benchmarks/spew/Manifest
new file mode 100644
index 000000000000..e4bc29f43f59
--- /dev/null
+++ b/app-benchmarks/spew/Manifest
@@ -0,0 +1,10 @@
+AUX fix-automake-1.13.patch 738 SHA256 b2ef8dfd2e1cd6d6b0e2dde2c87f17c62781b5844d3c64f69e8e1a6b901c61dc SHA512 d901296e786de378c669bf0e5303ccd1825d29ffa2116aba301250577abdef4a79b28e7e7a31587b373819cf940392b72b1cf0352ab4ec5d81861c72c70c76fb WHIRLPOOL 2cc08a143eb1ed793c981436aaf24390de5a696345c0af6bf32ee46da957c1d0aa8924a1d07df164fa791e682ead2a595ca0aa6c2624fe849f4b3e74ee2349c7
+AUX fix-format-security.patch 1209 SHA256 56c6e9cd07f649487d143c28ba4032d034708d785dfa85726122b4aa7f7b1790 SHA512 17437880d9780f70f3d7e6208e3bf6d0788290876b2a1c473ce2a5df25fe51ec6df91c8d950196b2d0f498eafdedd2896a36539e393c9d2429200b3ae80b6617 WHIRLPOOL 0ebdae64451f582180964e03bcd754dc2bf2156025c44fd6578510fd596cf868a6185363970fc680d43c6a8531fe25c95e9a0933310689b0a314ed4b7fe27872
+AUX fix-ncurses-tinfo.patch 1094 SHA256 a328c206fafc5399366f37bc2b47d04b843a2c7504f774cda45232bb6ccbfde0 SHA512 84afc54f824fab7c74e370b9879555edc24d1ba0139446781c0b61a72b09936acabb8f6c3151f9d5c4fe602188b65b69816cf6fa9bd80b2147a6ff8a2561065e WHIRLPOOL 4ae097ce86e50477a00d0e318692d8b8d6a22c5c85b8e0e5a591eafbdb2b0343511510967c19cca3e5789758df0087d7c151250a4c13af48e524c83e180015c4
+AUX remove-symlinks-makefile.patch 1125 SHA256 06e591faefec55e12d52576f7ac4972dc4e4d0ba550f20bac3c089c7df1253a1 SHA512 4cedf0afe234089cced001bc5f491d49c836fc3acdf2264eecdc6d5621e9130efe9b4b24ce2198ed3edd9a4ec413bb5cbf45a2803650f8525acf3a903511cccc WHIRLPOOL 45406c8d36368e8f90e6aa16b6b4adb9a8193c963f1745fe59cb3b2e7a4887985bfc60c74cffcb7a6869bcfe630401568b06023fa8d365a46f750cb9f29e4299
+DIST spew-1.0.8.tgz 162091 SHA256 200da1b4390a5e4bf91cb7278b3ad813194f0e395abc0da6296ac415e11a76cb SHA512 ec76a1e681bbaabef6cdc63ced5114a856a312e91c5ff3e0d1536221583a1c939f9308139863670695121c8c720123a6d0697491867ccafc091607888cc81b56 WHIRLPOOL 9aac2fec8b514271fcaf3e72eb6affa505fcaae274e1966e67371c7671aa8e46cf9c0ab7345b83de4ce60a6a51b72cb9e17c692839a4eb810762bc8b851bc20a
+EBUILD spew-1.0.8-r1.ebuild 1077 SHA256 81d8ccfb96363907235bf2d1bf39ed317d3af5c526e1c1ff00c22c130ef3c728 SHA512 012b63e9f8c23adfc7e0ccfb878c1b424e74c120cd96d8ceb268ae1e26120b5f42e28a66919506456fd9092247b56f07b397edce70feafd6f1f6cda8b0100f41 WHIRLPOOL 70569864b466b96703157bdc80ea9d868db0b1894debd36b54325b92a32740d78b65a1abe0f3c0287ef2ebb9cb6a0298430c0d07e8ef02ed493d8e8e1836ebc4
+EBUILD spew-1.0.8.ebuild 983 SHA256 ae133b04ef1967cb3d63f74734fdebc4250838d29a74d8b29d1eac13e4b354a4 SHA512 4dcaf1c3adfc0cb0635f7f6e76e11cae307cf5679f6112ef051e2bb717cc1c8600ae75fe311be69c7f42b0b23d15af7b23b88edb27a2f3dc4e8c2c0c2a1aa2bb WHIRLPOOL a147af40d4de764703b59742b6b018b1e5dabbae1469e24b56bf5fd8c8098c28e586abc0d531137a8ef28f9b427e00f9d74324d4f6957a14871bf9d2a500ea26
+MISC ChangeLog 2366 SHA256 fecaecd871f78749cb03a7c8a25ed76b7c075a95aa35019935127a64b649b3b0 SHA512 e0385495c4d5d112b1e25a0f93c3180f1673a50c8437783cbb60478e9db53e32ee783180c6ecf52f4bdca7ae6e50d721dde82c36ca73cea62c064633c72778c4 WHIRLPOOL 4ca8449b3f5e15dc3775d0df58fae62cde559eae89b10061bd397946a2b9becdad94e1f5e84b759399112c15941f3927c756be1d9404bffa7b3bd6d7408582a7
+MISC ChangeLog-2015 1441 SHA256 4728441999acdfe7372ee6fbcb625a31f7dc66b93282d65240194a3c593d61a4 SHA512 dc570daff423eb3a2f1624dd9647bbca3cd82dfeacf6ffc7a87e7ee452f126da6536ed210cb51a4f4ca2d9bc9c385e9f11dfd3bad9544af9187e169091572b8c WHIRLPOOL b09263a3e3e9ffe0d4f1824868ecb292d83d06e07fc093bff84704b67e08374e0f4a038403534f2261a4cd5f80435b1516bb63e94e651a834378c02d4a25c3bf
+MISC metadata.xml 461 SHA256 94f4ce7e2573bc493ac1f1e136b0bb184247ddddd17e7ce6e86259b35fb6f0ed SHA512 fe2f2e2cac973a052af263b4021d198835077aaa43dcae82a1101b8156a6cc6d309078f78d6216234ea591a9202afaae298aa6d87755e7e3c032a5d841056597 WHIRLPOOL 5800850abadeec4153467d4dfb0165d535dd71e0518df077ee8dee423a7276a1a10662566e4a2a068d29ceebdda06bd022e57e0a3feae770c7e08ac35cddd592
diff --git a/app-benchmarks/spew/files/fix-automake-1.13.patch b/app-benchmarks/spew/files/fix-automake-1.13.patch
new file mode 100644
index 000000000000..c046c1b955eb
--- /dev/null
+++ b/app-benchmarks/spew/files/fix-automake-1.13.patch
@@ -0,0 +1,28 @@
+diff -Naur spew-1.0.8.orig/configure.ac spew-1.0.8/configure.ac
+--- spew-1.0.8.orig/configure.ac	2010-05-14 01:17:52.000000000 -0400
++++ spew-1.0.8/configure.ac	2013-06-21 09:06:42.000000000 -0400
+@@ -2,20 +2,13 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.57)
+-AC_INIT(src/spew.cpp)
++AC_INIT(spew, 1.0.8)
++AC_CONFIG_SRCDIR(src/spew.cpp)
+ AC_CONFIG_AUX_DIR(config)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+-SPEW_AGE=1
+-SPEW_REVISION=0
+-SPEW_CURRENT=8
+-AC_SUBST(SPEW_AGE)
+-AC_SUBST(SPEW_REVISION)
+-AC_SUBST(SPEW_CURRENT)
+-VERSION=$SPEW_AGE.$SPEW_REVISION.$SPEW_CURRENT
+-
+-AM_INIT_AUTOMAKE(spew, $VERSION)
++AM_INIT_AUTOMAKE
+ 
+ # Checks for programs.
+ AC_PROG_CXX
diff --git a/app-benchmarks/spew/files/fix-format-security.patch b/app-benchmarks/spew/files/fix-format-security.patch
new file mode 100644
index 000000000000..dd34d875bd0e
--- /dev/null
+++ b/app-benchmarks/spew/files/fix-format-security.patch
@@ -0,0 +1,24 @@
+diff -Naur spew-1.0.8.orig/src/spew.cpp spew-1.0.8/src/spew.cpp
+--- spew-1.0.8.orig/src/spew.cpp	2010-05-14 01:06:18.000000000 -0400
++++ spew-1.0.8/src/spew.cpp	2014-11-19 08:39:31.806338597 -0500
+@@ -285,7 +285,7 @@
+             PATTERN_LOOKUP[Job::PATTERN_USER_DEFINED],
+             PATTERN_LOOKUP[Job::PATTERN_USER_DEFINED],
+             PATTERN_LOOKUP[DEFAULT_PATTERN]);
+-   fprintf(stdout, outStr);
++   fprintf(stdout, "%s", outStr);
+ 
+    fprintf(stdout, "\nReport bugs to Andrew Patterson <andrew.patterson@hp.com>.\n");
+ }
+diff -Naur spew-1.0.8.orig/src/SpewTuiStatisticsWindow.cpp spew-1.0.8/src/SpewTuiStatisticsWindow.cpp
+--- spew-1.0.8.orig/src/SpewTuiStatisticsWindow.cpp	2008-05-13 00:47:17.000000000 -0400
++++ spew-1.0.8/src/SpewTuiStatisticsWindow.cpp	2014-11-19 08:39:52.527339540 -0500
+@@ -278,7 +278,7 @@
+              "");
+    if (mSpewTui->getCurrentIteration() > 0)
+    {
+-      int len = snprintf(NULL, 0, (char *)mTotalRunTime.getElapsedTimeStr().c_str());
++      int len = snprintf(NULL, 0, "%s", (char *)mTotalRunTime.getElapsedTimeStr().c_str());
+       mvwprintw(mWindow, 
+                 RUNTIME_FIELD_STARTY, 
+                 RUNTIME_FIELD_STARTX + RUNTIME_FIELD_WIDTH - len,
diff --git a/app-benchmarks/spew/files/fix-ncurses-tinfo.patch b/app-benchmarks/spew/files/fix-ncurses-tinfo.patch
new file mode 100644
index 000000000000..9905e2057042
--- /dev/null
+++ b/app-benchmarks/spew/files/fix-ncurses-tinfo.patch
@@ -0,0 +1,29 @@
+diff -Naur spew-1.0.8.orig/configure.ac spew-1.0.8/configure.ac
+--- spew-1.0.8.orig/configure.ac	2014-11-19 08:15:31.284273029 -0500
++++ spew-1.0.8/configure.ac	2014-11-19 08:16:07.063274657 -0500
+@@ -21,6 +21,7 @@
+ # Checks for libraries.
+ AC_CHECK_LIB(popt, poptGetContext, ,AC_MSG_ERROR([PACKAGE] requires popt))
+ AC_CHECK_LIB(ncurses, wresize, ,AC_MSG_ERROR([PACKAGE] requires ncurses))
++PKG_CHECK_MODULES(NCURSES, [ncurses])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+diff -Naur spew-1.0.8.orig/src/Makefile.am spew-1.0.8/src/Makefile.am
+--- spew-1.0.8.orig/src/Makefile.am	2014-11-19 08:15:31.311273030 -0500
++++ spew-1.0.8/src/Makefile.am	2014-11-19 08:16:57.034276932 -0500
+@@ -24,7 +24,7 @@
+ libtui_a_SOURCES = \
+         Tui.cpp Tui.h
+ 
+-LDADD = libcommon.a libtui.a
++LDADD = libcommon.a libtui.a $(NCURSES_LIBS)
+ 
+ bin_PROGRAMS = spew
+ spew_SOURCES = spew.cpp \
+@@ -37,4 +37,5 @@
+                SpewTuiStatisticsWindow.cpp SpewTuiStatisticsWindow.h \
+                SpewTuiStatusWindow.cpp SpewTuiStatusWindow.h
+ 
++spew_CFLAGS = $(NCURSES_CFLAGS)
+ spew_LDFLAGS = $(STATIC_LINK)
diff --git a/app-benchmarks/spew/files/remove-symlinks-makefile.patch b/app-benchmarks/spew/files/remove-symlinks-makefile.patch
new file mode 100644
index 000000000000..e5c369a7f8a0
--- /dev/null
+++ b/app-benchmarks/spew/files/remove-symlinks-makefile.patch
@@ -0,0 +1,26 @@
+diff -Naur spew-1.0.8.orig/man/Makefile.am spew-1.0.8/man/Makefile.am
+--- spew-1.0.8.orig/man/Makefile.am	2008-05-13 00:47:28.000000000 -0400
++++ spew-1.0.8/man/Makefile.am	2011-04-05 09:39:32.000000000 -0400
+@@ -10,11 +10,5 @@
+ 	sed -e 's!SPEW_VERSION!$(VERSION)!' \
+ 	    -e 's!SYSCONFDIR!$(sysconfdir)!' $< >$@
+ 
+-install-data-am:	install-man install-man-local
+-
+-install-man-local:
+-	(cd $(DESTDIR)$(mandir)/man1 && $(LN_S) -f spew.1 gorge.1)
+-	(cd $(DESTDIR)$(mandir)/man1 && $(LN_S) -f spew.1 regorge.1)
+-
+ help2man:
+ 	help2man --section=1 --no-info --name="measures I/O performance and/or generates I/O load" --include="spew.1.include" --output=spew.1.in ../src/spew
+diff -Naur spew-1.0.8.orig/src/Makefile.am spew-1.0.8/src/Makefile.am
+--- spew-1.0.8.orig/src/Makefile.am	2008-05-13 00:47:20.000000000 -0400
++++ spew-1.0.8/src/Makefile.am	2011-04-05 09:35:16.000000000 -0400
+@@ -38,7 +38,3 @@
+                SpewTuiStatusWindow.cpp SpewTuiStatusWindow.h
+ 
+ spew_LDFLAGS = $(STATIC_LINK)
+-
+-install-exec-local:
+-	(cd $(DESTDIR)$(bindir) && $(LN_S) -f spew gorge)
+-	(cd $(DESTDIR)$(bindir) && $(LN_S) -f spew regorge)
diff --git a/app-benchmarks/spew/metadata.xml b/app-benchmarks/spew/metadata.xml
new file mode 100644
index 000000000000..130a05db05f5
--- /dev/null
+++ b/app-benchmarks/spew/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription lang="en">
+		An I/O performance measurement and load generation tool. Writes
+		and/or reads generated data to or from a character device, block
+		device, or regular file.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/spew/spew-1.0.8-r1.ebuild b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..746b3b536e96
--- /dev/null
+++ b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Measures I/O performance and/or generates I/O load"
+HOMEPAGE="http://spew.berlios.de/"
+SRC_URI="ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE="static"
+
+DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
+	!static? ( sys-libs/ncurses dev-libs/popt )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-format-security.patch
+	epatch "${FILESDIR}"/fix-automake-1.13.patch
+	epatch "${FILESDIR}"/remove-symlinks-makefile.patch
+	epatch "${FILESDIR}"/fix-ncurses-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static static-link)
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dosym ${PN} /usr/bin/gorge
+	dosym ${PN} /usr/bin/regorge
+	dosym ${PN}.1.bz2 /usr/share/man/man1/gorge.1.bz2
+	dosym ${PN}.1.bz2 /usr/share/man/man1/reorge.1.bz2
+}
diff --git a/app-benchmarks/spew/spew-1.0.8.ebuild b/app-benchmarks/spew/spew-1.0.8.ebuild
new file mode 100644
index 000000000000..a699f26eac3d
--- /dev/null
+++ b/app-benchmarks/spew/spew-1.0.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Measures I/O performance and/or generates I/O load"
+HOMEPAGE="http://spew.berlios.de/"
+SRC_URI="ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE="static"
+
+DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
+	!static? ( sys-libs/ncurses dev-libs/popt )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-automake-1.13.patch
+	epatch "${FILESDIR}"/remove-symlinks-makefile.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static static-link)
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dosym ${PN} /usr/bin/gorge
+	dosym ${PN} /usr/bin/regorge
+	dosym ${PN}.1.bz2 /usr/share/man/man1/gorge.1.bz2
+	dosym ${PN}.1.bz2 /usr/share/man/man1/reorge.1.bz2
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
new file mode 100644
index 000000000000..509a4dc034f9
--- /dev/null
+++ b/app-benchmarks/stress-ng/Manifest
@@ -0,0 +1,6 @@
+DIST stress-ng-0.05.12.tar.gz 280758 SHA256 081a597bc3b6b7f2993828a04048e5321a81ece6995c7bb9b202dd65e7fb055f SHA512 ee622b1d8fd1b3ddee6119f5a43cedb427e3524bb6ef10f7ac96c305567c9919574e9103949825e2bea3391c302b6e2b5871667bc8f8609844765b64ec760bc8 WHIRLPOOL b9f84501fcbe6494881947a44bbb42ba6fb00120ab6e7fc45ac6b5ece76f7dd95a98a588db9326f0e1bd879020a8ffdcc604dfc5a70f2858924bf85a8a4612c0
+DIST stress-ng-0.06.00.tar.gz 311761 SHA256 b6781e7c53c5a7938690df8cdd1f3d1191ce758dca820c1175752da6f7085491 SHA512 a23a3f020e1fa777c6141db8f9d91833b9758172974be0db341c757eb7b407520b80bc9889eb7b6348cfa64d8f8976ba6ad8761a5fbc31055accd8fbceb8de66 WHIRLPOOL 14dc2ebf3858583cc1933be3177966f597f10d5595ee60dc804fb2ee9903a78a34746761313844c23da784c8e3f2cfc3279eca1ec480811e0c74b33ef10b1c49
+EBUILD stress-ng-0.05.12.ebuild 418 SHA256 60106fac2b04c9de9cda0c9b4709e86716888186f316eae43c8fd9d59aa50e58 SHA512 c4ce319d581ff494cdeca68b754d7cc4747edadffcc945637d43290414163409be98839c1dd484bc3264217f4f7e655e8fea5c1d2f62dd1da4d7bf99f852191d WHIRLPOOL 559f69c71aae1e3c66261ce26cf276e42989debe5648bcdc37addb37f397526beb5fc588db04f4624eb63a38f6ad0ecb8c4272b8380481b21fcddf1ca300c824
+EBUILD stress-ng-0.06.00.ebuild 468 SHA256 abda3987fbd468643051ee6c94377e1884fd85e08dc6e8b1e03b222afca7e4e7 SHA512 b8cff039db84fc870cc889f27cc1a2023ced0effc4d7fb44efac4c7729767d1bce614f089941e7043bfc2d361eacfba46a53a50566ab4d3082a5a51185a42706 WHIRLPOOL 69d7a1400a97f8121a7b1f416de282fa5e91c45195c444a581c6fa9e035cdcb7d6d21d4941c25811dd44bb3f06d1ed523f6f9b510c6a7b585a55afdb33631f05
+MISC ChangeLog 623 SHA256 8b1ca3c6f041732302245d7822ee1a12c7f1bc86f1c3f280ae552375a21b318e SHA512 69f315dc5b627f0f1e5c087e56072b736cc8484ea495ee9c195bc7d1661784783b9bc163883efae084b6b069982551b50db62e2a19248f6b3140bcc4194fd19a WHIRLPOOL c6b920bfa050d6c217e7788a90c75a340c25d6ffd180f0c8feaf48a1eaac30b2198eada4e131ea00f04c61a3244d75771e6cc6a89fa6076fcb3fab9a17d91087
+MISC metadata.xml 430 SHA256 fb96586ec004fcaa17e18cb473ee5d3941a8d7b4a6c306515851f890c754440c SHA512 e25f398d6820b7186bdd2ecdbc0462c5b4f005f3ef3eeb4ca96c9b27c02cb9e852d33a814a850b6b2137258dbce8ba014ba9faba5d1da18133e9ae54b5873470 WHIRLPOOL fc40a4d9476b5cca9a7ac27e93663c9ad13a595b0d32e89dff72dcd9c69c30c31dfe839770dc6fd46efb0f42135414d43f4e5b8ceb2a17aeaf4f5862d58edc74
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
new file mode 100644
index 000000000000..dbd7f9333e52
--- /dev/null
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Horan</name>
+		<description>Proxy - Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild
new file mode 100644
index 000000000000..8466bf3f55f7
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to load and stress a computer system"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/keyutils
+		sys-apps/attr"
+RDEPEND="${DEPEND}"
diff --git a/app-benchmarks/stress-ng/stress-ng-0.06.00.ebuild b/app-benchmarks/stress-ng/stress-ng-0.06.00.ebuild
new file mode 100644
index 000000000000..50340249b9c6
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.06.00.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to load and stress a computer system"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/keyutils
+		sys-apps/attr"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${ED}" install
+}
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
new file mode 100644
index 000000000000..fb4565f77631
--- /dev/null
+++ b/app-benchmarks/stress/Manifest
@@ -0,0 +1,5 @@
+DIST stress-1.0.4-r1.tar.gz 191800 SHA256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4 WHIRLPOOL f61eb216ec44242c74ae86b3c5390c361c16f4466cfad231d4fbfa93f61578c36dde779db3cf0ba8a0e0751b74fb33a1085372d825d9fd0ebb8120962e9f1cdf
+EBUILD stress-1.0.4-r1.ebuild 540 SHA256 51351bdd21ca57983720c05dce74aed12fee04964983d2982ac50d65f20fdc82 SHA512 534374410d55204c75b55f1702c56409b940b47c6b600c49da74c209a7eeceb73abcd87071b12d642c388edd53a890c23301d04cb03b4c1c207aba9b4c2e8c88 WHIRLPOOL 5257946f7b41ede2f08d9cfe3fe7e0c456be1556c661930d6bf2535f4ffc9ce3c5936434168e0afd1a4e0bb5c55cd4c3538437a0add27fa5079ec767c8c98eea
+MISC ChangeLog 2887 SHA256 471c55b0f000594db95e3b6b598a2ae88c9b5c6e688a9db62e9cb1e49c7fa2ef SHA512 0cbd556ea131fd496e03da68f41835dd3638b4dc539921ffa7769c22f3c2ca2bb9fc0663826a3770b95a01e18c39c54fbd513e24fbd07b77cbc11f035a0ec92c WHIRLPOOL ebf8462462d1ef04835ce2c152b65da5c2378ae3c57771eb770a94e6ae03d8e24bdfe20638ef157565e6f1e034b625df38544b58f51a711ad54d3d32a886d23d
+MISC ChangeLog-2015 6197 SHA256 8ee029c0b786297d23188e03deea24586cd32ebcd31530235c214a828fa4be7d SHA512 57709813b1f579986132cfd5a977f0c6ef8a5de4d89e2838252aad2b4cf7beda5ed4a4677acda073b33a2a71d723a4df7caffbaee24f53887b8abfaaf6946d41 WHIRLPOOL 9b6bd42215ffb22b7406a62b07979642bd23b5cfd05ea35b93dd738a7e4d28fa617cecb2f57235d7d61bf64369b503ac1a1f0120fcba200c84603e7b9137c2fc
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-benchmarks/stress/metadata.xml b/app-benchmarks/stress/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-benchmarks/stress/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-benchmarks/stress/stress-1.0.4-r1.ebuild b/app-benchmarks/stress/stress-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..bf041b642ac5
--- /dev/null
+++ b/app-benchmarks/stress/stress-1.0.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="Imposes stressful loads on different aspects of the system"
+HOMEPAGE="http://people.seas.harvard.edu/~apw/stress"
+SRC_URI="http://people.seas.harvard.edu/~apw/stress/${MY_P}.tar.gz -> ${MY_P}-r1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+IUSE="static"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	use static && append-ldflags -static
+}
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
new file mode 100644
index 000000000000..b1e5a342b679
--- /dev/null
+++ b/app-benchmarks/sysbench/Manifest
@@ -0,0 +1,13 @@
+AUX sysbench-fix-mariadb-include.patch 709 SHA256 383d83f7111f2e055d9b9d0f2b22fa47423fc2120329a68d011257beb6c90c08 SHA512 c8b54b8ff2752ea351138c955fb3bc6c6d0d176850b54a85ec7b6add1df512aaa00b20293a7006b2a3a4f5011ec99bf088c08fd28c09bfc3538135d51a590005 WHIRLPOOL c262b890de81c2e3ffae6d6451d2a58d08381114b8fce6b8e62aec799c0872e6d4a6fb2024d1941c75d7906d413e07ca29ab9810cead555325ed59918b1b1e22
+DIST sysbench-1.0.6.tar.gz 1493941 SHA256 cd23c622da3d3267885ed126540dc04c578ee16c3d31307e21b5acd8e4036eda SHA512 d17a8a8b2387458b467b3e5034b37cb075ffc444c5576013fe7ac3d390c110e0fb4bc6a39f9b350f7ce9b40f3f039e0af9eb84ffafe9ab05a8be5b36ac5b56ac WHIRLPOOL 8d1073a720fd8220769a509677e3d638d93d6aca247a5d2c9017eae3e05391a63e28fade0d306e56a82c5835db58926178e66f1ef94859e2f65497cbe89a172e
+DIST sysbench-1.0.7.tar.gz 1494571 SHA256 db91521e70b0d1a6fccc60a8d4acadacb3f9328e8ab6802ae82f93393a688d43 SHA512 0b32ad27180ab02df9c2e5e85a8b9bec231338cfb20d7337dd80f1e0628b48bae480fde9d69cd21730aa0ab7c65fecbede9c10cd4b96d0dcf44cd012afa10d65 WHIRLPOOL f33c7d328ce1bec01321656b65123a6b790647f36db7351f6cae5340ee8678c66dc3a4d05a36babe8bec51b42ee0fff937b9c28fa2697408fca5842af50072e1
+DIST sysbench-1.0.8.tar.gz 1494988 SHA256 2dad131a99578999c8159eccd2f7ec1b9da4eca9e646dfeb838cf72c00862d69 SHA512 1baba00dc116a97295e4be26488598d160b7688739b08551d0cf2089bcd0f89a0c8edba6faa3634ea98955aecc04966e8328e79978352647ed764dcbe170566f WHIRLPOOL e1b13661adbe00b86bc5533962974c6eb3869e71392e7815a50543fbd50bae3f843a932c02f8a17decd5ac4fac644f52b564b1c1073292e6778dafe1d7b9eeac
+DIST sysbench-1.0.9.tar.gz 1495628 SHA256 3e472d5b175dcc5a8b0ebdf102dbe64bdcc712f6c41812849490e739bf8ce483 SHA512 498b267585e8186f9db4a0f6c6147d1051dab049dae71ddee27f2fedc50ce5ccd75a9ea91819f1fcd15a4d680c4111f5014c60e5a0a69b0a6f217b1a04e61538 WHIRLPOOL 8163bf6f6e5ce85067746036f5cd5f08f2b2d2634f99b5a4e62656ad5091a5f01117672163fc23482fa00e67b1d96d60af7996994965f580b11ccff96e69dc24
+EBUILD sysbench-1.0.6.ebuild 1180 SHA256 65fb179e01b2e2a930f54c1dfdcf5ee6732cce3949076158e25ecfc164461418 SHA512 444c05053d438288cbb9c63c05139eaa350b54fa54dcf41d39b9ec0d41b5da4a6be52541fdcac8fe2bb9c0090d1c26cd24bd8f5afe14803a19c6fc7fde87d20f WHIRLPOOL 4c3fb72f13a29f1e7ca0ea086c2ca12234c96bca2070c1862cbce56ca156efcedd01a61fbf7808240fc479cf6b4fb993b329798da1ab104eed874fa23f16f4f6
+EBUILD sysbench-1.0.7.ebuild 1256 SHA256 788c523f011497cfabce223a596792248aeb92a3471220597d91b8e4b98bfe18 SHA512 8f1e1da773fcf7ed68d8e5467de91096eb8f70ec63a58111acbf6caf8682863f2b09e17a7cc024256853a68fad2849927b0a9329f680f935dcd77ad5dcff03b8 WHIRLPOOL 8b67fc06731fa7f85613a2f0c8d80f471de8b3e8df86fcc20faf619d0e7a5eedd62de3c8b27db21b5b7dcb652ff7193aa885ecc79426e3a0f9621c7388dd1d6f
+EBUILD sysbench-1.0.8.ebuild 1257 SHA256 e56bbfbf1a8c6dceda76c882f3349b1683324439e428f072a91ce7fc4a338ffe SHA512 bf0ac825d0ff12f745825134f24d58ea849cc61408324b5847d683d5a2c29884c1c98a47048067e1135a9057b8ef4d501ae9d2680a746a7cdd3ce26cb182ef02 WHIRLPOOL 1f07207052b4fcad708305bd8c2506894e3026ad9a36d59883d42acdb7a71c1f10a3652a4e7b6e563542062cf7c7e9d74a40184433651636d597dabb93e3d03e
+EBUILD sysbench-1.0.9.ebuild 1403 SHA256 a4c427a5e1f28da20b7c84c7c2b168f6ae40ff542fae403cc824f01afe0c274c SHA512 5e181e58e7d37dc3a18be4323a85004e04b303cdc739c9b01ee7f75f72874979973121eb1cf6a2e3c80611b17ebf1fd256cdb794315475153e96549f6feea8ec WHIRLPOOL 184dac74ec27ac3d8a29824a990aabee82dd894d6d44ad91b5d43d57ca6d542aa859125d813723630add5cc15a2ea7deae00eac38950edbeeefe01da28beb7c5
+EBUILD sysbench-9999.ebuild 1079 SHA256 78ed0e5ec201a7e73eb75574c54df75ccf3e8d4547fb6919fc2f2d1e4ac4acde SHA512 9bc554eaf47f3ddb41d8aa0590d686f9fd724dcf98445610a7bebe6fbd8f0b40a815c0cf5c4f0378a6424c1222ba117163c1c7e27bf5c7e717d3825aaa8193a2 WHIRLPOOL 48c7514cd40d2d253265cb3fbc7ee2fd02fe0dbf37ab035c51a445608aa144abe8ece4b892f177860fa36ad565c33f9ca1d90ac4eea6b6eb2632fe23073a91c6
+MISC ChangeLog 3361 SHA256 26df65fd9802faf1013eace20d1ba4b461bd1bebd4f1eb8eb30d68e6d15ea9a4 SHA512 a1917f434e0ce17032ae6557527005c2b348d255298362600f47d232c01e164bf56a48320b1a044506390022504a0fdbdb5468f3fa0a71fb9e6592340c2e49d8 WHIRLPOOL 28ee551701e83293fbed58f3e9161fe8817e95cbba042e95b1370b007b98e11daa519c4c5d191646adcf4162aed507f95109d4e7ead034473f730ff87c8a02f1
+MISC ChangeLog-2015 1384 SHA256 486aedc4613e75f0addbad1722bf22f00fa85971b7e46985a926d901044b80ba SHA512 1d2dcee1caee59191f737fbc190bdec63db8cbac44aff88f2d34ad903a19e7ac8aa4ee829a7b2f5fb38287fc2fd374c7e7c16f14f6cfc1461ca2612133daf341 WHIRLPOOL 55bca9507cc4da1edc88ddccf5a21c36bdf20ec68157c0d0e74cdee179e43e05a6be5f945490c709b4386638800cd16b8c7924229b70532b2056c01e6a3339d6
+MISC metadata.xml 512 SHA256 245e7cd32f2ab0ee86da55f70acca1a434b7525f07c75b0ee293943eace26255 SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd WHIRLPOOL e8a0a99e4deb221cf0672a5ecdaec287e81e860083f8f92c298d0c7bc13d671ecf91b501a17b80a69c33a58b7ccfe740018e65c8b155eb0314c7370e81ee5ac7
diff --git a/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
new file mode 100644
index 000000000000..7c3ac31dc9df
--- /dev/null
+++ b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
@@ -0,0 +1,21 @@
+--- a/src/drivers/mysql/drv_mysql.c.orig	2017-10-06 06:24:37.930414458 +0000
++++ b/src/drivers/mysql/drv_mysql.c	2017-10-06 06:25:19.647414458 +0000
+@@ -35,7 +35,6 @@
+ #include <stdio.h>
+ 
+ #include <mysql.h>
+-#include <mysql_version.h>
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+ 
+@@ -50,8 +49,8 @@
+ 
+ #define SAFESTR(s) ((s != NULL) ? (s) : "(null)")
+ 
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 && \
+-  MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \
++  MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
+ typedef bool my_bool;
+ #endif
+ 
diff --git a/app-benchmarks/sysbench/metadata.xml b/app-benchmarks/sysbench/metadata.xml
new file mode 100644
index 000000000000..828134c90a90
--- /dev/null
+++ b/app-benchmarks/sysbench/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="aio">Enable libaio support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">akopytov/sysbench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/sysbench/sysbench-1.0.6.ebuild b/app-benchmarks/sysbench/sysbench-1.0.6.ebuild
new file mode 100644
index 000000000000..60f103474a06
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	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_test() {
+	emake check test
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.7.ebuild b/app-benchmarks/sysbench/sysbench-1.0.7.ebuild
new file mode 100644
index 000000000000..eaf22142c5cb
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 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:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	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
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.8.ebuild b/app-benchmarks/sysbench/sysbench-1.0.8.ebuild
new file mode 100644
index 000000000000..899409479d82
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 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:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	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
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.9.ebuild b/app-benchmarks/sysbench/sysbench-1.0.9.ebuild
new file mode 100644
index 000000000000..4a7face7bc13
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 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:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+# https://github.com/akopytov/sysbench/commit/f5fa7800cbbdd3920290e04e597d90a26cde7608
+PATCHES=( "${FILESDIR}/${PN}-fix-mariadb-include.patch" )
+
+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
+}
diff --git a/app-benchmarks/sysbench/sysbench-9999.ebuild b/app-benchmarks/sysbench/sysbench-9999.ebuild
new file mode 100644
index 000000000000..1a7c3db4ddec
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit git-r3
+
+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"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# 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_test() {
+	emake check test
+}
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
new file mode 100644
index 000000000000..4ae08ca41b6f
--- /dev/null
+++ b/app-benchmarks/tiobench/Manifest
@@ -0,0 +1,12 @@
+AUX 0.3.3-LDFLAGS.patch 470 SHA256 56498d2262bb8af1e07b8fcde6f2bfae35fd1f20da82cbd96855ead2d8d4fe96 SHA512 2c352d6ba3f6c3cb669ce0a0fe51390a02b6ed2f34436464561c45de08143d3fd14fccf609c9f8c1332a1ad2349b78b40e2a648f1b36caf521a793b8ee8c6c6a WHIRLPOOL 6854fd5f2b79b075e158fb0e83cef7f4fd617e5cfb70363f63aa8848ecf5560d90babb331f0fe1b35662a6fd1f92ce906214332931610de7a60254e6d4ff100e
+AUX 0.3.3-column-description-fix.patch 1032 SHA256 657c78edb76a40367ad026cbd5a195d8a36dfc4ad6c024524f39792120efdfe8 SHA512 b34ad47a75d99bb24ae04f2e2e578c1e957b8459250f201e35d535c3c70731d5e792ccff67192b0c4fa9b634e8e099539b94ba22de8bb37cf80c0f4851cf1883 WHIRLPOOL 2a66936b87f703f2e61c785c4509842571f2e589d0a6c0574b87c122561ff169139d8f750529dc974e7d87406412f5f2a1c7426a95134589c340ee7936a3759f
+AUX 0.3.3-glibc-2.16.patch 717 SHA256 6d1ed918a6b92ab801ee1c8183976d4145f3ce938356de4b697aed234cd068a2 SHA512 6ca5a5654f703243aeee5428c8dc133df97f47e55f536e6c9aa89455b54f0578b4af19119ad7bf868844fcf531b8fb93a1b4d9ad1f44527746b9c87c456d6cde WHIRLPOOL 0ac77f9a7ff3af271a793fa85d657997e1f5a18255de53b59e8386f8ad5f4f31d14db092fa915c3858e973198f6119c8eb482799e368dae181e677145741378e
+AUX tiobench-0.4.2-fix-perl-shebang.patch 1530 SHA256 ca307683cbb05e84b92731ab79bcd5ed6c9b2d3bb643b9ccc9adf8b239eebc6a SHA512 baba72c336006d3f2c69768720bb076b8f2750d72252cf19b74e4f5b9e0140e74de1edfc63da674f26d24d675f4e00201be61f98cd7fd164b1c13cfab49f3b38 WHIRLPOOL ddd2e33aab1bf7c8e62b1cbd8346ae34909c84a9a6d075e219df6ef0ad38ee09a24c724950f3916fe70e139e657f855a27a9ad000d5cf87afafb8fee4c94b902
+AUX tiobench-0.4.2-gcc5.patch 1309 SHA256 28f88a3480c7471fcc00fba2c55566ef43fdfbc238939813f8f170b62d0ea6ea SHA512 f462c4eab88aa707a8383fec9e6e8c15f72237ef3d67f8481d2d6abef855f68b5a4281a7a1f1668b968df988e9ac283e4aabb2dfaf68b33cd3430a90e59f97a7 WHIRLPOOL bf366bbea2028e778cd714f59a3d943cb73337822b0c0c40749bb70ae5f8b544f54f9ad169e43e061eab2e7d24eecc2f67b310af9724513500c6c91e39f5fda6
+DIST tiobench-0.3.3.tar.gz 28282 SHA256 8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc SHA512 e2752e32e9deaea611217629e99dc8fd738e63b4a21f49a0286f894bece3a258a3d223e0eb403ad5350dbb408738b9c5ba7300a85c8eea464266152965730328 WHIRLPOOL f6bb9b353cbbf007f6095caa5e893b3bac9af2f4cdb681be9b3f1abf6e07a5b4cd8dd0ceebfa96fd4a888fa28528a78ce00ff239c93cb96a11795168e4b2e81e
+DIST tiobench-0.4.2.tar.gz 32182 SHA256 d6166edd6892725d413566ffe348d58927726fa7fa000efb384f7bcccad2e0ba SHA512 02e82d86ee889a366c1a00d4fb49f63d926e44ba6e2f297212479a5c13abe008b62c12d44483de7e971b5ebf875d5c07847f1d69dd11b2e87a050e27d8f9f09f WHIRLPOOL 8b6e5601b3079943eb1c7adf2d2fb12d05f36eaba19552c76b042b37743b0ceda5e5fd105cd64db6c0b2c111e20f9c54424113a427ad7b790a01a714c2bc1f87
+EBUILD tiobench-0.3.3-r2.ebuild 1000 SHA256 42b41531568c26569ac14ef66f273ab43375ea4fc0b84717d1c2927037ff337d SHA512 8bcd7871457bec7dc7f5b0ba3957d39352dbb2e1792ea4aadaadb8f977a3a1f3072907e4dad7075463d0499473cd535799030ddbc4e6fccb4978680b8cc8629b WHIRLPOOL 427280f9d16f25e1c5cdf2f80b706d5be76cb4fa5caa9bf8e7e455bc98ffb8dc47a5f25ea2068739da85adc61871644ee827da4231785133b1b23817c69d8252
+EBUILD tiobench-0.4.2.ebuild 891 SHA256 ac5254132375c77b8b480dd259c9eb8df1beae0582432af8920c2bc57f55bae2 SHA512 2749131275caa448748c0a3e9a7741ad5b7aa6d39915f526c0863203a67074fc4cec8422ecbe3167836fa292d218119cb837585c66b6e6b876e084fcc5a9aa0d WHIRLPOOL 2c5333ece5f97d3884f9f8c3cec126860625c284ed2585555521166a130cc46fa2ab4b0c5fcb95559892366303db050869da8ad173483591b71cf68c21912f88
+MISC ChangeLog 2701 SHA256 d70970e1e98ed80e94c7f3190c6cc3348e9d78e259d9b8ed036905935265d986 SHA512 3f0b7dad1d131c4009b82066d328d1e78b77a3449cf8858ed2cec830991c70c8c17c4d78b964ea6f11eba5895e010f85e42b47dfc5120eece7f33b68e24b328f WHIRLPOOL ad070f8e792d4135b725203f196328247eae1a9c42a6cb4f1ecdd0c8b8e93a356bc5b37c6434f70f27707ea6cb72a4a37550692415ed1e195734cb4fcf21fbe3
+MISC ChangeLog-2015 2570 SHA256 2e20628766f82c6911543efa491efec906dd96a1a6fe39e326ab78c0067a1294 SHA512 a4ddbfe0f8514f21d77b6108282f969f5380758d9c4da8d2110848f7a3fbf8f4579a053addf51cbdf6348196c019b6bc911571351cce5d552bb3772449574872 WHIRLPOOL 8f90ebfa3512c9a36f52c5c707d2ee975c71b23eab540041e6b13a16fdf7c611f62ae1baedeaa523441acad82f729ce2db55e299dac9d71772f9e862bd17a56c
+MISC metadata.xml 382 SHA256 8b55345e41bacdff92fa4cfda5ebbe0be02f3682205b290766d196ef516d6f12 SHA512 ab6ce68c948d173a0241be91da8af3f3690510b521307efe0752f6ca9db17ef573f2980bc16fe904c26123cf2802035de97e58f39d1f60d19ed827d53d06fb34 WHIRLPOOL 19838e39f11fa7463e0e23b7fa4f38338c958a2444d8f397f5cc5912f3d61f73c02ca2351a80a05c7054ae904982842165054620c8dd514ce9b5ecaf9e2c921c
diff --git a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch b/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
new file mode 100644
index 000000000000..9145ae47044a
--- /dev/null
+++ b/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff -Nur tiobench-0.3.3.orig/Makefile tiobench-0.3.3/Makefile
+--- tiobench-0.3.3.orig/Makefile	2002-03-13 20:22:55.000000000 +0000
++++ tiobench-0.3.3/Makefile	2006-09-16 17:07:21.181644608 +0000
+@@ -34,7 +34,7 @@
+ 	$(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o
+ 
+ $(EXE): tiotest.o crc32.o
+-	$(LINK) -o $(EXE) tiotest.o crc32.o -lpthread
++	$(LINK) -o $(EXE) $(LDFLAGS) tiotest.o crc32.o -lpthread
+ 	@echo
+ 	@echo "./tiobench.pl --help for usage options"
+ 	@echo
diff --git a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
new file mode 100644
index 000000000000..b3ebb90b33e1
--- /dev/null
+++ b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
@@ -0,0 +1,21 @@
+--- tiobench.pl	2005-02-23 00:21:33.000000000 +0100
++++ tiobench.pl	2005-03-15 18:11:19.000000000 +0100
+@@ -168,6 +168,8 @@
+                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) / 
+                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
+                $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpueff'} =
++                  ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'} == 0) ?
++                  '0' :
+                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'rate'} /
+                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'}/100));
+             }
+@@ -196,6 +198,9 @@
+ $report{'SEQ_WRITES'}   = "Sequential Writes";
+ $report{'RAND_WRITES'}  = "Random Writes";
+ 
++# The top is the same for all 4 reports
++$^ = 'SEQ_READS_TOP';
++
+ foreach my $title ('SEQ_READS', 'RAND_READS', 'SEQ_WRITES', 'RAND_WRITES') {
+    $-=0; $~="$title"; $^L=''; # reporting variables
+    print "\n$report{$title}\n";
diff --git a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
new file mode 100644
index 000000000000..fed845a51d62
--- /dev/null
+++ b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
@@ -0,0 +1,21 @@
+diff -Nur tiobench-0.3.3.orig/tiotest.c tiobench-0.3.3/tiotest.c
+--- tiobench-0.3.3.orig/tiotest.c	2001-03-05 02:34:00.000000000 +0000
++++ tiobench-0.3.3/tiotest.c	2012-11-04 22:44:41.695677071 +0000
+@@ -31,7 +31,7 @@
+ */
+ ArgumentOptions args;
+ 
+-static void * aligned_alloc(ssize_t size)
++static void * tio_aligned_alloc(ssize_t size)
+ {
+ 	caddr_t a;
+ 	a = mmap((caddr_t )0, size, 
+@@ -281,7 +281,7 @@
+ 		pthread_attr_setscope(&(d->threads[i].thread_attr),
+ 				      PTHREAD_SCOPE_SYSTEM);
+ 
+-		d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
++		d->threads[i].buffer = tio_aligned_alloc( d->threads[i].blockSize );
+ 		if( d->threads[i].buffer == NULL )
+ 		{
+ 			perror("Error allocating memory");
diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
new file mode 100644
index 000000000000..900472d80dd2
--- /dev/null
+++ b/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
@@ -0,0 +1,51 @@
+Fix perl shebangs, in order to be maximally compatible with Gentoo Prefix.
+Rationale: https://blogs.gentoo.org/mgorny/2016/02/08/a-quick-note-on-portable-shebangs/
+
+--- a/scripts/makeimages.pl
++++ b/scripts/makeimages.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ #    Author: James Manning <jmm@users.sf.net>
+ #       This software may be used and distributed according to the terms of
+@@ -8,6 +8,7 @@
+ #       Perl wrapper for calling tiobench.pl and displaying results
+ #       graphically using gnuplot
+ 
++use warnings;
+ use strict;
+ 
+ my $args = join(" ",@ARGV);
+--- a/scripts/tiosum.pl
++++ b/scripts/tiosum.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #    Author: Randy Hron <rwhron (at) earthlink dot net>
+ #       This software may be used and distributed according to the terms of
+ #       the GNU General Public License, http://www.gnu.org/copyleft/gpl.html
+@@ -6,6 +6,7 @@
+ #     Summarize output of tiobench2.pl for multiple kernels/runs.
+ #       Assumes logfiles created with: 
+ #       ./tiobench2.pl > tiobench-`uname -r` 2> tiobench-`uname -r`.err
++use warnings;
+ use strict;
+ $|++;
+ 
+--- a/tiobench.pl
++++ b/tiobench.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ #    Author: James Manning <jmm at users.sf.net>
+ #    Author: Randy Hron <rwhron at earthlink dot net>
+@@ -9,6 +9,7 @@
+ #       Perl wrapper for calling the tiotest executable multiple times
+ #       with varying sets of parameters as instructed
+ 
++use warnings;
+ use strict;
+ use Getopt::Long;
+ 
diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
new file mode 100644
index 000000000000..e1bf89b87ec3
--- /dev/null
+++ b/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
@@ -0,0 +1,48 @@
+diff --git a/crc32.c b/crc32.c
+index bae7384..a22fc5d 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -72,10 +72,9 @@ static const unsigned long crctab[256] = {
+   0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
+ };
+ 
+-inline
+-unsigned long crc32(  const void* buffer, 
+-		      unsigned long length, 
+-		      unsigned long crc)
++unsigned long crc32(const void* buffer,
++		    unsigned long length,
++		    unsigned long crc)
+ {
+       const unsigned char* cp = (const unsigned char*)buffer;
+ 
+diff --git a/crc32.h b/crc32.h
+index 62b3433..cb9b96f 100644
+--- a/crc32.h
++++ b/crc32.h
+@@ -18,9 +18,8 @@
+ #ifndef CRC32_H
+ #define CRC32_H
+ 
+-inline 
+-unsigned long crc32( const void* const buffer, 
+-		      unsigned long length, 
+-		      unsigned long crc);
++unsigned long crc32(const void* const buffer,
++		    unsigned long length,
++		    unsigned long crc);
+ 
+ #endif
+diff --git a/tiotest.c b/tiotest.c
+index c23ceb4..bb73fcb 100644
+--- a/tiotest.c
++++ b/tiotest.c
+@@ -1392,7 +1392,7 @@ static int do_mmap_read_operation(void *loc, ThreadData *d)
+ 
+ 		if(crc != d->bufferCrc)
+ 		{
+-			fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%x\n", d->myNumber, (unsigned int)loc);
++			fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%p\n", d->myNumber, loc);
+ 			return -1;
+ 		}
+ 	}
diff --git a/app-benchmarks/tiobench/metadata.xml b/app-benchmarks/tiobench/metadata.xml
new file mode 100644
index 000000000000..c217c527e32b
--- /dev/null
+++ b/app-benchmarks/tiobench/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mkuoppal/tiobench</remote-id>
+		<remote-id type="sourceforge">tiobench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..cd8d0a25822d
--- /dev/null
+++ b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Portable, robust, fully-threaded I/O benchmark program"
+HOMEPAGE="http://tiobench.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc ppc64"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-column-description-fix.patch
+	epatch "${FILESDIR}"/${PV}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${PV}-glibc-2.16.patch
+
+	sed -i \
+		-e 's:/usr/local/bin:/usr/sbin:' tiobench.pl \
+		|| die "sed tiobench.pl failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LINK="$(tc-getCC)" \
+		DEFINES="-DLARGEFILES" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dosbin tiotest tiobench.pl tiosum.pl || die "dosbin failed"
+	dodoc BUGS ChangeLog README TODO || die "dodoc failed"
+}
diff --git a/app-benchmarks/tiobench/tiobench-0.4.2.ebuild b/app-benchmarks/tiobench/tiobench-0.4.2.ebuild
new file mode 100644
index 000000000000..339da5860de9
--- /dev/null
+++ b/app-benchmarks/tiobench/tiobench-0.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Portable, robust, fully-threaded I/O benchmark program"
+HOMEPAGE="https://github.com/mkuoppal/tiobench"
+SRC_URI="https://github.com/mkuoppal/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-fix-perl-shebang.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:/usr/local/bin:${EPREFIX}/usr/sbin:" tiobench.pl \
+		|| die "sed tiobench.pl failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LINK="$(tc-getCC)" \
+		DEFINES="-DLARGEFILES" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin tiotest tiobench.pl scripts/tiosum.pl
+	einstalldocs
+}
diff --git a/app-benchmarks/volanomark/Manifest b/app-benchmarks/volanomark/Manifest
new file mode 100644
index 000000000000..edec075f6e4b
--- /dev/null
+++ b/app-benchmarks/volanomark/Manifest
@@ -0,0 +1,5 @@
+DIST vmark2_5_0_9.class 1591590 SHA256 55ae31452e771caded4af1bb45a2e01b710a3c3b02eea372db0d6d535591a7b4 SHA512 002953f780bfb2fa0f9663f6ee2228abbf277e98ebdc69dce3c0e9f03147e0bdb80ae381daf29838790c13aefc83406b61428871a890dcae2396a5c59fcee8bf WHIRLPOOL 00e8ffe4bae635bc72eeaac02e57ca3bfc39db416bf08251d1039dafa7e39d2f8858bd0f64f90a2623b739f84f9996efd7131a6f475df837c28dc236501b3810
+EBUILD volanomark-2.5.0.9.ebuild 1763 SHA256 ea67846f46c449541d1339a2ddb3ff92827c9b360b05ca0bba88377d64fc59c0 SHA512 c756ba709878f923034df3837f5cb3caee584c004705aa2bc8b14666c647c2867e23ae3207f632aad12ad36c607f2f7d3ee7053b59fe7d46c27a1de4e85b03a3 WHIRLPOOL 57e152c38f0bacbd331afee116de7dfd7d468f45e6d376a617007ba3e9b6074ec761bd6896ce2e65b55455751e89c196bc8999e4224399323ce22283eff01e2c
+MISC ChangeLog 2934 SHA256 0818be26cddaa88b40d140a91f525a8089fcf68a7cb0aba7f428bd0e8465f343 SHA512 41af6986d426470f8faeab9d08708ab7858737339ba5e6208be7e9171604802fb525a60925a60b455073e72d656672904d84a55d47718d153178c2d92a1993de WHIRLPOOL 998ed1a54b7b5a0cd1143efca4afc2366f89c9e8e8f960af691bf015cd76f25079610715f882c12573fa8394e6089b20b72df3d451d4978a939a4bd137a3788f
+MISC ChangeLog-2015 1497 SHA256 f60ae62eb2c2ba830468bd03ef073a4418f0d98b68856faa1280f35f8e7f82d1 SHA512 12e48268a77140cf82b2165b5357f3e044a3c4072a0baaea6066de9974ca1e3baaef4c3699a175335bdd443df64379936bb0d9d847ca25d871a9a13de7309fd9 WHIRLPOOL 5c56ccfcc902d62b1beb4834c7dfacd95994a75f6d54fe8324407603b861c196ea2946a195432684933247d5b3909c7a66aee58783e2e8697df3bfded32330a2
+MISC metadata.xml 221 SHA256 7128903b26ea4c5514850dbadaab34b58d5208c3ffede31f59cf53ed174f2c1e SHA512 239603806c8f5664d980a58bed0512b05b581342df90ed690086c86db2290edbb38183fe2cc1805b4245f9e87763c86c6f945022ac9704f8f9214dd73c5d2e07 WHIRLPOOL 78baaf548c2dd6174f70d3787ca3c694d6ee9a96ae628a9c242f0bf4b695f28c27dd1c91d8f73768b20ea410a7167e8742250e6fa305fbc591dcc3e29d779063
diff --git a/app-benchmarks/volanomark/metadata.xml b/app-benchmarks/volanomark/metadata.xml
new file mode 100644
index 000000000000..c2a23a7dec6b
--- /dev/null
+++ b/app-benchmarks/volanomark/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Java Benchmark test</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
new file mode 100644
index 000000000000..45a5ff4a18d4
--- /dev/null
+++ b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Java server benchmark utility"
+HOMEPAGE="http://www.volano.com/benchmarks.html"
+SRC_URI="http://www.volano.com/pub/vmark2_5_0_9.class"
+LICENSE="Volano"
+
+# Below because of licensing.
+RESTRICT="mirror"
+
+SLOT="0"
+
+KEYWORDS="x86 amd64"
+IUSE=""
+DEPEND="virtual/jre
+	>=sys-apps/sed-4
+	sys-apps/net-tools"
+
+RDEPEND="virtual/jre"
+
+src_unpack() {
+	einfo "No unpack required"
+}
+
+src_install() {
+	dodir /opt/${PN}
+	java -classpath "${DISTDIR}" vmark2_5_0_9 -o "${D}"/opt/${PN}
+	chmod 755 "${D}"/opt/${PN}/*.sh
+	sed -i -e "s#^host=.*#cd /opt/${PN}\nhost=`hostname`#" \
+		-e 's:"$java":java:g' \
+		-e 's:! -f: -z :' \
+		-e 's:-Sn:-n:' \
+		"${D}"/opt/${PN}/startup.sh
+
+	sed -i -e "s#^./startup.sh#/opt/${PN}/startup.sh#g" "${D}"/opt/${PN}/*.sh
+
+	# Set stack-size correctly for different arches
+	if [ "${ARCH}" == "amd64" ] ; then
+		sed -i -e 's:Xss96:Xss512:' "${D}"/opt/${PN}/startup.sh
+	else
+		sed -i -e 's:Xss96:Xss128:' "${D}"/opt/${PN}/startup.sh
+	fi
+
+	keepdir /opt/${PN}/logs
+}
+
+pkg_postinst() {
+
+	ewarn "The vendor provided installation script is somewhat broken!"
+	elog
+	elog "startup.sh was patched to allow the use of the current JVM as"
+	elog "selected by java-config. This means that regardless of the"
+	elog "Java vendor you specify to ${PN}, it will STILL use the default"
+	elog "JVM configured via java-config"
+	elog
+	elog "Just make sure that when you run ${PN}, the Java vendor you specify"
+	elog "matches up with what java-config is configured for. Otherwise specific"
+	elog "vendor specific options runtime may not work."
+	elog
+	elog "Remember to check the host property in startup.sh to the host that is"
+	elog "running the server"
+
+}
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
new file mode 100644
index 000000000000..200a5141153c
--- /dev/null
+++ b/app-benchmarks/wrk/Manifest
@@ -0,0 +1,6 @@
+AUX wrk-3.1.1-makefile.patch 1338 SHA256 deb6a89add9bc93c159b2cbc40d5f8b89d9d1147cb7463a01932689e63616f8a SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643 WHIRLPOOL affaf23958f5925060e41905fa272cdc7f403012ab44b423a2b21d9127a1973f9b02b920fa0abd2a743ed987fbcce8e95fecfd31f4c73b1e9b55be9c505a3983
+DIST wrk-3.1.2.tar.gz 902868 SHA256 da88a25f0eeb9e1fd6a9dcf4a96859e9e758f9446f0787cf7c95e4ccde14eefc SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15 WHIRLPOOL 3460aadf5f3e54cf64d0779b45efba291200f0344a55b3a8c35a603d9fbb917c006ff2035fb91bfdce7652b7e4231fc43c558115cab4ff73b91087163655fe85
+EBUILD wrk-3.1.2.ebuild 749 SHA256 a4a78a895cb2aa105a735cd2eb62aeacd52c81fbd5e30d371edb37ec40f67729 SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432 WHIRLPOOL d4561304b66b18c0b0134901578c9768ee518c3fc189a950e81278f9d80b870f0b160b161da79c764b6e2ba000b5c67583954ff88a35e13a93b57c53143a1a22
+MISC ChangeLog 2656 SHA256 0e2fb42ad64b037dbbc84e5193ecc74900239f7a12f7a1e5ba5d849d609bbbea SHA512 8d37fd1c2e26557540b96c88e4b5f8c7df5ea34880f1cbb5f055720747a9b8a0f97455997b8b26b805ea77f49ef0147e14ddd8ab812d1bb886b606522474569f WHIRLPOOL ec83cdf128bb20e55154837b83c512ed9a9aa9d2eaa77a1fac3a721a5c0ae8d0d45931a0278850be8d26e7bac5760788cc8a7cecbb6b6355706bd9bc6dd6f9f7
+MISC ChangeLog-2015 720 SHA256 6e30aa92f7f5af730ac3a6019f71047f7834f030500d2b661ce48d85cd5a37ae SHA512 f5fba76f0a2b5ce72a9764228b75f1f0347fb8bad32b6227b3e68135b0c2b10627910e58c1c2798f9eee971f170002cc47679be630cb08a12cf11613c3608d8f WHIRLPOOL 642155819a22b889016b27d78b4540ea7358828d9a17ba101409e5350bfe130090d22e18dbf0ad6f6d3a3f42763d80912714ca9e21a8ffdefb2cc1b071ae9b73
+MISC metadata.xml 729 SHA256 6dcf73bb2b35fcbe91dffeada056c7b7ee3a1f15b7114c42bd15d14a4fe8a900 SHA512 2c6513f32e7f7b67aed0021d6cae23f59aaf8f57ab88cd57fbe346422997617813f8a92208535397cd391935028174fce5cd88364eeff038481fd0362513d89f WHIRLPOOL 18d586d38d9808dddf9b01787f34db7ff8f753125df7b84682e013039ef29c861c3417dae90646f4589eda7834fc8d0c2f9eb3446c93be11736ef13b3bc38d78
diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
new file mode 100644
index 000000000000..595c69ac1572
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
@@ -0,0 +1,54 @@
+diff --git i/Makefile w/Makefile
+index d956c6b..48be677 100644
+--- i/Makefile
++++ w/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
++CFLAGS  += -std=c99 -Wall -D_REENTRANT
+ LIBS    := -lpthread -lm -lcrypto -lssl
+ 
+ TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+@@ -23,38 +23,31 @@ BIN  := wrk
+ ODIR := obj
+ OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
+ 
+-LDIR     = deps/luajit/src
+-LIBS    := -lluajit $(LIBS)
+-CFLAGS  += -I$(LDIR)
+-LDFLAGS += -L$(LDIR)
++LIBS    := $(shell pkg-config --libs luajit) $(LIBS)
++CFLAGS  += $(shell pkg-config --cflags luajit)
+ 
+ all: $(BIN)
+ 
+ clean:
+ 	$(RM) $(BIN) obj/*
+-	@$(MAKE) -C deps/luajit clean
+ 
+ $(BIN): $(OBJ)
+ 	@echo LINK $(BIN)
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+-$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
++$(OBJ): config.h Makefile | $(ODIR)
+ 
+ $(ODIR):
+ 	@mkdir -p $@
+ 
+ $(ODIR)/bytecode.o: src/wrk.lua
+ 	@echo LUAJIT $<
+-	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
++	@$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@'
+ 
+ $(ODIR)/%.o : %.c
+ 	@echo CC $<
+ 	@$(CC) $(CFLAGS) -c -o $@ $<
+ 
+-$(LDIR)/libluajit.a:
+-	@echo Building LuaJIT...
+-	@$(MAKE) -C $(LDIR) BUILDMODE=static
+-
+ .PHONY: all clean
+ .SUFFIXES:
+ .SUFFIXES: .c .o .lua
diff --git a/app-benchmarks/wrk/metadata.xml b/app-benchmarks/wrk/metadata.xml
new file mode 100644
index 000000000000..732ae8ed75af
--- /dev/null
+++ b/app-benchmarks/wrk/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vikraman@gentoo.org</email>
+    <name>Vikraman Choudhury (vikraman)</name>
+  </maintainer>
+  <longdescription lang="en">
+		wrk is a modern HTTP benchmarking tool capable of generating
+		significant load when run on a single multi-core CPU. It combines a
+		multithreaded design with scalable event notification systems such as
+		epoll and kqueue.  An optional LuaJIT script can perform HTTP request
+		generation, response processing, and custom reporting.
+	</longdescription>
+  <upstream>
+    <remote-id type="github">wg/wrk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/wrk/wrk-3.1.2.ebuild b/app-benchmarks/wrk/wrk-3.1.2.ebuild
new file mode 100644
index 000000000000..724ae80c1f05
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-3.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A modern HTTP benchmarking tool"
+HOMEPAGE="https://github.com/wg/wrk"
+SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="libressl"
+
+DEPEND=">=dev-lang/luajit-2.0.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -rf deps/luajit || die "failed to remove bundled luajit"
+	epatch "${FILESDIR}/${PN}-3.1.1-makefile.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-benchmarks