gentoo resync : 12.05.2022

3 files changed, 101 insertions, 14 deletions

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 49a83e869f78..e6ddc962de7d 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,4 +1,5 @@
+AUX edb-debugger-1.3.0-gcc12.patch 3374 BLAKE2B 6e75e6d940da2d54d20bfdd62dd26c7955ffcc00d00d84a1029b583b00bee69106e43a64ad5b9ab96a269b84f7a69e48c12d6acbfd0f4404b8d490660620c35f SHA512 9b0fb244ce7e80ca4810323d6198e273019b3255c40e198563da109e228f1329bf0b36560024607b6015bc1ba992e396151858cb1bed1fecc39d2dd688232e62
 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
-EBUILD edb-debugger-1.3.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
+EBUILD edb-debugger-1.3.0.ebuild 1175 BLAKE2B a1cdcee8c104480f9edbef70aa619cd3a1776e5a4c161cea7b6e069294f4a96da2fd753040b1943930ee49cb3ece37e5642b7fd58f188058b009147c24ffa54a SHA512 5a4afc4dbd8a317a5a8057da9b100ed71bcf216618299a2087bf4dc43aa48ce6b5ba8ca0d7c812d068a05aca2aa127f52017be0cdf09beb1881650d86a5e7057
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 275 BLAKE2B 382b1023fe29dd71c57d25b04115b5757d90933d0cc3eefed19ac110608bcc02c260308112523d142d342921a652eb8bb66395e10c37aeadaec13e26db64dc10 SHA512 187c55986315e59f9adfc9129c81243da596fc9827774e08c244d64301380303c682c55af8db1acc80d90f648b1b154dc5a8cbdcbba7a7475c7a90735da1ef44
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
index 21c906d48591..e550d9ad3f47 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,14 +8,14 @@ inherit cmake
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
 SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
-RDEPEND="
-	dev-libs/capstone:=
+RDEPEND="dev-libs/capstone:=
 	dev-libs/double-conversion
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -25,19 +25,17 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	graphviz? ( media-gfx/graphviz )
-"
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="dev-libs/boost
+	${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+)
 
 src_prepare() {
-	#Make the desktop's entries somewhat better
+	# Make the desktop's entries somewhat better
 	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
 	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
 
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
new file mode 100644
index 000000000000..df037193310f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
@@ -0,0 +1,88 @@
+https://github.com/eteran/edb-debugger/commit/da04c339559f82257ff54ea62b1d403ee98c1ba0
+https://bugs.gentoo.org/841839
+
+From da04c339559f82257ff54ea62b1d403ee98c1ba0 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 2 Apr 2022 22:36:50 +0000
+Subject: [PATCH] Gcc 12 includes fix (#815)
+
+* RegisterViewModelBase.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 20%] Building CXX object src/CMakeFiles/edb.dir/RegisterViewModelBase.cpp.o
+    In file included from edb-debugger/src/RegisterViewModelBase.cpp:18:
+    edb-debugger/include/RegisterViewModelBase.h:162:14: error:
+      'unique_ptr' in namespace 'std' does not name a template type
+      162 |         std::unique_ptr<CategoriesHolder> rootItem;
+          |              ^~~~~~~~~~
+    edb-debugger/include/RegisterViewModelBase.h:9:1: note:
+      'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+        8 | #include <deque>
+      +++ |+#include <memory>
+
+* State.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 21%] Building CXX object src/CMakeFiles/edb.dir/State.cpp.o
+    In file included from edb-debugger/src/State.cpp:19:
+    edb-debugger/include/State.h:93:14:
+      error: 'unique_ptr' in namespace 'std' does not name a template type
+       93 |         std::unique_ptr<IState> impl_;
+          |              ^~~~~~~~~~
+    edb-debugger/include/State.h:24:1:
+      note: 'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+       23 | #include "Types.h"
+      +++ |+#include <memory>
+       24 |
+
+* IState.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 69%] Building CXX object plugins/DebuggerCore/CMakeFiles/DebuggerCore.dir/unix/linux/arch/x86-generic/PlatformState.cpp.o
+    In file included from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.h:22,
+                     from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.cpp:19:
+    edb-debugger/include/IState.h:33:22:
+      error: 'unique_ptr' in namespace 'std' does not name a template type
+       33 |         virtual std::unique_ptr<IState> clone() const = 0;
+          |                      ^~~~~~~~~~
+    edb-debugger/include/IState.h:23:1:
+      note: 'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+       22 | #include "Register.h"
+      +++ |+#include <memory>
+       23 | #include "Types.h"
+--- a/include/IState.h
++++ b/include/IState.h
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #ifndef ISTATE_H_20110315_
+ #define ISTATE_H_20110315_
+ 
++#include <memory>
+ #include "Register.h"
+ #include "Types.h"
+ 
+--- a/include/RegisterViewModelBase.h
++++ b/include/RegisterViewModelBase.h
+@@ -6,6 +6,7 @@
+ #include "util/Integer.h"
+ #include <QAbstractItemModel>
+ #include <deque>
++#include <memory>
+ #include <vector>
+ 
+ Q_DECLARE_METATYPE(std::vector<NumberDisplayMode>)
+--- a/include/State.h
++++ b/include/State.h
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #ifndef STATE_H_20060715_
+ #define STATE_H_20060715_
+ 
++#include <memory>
+ #include "API.h"
+ #include "Types.h"
+