gentoo resync : 31.05.2021

4 files changed, 5 insertions, 70 deletions

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 02cc58c4d1d5..49c99b90fc08 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,9 +1,7 @@
 AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
 DIST cutter-1.12.0.tar.gz 2323732 BLAKE2B fb40444b60c19f88dafb9447731b91031ad764359121b835ae03477bf52f17d12d1a0b651059072b6ffb7bf811d4493b3746ab9c48d8f09257b5338130edecbd SHA512 3d8dd9cb6f9e69f41e295795f3d1b7256c071abafd04bdecd619817b8fd04396770f69df753701ffb376a358f0df9bd38dff6a344df4e5ca92163275ad670531
-DIST cutter-2.0.1.tar.gz 2695412 BLAKE2B 19d0e45a060d12dbf58cbcd0a7a9fa42b0a57b66016c4390b79daeb1dfe3efca0962068f665dbe30a6b9f0a04fc72603973c18315b4c4396845e4860744223b6 SHA512 600f005fcc8fbc54a5be1cb256d66387e8e37c579836d66b3caaf1130dbe945f21bd579313c9ecf2cba2b258efa85e2d437a957a694c7e7ca515341b25086528
 DIST cutter-2.0.2.tar.gz 2696029 BLAKE2B 9bc101137a1e479e137d9638ffa6892fa1fd7b3393462a305d0c92bd02b0486b1d2d071770be135de9493b23fa563421ac1d25bc890d9b2ed21d302601afb333 SHA512 17ec58fddbbceb4ab06b367f2f795ac0a2d8876c454159f20b7b1c6448bda330445ff922c2dd125ca42b77c729f5c65bafbf1c98eecc29c0bc1081c78f052141
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
-EBUILD cutter-1.12.0.ebuild 1003 BLAKE2B cb2e19913b2a9d1280a1267635b20b574f4c6ed9880e44cc959bfa7cbbdaa4195c4d82ab488d60821bd92c8ff2128ab5e8977c39af92075b97b0e4a96427f829 SHA512 7091a4834bf3b6c2b6b2a3d44c2f2929c460ac1cc9313955bc714ff543c85a4d4cb69076d3a473fccaa1e76d498d01b14e6d7ca628014c5b25985f53847e2a3d
-EBUILD cutter-2.0.1.ebuild 1595 BLAKE2B 1b16fc0730d870d502d5a2e71f974ad9c78a1c927a7ca508bbf30cc2334a05226949e51d1b1b4d082afc7ee83e9653cd2ae43d45df7482007d21e183aa5419a3 SHA512 5971e8fb912970a9e6683430f60710f96b97aa9db2eff023272cc3ff33a2d596ca42911c4023aa080ba7a143e08518353f15fcf6af2b01a069be9802a0773850
-EBUILD cutter-2.0.2.ebuild 1595 BLAKE2B 1b16fc0730d870d502d5a2e71f974ad9c78a1c927a7ca508bbf30cc2334a05226949e51d1b1b4d082afc7ee83e9653cd2ae43d45df7482007d21e183aa5419a3 SHA512 5971e8fb912970a9e6683430f60710f96b97aa9db2eff023272cc3ff33a2d596ca42911c4023aa080ba7a143e08518353f15fcf6af2b01a069be9802a0773850
+EBUILD cutter-1.12.0.ebuild 1006 BLAKE2B 6c5afd922aa85627b555f9d6328d6a24f572e847a7363e7a7e0828ae2405b228cc5af9849cb6096ced0216e7e16705e063c651eb9fab7cf221c371f9887bf81a SHA512 69ef42f5d52a5dc2fb112163142b7d7b209c73027a53b7c6d28545be52940c5d7a7619b5379e16137eada0ffe78ef8bf986d34d1d15db2e550f8e24ac3c0f05c
+EBUILD cutter-2.0.2.ebuild 1598 BLAKE2B b26ed5d1c12aed59ca3632bbdacd95cefae09d1a6105bd56ad1d3d5bd19be3f95b35727b08ab6d5860b2dff98e2df8d1277d761fd656ec804d44796c5fda6c8b SHA512 3d2fbe30c9b7ed34f5d82d8502a58e392352b6a2dfc40ef12a57b438e54ef16b9e107d5a1febcdbaf5acfb5c37231ead88b94f130f07dbc5b94b2eb8f90124f3
 MISC metadata.xml 328 BLAKE2B 597e3a2352bd67dfaa1ab7604e6dafef7605a789b077c4540603af21d19d6eb0b2439cebcd11788cb7165c7c62e9300699cc72700d6383da1debb1c50910fb52 SHA512 cd78fe37ddd92ef4ecfd2099fd3c20b3014c691de405013b8647a9d81c17e84f8b784a4ac46ed7e21ee5246d5878817c60b27899ed48eefdb7c09f21084f11a0
diff --git a/dev-util/cutter/cutter-1.12.0.ebuild b/dev-util/cutter/cutter-1.12.0.ebuild
index 9d335195066e..10a06648756a 100644
--- a/dev-util/cutter/cutter-1.12.0.ebuild
+++ b/dev-util/cutter/cutter-1.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit qmake-utils xdg-utils python-single-r1
 
diff --git a/dev-util/cutter/cutter-2.0.1.ebuild b/dev-util/cutter/cutter-2.0.1.ebuild
deleted file mode 100644
index c5eb669d8b49..000000000000
--- a/dev-util/cutter/cutter-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_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/rizin
-	graphviz? ( media-gfx/graphviz )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	rmdir "${S}/src/translations" || die
-	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
-	   "${S}/src/translations" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.0.2.ebuild b/dev-util/cutter/cutter-2.0.2.ebuild
index c5eb669d8b49..68cbba5c987b 100644
--- a/dev-util/cutter/cutter-2.0.2.ebuild
+++ b/dev-util/cutter/cutter-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
 
 inherit cmake toolchain-funcs xdg-utils python-single-r1