gentoo resync : 04.05.2021

16 files changed, 329 insertions, 75 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 46a657486f8f..71f74c8f903d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 1fee5cd2b08f..f52ea017e4f5 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,9 +1,13 @@
 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
+AUX bonnie++-2.00a-gcc11.patch 5975 BLAKE2B ca83a0e7815641f67926ed49b7e80a0eb4819ee7988213f472e8d441c70a45169725614ac73b0b7225f017444d34e2066168186809a1aa8aebfb3d83dc8423e6 SHA512 86b681fd1420633e50b75a200def5a6696216761064f642a47aad648b7ae932d8debcbf0f499e4f66c122a462a55a18bebede548867dd005c358708e6501d5f4
+AUX bonnie++-2.00a-makefile.patch 1680 BLAKE2B 9fcf5496573df14ad37a73426b4e05ce6348ec4304d529d03c2e12ff98bd643ed0121774a7e4e28e4f9d6a233d7d6df2d6ba59c1a3843ef7e10a7976d60a4c80 SHA512 b03c747b93dcbf1bd405052c1e5c73d1f9f35b59f053fd106f4ffddfed89ea7579b60201f007c174f81e20fa4ee316ce2a0ae4e529ceb31c8143b9d7893cb44b
 DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
 DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
 DIST bonnie++-1.98.tgz 100339 BLAKE2B 2a75cbeb881fd12727b5edf4e67789e64bd624b1885cdaf83fe3fc920fb2346e98faea2d9ce5da6fac8a84318a9cbda013afa2c9809892b23d3cf85c5a70982b SHA512 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
+DIST bonnie++-2.00a.tgz 100502 BLAKE2B 8bf9105dbbb1137485d8f24d4b911ca6787d09e3926181b460c18ceb52aea11ddff8f8edfefd1b2577fb1b59e658f4835cc865755faf739389f78fa855d13815 SHA512 1776f8406ccd0341f13bd952830f063e7df8fc2bd6d5c837de875dd5f817e29982b2a6358049221bffcae8faa7489560d2a1af46d79d8eb221d515d797236bdc
 EBUILD bonnie++-1.97.2.ebuild 951 BLAKE2B 43567c5542dcee95e2db0d85b2489de1ec616d37f1a846da79617b9b93507d6926e35755e82b1730f4e3eb4c4fba4e025279082bd30ee85992ba93906d9d8d03 SHA512 3d627625c700fec0c5ff3582dd7d080e0c900c7fe60859970e12330526416604c00cb933722a2386ae84a3e8e252e545afff6f7432d71fa9678fbde37986ccfc
 EBUILD bonnie++-1.97.3.ebuild 950 BLAKE2B 7c53c91c578a093ff0af144521520b6733003b4b6d9638e14c4f8a6950eae01e8fe1dc0028e4dff0bfdf9fdfb48e5f6aebd56c7db8a18af5ed3463d11becfb3e SHA512 00435788b509443f193d51fa443127f2d2614cb79cc02fab13c6f4979b0fd6f67d25df525ab3a5fc0842a60c625b48ce313655b7b5bd72ad03bb316ff631d697
 EBUILD bonnie++-1.98.ebuild 954 BLAKE2B 6e526aa665af274640f705b2423dd5d22742a9a0b81aef5b824960bc2ff377886aaca8ae80ea9788247a5d6e4b76b3f7755d3da8c3bd8e499a83cdfe16a30743 SHA512 438619d2734cbf6ce88d7a380ed94b68036485871a9ea8898134e248e2877e0833ae11db209cfb6bd2bcc4c9efdcc54670c66bd738678a6274f42cff3735d280
+EBUILD bonnie++-2.00a.ebuild 931 BLAKE2B b52dc5a4cd3bdb3f3f2fa138d508d5737e6506cc2cf57f1138f7d97ff85534deec3b984e56c8a4c67de33662b61155f510c3f4bf83088434832d52836d25573f SHA512 b854f733c62009e8b302ddc4303706d2e105c8cf9f36d1352004e80ae7717c2f7869a44c9aa4237b8cdd5c2cd1d8c25ffc3ccc415d26e43965618d4bd53ce30d
 MISC metadata.xml 610 BLAKE2B f9248e7f0ed78f7b1beffc4fcf133e76b09a7140bfa1b6d4aa42278181362223f272d3b6444075b51cc4f553fdad7ed9d092c6edca604475bffb890a278d6e98 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc
