gentoo resync : 04.07.2020

4 files changed, 132 insertions, 0 deletions

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 537d98ce724b..43f5b7ec098f 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,9 +1,13 @@
 AUX cutter-1.10.1-radare2-4.3.0.patch 492 BLAKE2B 3f6115c29ffcacabcb6fed3870f73bbf4dbbd5d5afd4ccf0c44d1a40e98519f44a8611571ee491f21c675edfad01ed4ff1d132e64f122c7ca7859a1081ef0c0b SHA512 ca97982571f98cb4549ddf82e0d8c13214c2006cf30710d55073b7704b8e6561b6c597157011af70af2e57a058ccade89cee56d18207453b2a367a5a18b7c228
+AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
+AUX cutter-1.10.3-qt-5.15.patch 1052 BLAKE2B e1f4342f73da70bd49b1a51c4962e3c95b2895263641143a419b122d8122b94847ebd27b3d7b68652e8d37d24efb5737e90585093ed46eb6f3028677ad444686 SHA512 0288638c03600b9b11d5aa5f432ed15b43f75791f43751cb670973ec69cf8c9f8c505b2a54981faaec0d7779458abe7c7ed77663db73222074bd4528463154b3
 AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
 DIST cutter-1.10.1.tar.gz 1839344 BLAKE2B 883d0fa3d224d190b2dbec66e0bad1f2a542357bec9ce168706d60fa23794be23841157815323c989c1ddab9e1e428446e50ca0d71a91f7dbc8f01fe796caee2 SHA512 66f530687810a0bea3e4fcdf9962427964454a4a26e8d626d970bca358aab16b7939857fdbe22f0a611cdbdfbf67b5ab5f12959d8f04549c4cf8177cae49a54b
+DIST cutter-1.10.3.tar.gz 1866223 BLAKE2B fe03da351b04511457ab9d5eaf1761a69237d125c7f835cb00f7c4eb5fd3cd3a2ca3dfafcd64757b115d68d14f0604f71da0ebf9993b839e89d1b55375df265f SHA512 8bee19ad5cc4304c52907247ac508bb10d1bf8251a0c75f96c01dbe918327f18ee0e76f831feca0c115134e08025fc9b79dc1d8e3e01925d4d2c960c8c67336d
 DIST cutter-1.8.2.tar.gz 1527164 BLAKE2B 49ad9d208d77332c87acb2ed389d854ed8866bd561e89582266effd448bd3f1260f2e8d91ebc2fcbb7beb40aec39e460bc7a327021a4339db157af5a809cbc19 SHA512 16cb6a158882f17435e4c146b021a7ddb61a331efcb53e5a29e3598f399e71b59003473fa5a07cc0769148e67b02dbf955051bbb5ceb4df69b4cf1805b85f4cc
 DIST cutter-1.9.0.tar.gz 1548575 BLAKE2B 810b6d9f3b203f79711e38b26b60f545fd65f96e5b7d7638538c074ab7dbe83104d79b11f6b552d16e4a30236c5965ed377ad7d9c71cb8fce0a1d9d13076cd54 SHA512 f9b68469320e0e54562612cba21632f69dfe1e0bb1f21d05d7f0a083208e11f2e1a0ab338f8db43fb324aa8538b6f93d566eda13283d5b96ab1127c2d846b388
 EBUILD cutter-1.10.1.ebuild 1057 BLAKE2B 0e69f2fe39258ebaafd1d7762bd5de7fcc5983fb5f4fba0bc87e1e1f0ba6d18c20969b2d5a5adc174f15fa6771f67b574e00e4ca4ecd6e85034cff5523394e42 SHA512 9107645f9fa7b302ec0bba142cfb80e907f22b8fa05af98b5eea7e83a0baef32aad39622719cdeab19fada018f1703f3fa5e91fe0cb8c466a82ffbec92f57d82
