[gentoo-commits] repo/gentoo:master commit in: dev-util/cutter/, dev-util/cutter/files/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     33e26ac5182a958ba436de2369615b5db4c8e747
Author:     Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Sun Jul  5 09:06:10 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 09:01:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e26ac5

dev-util/cutter: cleanup

Versions before 1.10.3 are only working with older dev-util/radare2
versions which were already removed from Gentoo.

Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu>
Closes: https://github.com/gentoo/gentoo/pull/16593
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/cutter/Manifest                           |  3 --
 dev-util/cutter/cutter-1.10.1.ebuild               | 56 --------------------
 dev-util/cutter/cutter-1.8.2.ebuild                | 60 ----------------------
 dev-util/cutter/cutter-1.9.0.ebuild                | 60 ----------------------
 .../cutter/files/cutter-1.10.1-radare2-4.3.0.patch | 12 -----
 .../cutter/files/cutter-1.8.0-python3-config.patch | 31 -----------
 dev-util/cutter/metadata.xml                       |  4 --
 7 files changed, 226 deletions(-)

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 00da44cf69f..1fcaa812ad4 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,4 +1 @@
-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

diff --git a/dev-util/cutter/cutter-1.10.1.ebuild b/dev-util/cutter/cutter-1.10.1.ebuild
deleted file mode 100644
index 5e855969acf..00000000000
--- a/dev-util/cutter/cutter-1.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-4.3.0
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-	"${FILESDIR}/${PN}-1.10.1-radare2-4.3.0.patch"
-)
-
-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/cutter-1.8.2.ebuild b/dev-util/cutter/cutter-1.8.2.ebuild
deleted file mode 100644
index c31e6b2f6d5..00000000000
--- a/dev-util/cutter/cutter-1.8.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-3.5.1
-	jupyter? ( dev-python/jupyter )
-	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
-		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
-		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/cutter-1.9.0.ebuild b/dev-util/cutter/cutter-1.9.0.ebuild
deleted file mode 100644
index 052885e5c90..00000000000
--- a/dev-util/cutter/cutter-1.9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-3.8.0
-	jupyter? ( dev-python/jupyter )
-	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
-		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
-		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.1-radare2-4.3.0.patch b/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
deleted file mode 100644
index 590a07063c5..00000000000
--- a/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cutter-1.10.1-orig/src/core/Cutter.cpp cutter-1.10.1/src/core/Cutter.cpp
---- cutter-1.10.1-orig/src/core/Cutter.cpp	2020-02-01 16:54:36.000000000 +0100
-+++ cutter-1.10.1/src/core/Cutter.cpp	2020-03-08 16:05:36.332364202 +0100
-@@ -535,7 +535,7 @@
-     }
- 
-     ut64 hashLimit = getConfigut64("cfg.hashlimit");
--    r_bin_file_hash(core->bin, hashLimit, path.toUtf8().constData(), NULL);
-+    r_bin_file_compute_hashes(core->bin, hashLimit);
- 
-     fflush(stdout);
-     return true;

diff --git a/dev-util/cutter/files/cutter-1.8.0-python3-config.patch b/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
deleted file mode 100644
index e2ab0556472..00000000000
--- a/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur cutter-1.8.0-orig/src/Cutter.pro cutter-1.8.0/src/Cutter.pro
---- cutter-1.8.0-orig/src/Cutter.pro	2019-03-27 12:14:42.436446303 -0400
-+++ cutter-1.8.0/src/Cutter.pro	2019-03-27 12:16:26.971448895 -0400
-@@ -118,10 +118,6 @@
- # Libraries
- include(lib_radare2.pri)
- 
--!win32 {
--    CONFIG += link_pkgconfig
--}
--
- CUTTER_ENABLE_PYTHON {
-     win32 {
-         PYTHON_EXECUTABLE = $$system("where python", lines)
-@@ -140,10 +136,13 @@
-             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) {
-+                LIBS += $$system(python3-config --libs)
-+                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/metadata.xml b/dev-util/cutter/metadata.xml
index f2af393dbcf..95eddc5b457 100644
--- a/dev-util/cutter/metadata.xml
+++ b/dev-util/cutter/metadata.xml
@@ -12,8 +12,4 @@
     <upstream>
         <remote-id type="github">radareorg/cutter</remote-id>
     </upstream>
-    <use>
-        <flag name="jupyter">Add support for jupyter notebook</flag>
-        <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for in-app jupyter browser</flag>
-    </use>
 </pkgmetadata>