diff --git a/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild b/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
new file mode 100644
index 000000000000..f78476d70b64
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="https://www.coker.com.au/bonnie++/"
+SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.97-zcav-array-indexing-fix.patch" #309319
+	"${FILESDIR}/${PN}-2.00a-gcc11.patch" #768402
+	"${FILESDIR}/${PN}-2.00a-makefile.patch" #426788
+)
+
+DOCS=( "credits.txt" "README.txt" "README-2.00" "debian/changelog" )
+HTML_DOCS=( "readme.html" )
+
+src_prepare() {
+	default
+
+	# Fix path in manpage #431684
+	sed -e "/readme.html/s/bonnie++/${PF}\/html/" -i bonnie++.8 || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-stripping
+		$(usex debug "--enable-debug" "")
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch b/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch
new file mode 100644
index 000000000000..3bf224f34b5c
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch
@@ -0,0 +1,177 @@
+--- a/bon_csv2html.cpp
++++ b/bon_csv2html.cpp
+@@ -10,7 +10,7 @@
+ using namespace std;
+ typedef vector<PCCHAR> STR_VEC;
+ 
+-vector<STR_VEC> data;
++vector<STR_VEC> stddata;
+ typedef PCCHAR * PPCCHAR;
+ PPCCHAR * props;
+ 
+@@ -87,8 +87,8 @@
+     read_in(buf);
+   }
+ 
+-  props = new PPCCHAR[data.size()];
+-  for(i = 0; i < data.size(); i++)
++  props = new PPCCHAR[stddata.size()];
++  for(i = 0; i < stddata.size(); i++)
+   {
+     props[i] = new PCCHAR[MAX_ITEMS];
+     props[i][0] = NULL;
+@@ -109,7 +109,7 @@
+   }
+   calc_vals();
+   int mid_width = header();
+-  for(i = 0; i < data.size(); i++)
++  for(i = 0; i < stddata.size(); i++)
+   {
+ // First print the average speed line
+     printf("<tr>");
+@@ -171,23 +171,23 @@
+ 
+ void calc_vals()
+ {
+-  ITEM *arr = new ITEM[data.size()];
++  ITEM *arr = new ITEM[stddata.size()];
+   for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++)
+   {
+     switch(vals[column_ind])
+     {
+     case eNoCols:
+     {
+-      for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++      for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+       {
+         if(column_ind == COL_CONCURRENCY)
+         {
+-          if(data[row_ind][column_ind] && strcmp("1", data[row_ind][column_ind]))
++          if(stddata[row_ind][column_ind] && strcmp("1", stddata[row_ind][column_ind]))
+             col_used[column_ind] = true;
+         }
+         else
+         {
+-          if(data[row_ind][column_ind] && strlen(data[row_ind][column_ind]))
++          if(stddata[row_ind][column_ind] && strlen(stddata[row_ind][column_ind]))
+             col_used[column_ind] = true;
+         }
+       }
+@@ -195,22 +195,22 @@
+     break;
+     case eCPU:
+     {
+-      for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++      for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+       {
+         double work, cpu;
+         arr[row_ind].val = 0.0;
+-        if(data[row_ind].size() > column_ind
+-         && sscanf(data[row_ind][column_ind - 1], "%lf", &work) == 1
+-         && sscanf(data[row_ind][column_ind], "%lf", &cpu) == 1)
++        if(stddata[row_ind].size() > column_ind
++         && sscanf(stddata[row_ind][column_ind - 1], "%lf", &work) == 1
++         && sscanf(stddata[row_ind][column_ind], "%lf", &cpu) == 1)
+         {
+           arr[row_ind].val = cpu / work;
+         }
+         arr[row_ind].pos = row_ind;
+       }
+-      qsort(arr, data.size(), sizeof(ITEM), compar);
++      qsort(arr, stddata.size(), sizeof(ITEM), compar);
+       int col_count = -1;
+       double min_col = -1.0, max_col = -1.0;
+-      for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++      for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+       {
+         // if item is different from previous or if the first row
+         // (sort_ind == 0) then increment col count
+@@ -239,7 +239,7 @@
+           min_col /= mult;
+         }
+         double range_col = max_col - min_col;
+-        for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++        for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+         {
+           if(arr[sort_ind].col_ind > -1)
+           {
+@@ -250,7 +250,7 @@
+       }
+       else
+       {
+-        for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++        for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+         {
+           if(vals[column_ind] == eLatency)
+           {
+@@ -263,25 +263,25 @@
+     case eSpeed:
+     case eLatency:
+     {
+-      for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++      for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+       {
+         arr[row_ind].val = 0.0;
+-        if(data[row_ind].size() <= column_ind
+-         || sscanf(data[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
++        if(stddata[row_ind].size() <= column_ind
++         || sscanf(stddata[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
+           arr[row_ind].val = 0.0;
+         if(vals[column_ind] == eLatency && arr[row_ind].val != 0.0)
+         {
+-          if(strstr(data[row_ind][column_ind], "ms"))
++          if(strstr(stddata[row_ind][column_ind], "ms"))
+             arr[row_ind].val *= 1000.0;
+-          else if(!strstr(data[row_ind][column_ind], "us"))
++          else if(!strstr(stddata[row_ind][column_ind], "us"))
+             arr[row_ind].val *= 1000000.0; // is !us && !ms then secs!
+         }
+         arr[row_ind].pos = row_ind;
+       }
+-      qsort(arr, data.size(), sizeof(ITEM), compar);
++      qsort(arr, stddata.size(), sizeof(ITEM), compar);
+       int col_count = -1;
+       double min_col = -1.0, max_col = -1.0;
+-      for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++      for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+       {
+         // if item is different from previous or if the first row
+         // (sort_ind == 0) then increment col count
+@@ -310,7 +310,7 @@
+           min_col /= mult;
+         }
+         double range_col = max_col - min_col;
+-        for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++        for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+         {
+           if(arr[sort_ind].col_ind > -1)
+           {
+@@ -332,7 +332,7 @@
+       }
+       else
+       {
+-        for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++        for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+         {
+           if(vals[column_ind] == eLatency)
+           {
+@@ -481,16 +481,16 @@
+     free((void *)arr[0]);
+     return;
+   }
+-  data.push_back(arr);
++  stddata.push_back(arr);
+ }
+ 
+ void print_item(int num, int item, CPCCHAR extra)
+ {
+   PCCHAR line_data;
+   char buf[1024];
+-  if(int(data[num].size()) > item)
++  if(int(stddata[num].size()) > item)
+   {
+-    line_data = data[num][item];
++    line_data = stddata[num][item];
+     switch(item)
+     {
+     case COL_PUT_BLOCK:
diff --git a/app-benchmarks/bonnie++/files/bonnie++-2.00a-makefile.patch b/app-benchmarks/bonnie++/files/bonnie++-2.00a-makefile.patch
new file mode 100644
index 000000000000..2fd48e9ff85a
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-2.00a-makefile.patch
@@ -0,0 +1,47 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,9 +9,9 @@
+ 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@
+@@ -43,7 +43,7 @@
+ 	$(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)
+ 
+ getc_putc_helper: $(GETCHOBJS)
+-	$(CXX) -o getc_putc_helper $(GETCHOBJS)
++	$(CXX) $(LDFLAGS) -o getc_putc_helper $(GETCHOBJS)
+ 
+ bon_csv2html: bon_csv2html.o
+ 	$(LINK) bon_csv2html.o -o bon_csv2html
+@@ -52,15 +52,15 @@
+ 	$(LINK) generate_randfile.o -o generate_randfile
+ 
+ install-bin: $(EXE) $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
+-	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
+-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
++	mkdir -p $(DESTDIR)/$(eprefix)/bin $(DESTDIR)/$(eprefix)/sbin
++	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)/$(eprefix)/sbin
++	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)/$(eprefix)/bin
++	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)/$(eprefix)/bin
+ 
+ install: install-bin
+-	mkdir -p @mandir@/man1 @mandir@/man8
+-	@INSTALL_DATA@ $(MAN1) @mandir@/man1
+-	@INSTALL_DATA@ $(MAN8) @mandir@/man8
++	mkdir -p $(DESTDIR)/@mandir@/man1 $(DESTDIR)/@mandir@/man8
++	@INSTALL_DATA@ $(MAN1) $(DESTDIR)/@mandir@/man1
++	@INSTALL_DATA@ $(MAN8) $(DESTDIR)/@mandir@/man8
+ 
+ %.o: %.cpp
+ 	$(CXX) -c $<
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 37a4e77c8e17..e7bdbaaf1c88 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,9 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.4.0-Linux.tar.gz 93156197 BLAKE2B 5d41cbac86ab9a2f9df2a401c6081da3b4e4f4d405ae6913371eae4dbe3135dc781220fc0d43fea58bc4dbde6f1383a4a8cede82b16af813b8cd401d72b2cbcd SHA512 85f1ac0a9618ef08139f9a08051748b1c23827cf770c1e2abd7829a93d2f656b6dbb00fe194b92a15b6f94694142f2df62ed5113b50a6bec4777988e322bd2f3
+DIST Geekbench-5.4.1-Linux.tar.gz 93161586 BLAKE2B 3d7c1915b6eeb83f5e7c3f2ab2e3d863d0e1e9252d76a612d58f2549e0c2ef664d1ebade93d2eaca336e78d54641768d1cfc9d9d736eb00c7457d312af565ab2 SHA512 b1a6634c9173254aa46111b06367dbc13aeb0813ba53b770a1dc7757140c1821c03dee566f40c0378d79f8658ff4c06bfb8170be631c2d95c2e367d239554492
 EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
 EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
 EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
 EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
 EBUILD geekbench-5.4.0.ebuild 1030 BLAKE2B 4d6e7cdc1b6df833af68ac9592fcc96aea1a8a6c7612add61df7c8f61a967c6c9d4992fa8b8e279dcbbd63dccfd9082aac415f4be4650767e04042985ddee51f SHA512 aa160280a524a86e8c78504255cc984a2ba18ca13ec0df019728f54841d18108844bea3e946091c2de3c30ac7f1c01659ac56c56cd7cc4aca77a6e01ae72ca2f
+EBUILD geekbench-5.4.1.ebuild 1031 BLAKE2B 25532425376ee29508a8aa262c0b2f914226a5949a8e47bd03b937c3464c1c034dc28d9e7c7cdc3bf100799f9f402d78209f5ffa80bccb23cbb229c6a13c578f SHA512 0999f6362bcae62a6e8d50ac7a8427f69717a5ac7ed5d85b23c70854af4dcfb24ed92656f0483b919e9303a31afa752396b7c9c8779048241d6f31e49429affa
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.4.1.ebuild b/app-benchmarks/geekbench/geekbench-5.4.1.ebuild
new file mode 100644
index 000000000000..257bad69c379
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-5.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+LICENSE="geekbench"
+SLOT="5"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="
+	opt/geekbench5/geekbench5
+	opt/geekbench5/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/geekbench5
+	doexe geekbench5 geekbench_x86_64
+
+	insinto /opt/geekbench5
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
+}
+
+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 "geekbench5 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
index 03744c3167c7..c870a0f94a95 100644
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@@ -1,5 +1,4 @@
-AUX httperf-0.9.1_p20181111-libressl.patch 1907 BLAKE2B 7a4c3d3b11d41c994dc1b098a03511dab22cf7ca649047d4af4fac4a8333fbad83f048352fb21f233d89d2c389592821680bbc223dc188cd3ae3ceb8ef9adad5 SHA512 d4893c719b16271fa09b1fe19f5a3be13b44578d60d64cb9ab62d1c49eee47720297a501e19dc4521025d117e1b2043dae20bf6c752a16c0b061de828dfdb679
 DIST httperf-0.9.1_p20181111.tar.gz 107070 BLAKE2B 044f45b0d4b17bc714a718835be1e713092fe7f6d6573df237ba87791e5783e8f60d1218f29e01473ccdeec3b461d3ab7d35d68a1037ee693865a37fd78b7ea5 SHA512 34cc92f3de6d1dadc3fedc5b5f617538b76787496f9dd28b7800866abaf96c7410765d4bb0989000910bf2b51433292c0a7009fe64ba4fd29889ce96cc4d10fc
-EBUILD httperf-0.9.1_p20181111-r1.ebuild 921 BLAKE2B fe145b72aecb61b52c3e7fb3ce098daead417280d127e02ef0829083fad2c6c04cdc940752645a01380e6d9f28483bb915f4992a5effa4087ee547c224899c25 SHA512 b09f58c353e11b84be8a54bdd680cf7a82cfa26615b1ea2fd973d4497f5cf728d185c2b66c06432bca44df833e3f508ee45627633d02afceb06cc22f85e894c5
-EBUILD httperf-0.9.1_p20181111.ebuild 872 BLAKE2B 6c782cb5e5c5ed0cafb8c9143639025397e4f06cbddf136eb8d3c759585b2a0ce4328c73f358a9e29b90d2f1c38c9099fd500ed1d7f3fd368c0b16e99cb035a7 SHA512 30ebefb5b74f7d1e668f2c224e15f1385227914bcf1534ff9777f5324c22235999d051a7562b960dcbcb632dc9a2f3b5965dda9aeb713a7b507641ccaacef3b9
+EBUILD httperf-0.9.1_p20181111-r1.ebuild 814 BLAKE2B a1bc810e71a936aeec9c43df3bed440a86cb7f0c21aca8678e9b2b1ca7d997545404d6e7b27ec4e46e2c15a1bc1ea61dba0434f3b2007a00f05f9e6c01da7785 SHA512 61d16995de2d5f6b98f46ea2baa8fdf89e397e45728e33c728b2f8b5f43c1bf8bc530219e1a8ede8a3e56cba2f7b6a84beacb4b478968ed1b6404b0f5cf18278
+EBUILD httperf-0.9.1_p20181111.ebuild 812 BLAKE2B c95b40220389b9793d6ffeecc0e629463752404c2872e00e6d698f4a0df9ded2bc9cc79bff3f39a7acde61ae9dde46f1b3cb126a555d245f2a6200e6202d9fb4 SHA512 080f57337dfff2b470d2f6944c1e857ea0532178cad25242ab9de3703133c35bc50dd895a8aeb9c172c65df1ada94dafc7b2d4ce91f6816dd8648cdcb9b06286
 MISC metadata.xml 1226 BLAKE2B b54552bb32937709b97ececa4899fd545254144c19dd639248b813f4ed5d98436d786def37b326d84b30c7aba7a6dfcbf48919cfe5368fd66236da58bd52817c SHA512 6035419ee87b279de13bca869a8407bb1dcf3198d49670219f708f57757c61b62c3ac41c31a41b4972829388e71b69432b58e61ec63882f3d6b8ffabb080af58
diff --git a/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch b/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch
deleted file mode 100644
index e1c0c90fac07..000000000000
--- a/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1c4277eb9288c719b009aacb4bd71ca543f51cbd Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 3 Jun 2019 16:18:21 +0300
-Subject: [PATCH] Use correct ifdefs for checking TLS 1.3
-
-TLS 1.3 is not ready yet in LibreSSL. Also there is a theoretical
-possibility of OpenSSL >=1.1.1 built without TLS 1.3 support
-
-Upstream-Status: Submitted
-[https://github.com/httperf/httperf/pull/66]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/httperf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/httperf.c b/src/httperf.c
-index af6f568..5dbba07 100755
---- a/src/httperf.c
-+++ b/src/httperf.c
-@@ -687,7 +687,7 @@ main(int argc, char **argv)
-                                 param.ssl_protocol = 5;
- 			    else if (strcasecmp (optarg, "TLSv1.2") == 0 || strcasecmp (optarg, "TLSv1_2") == 0)
-                                 param.ssl_protocol = 6;
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#ifdef TLS1_3_VERSION
-                             else if (strcasecmp (optarg, "TLSv1.3") == 0 || strcasecmp (optarg, "TLSv1_3") == 0)
-                                 param.ssl_protocol = 7;
- #endif
-@@ -1104,7 +1104,7 @@ main(int argc, char **argv)
- 		    SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1); break;
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#ifdef TLS1_3_VERSION
-                     /* 7/TLSv1.3 */
- 		    case 7:
-                     ssl_ctx = SSL_CTX_new (TLS_client_method ());
-@@ -1329,7 +1329,7 @@ main(int argc, char **argv)
-             case 4: printf (" --ssl-protocol=TLSv1.0"); break;
- 	    case 5: printf (" --ssl-protocol=TLSv1.1"); break;
- 	    case 6: printf (" --ssl-protocol=TLSv1.2"); break;
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#ifdef TLS1_3_VERSION
-             case 7: printf (" --ssl-protocol=TLSv1.3"); break;
- #endif
-         }
--- 
-2.21.0
-
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
index d340a5ce8237..082a178bf83d 100644
--- a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,19 +13,16 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
-IUSE="debug idleconn libressl"
+IUSE="debug idleconn"
 
 DEPEND="
 	idleconn? ( dev-libs/libevent:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild
index f3dc6dda6969..72306744e8d6 100644
--- a/app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,12 +13,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
-IUSE="debug idleconn libressl"
+IUSE="debug idleconn"
 
 DEPEND="
 	idleconn? ( dev-libs/libevent:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 9126a82f07e1..f88b2245edfc 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -2,7 +2,7 @@ AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cc
 DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
 DIST siege-4.0.8.tar.gz 525619 BLAKE2B 4c0b570810c4c1f3f13374aa1f33dc1624f989096280fd672a2c3deee7827099d790215e2583670fa58862df35b4db8998cf57c3c864354e8bd8aa8093c66724 SHA512 34239d761c1fff2a6048b59a98b64e87da065257ca4d62eb899f600573d920f5503bbdad8f5c5d31b4052c64857394c7899a9bda5384c00be8652ce4c98845ca
 DIST siege-4.0.9.tar.gz 525804 BLAKE2B d857df05f40a0ac26a8abdd54e7de374125dde4c114bd1ac3ddd9e9856a30d4fdfefd325980717e59b5876df99a87f971c5b3f91d6478f9638f1860557615169 SHA512 6208b7924162be4dd7ea8cdc297930d28e8a1cb125cf26e8707c2cb67efad741cd090c12081ea80837314d4b5703da152a97b0e8fbf4c64ff64c6714eb4b5fc7
-EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
-EBUILD siege-4.0.8.ebuild 1279 BLAKE2B 92839e839861534d87b0caa57019b523958036e0fe5e756bc6a006cf19015372981b37b036f8f39e87f420eec224fde6f86094171e57a9a80416dbc0166d23e2 SHA512 3dbbbca663341020e4fd12d7b56048f15322510ec1e19f98668fe67d4b8b834e62bcf63f0e429a15e9baed9d843c0302fa76cba286adc5aac43c0d43dac5c317
+EBUILD siege-4.0.7.ebuild 1219 BLAKE2B ef3398c1d2044de6ddebf345389c732fba86c30ff787ad6f1a69b6d4e419d133c8c55c384380f16a652d6aa81613397d6ac48cbbadd918ec1889634f43bb1263 SHA512 bdb584afed2f23c3074187c0ac5d014894b66bed326bdf87cc5aa92f4ab26e6adabc5329aaa2f8b5bbbefb3b501cd50c32f46babe2235bebf9395d3416504dcf
+EBUILD siege-4.0.8.ebuild 1219 BLAKE2B ef3398c1d2044de6ddebf345389c732fba86c30ff787ad6f1a69b6d4e419d133c8c55c384380f16a652d6aa81613397d6ac48cbbadd918ec1889634f43bb1263 SHA512 bdb584afed2f23c3074187c0ac5d014894b66bed326bdf87cc5aa92f4ab26e6adabc5329aaa2f8b5bbbefb3b501cd50c32f46babe2235bebf9395d3416504dcf
 EBUILD siege-4.0.9.ebuild 1222 BLAKE2B 124cc03e0c5ea1e8961601382899f53ef883fdd540582cf107302135de67ba5a380cc8360a05fad23406e045ad6276dd6b1d6fcda5451b8d2a469fbe61c8168d SHA512 0e1a7e8d1d197764e5cfbafe1c30040a4bd3cc1410513d1946985caeb42e7be21df5fe95a4a6fcd04b3f95f18e36c51ba01b4d4bba21fc382c28a64b7e93cd93
 MISC metadata.xml 855 BLAKE2B 4dfaca82343517227a9fe3f2507863665e5d966bead652ce7700a2a2aa86363750df02e6fb1dfa2ca86d781cca3cb02611325c6def60461692cb2213d5c78d65 SHA512 09a8da39fde59f4eb9e93d39c7e2dc3414e6bc24d0b4c24e7bcef5878f5987221ab7fc3e7285dbbf1be619ab1663a1aabd267ef00bfea9c4b3addd52473a0679
diff --git a/app-benchmarks/siege/siege-4.0.7.ebuild b/app-benchmarks/siege/siege-4.0.7.ebuild
index 2c6ff06e63f9..990995d6ca8d 100644
--- a/app-benchmarks/siege/siege-4.0.7.ebuild
+++ b/app-benchmarks/siege/siege-4.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-benchmarks/siege/siege-4.0.8.ebuild b/app-benchmarks/siege/siege-4.0.8.ebuild
index 294132c28c6b..990995d6ca8d 100644
--- a/app-benchmarks/siege/siege-4.0.8.ebuild
+++ b/app-benchmarks/siege/siege-4.0.8.ebuild
@@ -12,11 +12,10 @@ SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 7aa6219700ac..4462d188208a 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,4 +1,4 @@
 AUX wrk-4.1.0-r100-makefile.patch 1509 BLAKE2B d03fcc70c201777cc0f75e81e827ef941ac9a2128b05118ceae5256c481065ed21f1bf5290b05c304a03fe765b7576a91d882392d376ceed19d2d1fc89c9f894 SHA512 a4d035c7114a8876b10435936db30068ba7232516b5e21f9577832e7ffed28144b0f5864b25e9df72ced0937c6d687117cdee42234fcba2a1cfa20b9bd1e31c0
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-4.1.0-r100.ebuild 920 BLAKE2B 2169abb35f8a845533f93edfdc9d050693f73867c22e3f78a96084e80275cbd4b1b85d399ea33bf180b74874da641ed907da06aa97fa0936f86da05400e565e9 SHA512 6dcde60ccc94cc2c7199fa5cf7456a1692c1c69fbd503f2b7e2a735f45c87e6e1f384dc9310c346d6ad0aaa66947d527b4981a09ff41f0249c100aeb80dc7431
+EBUILD wrk-4.1.0-r100.ebuild 853 BLAKE2B a3654e82bf0ec7b89617585555d6e03bd8ec923ec02b17314aa565927a3ae26fcae83f87711b22efd3a677cfb5996c5e1c10740d481d8a8bbd80303dda315331 SHA512 0cc4e667cf0647d9d51db4278d40192949d6f73e2b4703f73d51b3d925c929adea2fea7ad866236d32a0110a3ab9c6cbb183334fd2353032b0fde7e44637aea1
 MISC metadata.xml 753 BLAKE2B 394af58d15030f33d953c4afae440cad777ba3e5fb4f95ec4a06cc6124929365bbcb2117734e7bb6e3d45cf9a42acee152a556f280fcf04244c0d8103e8f161f SHA512 5e262656536bd745faca708024430a5fc321dfea12ab61fdf74bae90df9b1d8237737db5a09afffdbfa278e29a9eb250292c2023263e4540f3fdd4cfe4984ade
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
index 065b55d6d59b..a72f75b15bd4 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
@@ -14,12 +14,10 @@ SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
-IUSE="libressl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	${LUA_DEPS}
 "