1 |
commit: 64a7e6368a18ce304f1dfa8a5862f577bd8927cf |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 13 17:01:59 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 13 17:02:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a7e636 |
7 |
|
8 |
dev-util/edb-debugger: sync live |
9 |
|
10 |
Bug: https://bugs.gentoo.org/843755 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
...r-1.3.0.ebuild => edb-debugger-1.3.0-r1.ebuild} | 13 ++++-- |
14 |
dev-util/edb-debugger/edb-debugger-9999.ebuild | 47 +++++++++++----------- |
15 |
dev-util/edb-debugger/metadata.xml | 3 -- |
16 |
3 files changed, 34 insertions(+), 29 deletions(-) |
17 |
|
18 |
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 |
19 |
similarity index 80% |
20 |
rename from dev-util/edb-debugger/edb-debugger-1.3.0.ebuild |
21 |
rename to dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild |
22 |
index cf000cdee218..01f72a1e8911 100644 |
23 |
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild |
24 |
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild |
25 |
@@ -7,12 +7,19 @@ inherit cmake |
26 |
|
27 |
DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" |
28 |
HOMEPAGE="https://github.com/eteran/edb-debugger" |
29 |
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz" |
30 |
-S="${WORKDIR}"/${PN} |
31 |
+ |
32 |
+if [[ ${PV} == 9999 ]] ; then |
33 |
+ EGIT_REPO_URI="https://github.com/eteran/edb-debugger" |
34 |
+ inherit git-r3 |
35 |
+else |
36 |
+ SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz" |
37 |
+ S="${WORKDIR}"/${PN} |
38 |
+ |
39 |
+ KEYWORDS="~amd64 ~x86" |
40 |
+fi |
41 |
|
42 |
LICENSE="GPL-2+" |
43 |
SLOT="0" |
44 |
-KEYWORDS="~amd64 ~x86" |
45 |
IUSE="graphviz" |
46 |
|
47 |
RDEPEND="dev-libs/capstone:= |
48 |
|
49 |
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild |
50 |
index 6ff5cb3e1c08..de40794d96ce 100644 |
51 |
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild |
52 |
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild |
53 |
@@ -1,22 +1,29 @@ |
54 |
-# Copyright 1999-2020 Gentoo Authors |
55 |
+# Copyright 1999-2022 Gentoo Authors |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
EAPI=7 |
59 |
|
60 |
-inherit cmake git-r3 |
61 |
+inherit cmake |
62 |
|
63 |
DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" |
64 |
HOMEPAGE="https://github.com/eteran/edb-debugger" |
65 |
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git" |
66 |
+ |
67 |
+if [[ ${PV} == 9999 ]] ; then |
68 |
+ EGIT_REPO_URI="https://github.com/eteran/edb-debugger" |
69 |
+ inherit git-r3 |
70 |
+else |
71 |
+ SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz" |
72 |
+ S="${WORKDIR}"/${PN} |
73 |
+ |
74 |
+ KEYWORDS="~amd64 ~x86" |
75 |
+fi |
76 |
|
77 |
LICENSE="GPL-2+" |
78 |
SLOT="0" |
79 |
-KEYWORDS="" |
80 |
-IUSE="graphviz jumbo-build" |
81 |
+IUSE="graphviz" |
82 |
|
83 |
-RDEPEND=" |
84 |
- dev-libs/capstone:= |
85 |
- dev-libs/double-conversion |
86 |
+RDEPEND="dev-libs/capstone:= |
87 |
+ dev-libs/double-conversion:= |
88 |
dev-qt/qtconcurrent:5 |
89 |
dev-qt/qtcore:5 |
90 |
dev-qt/qtgui:5 |
91 |
@@ -25,25 +32,19 @@ RDEPEND=" |
92 |
dev-qt/qtwidgets:5 |
93 |
dev-qt/qtxml:5 |
94 |
dev-qt/qtxmlpatterns:5 |
95 |
- graphviz? ( media-gfx/graphviz ) |
96 |
-" |
97 |
- |
98 |
-DEPEND=" |
99 |
- dev-libs/boost |
100 |
- virtual/pkgconfig |
101 |
- ${RDEPEND} |
102 |
-" |
103 |
+ graphviz? ( media-gfx/graphviz )" |
104 |
+DEPEND="dev-libs/boost |
105 |
+ ${RDEPEND}" |
106 |
+BDEPEND="virtual/pkgconfig" |
107 |
|
108 |
src_prepare() { |
109 |
+ # Make the desktop's entries somewhat better |
110 |
+ sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die |
111 |
+ sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die |
112 |
+ |
113 |
if ! use graphviz; then |
114 |
sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die |
115 |
fi |
116 |
- cmake_src_prepare |
117 |
-} |
118 |
|
119 |
-src_configure() { |
120 |
- local mycmakeargs=( |
121 |
- -DBUILD_JUMBO=$(usex jumbo-build) |
122 |
- ) |
123 |
- cmake_src_configure |
124 |
+ cmake_src_prepare |
125 |
} |
126 |
|
127 |
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml |
128 |
index 31849a247616..115e9d64a669 100644 |
129 |
--- a/dev-util/edb-debugger/metadata.xml |
130 |
+++ b/dev-util/edb-debugger/metadata.xml |
131 |
@@ -2,7 +2,4 @@ |
132 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
133 |
<pkgmetadata> |
134 |
<!-- maintainer-needed --> |
135 |
- <use> |
136 |
- <flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag> |
137 |
- </use> |
138 |
</pkgmetadata> |