commit: 64a7e6368a18ce304f1dfa8a5862f577bd8927cf Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Sep 13 17:01:59 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 13 17:02:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a7e636
dev-util/edb-debugger: sync live Bug: https://bugs.gentoo.org/843755 Signed-off-by: Sam James <sam <AT> gentoo.org> ...r-1.3.0.ebuild => edb-debugger-1.3.0-r1.ebuild} | 13 ++++-- dev-util/edb-debugger/edb-debugger-9999.ebuild | 47 +++++++++++----------- dev-util/edb-debugger/metadata.xml | 3 -- 3 files changed, 34 insertions(+), 29 deletions(-) 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 similarity index 80% rename from dev-util/edb-debugger/edb-debugger-1.3.0.ebuild rename to dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild index cf000cdee218..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,12 +7,19 @@ 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:= 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/metadata.xml b/dev-util/edb-debugger/metadata.xml index 31849a247616..115e9d64a669 100644 --- a/dev-util/edb-debugger/metadata.xml +++ b/dev-util/edb-debugger/metadata.xml @@ -2,7 +2,4 @@ <!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> </pkgmetadata>
