gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-benchmarks
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
199 files changed, 3985 insertions, 505 deletions
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 86f31313d9be..95d95abd366d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea-5.1.1 b/app-benchmarks/acovea-5.1.1
deleted file mode 100644
index fbc19209d2f9..000000000000
--- a/app-benchmarks/acovea-5.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libcoyotl-3.1.0 >=dev-libs/libevocosm-3.1.0 dev-libs/expat >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Analysis of Compiler Options via Evolutionary Algorithm
-EAPI=5
-HOMEPAGE=http://www.coyotegulch.com/products/acovea/
-IUSE=static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcoyotl-3.1.0 >=dev-libs/libevocosm-3.1.0 dev-libs/expat
-SLOT=0
-SRC_URI=http://www.coyotegulch.com/distfiles/libacovea-5.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3621259f54fddacdf0af3806f9488ac
diff --git a/app-benchmarks/acovea-5.1.1-r2 b/app-benchmarks/acovea-5.1.1-r2
deleted file mode 100644
index da72045979f5..000000000000
--- a/app-benchmarks/acovea-5.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libcoyotl-3.1.0:= >=dev-libs/libevocosm-3.3.0:= dev-libs/expat:= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Analysis of Compiler Options via Evolutionary Algorithm
-EAPI=6
-HOMEPAGE=http://www.coyotegulch.com/products/acovea/
-IUSE=static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcoyotl-3.1.0:= >=dev-libs/libevocosm-3.3.0:= dev-libs/expat:=
-SLOT=0
-SRC_URI=http://www.coyotegulch.com/distfiles/libacovea-5.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ed694ec24045975e04c15e9629f44296
diff --git a/app-benchmarks/acovea-gtk-1.0.1 b/app-benchmarks/acovea-gtk-1.0.1
deleted file mode 100644
index 635d03819ad1..000000000000
--- a/app-benchmarks/acovea-gtk-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-benchmarks/acovea-5 dev-cpp/gtkmm:2.4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Analysis of Compiler Options via Evolutionary Algorithm GUI
-EAPI=5
-HOMEPAGE=http://www.coyotegulch.com/products/acovea/
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-benchmarks/acovea-5 dev-cpp/gtkmm:2.4
-SLOT=0
-SRC_URI=http://www.coyotegulch.com/distfiles/acovea-gtk-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3091c7f783a16bd19a795267956de803
diff --git a/app-benchmarks/acovea-gtk/Manifest b/app-benchmarks/acovea-gtk/Manifest
new file mode 100644
index 000000000000..53a734d6de85
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/Manifest
@@ -0,0 +1,7 @@
+AUX acovea-gtk-1.0.1-gcc4.3.patch 455 BLAKE2B 4cd6eaea8285e185f01a577e350f1921d3037dd206ab5ac04cb6d369530d2ac3f24e642b4a451e4ce73263f4260a7813d54599450f1ec16d24e809ae92b5fe51 SHA512 a1312e06ff5bebb8f66a27b34cbdf9cb05879e6dc51951bb683746e2ad20a9cbaddc6d43165face16d1c130262bfd38a29ff645809f884ac88fc66f3d7f19462
+AUX acovea-gtk-1.0.1-libbrahe.patch 351 BLAKE2B 9926469cb0812db675c89be708246207c3c2d86f198e95f771fb4324a4fba561de030b0c4c2398aa7edadd8e4dbc1cfa49c51a096fe1fb3680b4448ac862db35 SHA512 a12b61a07f1d68c56fe13840e9bfd54ebfce1f6205bd0f7d3a98c7a505b7c6dfba33eb159f51c73d64ffabd0f1053c54213ddd01c9a438de35a9a4e00b71282c
+AUX acovea-gtk-1.0.1-libsigc.patch 6753 BLAKE2B b7a32cdc82f00e8add5ccff74e666667f170cce1113aa549ac3cdfdc241fcc55328804fa8e8ef14a888ddf0362440ada3f3cc34cbc9d611047e373684026396c SHA512 0f8463b8cec994a8fe1fe2a3971c9cc3f3d1427b7f3925cfdeb3a23ebcecfe324512830a80532ca904896c3314a72e75180dae9b10c2d0711d503c8bfc081ec0
+AUX acovea-gtk-1.0.1-unicode.patch 385 BLAKE2B ab96d0827004a7cd1dc1fb27af0db920d5ca3a0fa9770afebe3fb0a7cb52c9eb09c20651bb9dff26638d179c64dbbac721938a9c417a716444c3bfdaa2f8f3af SHA512 ea792ec464cc5d844eba769bb4246a7396b393d214834c6eaf8890ebf2d0de2d36e0e89dc89efdf753d046d1d3f032dc3806a20bf4360810bb8e1af56fc4d66e
+DIST acovea-gtk-1.0.1.tar.gz 407230 BLAKE2B ba8e27bc42e1cf7577c61a819a25b373c45738fb6788da9e4e40368ee3a64e363fcc66b43b80a357ba7ecf8e2b22937188c61457212e6051950fe5285e8e7629 SHA512 c26eb0059b0f6a8a77ebff2f9cad9a9d543a2932f035e520c40bc3b917d1570533be934571528b7e2e53932e56afa77eff108a1ac51678a514960563a775c2ed
+EBUILD acovea-gtk-1.0.1.ebuild 785 BLAKE2B 2baa669f0f3bee1ca8d5a3444c3fa480e8517221a8e3de0c870931837de82f438a50276b0b9f9c4c9fb2bdd15cb5dd60dc4055b54e49967d5fc5546c1668b509 SHA512 c0a3df2942f9131796858ab77450eb5ab2aeb47b2b2ed969dbc132ac266e766961c0bab75964a27019d8930e60f6ef39211f8162f2b2efab261032598ab6775d
+MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
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..a6bd63158514
--- /dev/null
+++ b/app-benchmarks/acovea/Manifest
@@ -0,0 +1,10 @@
+AUX acovea-5.1.1-asneeded.patch 373 BLAKE2B 6322fdbf97e59a601e4d7dc246cfcc14be5434b2ef03f3d0fea4e71c7c7bdaee4735eda0ed8f9b7b5895c0618718f5a400711c033bfa12a40105bfe2409e6de5 SHA512 888da467b00314edbc17abd589aecd9aa70951c6137b8c9da6d133f0f838ee40fc396585fd9c50bc18ee3300d386eccf99d7976dfba37ac8267e4479d26a755e
+AUX acovea-5.1.1-free-fix.patch 271 BLAKE2B fcf114d5420795ca08d3ca8605ab7968a18b05f2a52403fda0233360b3f8efb7c0d924708756488f7a77ebca0517cffe3ab6f732fdd27d1d7f0526534f5e8a29 SHA512 0f7ab86bb81ce9a6f54cfd1f9c35fa9b62bbf12500b6b5a91b0c387b3ba3d6f17683009e6656ce1c37ed95893814a884494823ccb9896bd0111275f444c6801a
+AUX acovea-5.1.1-gcc44.patch 285 BLAKE2B 37d3d8bbc0243cb3ce1df5eb4e6592bb9c6175bb367c317a802d438842504f186a1872f534a971176adefc7546df291d0b60823f001e7626ee191df317f516ec SHA512 2cc3307131a3038e002dd025a2c8888416004845da2c8fcdf96ab0732644e6effd75dbf3b41e7e5a30c38da14dd04015d9c5626320b333994963ba4a602d2450
+AUX acovea-5.1.1-glibc-212.patch 235 BLAKE2B 13be0d214c3f0c287a560bb240efc47874bb9f743f7197ea6809d0912e56baef02ea4861467e0b8c01e3bbb2bbd1e788150f45532d63f4b263067a7efeab0cee SHA512 29da09439e6caddbd5a934d147f2638cea117707be38f623f53f68134178bb29b25690c802dc5522985deb0a3eade245fa7e9b1067c1a84637564ef0ffdb7298
+AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8df510bdce15c32a5b1a70420b5acb7987780dcc4db6cba9cf6609a8f91397845071ba45797c81f4911f33b79acc4d403 SHA512 41704c855fdbdef96dc7eae1f196fde895412a95a248627cbf4e99ccf28519f3725edde17d443fa92ae0f5a301b95c4d8e2255d4a48deb14d4e5a59e902cbe1f
+AUX acovea-5.1.1-underlinking.patch 327 BLAKE2B 3b611c70d306cce314baf45622e4a395fa48f0a29d663198098f8446a575176e852b878615fd5abd3460e660c25f8549492cfb0c2e6c60ed20fb6915082a18f3 SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883
+DIST libacovea-5.1.1.tar.gz 363048 BLAKE2B 61f894e99f3678f3b676e0926ff6d7a6bd376a654ad109d5b7f676d7053e4b975d90e0ac01d820b8498a6992db1cbd2fb5443fbe3871ef3f86bee280fd808352 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365
+EBUILD acovea-5.1.1-r2.ebuild 924 BLAKE2B 770d72ef6cfd95f1b4c344649e3538a5409eb5b637a5cc81013a4d2f2747ead9abccbd1cee4582533b2371d69d6f8fda56a959ba4a40135ca0504d28aa4c1b39 SHA512 f2c6cfb365cca5155435b901daf0408a7264f1f999401aa93db546959b25a160026d7ed43e1896d48cac789c9acf1dd59235a3c62f39c44894a8d646b11079e8
+EBUILD acovea-5.1.1.ebuild 1057 BLAKE2B 8cfdcfd6c09b76e998ed17d7ad776b533ed8cc993a69a597dcb0d7938b11988ae8b0a7b90fa9126bfeac01216429df32d3f88acb450f4506313f90d6b353ef6a SHA512 54def173fd2bd5049bb044ce6e648ecdaee76ee9e0930bf41d1875105b2395554edcb31398c538f33db1b94ded703128287922cef38511d3b532472429ec272c
+MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
new file mode 100644
index 000000000000..6d3ae2f60f1c
--- /dev/null
+++ b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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.3.0:=
+	dev-libs/expat:="
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/lib${P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-free-fix.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-glibc-212.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libevocosm.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
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..3a887c15888c
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
@@ -0,0 +1,16 @@
+--- a/cmdline/Makefile.am
++++ b/cmdline/Makefile.am
+@@ -7,4 +7,4 @@
+ 
+ runacovea_SOURCES = runacovea.cpp
+ 
+-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lexpat
++LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
+--- a/libacovea/Makefile.am
++++ b/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..e20bfa3eb98f
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
@@ -0,0 +1,12 @@
+--- a/benchmarks/treebench.c
++++ b/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..2207f4616426
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
@@ -0,0 +1,14 @@
+--- a/libacovea/acovea.cpp
++++ b/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..996cb5ebc82e
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/336260
+
+--- a/libacovea/acovea.cpp
++++ b/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..46ddb5fe4d97
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
@@ -0,0 +1,119 @@
+--- a/libacovea/acovea.cpp
++++ b/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-0.6.2 b/app-benchmarks/bashmark-0.6.2
deleted file mode 100644
index b9637800d2db..000000000000
--- a/app-benchmarks/bashmark-0.6.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Geno's cross platform benchmarking suite
-EAPI=5
-HOMEPAGE=http://bashmark.coders-net.de
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://bashmark.coders-net.de/download/src/bashmark-0.6.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=450e5e6b8842e04f832ed5548338f1cc
diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
new file mode 100644
index 000000000000..e97c8e924187
--- /dev/null
+++ b/app-benchmarks/bashmark/Manifest
@@ -0,0 +1,6 @@
+AUX bashmark-0.6.2-as-needed.patch 362 BLAKE2B 6d6f5697f1da32395fb454ffe844b72799b7294559d8d390958a73b119159dd8ec138ed8ea34537349761c9b13820347b5f5657589f90125eac554f2a550edb5 SHA512 123afc84ec7131492054d28d6e41f32730328298fcb5f13055a56277d1c286352a3ff70d759fb307dc960fba413ad31102f04bf5b5df55d6052743d26b7bcad4
+AUX bashmark-0.6.2-gcc43.patch 2034 BLAKE2B c931cc7edea7fe1bd2d8939564896c352a4a33eb078e54214c20f9d56c5be533bb23787ad1240d7716dd55475ce67b09f611a3ed176810696ae9e248eae471c2 SHA512 48d1d0b2924d3640e8939f44989528a9a83fb56e436da21abb9301bbbbed28dbf2fa5e46b6631ac09531ed1ef218da685d21d5b3aeb48f147d56a1aa161bf09c
+AUX bashmark-0.6.2-gcc47.patch 631 BLAKE2B fbb465dfc0f5b68337bf15be09413209b4c6dc3cad1b11379723252320c96b26b4b6eaa7b16eda511201d9ee71aefd25368042587915edafd02184792dd9e843 SHA512 60b1c1dd529d7dcac0893f1cc5d74e5fdcecb2bfd5735e33c6445d9fbaa843258b9aaaee9627ba98db1f8237f4567b8868f4be483b681b130d5a34943d2d24b6
+DIST bashmark-0.6.2.tar.bz2 21944 BLAKE2B 63c6241dfe67dbd3961d7712a5b4c2f611846e3e5a7bfa1796ff14f03610d8db0a7f71239a4eec9eaba53c09274d12f320aa30d5ffc7462ff1a186b19c456256 SHA512 43935b44c1b871d724aca0e1a6dfd99c73c29ec276c4127186e8dc6c7b27d57554b8b32a7e2372cd0b78eb584df7ee169f51f47e6666f61eaacbe35c5d4074f8
+EBUILD bashmark-0.6.2.ebuild 541 BLAKE2B 1a9a38a97eba174c653492e1ae790dfb9c7bf23d9ecfde35e376e62733185454c69e4a53c6d2af2d74ce06793dd45f051174868ab1150d42e95021d0cd2c7945 SHA512 cfdce168c7343f0903b4bd5cb66bfdf7383d5f00263d1b2aba335d9535fbeb5023b30b3a9eb860ec7d7d139c0316fd8db16c7e95d40897205da42811a59d67c7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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++-1.97.2 b/app-benchmarks/bonnie++-1.97.2
deleted file mode 100644
index d221ec3c5693..000000000000
--- a/app-benchmarks/bonnie++-1.97.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=6
-HOMEPAGE=http://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.2.tgz
-_md5_=c1f1a14ae1eb5835d8bab024f81b64c3
diff --git a/app-benchmarks/bonnie++-1.97.3 b/app-benchmarks/bonnie++-1.97.3
deleted file mode 100644
index b51e18cdf4ee..000000000000
--- a/app-benchmarks/bonnie++-1.97.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=6
-HOMEPAGE=http://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.3.tgz
-_md5_=d3ab5c4cc52c38bf171851843e57cd3a
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
new file mode 100644
index 000000000000..db55fe7993f0
--- /dev/null
+++ b/app-benchmarks/bonnie++/Manifest
@@ -0,0 +1,7 @@
+AUX bonnie++-1.96-compile-flags.patch 611 BLAKE2B b4290c150cd7a84e3b3f60efb1999f83231657533c674b686c02f9ea7d8da6e17dafb9cb94e047edd72fcca484723cbb1828c42c1cf4d37467d405e187344314 SHA512 bc5acf12ba0231f8ed4708363dd4146bf9b07fb05c8367e1c572b1950a8334da413de0b2283bc185050cb57a4d5b2ec966072085f80b7bcd6f45d5a8b8ba7fee
+AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 BLAKE2B c31575b33594c310884d95c0030867706dee2598b49c9943e8ca6af3e6ebef5454f1cc786c487f8970f8be70df54830b54ab02ccd061a8bac2daf100d77b7578 SHA512 f26a3873965d70c3cb1b0ce4422daa1a9b3152d189a532c81ec4764aac1a04fadf45f1c562fedaaa6de443eeadcdc176ed7b5c1353eeaa91ad340a1560e96d32
+DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
+DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
+EBUILD bonnie++-1.97.2.ebuild 965 BLAKE2B 1eb3c87ffc61ba3d9aa790ffdabb767f1eaeb96d929a155428d6edfe5a02124ea4f072e3ab43f95dd53cca58047c2540dafdbd1241615b2f44659c991767d0c7 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b
+EBUILD bonnie++-1.97.3.ebuild 964 BLAKE2B f5bf7dfd5d015e6226fdb9625403cc5aafd2088f2f6272f0b13cdd9d444d11c7d7623d60d72ed423864adb9f034481fff9f6d1b4ffbe51f7714101da2ca81570 SHA512 a182e252546d1d8ef98b4ec5031dab9b2a7b050df5a01f3018dd5752b231050f927ca2c64754421d121ab6bf990f83448c43619b437d7806592dd00257f77492
+MISC metadata.xml 610 BLAKE2B f9248e7f0ed78f7b1beffc4fcf133e76b09a7140bfa1b6d4aa42278181362223f272d3b6444075b51cc4f553fdad7ed9d092c6edca604475bffb890a278d6e98 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc
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..3ff574002e5f
--- /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-2.0.6-r2 b/app-benchmarks/bonnie-2.0.6-r2
deleted file mode 100644
index 9186a6502a86..000000000000
--- a/app-benchmarks/bonnie-2.0.6-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Performance Test of Filesystem I/O using standard C library calls
-EAPI=6
-HOMEPAGE=http://www.textuality.com/bonnie/
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=bonnie
-SLOT=0
-SRC_URI=http://www.textuality.com/bonnie/bonnie.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ff5b900c79cc39799906bba07bea3cc5
diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
new file mode 100644
index 000000000000..3df213261711
--- /dev/null
+++ b/app-benchmarks/bonnie/Manifest
@@ -0,0 +1,6 @@
+AUX Makefile.patch 348 BLAKE2B 016aba350938f561865925b5ac5aea0502b5db4a9799ecf72de26a51d1c522f37a7ddcd44a6d69d50f16bd179b185103514dabb10eb74e4dadc46ffe485af107 SHA512 e795a7f4179aee9a86d546845cb16c03770a93013c83186c46a9a759edff909c4d85a40ec2091d068496c289cb5bb015026796b060e6bdec44d72fa8e13c2518
+AUX bonnie-2.0.6-includes.patch 336 BLAKE2B 438e8bbd08e98e30c74981b31c5896ab17efcea190394a260c0913a5d8e4289321d4550fa9d40072c8686629497ea1c09db50508251ec044e82489c270047674 SHA512 ed5cadebfabf1efb7e0b5289cfb67627262d83f4f9650d020755b1c47f19601b845193892c502d9947316d639b6423d52a862224f1943dcae182a151e0c72a39
+AUX bonnie_man.patch 349 BLAKE2B 9251f607a2875912d9c27228f0e3889f44a4ac013616450f8ba7cc8424065a8220560a846841f199227e65c18e770bf3ef294c391bea2c96b9bc9fac2cc50998 SHA512 38d88dcba9ef17e2de843a6123a063203c8fa1c1b654109fba3c7bee54275e6fa0ebe1f3ce8986b07891fc5cbfca4b310f71d4bc4e564a20ec199ecafb58de64
+DIST bonnie.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
+EBUILD bonnie-2.0.6-r2.ebuild 648 BLAKE2B b38c96a6e08db06992a97e34485e9dbfb13d3622113ad1c8efe63660e6dfceaa2e366d7728f1c0aa2c3c8be61385476c4a939f5fd9d2aaec26e37628e6309f4a SHA512 bd6eb2a48f1e4af1183c331653765d6ee9bb6c93e6dd2c769c6b0d010bba55f56a0079412dafdb225a0ddb16942a5b7c864b55edaa13b1912d25ddb85e4fca40
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
new file mode 100644
index 000000000000..e67da1923998
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
+HOMEPAGE="http://www.textuality.com/bonnie/"
+SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
+
+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_configure() {
+	tc-export CC
+}
+
+src_install() {
+	newbin Bonnie bonnie
+	doman bonnie.1
+	dodoc Instructions
+}
diff --git a/app-benchmarks/bonnie/files/Makefile.patch b/app-benchmarks/bonnie/files/Makefile.patch
new file mode 100644
index 000000000000..d803bd077ced
--- /dev/null
+++ b/app-benchmarks/bonnie/files/Makefile.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,9 @@
+-CFLAGS = -O $(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-0.14.7-r1 b/app-benchmarks/bootchart2-0.14.7-r1
deleted file mode 100644
index 52b273b69fe7..000000000000
--- a/app-benchmarks/bootchart2-0.14.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/pkgconfig
-DESCRIPTION=Performance analysis and visualization of the system boot process
-EAPI=5
-HOMEPAGE=https://github.com/mmeeks/bootchart/
-IUSE=svg test X kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-apps/lsb-release
-REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( X )
-SLOT=0
-SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.7.tar.gz -> bootchart2-0.14.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3d8c60ed3915ccfa30a5035d030cd43
diff --git a/app-benchmarks/bootchart2-0.14.8 b/app-benchmarks/bootchart2-0.14.8
deleted file mode 100644
index ec4111b1ffaa..000000000000
--- a/app-benchmarks/bootchart2-0.14.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
-DESCRIPTION=Performance analysis and visualization of the system boot process
-EAPI=5
-HOMEPAGE=https://github.com/mmeeks/bootchart/
-IUSE=svg test X kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-apps/lsb-release
-REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( X )
-SLOT=0
-SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=444984e76373f86307fd3a29fe47ae6c
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
new file mode 100644
index 000000000000..7363ee823bb0
--- /dev/null
+++ b/app-benchmarks/bootchart2/Manifest
@@ -0,0 +1,7 @@
+AUX bootchart2-0.14.7-sysmacros.patch 898 BLAKE2B 8529bdfc1a4e554a87673113b91e4a15e2b2f7efe8090eaa0de1b13cfe296cfe74c29f0bd90f05bb4853dd5ef12aff4dc576252004c7977d30e6b2e41592cd52 SHA512 60f703d29e133817439dcbaf7b59d51ae63e98c8fc03ff860f588c6ef3e3aa422c3c5132faf456dde3198f5c02afea9fbdeae43701e4af15de29155fb677dc0a
+AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
+DIST bootchart2-0.14.7.tar.gz 1175145 BLAKE2B dfe56572eb2f85b68e0ad871c939ef16c48b0ee11ca881f03914d6773b86050091b232d80706f0df1d094c2e069c252609a0266d1cfa5159a6a0916321ea1dcf SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541
+DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
+EBUILD bootchart2-0.14.7-r1.ebuild 1906 BLAKE2B 25a10d431e40dfe32ea440e4f0684f2747aa8999e96ae1f03a4f31d362191ad103ad675483097e5941336743d80a55931a8c095b4f60e0215492b25698baa31c SHA512 66071bc7926f4be1a14fd6ace9e4690ecc4928b66d949f7bace426b8e3d5caad5b82aaaa1dc1755fca53411fc757e296177b42a5e4d921e4afd5336d0aefa642
+EBUILD bootchart2-0.14.8.ebuild 1917 BLAKE2B 71b125a05233ba635e4173674e16320ddbd3a4c6b4d65945233f19cee6c581be29ed9c3a17f2ca87c87ba9d067ad8de88e4b2e4adae45cb9b563daf4baef6f1b SHA512 007d93ec40b93e8bc4092670802983940aefaa8838950a02dfea7baf5653cf53a3040ecc8c0f00c2e13fc5f2fdc8bff15505eeb227d4a7c75e000f405754607d
+MISC metadata.xml 304 BLAKE2B 171fff1d72aaecb2e11f9d712aae9b40aba252d315f63184036d3757a92843f3e898b7e723b617014bca29b95f928a720ec7115a564766704514e8bc5b826e4a SHA512 a32bf175ccbaf61207413ae249aa66e72c7704abc0e1c41e9a6eb5fbbc21ea143f45588490ef53bbc8a5ffa0145880de87308ed33df9354a1433016f6540f46e
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/bootchart2-0.14.8.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
new file mode 100644
index 000000000000..d31698dcc3b2
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+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}"/${PN}-0.14.7-sysmacros.patch #579922
+	tc-export CC
+	sed -i \
+		-e "/^install/s:py-install-compile::g" \
+		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
+		Makefile || die
+	sed -i \
+		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
+		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..48cf685c0ca6
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/579922
+https://github.com/xrmx/bootchart/commit/add58c3b57064afd6f7d2fd5f09006d28a3e770e
+
+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-0.61-r1 b/app-benchmarks/contest-0.61-r1
deleted file mode 100644
index 5962fd9c97e1..000000000000
--- a/app-benchmarks/contest-0.61-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Test system responsiveness to compare different kernels
-EAPI=6
-HOMEPAGE=http://users.tpg.com.au/ckolivas/contest/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-benchmarks/dbench-2.0
-SLOT=0
-SRC_URI=http://www.tux.org/pub/kernel/people/ck/apps/contest/contest-0.61.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d9af0501284269be0ffad2258f92723b
diff --git a/app-benchmarks/contest/Manifest b/app-benchmarks/contest/Manifest
new file mode 100644
index 000000000000..75295b15e0b0
--- /dev/null
+++ b/app-benchmarks/contest/Manifest
@@ -0,0 +1,5 @@
+AUX contest-0.61-fix-buildsystem.patch 581 BLAKE2B 9a11fb9b24a674a7bea0c40b9100fa3813954b853cd133cf69b90b0a3381a20ef289793939834c777140709082b262715990900af16c422442fc2215be2922f2 SHA512 35abe08432d62020a1c9daa2c9bae18dd2d8db99d3f938f9eb423d89b30c9d67441922bef5376c9e4b5be1744fb62b6e7c0163033f006225638f95c097f484a3
+AUX contest-fortify_sources.patch 376 BLAKE2B fb2ca7869fc19304c14aa2e52e0d3986f2021703800f547af5f88b866978a016e82b2e2911192465d7836bbbc297ab25f7d7d3499759ee9ff915ee28a2e0e089 SHA512 71bb1d0b594bfa2342622c5495ea0306829ced109fd606bdfb5e1aecc17b11270235f83606961067819097863ba3bff66e5c37c5496028ccce3f1701ee9bdb2f
+DIST contest-0.61.tar.bz2 29204 BLAKE2B 76e19365026b63f4a37c45905769f28c921455cb4020666898efa332d88627d85e5044f385556f07325537b6b4f80079b301fd9915f068754dd80d815092ff86 SHA512 34fb83a3b37d67d9729ce14fdd066010c7360a401d21f3566be8dae7271a30f01cc5b84092405ddfb6961a2284af0a18ce6709ab6d4ab68607aa98f975815131
+EBUILD contest-0.61-r1.ebuild 752 BLAKE2B 1c3960f311cf6b0f4cd68bc28b503d663dd8976f319eb264e6ce8f71230c495af782ce6fe701302dd5045e55617a36d68bcd32794eb3199af96daabe8ec0b697 SHA512 f81082c98be91b791686bf0688706129bb149260021b5acf4f24ec998eddcd1c0059b369528996c8370b8feca5d512b259fb9813ec5c51599efec353216b3119
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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-1.4a-r1 b/app-benchmarks/cpuburn-1.4a-r1
deleted file mode 100644
index a4f8d4ef459b..000000000000
--- a/app-benchmarks/cpuburn-1.4a-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Designed to heavily load CPU chips [testing purposes]
-EAPI=5
-HOMEPAGE=http://pages.sbcglobal.net/redelm/
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/cpuburn-1.4a.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=199ab041ec7182d2a1400c7400c39bec
diff --git a/app-benchmarks/cpuburn-1.4a-r2 b/app-benchmarks/cpuburn-1.4a-r2
deleted file mode 100644
index bbbdbb8add4a..000000000000
--- a/app-benchmarks/cpuburn-1.4a-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=CPU testing utilities in optimized assembler for maximum loading
-EAPI=6
-HOMEPAGE=https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/cpuburn_1_4a_tar.gz -> cpuburn-1.4a.tar.gz
-_md5_=0ef4fb8e8a1ced1a83e2075784824d6f
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
new file mode 100644
index 000000000000..d80546c1e1f2
--- /dev/null
+++ b/app-benchmarks/cpuburn/Manifest
@@ -0,0 +1,6 @@
+AUX 01-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
+AUX cpuburn-1.4a-flags.patch 250 BLAKE2B 68e402e16d1b1ce3f278ee580175ddf459993f908e2d8ad1a823b5df619cd0f52b20d2ec56966141ebbd422013b180e4d5602742b3bdb8fec00e87e554dd512e SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668
+DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
+EBUILD cpuburn-1.4a-r1.ebuild 719 BLAKE2B 7c9565035030ed64abfba774264d371652b7e43358baef7dcfcfaf2f56ffc2828ccf5d84c28499d3be1f489637fe2883e4649c6b7a6bdafc55bbded0c7601ba6 SHA512 0516ac5c4b275e6a62269827271d321c259894540e558c9f4e15615d7b63496b8e3a75b36d69aeb2bf8558c5903e86381a3b7af64e2c17812e176b35a4fc726a
+EBUILD cpuburn-1.4a-r2.ebuild 1373 BLAKE2B 17b046c45cefc55b3083d4c16776ee68017376f38a9a066104bcc74959744cd490c069f072c10423fc5a29d48f369cbabb1e405b2700523b0868fdacd5b5e299 SHA512 2f98f322e6b5f68ed2212ddc8c92e0976b67c6660d47b48efae1175b6e14a46a75982a1ba3c5bd8874f32451e0d142c31b288d43b3793493b37197c6a8c1275f
+MISC metadata.xml 602 BLAKE2B eda46ae4cc60f92470dc83b419169c6daa3703f32f20a56b5c3764b7eef525a733898322f734739ca3cff379c568ffaa4754f996f5a7fe4637f7c7a3fcd23bf8 SHA512 2c6c59071ca30a6159222e37991b6b3367ba4ac6bc30e583b0ebbf537b9fac007df830fad046bc7904b0aa8e95c6e147fd983c219f97a921e5fd1d40dd593b12
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-r2.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
new file mode 100644
index 000000000000..db1f520822b5
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/./_}"
+
+DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
+HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
+SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/01-variables.patch" )
+
+QA_FLAGS_IGNORED="usr/bin/burnBX
+	usr/bin/burnK6
+	usr/bin/burnK7
+	usr/bin/burnMMX
+	usr/bin/burnP5
+	usr/bin/burnP6"
+
+QA_TEXTRELS="${QA_FLAGS_IGNORED}"
+
+src_prepare() {
+	default
+
+	# Respect users compiler and users CFLAGS and LDFLAGS on x86/amd64
+	# Must be always compiled in 32-bit on amd64 arch
+	# See https://bugs.gentoo.org/65719
+	sed -i -e 's/gcc -s/$(CC) $(CFLAGS) -m32 $(LDFLAGS)/' Makefile || die
+
+	# Respect users compiler and users CFLAGS and LDFLAGS on arm
+	sed -i -e '/CC :=/d' -e 's/^.*-mfloat-abi=softfp/	$(CC) $(CFLAGS) -nostdlib $(LDFLAGS)/' ARM/Makefile || die
+}
+
+src_compile() {
+	if use arm; then
+		cd "${S}"/ARM || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use arm; then
+		dobin ARM/burnCortexA8 ARM/burnCortexA9
+		local DOCS=( "ARM/Design" "README" )
+	else
+		dobin burnBX burnK6 burnK7 burnMMX burnP5 burnP6
+		local DOCS=( "Design" "README" )
+	fi
+
+	einstalldocs
+}
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..140c5aa589a6
--- /dev/null
+++ b/app-benchmarks/cpuburn/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>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		CPU testing utilities in optimized assembler for maximum loading
+		P6 (Intel Pentium Pro/II/III and Celeron TM),
+		AMD K7 (Athlon/Duron/Thunderbird TM),
+		AMD K6, and Intel P5 Pentium chips. 
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/dbench-4.0 b/app-benchmarks/dbench-4.0
deleted file mode 100644
index 8de3a60ff84e..000000000000
--- a/app-benchmarks/dbench-4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=dev-libs/popt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Popular filesystem benchmark
-EAPI=5
-HOMEPAGE=https://www.samba.org/ftp/tridge/dbench/
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/pub/tridge/dbench/dbench-4.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dce9332a7268c40aa5dda598e20237f
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
new file mode 100644
index 000000000000..a21ee57a74ae
--- /dev/null
+++ b/app-benchmarks/dbench/Manifest
@@ -0,0 +1,3 @@
+DIST dbench-4.0.tar.gz 2055359 BLAKE2B 20715b17472d0c6daaf1848873e33266272846447a207508c6801058ba91a38fe56045d8f6867df5814e7836e99cbd2675aad70a49021b04a3797e1231e20543 SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f
+EBUILD dbench-4.0.ebuild 852 BLAKE2B 2665c9ef680768e3e075917983d31df42ff064af306dc6c485db53b6ddfec1439ba06b005db7a764b9d18e837bf98341cf9567860e9603df940e0b79730b6349 SHA512 95fedbebe76978bb61f55e879f5a1a8790b83203e840db63a67eb61f7505abe77b0321f8df8076e2dc8af819fbd162af3b718d1a5c9326f2fea01baeb7d0a381
+MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
new file mode 100644
index 000000000000..4ce16456fdef
--- /dev/null
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -0,0 +1,42 @@
+# 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="https://www.samba.org/ftp/pub/tridge/dbench/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/ftp/tridge/dbench/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ~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-1.4.9.1-r1 b/app-benchmarks/filebench-1.4.9.1-r1
deleted file mode 100644
index 57cd673714b3..000000000000
--- a/app-benchmarks/filebench-1.4.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=auto-completion? ( dev-libs/libtecla ) sys-devel/flex sys-devel/bison >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Filebench - A Model Based File System Workload Generator
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/filebench/
-IUSE=auto-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=CDDL
-RDEPEND=auto-completion? ( dev-libs/libtecla )
-SLOT=0
-SRC_URI=mirror://sourceforge/filebench/filebench-1.4.9.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=30a24e336e8853f9db776c23b81dfef5
diff --git a/app-benchmarks/filebench/Manifest b/app-benchmarks/filebench/Manifest
new file mode 100644
index 000000000000..2de70ffd47d3
--- /dev/null
+++ b/app-benchmarks/filebench/Manifest
@@ -0,0 +1,4 @@
+AUX filebench-fix-automagic-libtecla-dependency.patch 1088 BLAKE2B b2acdc8e02b7bececb6680c0a7131443bf2ddf56ce24105713d23f005109651049ffc7e7859c8762402d50b85ca44e1a04351ce65884c835a22d77d72e31c655 SHA512 8c04b18d77749757bb98718ddc086637c9f541c48a2651e28b0d48586d4794feaa86eff1dafbe0c2c93bfe7ac2d090ab8fb38216f5999152309118ff3247b35d
+DIST filebench-1.4.9.1.tar.gz 349535 BLAKE2B 774eab935fba422064c9c6a5c233b99545b639b4319cb9658b6555d087f1af0f59c29de57a5fef94c2256199f1c328d2309641785d8573832629fb4a28b2e716 SHA512 a6400aba4266fcf98e46c4824796a594adc5d5e7f9605f6e1ab01973ce448e27948991e453b186947a8d89f8603a69a3ba955edf2a1abccd2935196af7b6f0d1
+EBUILD filebench-1.4.9.1-r1.ebuild 667 BLAKE2B 1c54c571520c9b20b9e53b3486bac3443c4a2a91fb7cb3a1788bcd90c46aa1a4a3b458cd1241c1138b7bef74de8dc86d335e4fb85d7267876d5b2db05dd6cedf SHA512 228a7297e0018c5616d34da4cf8151ca475e0b74f9ac3eecf2747687483cc6137899e77f4c5d4de8f16bde5f8f01eb802856ba97685ff654c35659da3526178b
+MISC metadata.xml 564 BLAKE2B f5ce812261f5426873a7b34b02e805a77f2e3a8fb5114a47007fa38064c88233c0f9c752d89d6da5386c92ab4115852571027ec0d4a1f0e0f98d3a7ec92e1d2a SHA512 3e0c33f3b4430560ad83c2391814d563e9a10df1521fa606c6517da33bdd256ecd0c6303e7f06e2b7695347aaa838dd70cc02329ae1dd17e08b1144cc5ea5c79
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..27ee8b7ca8d0
--- /dev/null
+++ b/app-benchmarks/filebench/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>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-1.4-r1 b/app-benchmarks/forkbomb-1.4-r1
deleted file mode 100644
index db65c9968e36..000000000000
--- a/app-benchmarks/forkbomb-1.4-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Controlled fork() bomber for testing heavy system load
-EAPI=6
-HOMEPAGE=http://home.tiscali.cz:8080/~cz210552/forkbomb.html
-KEYWORDS=~x86 ~amd64
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://home.tiscali.cz:8080/~cz210552/distfiles/forkbomb-1.4.tar.gz
-_md5_=0f92b0d62ae5d1e7343a78356e7f29bc
diff --git a/app-benchmarks/forkbomb/Manifest b/app-benchmarks/forkbomb/Manifest
new file mode 100644
index 000000000000..260ccf968595
--- /dev/null
+++ b/app-benchmarks/forkbomb/Manifest
@@ -0,0 +1,3 @@
+DIST forkbomb-1.4.tar.gz 4718 BLAKE2B cd784a4c5bfecbb1bdc295346fd78044519b1d2212e3ba8189954aaf74b754c8188a354f324e4f2702a6fc6d397a0e670a9b0c3c67b751f7fb148465ad9c3e44 SHA512 3f5404ed6b3fe70b970e79ffc5f75aef2f9b92d0087895e1ae7d3a5409f28475569dbbb00e5bcb66882f56ce34e18ce388babfbe7cfeb7729a688519663d016e
+EBUILD forkbomb-1.4-r1.ebuild 499 BLAKE2B 9776577091c0ecddb8b79de378a1f8632a6ff91f7f899799cabd5f66f5372293db7a85efec3347d4c38742ead0f8f92351266f324724a7999363dc65ea88ba8f SHA512 b10703223fcfe6c5ba23e418788e6a296fa3094c57a5654a2482fdd9d450db89b9e98ced85dcf7c61be6900d6a951481ce01d6377be9a01bb0020b7e4add4b53
+MISC metadata.xml 262 BLAKE2B f05392040245c379bef00514595c61b486888d358e699bf65aed331db84a565f6c1e07079994473e272b1736ce9d18c92c5dd8f0162ef6e279ddee527ffa858b SHA512 333932260d8f347e9ce590d0f0bc03f775d87d01ca98bb921f172815c18de2d792a6d6d9b44f33efd735bf43155c8684946e64c6746fd57990962c6cc2676ff4
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/geekbench-2.4.2 b/app-benchmarks/geekbench-2.4.2
deleted file mode 100644
index 8e331a85ab2e..000000000000
--- a/app-benchmarks/geekbench-2.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=6
-HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* arm
-LICENSE=geekbench
-RESTRICT=bindist fetch mirror strip
-SLOT=2
-SRC_URI=https://cdn.primatelabs.com/Geekbench-2.4.2-LinuxARM.tar.gz
-_md5_=4c5d04324805a87e1cb46b2f55a5bab5
diff --git a/app-benchmarks/geekbench-2.4.3 b/app-benchmarks/geekbench-2.4.3
deleted file mode 100644
index 6f2c77e52b76..000000000000
--- a/app-benchmarks/geekbench-2.4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=6
-HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* amd64 x86
-LICENSE=geekbench
-RESTRICT=bindist fetch mirror strip
-SLOT=2
-SRC_URI=https://cdn.primatelabs.com/Geekbench-2.4.3-Linux.tar.gz
-_md5_=16d123a014795d20bf62bb74caac821a
diff --git a/app-benchmarks/geekbench-3.4.2 b/app-benchmarks/geekbench-3.4.2
deleted file mode 100644
index eb987e915d64..000000000000
--- a/app-benchmarks/geekbench-3.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=6
-HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* amd64 x86
-LICENSE=geekbench
-RESTRICT=bindist fetch mirror strip
-SLOT=3
-SRC_URI=https://cdn.primatelabs.com/Geekbench-3.4.2-Linux.tar.gz
-_md5_=0f19360d5bee63a332bc9e96e812fd5e
diff --git a/app-benchmarks/geekbench-4.2.3 b/app-benchmarks/geekbench-4.2.3
deleted file mode 100644
index bdd211e1e995..000000000000
--- a/app-benchmarks/geekbench-4.2.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=6
-HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* amd64 x86
-LICENSE=geekbench
-RESTRICT=bindist fetch mirror strip
-SLOT=4
-SRC_URI=https://cdn.geekbench.com/Geekbench-4.2.3-Linux.tar.gz
-_md5_=1d4c40d7d107d413841778281b9d8850
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
new file mode 100644
index 000000000000..a15cf77fc6e5
--- /dev/null
+++ b/app-benchmarks/geekbench/Manifest
@@ -0,0 +1,9 @@
+DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b3320303258a5dcc6f169cee0134f1114927ff52745d5f6c0b5d604698e45a464a157454a249cab8e3114b01dad3f7b693ca45a5b0b SHA512 0acc0ce61aa5d2575976c66aeae6ebb88ba895dd89c07daf55e2c7af344858a620336f3e79ccfc5e7b8829caa9d600f97a35a4d6e4da630d19d723dd887fdafe
+DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
+DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
+DIST Geekbench-4.2.3-Linux.tar.gz 71032570 BLAKE2B 9589c355561acffdfe6b68fcb7a73a7d3c87376db10b70d471d7970491c9ce29cd66e9d5f48968cb2b34fad6440a8667ebf061976e5b838295fb002442de101a SHA512 eaeb1657a1eff0dd8fac4b9a89e5a7d0da22e396e35ba6a1255c2a5c4434ad1a23cda54f28f4271a9a5450e57b3601c344964ddd96dcdef1144f17b7fd20aa4b
+EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1c534e1fad2b37458ddca39ef1f1372ec8d3727c69ecc0c462ec2514abea33a48aedf35c7eee5444dbea8e9ddf96 SHA512 663d11705c70d7a082678b7ee74802651734fe367458a7e10974f33b7c22930d78eddee7a1c56993e11a856da0efeef0412e02696485d7def3e4a6e0464b39f5
+EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
+EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
+EBUILD geekbench-4.2.3.ebuild 1111 BLAKE2B 819573e558d88206121c461935c424e85e85f811e3c00669627daa0434cd5505ea0fc0621ad0b93677ad19023c5a78a9203319d4160952a72f9b1bbf2b9c6f53 SHA512 c51a31b124940476742ba26497652e0cced23f2cab230222246be02ddc2f90359580cb517374f8498b63bcab5e66dc82a8bec0c3b6cc5d0bbaf1d3a182900f5c
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild b/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
new file mode 100644
index 000000000000..c8df4703ddb8
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-LinuxARM.tar.gz"
+
+KEYWORDS="-* arm"
+LICENSE="geekbench"
+SLOT="2"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/dist/Geekbench-${PV}-LinuxARM"
+
+QA_PREBUILT="opt/geekbench2/geekbench opt/geekbench2/geekbench_arm_32"
+
+pkg_nofetch() {
+	elog "Please download https://cdn.primatelabs.com/${A}"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench2"
+	doexe "geekbench" "geekbench_arm_32"
+
+	insinto "/opt/geekbench2"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench2/geekbench" "/opt/bin/geekbench2"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench2 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild b/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
new file mode 100644
index 000000000000..44d63ccf38c0
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="geekbench"
+SLOT="2"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="opt/geekbench2/geekbench opt/geekbench2/geekbench_x86_32 opt/geekbench2/geekbench_x86_64"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/${PN}2/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench2"
+	doexe "geekbench" "geekbench_x86_32" "geekbench_x86_64"
+
+	insinto "/opt/geekbench2"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench2/geekbench" "/opt/bin/geekbench2"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench2 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild b/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
new file mode 100644
index 000000000000..5994b8d352e1
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="geekbench"
+SLOT="3"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="opt/geekbench3/geekbench opt/geekbench3/geekbench_x86_32 opt/geekbench3/geekbench_x86_64"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/${PN}3/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench3"
+	doexe "geekbench" "geekbench_x86_32" "geekbench_x86_64"
+
+	insinto "/opt/geekbench3"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench3/geekbench" "/opt/bin/geekbench3"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench3 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/geekbench/geekbench-4.2.3.ebuild b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
new file mode 100644
index 000000000000..58eedcb80749
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="geekbench"
+SLOT="4"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="opt/geekbench4/geekbench4 opt/geekbench4/geekbench_x86_32 opt/geekbench4/geekbench_x86_64"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench4"
+	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
+
+	insinto "/opt/geekbench4"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench4 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/geekbench/metadata.xml b/app-benchmarks/geekbench/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/app-benchmarks/geekbench/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>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/gtkperf-0.40-r1 b/app-benchmarks/gtkperf-0.40-r1
deleted file mode 100644
index 244e7ded0f07..000000000000
--- a/app-benchmarks/gtkperf-0.40-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Application designed to test GTK+ performance
-EAPI=5
-HOMEPAGE=http://gtkperf.sourceforge.net/
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkperf/gtkperf_0.40.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1365da35444c24b0e5052f74d65acf9
diff --git a/app-benchmarks/gtkperf/Manifest b/app-benchmarks/gtkperf/Manifest
new file mode 100644
index 000000000000..1fa2e2439db9
--- /dev/null
+++ b/app-benchmarks/gtkperf/Manifest
@@ -0,0 +1,4 @@
+AUX gtkperf-0.40-gentoo.patch 1008 BLAKE2B 9aba78c70fe1c8a7c5166c01a145dd758b9e402509be6f0bec8a57a5bad00fda9623d991ddcb8a0609f8515fc53e20cb55639d41cef035cbaf1386672d866887 SHA512 f0feb9f17471167b352d79dfde1439ef0cdb5d2961a191bb9716a2b75a6c5dd2067a80ab3dcaf5669f335b9b0200803c234b228bc64d3152578ab3f3ab21564d
+DIST gtkperf_0.40.tar.gz 402982 BLAKE2B 2fc26da36d2799a0b79810f52399ee49cc36e3093b35605142e73ae91f6953927194f50df35f02246e3ea3ce4b5e253731dbe3a9d550d5b20a001dd06597d89e SHA512 d406955b38c0450c3c6a6a7e9fb1fa7b326932325360353001cab6be63c8deaaea487123512740b57cdc28579ee84aabce789df5ce7dfaa92f8d9010f0a6d7be
+EBUILD gtkperf-0.40-r1.ebuild 724 BLAKE2B 300cad3ca441d72cec91de139a8982af51dccef7a2dda75cf7a2f303f0e183661a1e8cb4d570850e0066b1a83d2f3a65fcfdc4c38d8014bf5aca0a8c7e48be4a SHA512 3bd350a934e5d2b21af8eb0b404f5eade82dcbff5994605fcfdd01b25c2e9950897cadf713f87152096b658e25bf13a85f9cbbd5e7cf9fc29005c3d0e6c47c2c
+MISC metadata.xml 592 BLAKE2B e1721dda782499ec5d22b22681440a0f718123afab9c48a07877bc7373ddfd500a40a6a118ef47980a113bbd3703de1bb77b6ca2aa8b9f5628843c5f8681d4be SHA512 1b8e9e427468d498f3e064184f48886b43370328d5640cc14d38603a03bb90ab8467e95783d8d5ea12ab211f3643c369400d0571f5e181cdd9131a19f48a524a
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-0.9.1_p20161228 b/app-benchmarks/httperf-0.9.1_p20161228
deleted file mode 100644
index d631ec85b442..000000000000
--- a/app-benchmarks/httperf-0.9.1_p20161228
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idleconn? ( dev-libs/libevent:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A tool from HP for measuring web server performance
-EAPI=6
-HOMEPAGE=https://github.com/httperf/httperf
-IUSE=debug libressl idleconn
-KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x64-macos
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idleconn? ( dev-libs/libevent:0= )
-SLOT=0
-SRC_URI=https://github.com/httperf/httperf/archive/cc888437e4572ec29a4a7209f34fbd39c31600f5.tar.gz -> httperf-0.9.1_p20161228.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=db1f2827e5ddafede21fa821f7b9bab8
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
new file mode 100644
index 000000000000..706b7e082dd2
--- /dev/null
+++ b/app-benchmarks/httperf/Manifest
@@ -0,0 +1,3 @@
+DIST httperf-0.9.1_p20161228.tar.gz 106357 BLAKE2B fa35d47a9e59bd8d8979e2a56ef8e5966c8e83a0a738e0995730efb2721344bcfa6187581b04a05ec2ca7f3424072894c7c10dd63cc1a4a2bb4c0f29df2a0a6c SHA512 e5dbb400e4ab0db3cc1621731d99af9261574a8a1da4279c722ebbd80537d0aae2a3d662f4d51eb9130bc98823c2786710c7819a0144f4ae3f8cf153e28d7dfa
+EBUILD httperf-0.9.1_p20161228.ebuild 871 BLAKE2B 82002e03bafc8a3562e681a35a03da189a7320b45fbf8c3957a100ac0652570f78cc8a2451dfcd137cfbbd1955997f96e61215918aea613c696be74bd4349dc1 SHA512 5fde46f6ab920265df114cce8341a772f46e5d9712932eda4e4c5b7593be5f0603fefc08c860d356eb2881656d7f817c0323dbe803e06026d2024077068c10c4
+MISC metadata.xml 1011 BLAKE2B 3254dacb03b6a957106287289566d9aa466768b5449eee054c423f2d22aac5cc464f990a7afa101256cb40075b03404c4af8bee542e6ee01b5af58e7c8a8415b SHA512 86a8ef9ea287532d89d5833abf29d71aae7e9aca494d6e40ebd6f43cb0eb766e63b769bc2218f8e374f13045d2b3445283dac68d384d9fb449e5a0800caf1dfb
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-93_p20131012-r1 b/app-benchmarks/i7z-93_p20131012-r1
deleted file mode 100644
index 785c3d94a313..000000000000
--- a/app-benchmarks/i7z-93_p20131012-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=A better i7 (and now i3, i5) reporting tool for Linux
-EAPI=6
-HOMEPAGE=https://github.com/ajaiantilal/i7z
-IUSE=qt5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=https://github.com/ajaiantilal/i7z/archive/5023138d7c35c4667c938b853e5ea89737334e92.tar.gz -> i7z-93_p20131012.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95e37035f824deab1173ba01f7354375
diff --git a/app-benchmarks/i7z-93_p20131012-r2 b/app-benchmarks/i7z-93_p20131012-r2
deleted file mode 100644
index 72250b209ea6..000000000000
--- a/app-benchmarks/i7z-93_p20131012-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=A better i7 (and now i3, i5) reporting tool for Linux
-EAPI=6
-HOMEPAGE=https://github.com/ajaiantilal/i7z
-IUSE=qt5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=https://github.com/ajaiantilal/i7z/archive/5023138d7c35c4667c938b853e5ea89737334e92.tar.gz -> i7z-93_p20131012.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=746189301fb2fa97ea4d1024cc802257
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
new file mode 100644
index 000000000000..536ad3d3a2bc
--- /dev/null
+++ b/app-benchmarks/i7z/Manifest
@@ -0,0 +1,13 @@
+AUX fix-insecure-tempfile.patch 3615 BLAKE2B a25ae5d15a1757d45901fd8d783bb5fa2c80f8c2e54b46906b55679f1c45b5268f853ce373ccf9e85c60cff8daefd43120627a8e08b2b944363b58f30e68d207 SHA512 ec07232656ea18602f062562af9182be5cc6b5e4a073b15f7d5308bf9632e2abf546de2006f4e4bd4cf4bd8314d9df521235e2b3c4720d0dee88e4430705978c
+AUX fix_cpuid_asm.patch 924 BLAKE2B 8c73d3034a70ec5a4b0b9b704ee10f6db99c5d592f68bc26f058c6ec99f681e1f0d04ae417d498a31bdfea4a52676cfb3a71d967bff9a79bbeee46b28837c546 SHA512 ad0ea8751e753340b541fc13849c2cb5b2be1c3c297a7b40e508d2ac9abdd1b153918ef507d89db1d4b15ec1e1eedfe7cb3619376649a10abfb1f5880f6d187c
+AUX gcc5.patch 1866 BLAKE2B 7792ec7852839317c9838617cb9fd85be0949afbe8cc456bf7f5587b0a934fb217a021c4d0a711d438553e15478e03e670f104bca122beaed4f68255c71139e8 SHA512 ad9a752bf3604136f2f3110c6053274581f6e5f6db56cede31fee2091d9b989b93f43d4658ca12f77bdf7c6ed78a0a06d8368ebea3ef20239fe707ae8e1a707a
+AUX hyphen-used-as-minus-sign.patch 2470 BLAKE2B e2c04874bae901475f1fadd1baf14d380182f25dd0ff41ab8879b1c2adf904475d6d5c64d0590abe638122653e7c0e3d8c44d713513b258b390df40f9f939fbb SHA512 05544e9f682bb6ccc1166182985ff4a4d19481ba555f63a0f030487ccc231cea9b2d1dfff83a95e9a2bcbf9d7dcc31cd331397cf84ef2ed253dac23fe9ecaa99
+AUX i7z-0.27.2-ncurses.patch 825 BLAKE2B 2538bcfcdb3f8597f33901c060974b3aa0e251f8c17b985452208e6e66940cedab29e21cdc3817070a91ec566b492c31bfcf3e3b727845bc9119a70b63f62e8a SHA512 6bf1773ccdf8b310be575eccdbbe351db5661bb4fef2621d2cf46dac073c627f27441e3a879b558c607305a5d73d53ef3687c98d49a2f0db7a1048019bd41a1a
+AUX install-i7z_rw_registers.patch 802 BLAKE2B 186862e797e903766767b035565a0a20814a8197051519a308a2774ad1d9556f17a91eb299ea050c83f9b91850fd47e77cbb7b4a41a73a5356f11267eb3f3624 SHA512 677df9ea9884d138f1eecb88b49ab96ac16f49cb63caf11fa63892940815e3c31e2170afadd0c73a2a571ff62b824be6109c0cda72779d76e03907da546f48d9
+AUX nehalem.patch 477 BLAKE2B e0f30d54f1da1cac0aafaea91641d5e626bbbdea6bc2abc6e1f6acf3c5e3d613cb1f0da5ff337fd8a44bc4288b981d83eaa63541291c0c397619f859b34b1da0 SHA512 5a647455d4fc4ff24689c9d4d6e936c346065ff2219de0bc61613a1044236df40fb815df0a136510ba2645bd01f172ba67486cbb9dc072dddf4308fab1824d7e
+AUX qt5.patch 365 BLAKE2B 4aa56d2b643ecc119122f549678d4cd1525bdba923067366c92fa0ef3a3b183b17668ad593d825223cb69bba883ede461439b05ecda1da29d27e6b3085a54f52 SHA512 fc38423e82f774aff588023b45154ea3bf3fd553ee6bc4261dcd0e7911d1d589754461a1734e0da969d03d6d94e2b844da6f09a388ce4508090d4ba5c75c7df0
+AUX use_stdbool.patch 885 BLAKE2B 10365e67f43418213e8f38ab74d3588aab2783329d447834ad795f8973cdd53fdc40862d8f9abc723acaddfe03f49f3c471046ae865ed72f041db23ee1337c37 SHA512 5df3d042a580268971e6da0878bd070d2054e9a9732b518a88a489d6b3d62acae58f697fe44634ee6c847b108cae25df6592ed9e1f20ea4d7c6b36adb516830d
+DIST i7z-93_p20131012.tar.gz 879969 BLAKE2B 73b1f2e777cef9799fc9e11d366c989c37f4bad03676409855fdd8229a66d1075805068ad424ab0b46bb9bb4fe62431fb6c79b414fde0c1b1d29935ca4566839 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
+EBUILD i7z-93_p20131012-r1.ebuild 1480 BLAKE2B d5fbec4df1b016bdcd875976eccb3f2a2627cfaa15a38c0ffb623089587980acc9a69309c695acc26b72500cf3a3b90fa5c78b49146578754250471088217b3d SHA512 866ba126d0743b1ec3c5fb57cad73729d43be1b9a61417208bca19a6ef50df092bad82c772ed86234b6eb46d538e3729fa298ca02986999795ce34874c80a91e
+EBUILD i7z-93_p20131012-r2.ebuild 1298 BLAKE2B f86d42dd03f42c5c94444be65e7b4f639ec7e103f1545d7fe94ff3c5e35cb6e380de539fe2623bfde38637b0f5c017e626de1a8ee6491aff37658ce1f66911a4 SHA512 5e67a7aae98ebb9e44041ab1df5cafd980c43d66b58714dc183c15281998b955aeb6e62b20736e9ca156cb26acd0e56db274022499f5945eb8f00a7416b4fb7c
+MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
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/nehalem.patch b/app-benchmarks/i7z/files/nehalem.patch
new file mode 100644
index 000000000000..c1b5639779a9
--- /dev/null
+++ b/app-benchmarks/i7z/files/nehalem.patch
@@ -0,0 +1,15 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix some nehalem detected as haswell, too
+Bug-Debian: https://bugs.debian.org/856806
+
+--- a/helper_functions.c
++++ b/helper_functions.c
+@@ -420,7 +420,7 @@ void Print_Information_Processor(bool* n
+    	    *nehalem = true;
+ 	    *sandy_bridge = false;
+ 	    *ivy_bridge = false;
+-	    *haswell = true;
++	    *haswell = false;
+ 
+         } else if (proc_info.extended_model == 0x2) {
+             switch (proc_info.model)
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/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
new file mode 100644
index 000000000000..992080972ba0
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 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
+	"${FILESDIR}"/nehalem.patch
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+	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-0.9 b/app-benchmarks/ioping-0.9
deleted file mode 100644
index fac7a3403f72..000000000000
--- a/app-benchmarks/ioping-0.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Simple disk I/0 latency measuring tool
-EAPI=6
-HOMEPAGE=https://github.com/koct9i/ioping
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/koct9i/ioping/releases/download/v0.9/ioping-0.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a41788177ae7503f69ec9b49a64cc96
diff --git a/app-benchmarks/ioping-1.0 b/app-benchmarks/ioping-1.0
deleted file mode 100644
index 8738d81ef742..000000000000
--- a/app-benchmarks/ioping-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Simple disk I/0 latency measuring tool
-EAPI=6
-HOMEPAGE=https://github.com/koct9i/ioping
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/koct9i/ioping/archive/v1.0.tar.gz -> ioping-1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34a58c673af6048f8bf5ce1af0ae5d08
diff --git a/app-benchmarks/ioping/Manifest b/app-benchmarks/ioping/Manifest
new file mode 100644
index 000000000000..4399981a58b3
--- /dev/null
+++ b/app-benchmarks/ioping/Manifest
@@ -0,0 +1,6 @@
+AUX ioping-0.9-sysmacros.patch 711 BLAKE2B 4614c8aada443a0800d427dc0e8858e6120fc3d8496af5bf24744300b7b92d9765c97e605dd297afee1090695089bef8623f4639c917737b66b6c990e726dcbf SHA512 93f3a64610bff6970b9a9add9266766953aef1c2ec50afc683154617ddf7698cb72438ece6bfa08609fc5ca2d92b1291b75cca853ebf995b67c0279ea4420557
+DIST ioping-0.9.tar.gz 23695 BLAKE2B 41b37ad8dabd2c2e16f26798d878807c38e0d03bc4964a001f8800d0f398ba48335b1187e1f04cd235a980c5dce7e864c471fce8d46ca24a65f2022847eb8ebd SHA512 609e19c31a16a5961be0e468255f2853311162ad988d07404a8198042bec1e20cab37e192ad148536a0772efe8034a94d594671ec6fde7d37badee859796de1c
+DIST ioping-1.0.tar.gz 28824 BLAKE2B bb0f28e560419167450b27846650ff131c9cbb23c5df7f518afa8cea6a83bd97142d7ad8920b9ec86754deea0dcbf36af923223c78df6488f3623f2df852b59c SHA512 a6763ac800e98c819a74af80634ac723f413ffa183297918389e1e1f5fc83713b683d53b594f5bd20f11d168c21de5da9d42a215d78531ee8b619aff8b9b0b84
+EBUILD ioping-0.9.ebuild 788 BLAKE2B f9ed84de7b23052c1255fd157e4e417315fcf4147c713fbb5e753203006905e6ddc868e4c6e730b51be6a5f46a68a5d2e87511b879f3b86e8584105ea81c33d2 SHA512 ddfa5c09cdcd32011ef6b16480008d5df66c826e37168a27443d876704597c8ba5ca4af4f0cd4c9b3928f2eaa7d904362b39c804a670e7a65a886583a2b3ffab
+EBUILD ioping-1.0.ebuild 637 BLAKE2B 1ecc2edcb820b7841e8ea2d2fa888314fa03d2cfce2fa8274331df60b3ab5b7d81484afddd85082645e0da70f09f71d4872daa4e49c7d3a711201444cbb918d4 SHA512 a4e9cb7dcaa6537698ea75674a8557a7c2d3e7ab5dafbd60a334d426dd76298aa9f0f7a2e105704287cc2d153d816e7e72fecc58ac038f65b78708d644036b7a
+MISC metadata.xml 486 BLAKE2B fbc1415094e68a44186c5d7ec7c5f8deb7f66c2aa38328eb4a93610fe1b14a6fcbbc1df32cf7af3c6c8eef9332be0ee51e58a9055ae0bdc67eb24b57afed8226 SHA512 4721668f3a6db1babe573c90b283eda592bde150928cb33c05826518afb61f3009aa9d556254e78bbd56a1693898629c555e7a74483f920606920ebda0c8522e
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-3.471 b/app-benchmarks/iozone-3.471
deleted file mode 100644
index c71986eed3e5..000000000000
--- a/app-benchmarks/iozone-3.471
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Filesystem benchmarking program
-EAPI=6
-HOMEPAGE=http://www.iozone.org/
-KEYWORDS=amd64 arm ia64 ppc ppc64 ~sparc x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://www.iozone.org/src/current/iozone3_471.tar
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e2f234feb701d03d0993715a25c1dc41
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
new file mode 100644
index 000000000000..875c7ea02302
--- /dev/null
+++ b/app-benchmarks/iozone/Manifest
@@ -0,0 +1,3 @@
+DIST iozone3_471.tar 1853440 BLAKE2B 280c821a439ad1bacbd749278385481678d644a59c14395482c8a088b0578285f389f376fb32ce3c3abde598f50d693fb0c7c9a3d6597765547a71c76d21ea1c SHA512 c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec
+EBUILD iozone-3.471.ebuild 1871 BLAKE2B 5813098f4c6f661dcb8eedea802c0ca13db9de4885c0c484f2882c6a72c8dc442696a83887862621642c2d49f2551c779f3031dfefc871188e1dbc69c4e06834 SHA512 062f87367b305e6a7b9c64ed8692115a42ad529357e61478212bb11b9917ca56f224f3fbaf9727b26c86afd7c7da27079bed737aa01da8c634a7020b8f03264c
+MISC metadata.xml 249 BLAKE2B e266b83580d700efa25e676fca79f0a3e3087e2ac13cd136676205d8c7129532541dee6d30cabf8040283400a70a7fdd305a114820055e092c322284e3e751b6 SHA512 541d74a2d7d079378380eaa4c09743553a6023183d1a7fc52fa527f8463eec32ec277455bf25e809e1f9cddf8a33cef8917e397bd601e9ae2831562c0ce2d6b0
diff --git a/app-benchmarks/iozone/iozone-3.471.ebuild b/app-benchmarks/iozone/iozone-3.471.ebuild
new file mode 100644
index 000000000000..cde87a71ebce
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.471.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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 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_prepare() {
+	default
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" src/current/makefile || die
+}
+
+src_configure() {
+	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
+}
+
+src_compile() {
+	emake -C src/current ${PLATFORM}
+}
+
+src_test() {
+	cd "${T}" || die
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
+
+src_install() {
+	dosbin src/current/{iozone,fileop}
+
+	dodoc docs/I* docs/Run_rules.doc src/current/Changes.txt
+	doman docs/iozone.1
+	cd src/current || die
+	dodoc Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
diff --git a/app-benchmarks/iozone/metadata.xml b/app-benchmarks/iozone/metadata.xml
new file mode 100644
index 000000000000..3240f0c89aba
--- /dev/null
+++ b/app-benchmarks/iozone/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/libc-bench-20110206 b/app-benchmarks/libc-bench-20110206
deleted file mode 100644
index 20307794cb35..000000000000
--- a/app-benchmarks/libc-bench-20110206
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Time and memory-efficiency tests of various C/POSIX standard library functions
-EAPI=5
-HOMEPAGE=http://www.etalabs.net/libc-bench.html http://git.musl-libc.org/cgit/libc-bench/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://www.etalabs.net/releases/libc-bench-20110206.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd9030f16366f107115733e39b4a39c6
diff --git a/app-benchmarks/libc-bench/Manifest b/app-benchmarks/libc-bench/Manifest
new file mode 100644
index 000000000000..627ea5032b8d
--- /dev/null
+++ b/app-benchmarks/libc-bench/Manifest
@@ -0,0 +1,4 @@
+AUX respect-flags.patch 528 BLAKE2B 89e202ce5cf9d3f7c25fa40333df2654c7546c068517367239fb8cbfe573bfa48ae9cdcad6fb98a721f5bef0349524277f6d11c83900d5947168492703cfb7dd SHA512 3f30d849ab7a52c0e16ea1e53e068d6761b782aab65cd47dfe6ba775257f858c2f4e3d3b1db920d45c8904b4973b45f013199adb93c1fb92e79c48bf7b89db09
+DIST libc-bench-20110206.tar.gz 3135 BLAKE2B f8c6b028e080695772f3275667dfc3ea6167eda47506dd32813a4942fc9f213317c0eafe6b08d1fd9a574301b74cf5ef1600cc4b12414245c6c85ca3b02e9013 SHA512 72f68616ab189f39f766c98afbb83bf3470a4e14ccb1dfe139a9006227262197546897da8f360bf48ba2c8854730aa385ca16270ec2e6cf2b531205550726f38
+EBUILD libc-bench-20110206.ebuild 601 BLAKE2B 27e0412fc45e98f47d2a462b13229e90a12b560867fed2f702ab954a415c6bebcbafd78243b9902bc671345dbb8a1b61aee449359e1d92478b529458d4594f86 SHA512 06acb3e505d2c9cd4375d31153d123e3015dd6376b1f9a815a0ea91ecfdbaf3f4b4fdb1ff2ac07c1cbfa3770637ca55f1699a84b11dc4149f1a486a9ff7dbf08
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
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-2.2.3-r1 b/app-benchmarks/nbench-2.2.3-r1
deleted file mode 100644
index ed7f62bdb1e3..000000000000
--- a/app-benchmarks/nbench-2.2.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark
-EAPI=6
-HOMEPAGE=http://www.tux.org/~mayer/linux/bmark.html
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9c928c9c61037cb323082470b1361173
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
new file mode 100644
index 000000000000..bcfa59f014eb
--- /dev/null
+++ b/app-benchmarks/nbench/Manifest
@@ -0,0 +1,4 @@
+AUX nbench-2.2.3-Makefile.patch 2616 BLAKE2B 60ac4ec24c7787ebf4c0f76c25c1ad1afcc96818a9c2c6dd6f5fb8b04de6ff6d3a6832f030c0f7cc7ddbebeca647bf129009926d7a550a7299b2f81e26cbef61 SHA512 9d5df03ec62ca535ae432a3644ae7903f0d8520d86d9bf16d3e715fabf63e124230ddd8f735f03599592a02bac4f06f95fdf427923fe54150bfb05f553011815
+DIST nbench-byte-2.2.3.tar.gz 111791 BLAKE2B 83b602f582af32fbf8e2440cf597e8fb605fba5e0c7e5ae070e4e759ad00ee86022123c7a8a5957382a03bb4c7450aa1a2633e8d98fc86d03ea52e7a8f2895ce SHA512 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8
+EBUILD nbench-2.2.3-r1.ebuild 952 BLAKE2B b3308cbcfcc7d2487efaed4eb665f6ac56c1f028b305d9c58d48e7bf58ccbe8f38e6a6056ba564883ba1da071f52ab74e35efb311484de85eabd487180027694 SHA512 e0af98ec3324dd2bf252f1b0054ac69f109f3ab71be8bb9f3fe615755df3b475b228a1d24a5d249a57f9860637167cda3ccf5d7f20e7c8e4be6914f61d2410d8
+MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
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..b853fc7b65ad
--- /dev/null
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -0,0 +1,77 @@
+--- a/Makefile
++++ b/Makefile
+@@ -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
+@@ -96,10 +96,10 @@
+ ##########################################################################
+ # For LINUX-like systems with gcc
+ sysinfoc.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ sysinfo.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ ##########################################################################
+ # For non-LINUX systems
+@@ -107,39 +107,39 @@
+ # and take sysinfo.c and sysinfoc.c out of the dependencies for nbench0.o
+ 
+ hardware.o: hardware.c hardware.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c hardware.c
+ 
+ nbench0.o: nbench0.h nbench0.c nmglobal.h pointer.h hardware.h\
+ 	   Makefile sysinfo.c sysinfoc.c
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench0.c
+ 
+ emfloat.o: emfloat.h emfloat.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c emfloat.c
+ 
+ pointer.h: pointer Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-o pointer pointer.c
+ 	rm -f pointer.h
+ 	if [ "4" = `./pointer` ] ; then touch pointer.h ;\
+ 	else echo "#define LONG64" >pointer.h ; fi
+ 
+-misc.o: misc.h misc.c Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++misc.o: misc.h misc.c pointer.h Makefile
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c misc.c
+ 
+ nbench1.o: nbench1.h nbench1.c wordcat.h nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench1.c
+ 
+ sysspec.o: sysspec.h sysspec.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c sysspec.c
+ 
+ nbench: emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(LINKFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\
+ 		emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o\
+ 		-o nbench -lm
+ 
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..2954671d7f89
--- /dev/null
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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}
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+
+src_prepare() {
+	default
+
+	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_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin nbench
+	dodoc Changes README* bdoc.txt
+
+	insinto /usr/share/nbench
+	doins NNET.DAT
+}
diff --git a/app-benchmarks/os-autoinst-9999 b/app-benchmarks/os-autoinst-9999
deleted file mode 100644
index 3764be23eb0d..000000000000
--- a/app-benchmarks/os-autoinst-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=media-libs/libogg:= media-libs/libsndfile:= media-libs/libtheora:= >=media-libs/opencv-2.4:= sci-libs/fftw:3.0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=automated testing of Operating Systems
-EAPI=6
-HOMEPAGE=http://os-autoinst.org/
-LICENSE=GPL-2
-RDEPEND=media-libs/libogg:= media-libs/libsndfile:= media-libs/libtheora:= >=media-libs/opencv-2.4:= sci-libs/fftw:3.0= dev-lang/perl[ithreads] dev-perl/JSON app-emulation/qemu app-text/gocr media-gfx/imagemagick media-video/ffmpeg2theora
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cc5fd4a53dc4adac639e5e4b58f6a6ca
diff --git a/app-benchmarks/os-autoinst/Manifest b/app-benchmarks/os-autoinst/Manifest
new file mode 100644
index 000000000000..67093d5afc5f
--- /dev/null
+++ b/app-benchmarks/os-autoinst/Manifest
@@ -0,0 +1,2 @@
+EBUILD os-autoinst-9999.ebuild 747 BLAKE2B c04a2c5bbd3352c2276f76fe498239d681ec95c50be3c80c9ee53becf18c3515379eae6638bee116ad83f774577e36ef06197d86acc77da4d91b25f0f374652e SHA512 91a7ecafdcf241312fb87c7af2a623daa1b8d184cbf438848f6bd07195773c094b057d27b19573b0117a082b7a18342594b2d2b14815968f5fc9d2c30f0fc8d4
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-benchmarks/os-autoinst/metadata.xml b/app-benchmarks/os-autoinst/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-benchmarks/os-autoinst/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</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..f9dca04f3834
--- /dev/null
+++ b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3
+
+DESCRIPTION="automated testing of Operating Systems"
+HOMEPAGE="http://os-autoinst.org/"
+EGIT_REPO_URI="https://github.com/os-autoinst/os-autoinst.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	media-libs/libogg:=
+	media-libs/libsndfile:=
+	media-libs/libtheora:=
+	>=media-libs/opencv-2.4:=
+	sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}
+	dev-lang/perl[ithreads]
+	dev-perl/JSON
+	app-emulation/qemu
+	app-text/gocr
+	media-gfx/imagemagick
+	media-video/ffmpeg2theora"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-benchmarks/pipebench-0.40-r2 b/app-benchmarks/pipebench-0.40-r2
deleted file mode 100644
index aced31e6896b..000000000000
--- a/app-benchmarks/pipebench-0.40-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Measures the speed of stdin/stdout communication
-EAPI=6
-HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=pipebench
-KEYWORDS=~alpha amd64 ppc ppc64 x86 ~arm-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.habets.pp.se/pub/synscan/pipebench-0.40.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=510680ce11406fa721b2c6ef1264151c
diff --git a/app-benchmarks/pipebench/Manifest b/app-benchmarks/pipebench/Manifest
new file mode 100644
index 000000000000..592a09cd8478
--- /dev/null
+++ b/app-benchmarks/pipebench/Manifest
@@ -0,0 +1,4 @@
+AUX pipebench-0.40-fix-build-system.patch 603 BLAKE2B 69c90bad81413e22ab1be93014b9a9a8a60207e852354bf74c86aab496761102bdeabebfa1c3d33d803b30d6f42275dfb3c5b2cb9fede394cee9db4b9957a696 SHA512 a054d3393043953c56b759326d0bd72e94233673f945474aaa24fba0c78901997f864e79a255ab282b7251a6d88d6a024c08d332581aa3461bc5ce4be9a94bff
+DIST pipebench-0.40.tar.gz 11542 BLAKE2B b024ad8066a0adb2c1c9e1de1de93d9a9e91104380a1d955852b6281f1b4506be3b03240ed238766590c643c1d93060da43c523e773da738adb8bab333894247 SHA512 bace18d73425cf56bc3fd95eea4db47b3010cc82c16d9b433390d0ee4593046ab10101ce73df451596b34ace89fa92e93a92bb625286edb9cdfb809e630788cd
+EBUILD pipebench-0.40-r2.ebuild 569 BLAKE2B 1ef74acbacde5f884e6b3d828a83373f3505e0a7f97c737644197cff77d237003da2646dae367886f57f5d7848e14f1c227d8759aa9e77a45e441195e8a3fc51 SHA512 5c651e73ceeb6775183836d31e63f656248ae789649cb6ad36da697093b1822273a4757b32b48424d0cfc395c8789a858d9c6897f4acb172849b8b61726691c1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch b/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch
new file mode 100644
index 000000000000..2d79d80ef7bc
--- /dev/null
+++ b/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,11 @@
+ # $Id: Makefile,v 1.2 2002/12/15 19:58:36 marvin Exp $
+ 
+-CC=gcc
+-CFLAGS=-Wall -w -pedantic
+ 
+ all: pipebench
+ doc: pipebench.1
+ install: pipebench
+-	cp pipebench /usr/local/bin/
+-	cp pipebench.1 /usr/local/man/man1/
+-
+-pipebench: pipebench.c
+-	$(CC) $(CFLAGS) -o pipebench pipebench.c
++	mkdir -p $(DESTDIR)$(EPREFIX)/usr/bin && cp pipebench $(DESTDIR)$(EPREFIX)/usr/bin/
++	mkdir -p $(DESTDIR)$(EPREFIX)/usr/share/man/man1 && cp pipebench.1 $(DESTDIR)$(EPREFIX)/usr/share/man/man1/
+ 
+ pipebench.1: pipebench.yodl
+ 	yodl2man -o pipebench.1 pipebench.yodl
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..0688bd665cff
--- /dev/null
+++ b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
@@ -0,0 +1,22 @@
+# 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="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=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.40-fix-build-system.patch )
+
+src_configure() {
+	append-cflags -Wall -w -pedantic
+	tc-export CC
+}
diff --git a/app-benchmarks/ramspeed-3.5.0-r2 b/app-benchmarks/ramspeed-3.5.0-r2
deleted file mode 100644
index 8fea6942024c..000000000000
--- a/app-benchmarks/ramspeed-3.5.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Benchmarking for memory and cache
-EAPI=5
-HOMEPAGE=http://www.alasir.com/software/ramspeed/
-IUSE=cpu_flags_x86_sse pic
-KEYWORDS=amd64 x86
-LICENSE=Alasir
-SLOT=0
-SRC_URI=http://www.alasir.com/software/ramspeed/ramsmp-3.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9f268ab49031d3b20aa679524793c03
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
new file mode 100644
index 000000000000..07c251f10080
--- /dev/null
+++ b/app-benchmarks/ramspeed/Manifest
@@ -0,0 +1,3 @@
+DIST ramsmp-3.5.0.tar.gz 79481 BLAKE2B 2bc3e12bf9e33c1a696743d8efa4a80ddcc2503dde2574a51a78d7f8927cbea08837be8a9ca0f9fc66865db5879785f86715afdc4c096aff326c9a462eab45c0 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e
+EBUILD ramspeed-3.5.0-r2.ebuild 1343 BLAKE2B f4e279344b86e0fca65f82413ebd0d513a3ea4c4582990a874be43b6116bd3e0bb7e5d491c90abe90ffc4f57a07cf30184f4263b65a13dcb2fa56aeb805694c1 SHA512 17da178a4ea32d1b4ebe39762e13dcb252eafbddc7c2f4ee7a5db8d8d28455038d981872636f6b67670a39f87c2bc1da0b981cd36ace22b7ed4a069f08d1574f
+MISC metadata.xml 354 BLAKE2B cbf3eb04d7171a135903e066fb9a52d788ce37a7406152116c88e695d4c3c144ca2221c789edbfa31861a36695ffd86c7cd3742a81f43c93748ce1663f771133 SHA512 38abbd2b91db1482fb69ccb45150c2f03331e4e4730754c1374a68f0e6b58bdf98a965a802e666473323894c7a91d8aa5a164bc929b3fbcd435163ed9c3d2306
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-3.1.4 b/app-benchmarks/siege-3.1.4
deleted file mode 100644
index ec8568ef8c12..000000000000
--- a/app-benchmarks/siege-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A HTTP regression testing and benchmarking utility
-EAPI=5
-HOMEPAGE=https://www.joedog.org/siege-home/
-IUSE=libressl ssl
-KEYWORDS=amd64 ~hppa ~mips ppc x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://download.joedog.org/siege/siege-3.1.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=585c76da7776270d689456453051b778
diff --git a/app-benchmarks/siege-4.0.4 b/app-benchmarks/siege-4.0.4
deleted file mode 100644
index 184a1e1e1e8a..000000000000
--- a/app-benchmarks/siege-4.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A HTTP regression testing and benchmarking utility
-EAPI=6
-HOMEPAGE=https://www.joedog.org/siege-home/
-IUSE=libressl ssl
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://download.joedog.org/siege/siege-4.0.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6d7db60d1f583c8f7cb1c33f1c72dfab
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
new file mode 100644
index 000000000000..ed2d9109b64b
--- /dev/null
+++ b/app-benchmarks/siege/Manifest
@@ -0,0 +1,6 @@
+AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
+DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
+DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
+EBUILD siege-3.1.4.ebuild 1189 BLAKE2B a72e0f000ae78e38e026666e23c7839e57109f8cfeaba90e476bbd34f880da9debd5f904c4e2a9482bb983573af72682fa7ba572a57575155771a8362bc7c640 SHA512 9a4d62ea2072f180eb99195c319f0b1546b31e4a50918db0bbaec8fa9cb9424afc8e18c03d258c7e37d4945046bba18890d68aa931c1d99db6f64195eb1e8c25
+EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild
new file mode 100644
index 000000000000..46104f68a615
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 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-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
new file mode 100644
index 000000000000..ebd14cfce9e5
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+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 ~arm ~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() {
+	default
+	# bundled macros break recent libtool
+	sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/spew-1.0.8-r1 b/app-benchmarks/spew-1.0.8-r1
deleted file mode 100644
index c0f5f16cd5ae..000000000000
--- a/app-benchmarks/spew-1.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Measures I/O performance and/or generates I/O load
-EAPI=4
-HOMEPAGE=http://spew.berlios.de/
-IUSE=static
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt )
-SLOT=0
-SRC_URI=ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5931b949406911acc138fbe231c3bdf5
diff --git a/app-benchmarks/spew/Manifest b/app-benchmarks/spew/Manifest
new file mode 100644
index 000000000000..e05e5ed7947b
--- /dev/null
+++ b/app-benchmarks/spew/Manifest
@@ -0,0 +1,7 @@
+AUX fix-automake-1.13.patch 738 BLAKE2B 988e2b37d12959d8c08380cb33ca4f82a9f2076e16008f29c658a4c4189b219a74f06087ff9aeb46b20399fbdb79edb84af244266a5d103eba3509729b73a106 SHA512 d901296e786de378c669bf0e5303ccd1825d29ffa2116aba301250577abdef4a79b28e7e7a31587b373819cf940392b72b1cf0352ab4ec5d81861c72c70c76fb
+AUX fix-format-security.patch 1209 BLAKE2B fa33eb49b61ee74f09f3df70d684c441ed1f089f94cc3571903bbd8c856995e2ad44fbdcb7e63dd6ee9202da23f5822c883037c6307f59c9e65f2efb777e3a05 SHA512 17437880d9780f70f3d7e6208e3bf6d0788290876b2a1c473ce2a5df25fe51ec6df91c8d950196b2d0f498eafdedd2896a36539e393c9d2429200b3ae80b6617
+AUX fix-ncurses-tinfo.patch 1094 BLAKE2B 446d9c396fef3b03898153e840536557af9aeafef35f9cf54fe6cf22eaf39f20f6920d47af1f4086bc9a6fa05303c7b7df54d189fdbdacc15bb9e33a2b53d6ed SHA512 84afc54f824fab7c74e370b9879555edc24d1ba0139446781c0b61a72b09936acabb8f6c3151f9d5c4fe602188b65b69816cf6fa9bd80b2147a6ff8a2561065e
+AUX remove-symlinks-makefile.patch 1125 BLAKE2B 85f660d6ae7da3ebefd4f728c4537919373b4083930f8bdc8bf548efb57905c2ed38802b1aa72b0cfe16b8fa4018d832e0b1c85c60485b0f4d7e4e3defdeffe9 SHA512 4cedf0afe234089cced001bc5f491d49c836fc3acdf2264eecdc6d5621e9130efe9b4b24ce2198ed3edd9a4ec413bb5cbf45a2803650f8525acf3a903511cccc
+DIST spew-1.0.8.tgz 162091 BLAKE2B 9ca0bba6cc749feb016d86bd4e159646538e0a89842aad44474bc377fe67c7f51aa33df2c4df14b329e1b7dabe78ef7da9f50daa0b01f8679a0e98810e5ea1b1 SHA512 ec76a1e681bbaabef6cdc63ced5114a856a312e91c5ff3e0d1536221583a1c939f9308139863670695121c8c720123a6d0697491867ccafc091607888cc81b56
+EBUILD spew-1.0.8-r1.ebuild 1077 BLAKE2B 505b6271d37c638c396f3d6258bdef0d6e7288054cff8aba09f9dc7683139c927bd6fb8e06c94667ea0542904d3c1b74353b57f69baedf76f671b644fd03ae5f SHA512 012b63e9f8c23adfc7e0ccfb878c1b424e74c120cd96d8ceb268ae1e26120b5f42e28a66919506456fd9092247b56f07b397edce70feafd6f1f6cda8b0100f41
+MISC metadata.xml 461 BLAKE2B 33e988b7c7846f687d9c6b83fbf3b560bde47a5be6cac346baa32a8f783ca7c0c5ba64be1c40411630884504aec99429e4a7f9cb9648fb55a23fd046c0be614d SHA512 fe2f2e2cac973a052af263b4021d198835077aaa43dcae82a1101b8156a6cc6d309078f78d6216234ea591a9202afaae298aa6d87755e7e3c032a5d841056597
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/stress-1.0.4-r1 b/app-benchmarks/stress-1.0.4-r1
deleted file mode 100644
index 23f56fc2d485..000000000000
--- a/app-benchmarks/stress-1.0.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Imposes stressful loads on different aspects of the system
-EAPI=5
-HOMEPAGE=https://people.seas.harvard.edu/~apw/stress
-IUSE=static
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.seas.harvard.edu/~apw/stress/stress-1.0.4.tar.gz -> stress-1.0.4-r1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30aa8a9c0b36a0015702f237e41df487
diff --git a/app-benchmarks/stress-ng-0.09.33 b/app-benchmarks/stress-ng-0.09.33
deleted file mode 100644
index acd20011700b..000000000000
--- a/app-benchmarks/stress-ng-0.09.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=6
-HOMEPAGE=http://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
-SLOT=0
-SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.33.tar.xz
-_md5_=58bffc5d94aab86ffe725437315db80a
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
new file mode 100644
index 000000000000..7b1a8889ad2c
--- /dev/null
+++ b/app-benchmarks/stress-ng/Manifest
@@ -0,0 +1,4 @@
+AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86
+DIST stress-ng-0.09.33.tar.xz 354140 BLAKE2B 301af9eb7b805619d2e91af205e6b8e1e47fc24de0b99409627a0d0b7b09d3512fab27f4b89676ffc298bb9ee86074518c919016b389e88dfe0e571ace6df397 SHA512 2add6dd17e64c7a324143f00a1e42fc3070448575bf3b65a1a4d0d261748546410d1c024ec4320249600e0c99867bfb42bbac987f297d080802ce9977240efd7
+EBUILD stress-ng-0.09.33.ebuild 679 BLAKE2B d3489ae39f79b3a064b6ccdd7bab945e1e7c2d8447ad9ebe13b405cfb21d769fa57a1e2c987429546dcfdc232905661bf7b0c5ca5fe907bee3a1619c9457a2e6 SHA512 abaa37e711a7748dab9a501fb487e634b2560aa781545cccb4f0714efd90002d4659b93601c508b98832fd2d8526ab7bf3a47f12035131cb9102b80f4bf913d7
+MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
new file mode 100644
index 000000000000..633c6db1b3fd
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
@@ -0,0 +1,64 @@
+--- a/Makefile	2018-06-21 15:39:27.000000000 +0200
++++ b/Makefile	2018-06-24 14:46:41.773596760 +0200
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -319,12 +319,10 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: info $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
+ 	@sync
+ 
+ .PHONY: info
+@@ -344,8 +342,7 @@
+ 		sed '$$ s/.$$//' >> apparmor-data.c
+ 	@echo "};" >> apparmor-data.c
+ 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+-	@echo "CC $<"
+-	@$(CC) -c apparmor-data.c -o apparmor-data.o
++	$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+ #
+@@ -360,12 +357,10 @@
+ perf.o: perf.c perf-event.c
+ 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+@@ -405,10 +400,10 @@
+ 	STRESS_NG=./stress-ng debian/tests/fast-test-all
+ 
+ .PHONY: install
+-install: stress-ng stress-ng.1.gz
++install: stress-ng
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp stress-ng ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++	cp stress-ng.1 ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+ 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
new file mode 100644
index 000000000000..2fbf8ab09005
--- /dev/null
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Stress-ng will stress test a computer system in various selectable ways.
+		It was designed to exercise various physical subsystems of a computer
+		as well as the various operating system kernel interfaces.
+		It features 200 stress tests, 70 CPU specific stress tests,
+		that exercise floating point, integer, bit manipulation and control flow
+		and over 20 virtual memory stress tests.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.33.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.33.ebuild
new file mode 100644
index 000000000000..728b7fb84338
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.33.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	net-misc/lksctp-tools
+	sys-apps/attr
+	sys-apps/keyutils
+	sys-libs/libapparmor
+	sys-libs/libcap
+	sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
new file mode 100644
index 000000000000..bf855dd0ec28
--- /dev/null
+++ b/app-benchmarks/stress/Manifest
@@ -0,0 +1,3 @@
+DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
+EBUILD stress-1.0.4-r1.ebuild 542 BLAKE2B 867de86ee7552edb9f50a7336ee3b38d0fad5c2e054107f65b71369b75fa13a7794f54d32349211e2c029eb9e03a89edba8ff0f11781870f23b119f7bbb9f48c SHA512 cb552d5cd8c52dc75fbfd365c17d784fe6d8b8318c077e4c9d909431b226f8beb2ad40ad62d0e86eb0104acf088098e342afb39cd980fd699cc8ba692056f1b7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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..7e8b16733fb7
--- /dev/null
+++ b/app-benchmarks/stress/stress-1.0.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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="https://people.seas.harvard.edu/~apw/stress"
+SRC_URI="https://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-1.0.10 b/app-benchmarks/sysbench-1.0.10
deleted file mode 100644
index e7ba1b254f7f..000000000000
--- a/app-benchmarks/sysbench-1.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= app-editors/vim-core dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
-DESCRIPTION=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.10.tar.gz -> sysbench-1.0.10.tar.gz
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=c7fb8543cea5e2966d7a12862fec839f
diff --git a/app-benchmarks/sysbench-1.0.15 b/app-benchmarks/sysbench-1.0.15
deleted file mode 100644
index 8bb527c6fc80..000000000000
--- a/app-benchmarks/sysbench-1.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4e28de46a98ce64ec8c334d97efba211
diff --git a/app-benchmarks/sysbench-9999 b/app-benchmarks/sysbench-9999
deleted file mode 100644
index a2568f6210ca..000000000000
--- a/app-benchmarks/sysbench-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare test unpack
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= app-editors/vim-core dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=ee34b89c506cc5e172027819b4de1edc
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
new file mode 100644
index 000000000000..18ad27d13851
--- /dev/null
+++ b/app-benchmarks/sysbench/Manifest
@@ -0,0 +1,6 @@
+DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
+DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
+EBUILD sysbench-1.0.10.ebuild 1253 BLAKE2B 0a1033e2f0008f1772ba9f2bf19b41c8df53d76c7ac6f3984daf774c46498fa8d7fc8ec28c5cb7a76c876e9ce656aa2dcaee559f49416cd6052062eb980544cc SHA512 5c8db4a79072da2d776b8045e67648570c4635d7435e53fbe18be022176694a342014b105f0a6f7996b49f7eeb8d947aee10813b49ed4aa53b526dbcf2c8249a
+EBUILD sysbench-1.0.15.ebuild 1149 BLAKE2B c0f991318d95baa7eb9da555f02440e0629bd89ab6dfd121c9e4989271f2bb1aab021ba171e87f0ca5b0e4c47957a2184a2e0dc27147bdbacd165ba614d7e4ad SHA512 bb8cf2a874cd0894c17c145f37321de3a45c69829d89b870a9bdd0e814459232306026af9ca2f220ef2a35ae66d0adc5990f538a19f4f79ab6f14281e6625981
+EBUILD sysbench-9999.ebuild 1077 BLAKE2B fb8c2b8e9ea170ea546b012e93ac7d263e88e3f530aa5fa85c3783775eff3dd722500147ea2818fe75a869c6fb8f16f99e573716f84afc92bcec2ccaac6c7798 SHA512 82046f5c6c88f905751442a51633c366b79465b9dc8adacf5f8a69d64a9df83e46fb8fb13085c1b76f6939e545a17fb798422f0217fd0462c642a138850ddd26
+MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/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.10.ebuild b/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
new file mode 100644
index 000000000000..d9ea6b09ba68
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	./autogen.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio aio)
+		$(use_with mysql mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	pax-mark m "${S}/src/${PN}"
+}
+
+src_test() {
+	emake check test
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
new file mode 100644
index 000000000000..58a949c87462
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED%/}"/usr/bin/${PN}
+}
diff --git a/app-benchmarks/sysbench/sysbench-9999.ebuild b/app-benchmarks/sysbench/sysbench-9999.ebuild
new file mode 100644
index 000000000000..6873945f546c
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 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:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# 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-0.4.2 b/app-benchmarks/tiobench-0.4.2
deleted file mode 100644
index e19967cb6f75..000000000000
--- a/app-benchmarks/tiobench-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Portable, robust, fully-threaded I/O benchmark program
-EAPI=6
-HOMEPAGE=https://github.com/mkuoppal/tiobench
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/mkuoppal/tiobench/archive/v0.4.2.tar.gz -> tiobench-0.4.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3400c4263f990c6e3719486b6a2eba11
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
new file mode 100644
index 000000000000..58ac1d01a05b
--- /dev/null
+++ b/app-benchmarks/tiobench/Manifest
@@ -0,0 +1,5 @@
+AUX tiobench-0.4.2-fix-perl-shebang.patch 1530 BLAKE2B c6800722dbd5edadd1ed37142d153639c73ddc2fdba50782ddf7dda1e658108a1826411b3e3ef3e49014d8e01237969bc50e0e59725536fccb3a7866699637ed SHA512 baba72c336006d3f2c69768720bb076b8f2750d72252cf19b74e4f5b9e0140e74de1edfc63da674f26d24d675f4e00201be61f98cd7fd164b1c13cfab49f3b38
+AUX tiobench-0.4.2-gcc5.patch 1309 BLAKE2B 7c432efee2225afe0f2e35688d19b735b7cff6f21605570b70be446d1e92d6feee477403a37d83351cacec56310a2e0bdc8dc08153b4dc0631b363419a3cf784 SHA512 f462c4eab88aa707a8383fec9e6e8c15f72237ef3d67f8481d2d6abef855f68b5a4281a7a1f1668b968df988e9ac283e4aabb2dfaf68b33cd3430a90e59f97a7
+DIST tiobench-0.4.2.tar.gz 32182 BLAKE2B f3c0f78daac0dc8c38de2049f8edfce7443fb43a6aacf31a0b5c12abf80ec0ae4c03b1bd25f954db261027c16dfb73fdffe970a730a853caf25763579c2e7170 SHA512 02e82d86ee889a366c1a00d4fb49f63d926e44ba6e2f297212479a5c13abe008b62c12d44483de7e971b5ebf875d5c07847f1d69dd11b2e87a050e27d8f9f09f
+EBUILD tiobench-0.4.2.ebuild 891 BLAKE2B b0d207e71b29c5c5c44f38b1921f5a990c3ef47991172e48327bdf36f3d67937474de727b362c00dc2bf88b6b1ffff5dfd0bfd05fcde57deeb5168a53a9bb5e5 SHA512 2749131275caa448748c0a3e9a7741ad5b7aa6d39915f526c0863203a67074fc4cec8422ecbe3167836fa292d218119cb837585c66b6e6b876e084fcc5a9aa0d
+MISC metadata.xml 382 BLAKE2B a8a9d1771e25d37b2d0d4b5264517e622baa324d2891c7f31a254d4a2d05b95c03761610525a979dc9d0e3488d96e64fbcbc651dc98f82fff18077fd49a33cc1 SHA512 ab6ce68c948d173a0241be91da8af3f3690510b521307efe0752f6ca9db17ef573f2980bc16fe904c26123cf2802035de97e58f39d1f60d19ed827d53d06fb34
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.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-2.5.0.9 b/app-benchmarks/volanomark-2.5.0.9
deleted file mode 100644
index ee4dbd19557e..000000000000
--- a/app-benchmarks/volanomark-2.5.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=virtual/jre >=sys-apps/sed-4 sys-apps/net-tools
-DESCRIPTION=Java server benchmark utility
-EAPI=0
-HOMEPAGE=http://www.volano.com/benchmarks.html
-KEYWORDS=x86 amd64
-LICENSE=Volano
-RDEPEND=virtual/jre
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://www.volano.com/pub/vmark2_5_0_9.class
-_md5_=c460c5bd0dc97603a5a00f6a33131997
diff --git a/app-benchmarks/volanomark/Manifest b/app-benchmarks/volanomark/Manifest
new file mode 100644
index 000000000000..098905b40050
--- /dev/null
+++ b/app-benchmarks/volanomark/Manifest
@@ -0,0 +1,3 @@
+DIST vmark2_5_0_9.class 1591590 BLAKE2B c67b18969f5ceb42f6d68d37260e43d3d30508956ddb2091a59852d5d151606ca3f30205cde397f3212ba5dfd4e4d109802ddcf0cdc6c851b20d07ab6cf5f5be SHA512 002953f780bfb2fa0f9663f6ee2228abbf277e98ebdc69dce3c0e9f03147e0bdb80ae381daf29838790c13aefc83406b61428871a890dcae2396a5c59fcee8bf
+EBUILD volanomark-2.5.0.9.ebuild 1771 BLAKE2B 22fcdcae01354588a8284f4a0afda3a909b5c12246136fdd3516922459b576f746317164caf8815b39bd22d96105d27c5fca0c713fc6126fab627d802c4bb601 SHA512 2e83a2adbb8da635e60eb97bb7fa1443deaa6fe29ac85db7ba63dc4bded121c9b610abeee1b309ea1d74e43581b34b3e464328f3b3ce458a49b4fff22cf58491
+MISC metadata.xml 221 BLAKE2B fddb0708e4743cdfe978ab6d0b49a8fc3213b1d7830a4c85ff6a2f4dac146729798ee797e9c35ac311982199a48cdf9a51c47a3bc566c23715ebe9735f98d9e8 SHA512 239603806c8f5664d980a58bed0512b05b581342df90ed690086c86db2290edbb38183fe2cc1805b4245f9e87763c86c6f945022ac9704f8f9214dd73c5d2e07
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..caf8ee111386
--- /dev/null
+++ b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+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-3.1.2 b/app-benchmarks/wrk-3.1.2
deleted file mode 100644
index 8d7029fea4b0..000000000000
--- a/app-benchmarks/wrk-3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=A modern HTTP benchmarking tool
-EAPI=5
-HOMEPAGE=https://github.com/wg/wrk
-IUSE=libressl
-KEYWORDS=x86 amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/wg/wrk/archive/3.1.2.tar.gz -> wrk-3.1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14e60bbe8cf4287ec0f0f81f2d21fe13
diff --git a/app-benchmarks/wrk-4.0.2 b/app-benchmarks/wrk-4.0.2
deleted file mode 100644
index 31258b0f7766..000000000000
--- a/app-benchmarks/wrk-4.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=A modern HTTP benchmarking tool
-EAPI=5
-HOMEPAGE=https://github.com/wg/wrk
-IUSE=libressl
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/wg/wrk/archive/4.0.2.tar.gz -> wrk-4.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96ff9bee96e5e4a46b15a199b83d0f30
diff --git a/app-benchmarks/wrk-4.1.0 b/app-benchmarks/wrk-4.1.0
deleted file mode 100644
index e517617c2b9e..000000000000
--- a/app-benchmarks/wrk-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/luajit-2.0.2 dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=A modern HTTP benchmarking tool
-EAPI=5
-HOMEPAGE=https://github.com/wg/wrk
-IUSE=libressl
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/luajit-2.0.2 dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/wg/wrk/archive/4.1.0.tar.gz -> wrk-4.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddeabd346a58edcf59b60ba1f8bae59c
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
new file mode 100644
index 000000000000..782b8dbf86c9
--- /dev/null
+++ b/app-benchmarks/wrk/Manifest
@@ -0,0 +1,9 @@
+AUX wrk-3.1.1-makefile.patch 1338 BLAKE2B 467634f4bc0686f81029875ff7abf061298cabe40fc54c6526b5f8dcfda8da7554c7605e0225e8decd8e5cbf5a63745f7aca6b3b3e035124a85360494c3c7845 SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643
+AUX wrk-4.1.0-makefile.patch 868 BLAKE2B 2d59e348d7a40badbb93f015b1aabacca4b9cf25783bac59f678e6a7f09f5f8031fff2e32cfe39a16df3159513514aa7d84eb713f6c568e4422bb67a0d7ac4bd SHA512 fae396ded1bc78fb59f16b92b81ab6fc366faaaee3367765de629d6ebfd341c1548514f8956b0d75aad766f5fbb131c7986d776d3cb3e6fdbceab07695d03171
+DIST wrk-3.1.2.tar.gz 902868 BLAKE2B 1b979a7b72c41d37ec63759c76770a74ca8cf618bf2e84b30556fa7db47b3cbe4957924a5ad90594580d4fed5194201d6205b04c660195466c6d6fb369604571 SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15
+DIST wrk-4.0.2.tar.gz 6146798 BLAKE2B 62188872a370d4ef3a3ffcf6f0568ca1b003473a1333b51d2b79fc3ce793c39ba5958d95c877fc0382751e89b687c8ee7f20b376c9b2fe3826afc3161aa0ac8e SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea
+DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
+EBUILD wrk-3.1.2.ebuild 749 BLAKE2B a7c575317dd0df7a3b3ccb010d9ad399b96e59c35e485888c8f134a0ca8898ec113199ccca4defaf77521d5ec41b53027bdbb07e7db04d5d8c0df51f1c79b52b SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432
+EBUILD wrk-4.0.2.ebuild 693 BLAKE2B 65b7d0c203adf4fb345c19a0e822fcb32f36b2ac187468620decfa1eae188a921002433d1be909b9f90b4fb68103e7596594d62c94aaa162d12fa8f2bafdbacd SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95
+EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
+MISC metadata.xml 718 BLAKE2B 0bea8e46c5ea180b770e62fca780e09e60d4f174c8d28470c4116027cddc54807d89cace134d8569a07ba10c6fda357b1bffb6a010808aab443f1dba1ce95a1f SHA512 8d1b5953eecc786c73122b1267ca72b57367b00452171db8224536dcd21d2841eee752e0b821530daca0443a1abe6ad860e99dad7127198f17cd32671b3b9e3e
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/files/wrk-4.1.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch
new file mode 100644
index 000000000000..6f091accca56
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch
@@ -0,0 +1,31 @@
+--- Makefile.orig	2018-01-21 01:00:58.000000000 -0500
++++ Makefile	2018-02-15 22:03:01.565862308 -0500
+@@ -1,4 +1,4 @@
+-CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
++CFLAGS  += -std=c99 -Wall -D_REENTRANT
+ LIBS    := -lpthread -lm -lssl -lcrypto
+ 
+ TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+@@ -30,20 +30,8 @@
+ CFLAGS  += -I$(ODIR)/include
+ LDFLAGS += -L$(ODIR)/lib
+ 
+-ifneq ($(WITH_LUAJIT),)
+-	CFLAGS  += -I$(WITH_LUAJIT)/include
+-	LDFLAGS += -L$(WITH_LUAJIT)/lib
+-else
+-	CFLAGS  += -I$(ODIR)/include/luajit-2.1
+-	DEPS    += $(ODIR)/lib/libluajit-5.1.a
+-endif
+-
+-ifneq ($(WITH_OPENSSL),)
+-	CFLAGS  += -I$(WITH_OPENSSL)/include
+-	LDFLAGS += -L$(WITH_OPENSSL)/lib
+-else
+-	DEPS += $(ODIR)/lib/libssl.a
+-endif
++CFLAGS  += $(shell pkg-config openssl luajit --cflags)
++LDFLAGS += $(shell pkg-config openssl luajit --libs)
+ 
+ all: $(BIN)
+ 
diff --git a/app-benchmarks/wrk/metadata.xml b/app-benchmarks/wrk/metadata.xml
new file mode 100644
index 000000000000..991df185e6e9
--- /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
+}
diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild
new file mode 100644
index 000000000000..990d52d0c66d
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 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_compile() {
+	tc-export CC
+	emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}
diff --git a/app-benchmarks/wrk/wrk-4.1.0.ebuild b/app-benchmarks/wrk/wrk-4.1.0.ebuild
new file mode 100644
index 000000000000..397a84d29580
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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
+	dev-lang/lua:0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -rf deps/ || die "failed to remove bundled dependencies"
+	epatch "${FILESDIR}/${PN}-4.1.0-makefile.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-benchmarks
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)