gentoo Easter resync : 12.04.2020

4 files changed, 51 insertions, 47 deletions

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 765925bd2a5c..be862215dcf9 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,6 @@
-AUX edb-debugger-1.0.0-climits.patch 607 BLAKE2B eb1a58c250308ca84a145f0a1333314437b9d6fb8636db8a5f6f46c6627d464f566a1d629391d5475e62ace85ffb94c387efe084301744a3a7b43ff70a25c851 SHA512 812f33bb0ed0ee83a57179701bdf8e25d70e9de73aa6f6d5c36674e4f16a124926940ce584f08537b4553749996e7c7d346bc42a8803a51ba3bbbfc968262ecf
-AUX edb-debugger-1.0.0-man1.patch 814 BLAKE2B d4c9540e0ec31b3a18d36126f92ebf850d3ca9768e6ae3d5c92d1f712f2a6542b72fe6c50dd30033a380cded0500996554c78fc0255179ade6dafdea66ce9673 SHA512 20b777ca2dd249140895658c610f74d770c757a8327f73bed7754de11bb6c50faa6fcbc71fc12ead9857f22fbc5dc20e950d2f1b1308565c02cd32fca789fc97
 DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
+DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
 EBUILD edb-debugger-1.1.0-r1.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
+EBUILD edb-debugger-1.2.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
new file mode 100644
index 000000000000..21c906d48591
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-libs/double-conversion
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	#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
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
deleted file mode 100644
index 929492ae670f..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/701112
-
-From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
-From: Evan Teran <evan.teran@gmail.com>
-Date: Mon, 15 Jul 2019 14:44:25 -0400
-Subject: [PATCH] fix for issue #719
-
----
- src/ByteShiftArray.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/ByteShiftArray.cpp
-+++ b/src/ByteShiftArray.cpp
-@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #include "ByteShiftArray.h"
-+#include <climits>
- 
- //------------------------------------------------------------------------------
- // Name: ByteShiftArray
--- 
-2.24.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
deleted file mode 100644
index 92625ac3701a..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/701080
-
-From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
-From: Ruslan Kabatsayev <b7.10110111@gmail.com>
-Date: Thu, 5 Jul 2018 23:45:03 +0300
-Subject: [PATCH] Fix installation path of the man page
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,6 +123,6 @@ endif()
- add_subdirectory(src)
- add_subdirectory(plugins)
- 
--install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
-+install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
- install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)