+EBUILD cutter-1.10.3.ebuild 1064 BLAKE2B bc65d52869e4e76d5ec74e1317fa5d45738185a3ad916a344fb2dc61ca764fd7429a8b3bfb9e3f23f99da8a667aa4167937e3d1c6f619ab8e92201b99fec5d43 SHA512 7754b1a0b783edaa916178f03aa22afb574487e1ad8588b48952564f194981aa8ac474fe1b7595427de04229411fe6283a35e7721c796ec60b1f62505df357fc
 EBUILD cutter-1.8.2.ebuild 1245 BLAKE2B a34d1b452f7fcadc22021dd4e1c5c5de55bf4ba0634bc2216f971e6bc7d299226e31a5caf07f4929d581eefb6eafce382297ee6631c665dc939d1c26300e9b66 SHA512 a8adece880ff5a6fd550d2ef0f18cd2bb1ad8f82d182643bdf61888f672101c9032eb14216e42c501f5d2db1d715f3bd2bf83c8a69e890470347c5cfa8fe98c5
 EBUILD cutter-1.9.0.ebuild 1245 BLAKE2B 680d680a6f462d2949b3f8a0bddc81e1518762d1dde458f71f1ccb44e3c1fc0dc18336d104791d3e8c4b3c86e581de6df9f1f5b89acb381ec0f4eb7d66efab39 SHA512 ccdc780dda57a3715a8c3e289add837ed03d3b18977a388591b3bfbf045108f36988ee6f6e7c424d7442061f1586e7a9080d0539f95745320d9c50024475f07d
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.10.3.ebuild b/dev-util/cutter/cutter-1.10.3.ebuild
new file mode 100644
index 000000000000..6fea7b83cb00
--- /dev/null
+++ b/dev-util/cutter/cutter-1.10.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit qmake-utils xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/radare2-4.4.0
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.3-python3-config.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # https://github.com/radareorg/cutter/pull/2231
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_PYTHON=true
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/cutter/files/cutter-1.10.3-python3-config.patch b/dev-util/cutter/files/cutter-1.10.3-python3-config.patch
new file mode 100644
index 000000000000..f024ba26df03
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.10.3-python3-config.patch
@@ -0,0 +1,36 @@
+diff --git a/src/Cutter.pro b/src/Cutter.pro
+index 5ea3a78..d99b4a5 100644
+--- a/src/Cutter.pro
++++ b/src/Cutter.pro
+@@ -115,10 +115,6 @@ unix {
+ # Libraries
+ include(lib_radare2.pri)
+ 
+-!win32 {
+-    CONFIG += link_pkgconfig
+-}
+-
+ CUTTER_ENABLE_PYTHON {
+     win32 {
+         PYTHON_EXECUTABLE = $$system("where python", lines)
+@@ -135,10 +131,17 @@ CUTTER_ENABLE_PYTHON {
+             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+         } else {
+-            !packagesExist(python3) {
+-                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++            system(type python3-config) {
++                TMP = $$system(python3-config --libs --embed, true, TMPSTATUS)
++                !equals(TMPSTATUS, 0) {
++                    TMP = $$system(python3-config --libs)
++                }
++                LIBS += $$TMP
++                TMP = $$system(python3-config --includes)
++                INCLUDEPATH += $$replace(TMP, "-I", "")
++            } else {
++                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+             }
+-            PKGCONFIG += python3
+         }
+     }
+ 
diff --git a/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch
new file mode 100644
index 000000000000..0ce08dd798a9
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch
@@ -0,0 +1,36 @@
+diff --git a/src/widgets/ColorPicker.cpp b/src/widgets/ColorPicker.cpp
+index 25df2e3ac..fd9ce0875 100644
+--- a/src/widgets/ColorPicker.cpp
++++ b/src/widgets/ColorPicker.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QDesktopWidget>
+ #include <QPixmap>
+diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp
+index d79b7eb51..6013fa4da 100644
+--- a/src/widgets/ColorThemeListView.cpp
++++ b/src/widgets/ColorThemeListView.cpp
+@@ -3,6 +3,7 @@
+ #include <QJsonArray>
+ #include <QMap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFontMetrics>
+ #include <QScreen>
+ #include <QJsonArray>
+diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
+index 34c1efbe7..25e917e96 100644
+--- a/src/widgets/DisassemblyWidget.cpp
++++ b/src/widgets/DisassemblyWidget.cpp
+@@ -14,6 +14,7 @@
+ #include <QRegularExpression>
+ #include <QTextBlockUserData>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSplitter>
+ 
+