gentoo auto-resync : 14:09:2022 - 11:10:10

5 files changed, 72 insertions, 33 deletions

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index e6ddc962de7d..d8581ed354d2 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,5 +1,6 @@
+AUX edb-debugger-1.3.0-capstone-5.patch 1135 BLAKE2B 835105b255338811747521ca9b76c88eb5b88cebb050c536657b110fcf20fa81b5e0a33fae1c81fe9c890daba9021f4782df7440a1197ae5da7b325a1076d504 SHA512 7b6edec1d8fa7f350883eb0e1184c5051096dec3a4ea9519dbaacd036a0c893ed452f11906ae2c1844c94f3df5f215ba43a21cc70c5da74412b1e905deb9c06a
 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 1175 BLAKE2B a1cdcee8c104480f9edbef70aa619cd3a1776e5a4c161cea7b6e069294f4a96da2fd753040b1943930ee49cb3ece37e5642b7fd58f188058b009147c24ffa54a SHA512 5a4afc4dbd8a317a5a8057da9b100ed71bcf216618299a2087bf4dc43aa48ce6b5ba8ca0d7c812d068a05aca2aa127f52017be0cdf09beb1881650d86a5e7057
-EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
-MISC metadata.xml 275 BLAKE2B 382b1023fe29dd71c57d25b04115b5757d90933d0cc3eefed19ac110608bcc02c260308112523d142d342921a652eb8bb66395e10c37aeadaec13e26db64dc10 SHA512 187c55986315e59f9adfc9129c81243da596fc9827774e08c244d64301380303c682c55af8db1acc80d90f648b1b154dc5a8cbdcbba7a7475c7a90735da1ef44
+EBUILD edb-debugger-1.3.0-r1.ebuild 1336 BLAKE2B 41f403885d80cda118d40e99da7b0f814f2fef59f050a1e3c2a02f87496d14cd2ce0a2cfda87069eeb9feeffe73925ef7c2329df2d9872a0564a90e9f09b369e SHA512 f63b41bbc3f219457eb4e66c64ba197bc242b0d33894f0868616a4b764c89b981f6ae34280f4c336706025195adc05295d99d0134827c9e18fed55c88548abf4
+EBUILD edb-debugger-9999.ebuild 1247 BLAKE2B 227bada04e32d2ddd645338e6572b68d8b70b920f2925e02c78d3e57c9922f30e18849920a3fff9f1a7ede030e77f2df83bef2f01ed2cd26be1c4f34b2ee879f SHA512 53ebf7ff9a2ab643b45610e3ab5b99d1cc8976a60d7ac08e23f068de850201523f25d8fd8879ffc9f6367f43040e287018665f730a8f379e81c4b049304b3e07
+MISC metadata.xml 252 BLAKE2B fb12cf596eb089cfb2077cf0726394d90785dbea303035ffbb140513dbb5e0fc69ddcdab039f0d159a41cedd601084eab5f93d017c8eed995112ced496a1ebf2 SHA512 23a9f942e083e04792112e33470839ef3906e11035ef61a24b4f5aa2bf0a5b4fc322ed9f48e09905132c9a8a5f7abe02b2711bd3396da9f6d4ec95fea50ccadb
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
index e550d9ad3f47..01f72a1e8911 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
@@ -7,16 +7,23 @@ 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}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/eteran/edb-debugger"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+	S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
 RDEPEND="dev-libs/capstone:=
-	dev-libs/double-conversion
+	dev-libs/double-conversion:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,6 +39,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc12.patch
+	"${FILESDIR}"/${PN}-1.3.0-capstone-5.patch
 )
 
 src_prepare() {
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 6ff5cb3e1c08..de40794d96ce 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake git-r3
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/eteran/edb-debugger"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+	S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
-IUSE="graphviz jumbo-build"
+IUSE="graphviz"
 
-RDEPEND="
-	dev-libs/capstone:=
-	dev-libs/double-conversion
+RDEPEND="dev-libs/capstone:=
+	dev-libs/double-conversion:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -25,25 +32,19 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	graphviz? ( media-gfx/graphviz )
-"
-
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}
-"
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="dev-libs/boost
+	${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 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
-}
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_JUMBO=$(usex jumbo-build)
-	)
-	cmake_src_configure
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
new file mode 100644
index 000000000000..d900ae335242
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
@@ -0,0 +1,29 @@
+From cb1da3fb1d2e45e279118ee8e68468373b71dbc8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 13 Sep 2022 17:52:01 +0100
+Subject: [PATCH] Fix build with Capstone 5
+
+Capstone 5 drops X86_INS_VCVTPD2DQX and X86_INS_VCVTPD2PSX from
+x86.h (happened in https://github.com/capstone-engine/capstone/commit/dd91f03fef5102492352756e2adb5972dd79a70f
+but no real explanation).
+
+Given:
+1. these instructions had no wiring up;
+2. other Capstone consumers have done the same
+let's drop based on a macro for the Capstone version.
+
+Bug: https://bugs.gentoo.org/843755
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/capstone-edb/Instruction.cpp
++++ b/src/capstone-edb/Instruction.cpp
+@@ -880,8 +880,10 @@ bool is_SIMD_PD(const Operand &operand) {
+ 	case X86_INS_CVTPD2PI:
+ 	case X86_INS_CVTPD2PS:
+ 	case X86_INS_VCVTPD2PS:
++#if CS_API_MAJOR < 5
+ 	case X86_INS_VCVTPD2DQX: // FIXME: what's this?
+ 	case X86_INS_VCVTPD2PSX: // FIXME: what's this?
++#endif
+ 	// case X86_INS_VCVTPD2QQ: // FIXME: Capstone seems to not support it
+ 	case X86_INS_VCVTPD2UDQ:
+ 		// case X86_INS_VCVTPD2UQQ: // FIXME: Capstone seems to not support it
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index 31849a247616..09229532f67a 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
-	</use>
+	<upstream>
+		<remote-id type="github">eteran/edb-debugger</remote-id>
+	</upstream>
 </pkgmetadata>