Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/
Date: Wed, 24 Aug 2022 15:52:28
Message-Id: 1660994532.a4a7b57c5bf56ee31059092a9c0d51ed90af044e.tastytea@gentoo
1 commit: a4a7b57c5bf56ee31059092a9c0d51ed90af044e
2 Author: Huang Rui <vowstar <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 20 11:22:12 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Sat Aug 20 11:22:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4a7b57c
7
8 app-editors/imhex: drop 1.8.1-r1, 1.10.0, 1.10.1
9
10 Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
11
12 app-editors/imhex/Manifest | 3 -
13 .../files/imhex-1.10.0-fix-yara-linking.patch | 11 ---
14 .../imhex/files/imhex-1.10.0-link-mbedtls.patch | 14 ---
15 .../files/imhex-1.10.0-no-lnlohmann_json.patch | 14 ---
16 .../files/imhex-1.10.1-no-lLLVMDemangle.patch | 18 ----
17 .../imhex-1.10.1-system-nativefiledialog.patch | 10 --
18 .../imhex/files/imhex-1.8.1-fix-yara-linking.patch | 11 ---
19 app-editors/imhex/files/imhex-1.8.1-gcc11.patch | 11 ---
20 .../imhex-1.8.1-system-nativefiledialog.patch | 19 ----
21 .../imhex/files/imhex-1.8.1-system-xdgpp.patch | 11 ---
22 app-editors/imhex/imhex-1.10.0.ebuild | 106 --------------------
23 app-editors/imhex/imhex-1.10.1.ebuild | 104 --------------------
24 app-editors/imhex/imhex-1.8.1-r1.ebuild | 108 ---------------------
25 13 files changed, 440 deletions(-)
26
27 diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
28 index e5404a712..fa985686e 100644
29 --- a/app-editors/imhex/Manifest
30 +++ b/app-editors/imhex/Manifest
31 @@ -1,5 +1,2 @@
32 -DIST imhex-1.10.0.tar.gz 8509953 BLAKE2B e258693f44d5524a86c88e29152bfe9777a149236f146a16b88bc7a49d3450f1b46138649a830c7164175afaea3c0d5e76c998e3e65020627b3c978c504431bb SHA512 03d84e30d5ee064ef2c3faf5cb40965f2c94b41e4d8b3e2e3e800f079d0710f0660b4c751dc0c4516b9b19bbf57df44a102ae61fa41d56606ce1f37c9aa8313c
33 -DIST imhex-1.10.1.tar.gz 8523483 BLAKE2B 7d73a06cfe83fdd9fa8723f1c64a752212f8e2f0dbf902f2d1da1349e53e580684263b168569f092d32c129eddba40131d8f8bd3148d6d59340dcd67bcdc8b6e SHA512 0542ce5db530989367dfc98932bd09e3020c955e2bd666122644612e1c41e2bc3d6a6374c60e7afbb4bae86c75930dfbc7a48f37a8cd8a0d85a550231f470b91
34 DIST imhex-1.21.2.tar.gz 23473112 BLAKE2B 5e1dbcf246fc2b2ac57636efee71574eb38ee2d04678a6e09b4d8c2d61da01021bb169fa40a18725d609a3daae1bf9a4ca8aacbb21b6d381c3ff1345d9f788c6 SHA512 e5dd9c5b81f739ee37cc51cf37aa6b866b1af8b28f06e0731612612c5a56d5d68d9d50c20ebb9304a51efb88c07fde72656dcc7d6c249dd827d5d15e44de9698
35 -DIST imhex-1.8.1.tar.gz 1758664 BLAKE2B 62c58358810bd4f1192495001d01fc6c6fe8f28a35adc1478c8b2d0dab0fd929c0f46018c9afd51c1094cbae0c04002f4887fb2fb9377b6c645abaee006b9a03 SHA512 c6ec73a282c9eb90b58d164c29abbef3dceba09aa706a8295cecdcb429d5efa4015fac0dd0a3111eae3efe667f5b16f063624bf188a00a400fc06b008e3b51f8
36 DIST imhex-patterns-1.21.2.tar.gz 4672663 BLAKE2B a0c4a9917ad44a4af0e01e67210bb025a01e6775b327248ba9259d36ea0596b2be74aed758d478b3f5c0d0aea669ed333c8aca2b7e43e275abc833bbdcef2490 SHA512 c5694bd5cc6a609dd8133f0566fbf3bfd4669cf4a20523d10afddbc39e4b7a8d52d8fdecff95883e40b6f06f858e1373c8dbe0713fd7f54380dac5ee3105b9ce
37
38 diff --git a/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch b/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch
39 deleted file mode 100644
40 index d1a5f4afa..000000000
41 --- a/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch
42 +++ /dev/null
43 @@ -1,11 +0,0 @@
44 ---- a/CMakeLists.txt
45 -+++ b/CMakeLists.txt
46 -@@ -93,7 +93,7 @@
47 - if (WIN32)
48 - target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} wsock32 ws2_32 libyara Dwmapi.lib dl)
49 - else ()
50 -- target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread libyara)
51 -+ target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread yara)
52 - endif ()
53 -
54 - createPackage()
55
56 diff --git a/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch b/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch
57 deleted file mode 100644
58 index 087faef0b..000000000
59 --- a/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch
60 +++ /dev/null
61 @@ -1,14 +0,0 @@
62 ---- a/plugins/libimhex/CMakeLists.txt
63 -+++ b/plugins/libimhex/CMakeLists.txt
64 -@@ -95,9 +95,9 @@
65 -
66 - if (APPLE)
67 - find_library(FOUNDATION NAMES Foundation)
68 -- target_link_libraries(libimhex PUBLIC imgui mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
69 -+ target_link_libraries(libimhex PUBLIC imgui mbedtls ${FOUNDATION} nfd fmt-header-only libcurl magic)
70 - else ()
71 -- target_link_libraries(libimhex PUBLIC imgui mbedcrypto nfd magic)
72 -+ target_link_libraries(libimhex PUBLIC imgui mbedtls nfd magic)
73 -
74 - if (NOT USE_SYSTEM_FMT)
75 - target_link_libraries(libimhex PUBLIC fmt-header-only)
76
77 diff --git a/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch b/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch
78 deleted file mode 100644
79 index 63f77e60f..000000000
80 --- a/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch
81 +++ /dev/null
82 @@ -1,14 +0,0 @@
83 ---- a/plugins/libimhex/CMakeLists.txt
84 -+++ b/plugins/libimhex/CMakeLists.txt
85 -@@ -95,9 +95,9 @@
86 -
87 - if (APPLE)
88 - find_library(FOUNDATION NAMES Foundation)
89 -- target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
90 -+ target_link_libraries(libimhex PUBLIC imgui mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
91 - else ()
92 -- target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto nfd magic)
93 -+ target_link_libraries(libimhex PUBLIC imgui mbedcrypto nfd magic)
94 -
95 - if (NOT USE_SYSTEM_FMT)
96 - target_link_libraries(libimhex PUBLIC fmt-header-only)
97
98 diff --git a/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch b/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch
99 deleted file mode 100644
100 index 3aa487ed1..000000000
101 --- a/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch
102 +++ /dev/null
103 @@ -1,18 +0,0 @@
104 ---- a/plugins/builtin/CMakeLists.txt
105 -+++ b/plugins/builtin/CMakeLists.txt
106 -@@ -25,7 +25,7 @@
107 - # Add additional include directories here #
108 - target_include_directories(${PROJECT_NAME} PRIVATE include)
109 - # Add additional libraries here #
110 --target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle)
111 -+target_link_libraries(${PROJECT_NAME} PRIVATE libimhex)
112 -
113 -
114 -
115 -@@ -43,4 +43,4 @@
116 -
117 - if (NOT TARGET libimhex)
118 - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libimhex ${CMAKE_CURRENT_BINARY_DIR}/plugins/libimhex)
119 --endif()
120 -\ Manca newline alla fine del file
121 -+endif()
122
123 diff --git a/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch b/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch
124 deleted file mode 100644
125 index 7e6f8d1dc..000000000
126 --- a/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch
127 +++ /dev/null
128 @@ -1,10 +0,0 @@
129 ---- a/plugins/libimhex/CMakeLists.txt
130 -+++ b/plugins/libimhex/CMakeLists.txt
131 -@@ -5,7 +5,6 @@
132 -
133 - set(BUILD_SHARED_LIBS OFF)
134 - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/ImGui ${CMAKE_CURRENT_BINARY_DIR}/external/ImGui)
135 --add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/nativefiledialog ${CMAKE_CURRENT_BINARY_DIR}/external/nativefiledialog EXCLUDE_FROM_ALL)
136 - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/microtar ${CMAKE_CURRENT_BINARY_DIR}/external/microtar EXCLUDE_FROM_ALL)
137 -
138 - set(XDGPP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../external/xdgpp")
139
140 diff --git a/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch b/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch
141 deleted file mode 100644
142 index 54754d241..000000000
143 --- a/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch
144 +++ /dev/null
145 @@ -1,11 +0,0 @@
146 ---- a/CMakeLists.txt
147 -+++ b/CMakeLists.txt
148 -@@ -93,7 +93,7 @@
149 - if (WIN32)
150 - target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} wsock32 ws2_32 libyara)
151 - else ()
152 -- target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread libyara)
153 -+ target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread yara)
154 - endif ()
155 -
156 - createPackage()
157
158 diff --git a/app-editors/imhex/files/imhex-1.8.1-gcc11.patch b/app-editors/imhex/files/imhex-1.8.1-gcc11.patch
159 deleted file mode 100644
160 index 7c62768ea..000000000
161 --- a/app-editors/imhex/files/imhex-1.8.1-gcc11.patch
162 +++ /dev/null
163 @@ -1,11 +0,0 @@
164 ---- a/plugins/libimhex/include/hex/helpers/utils.hpp
165 -+++ b/plugins/libimhex/include/hex/helpers/utils.hpp
166 -@@ -25,7 +25,7 @@
167 - #define fopen64 fopen
168 - #define fseeko64 fseek
169 - #define ftello64 ftell
170 --#else
171 -+#elif __cplusplus < 201703L
172 - template<>
173 - struct std::is_integral<u128> : public std::true_type { };
174 - template<>
175
176 diff --git a/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch b/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch
177 deleted file mode 100644
178 index 185b35469..000000000
179 --- a/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch
180 +++ /dev/null
181 @@ -1,19 +0,0 @@
182 ---- a/plugins/libimhex/CMakeLists.txt
183 -+++ b/plugins/libimhex/CMakeLists.txt
184 -@@ -12,7 +12,6 @@
185 - find_package(nlohmann_json REQUIRED)
186 - endif()
187 -
188 --add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/nativefiledialog ${CMAKE_CURRENT_BINARY_DIR}/external/nativefiledialog EXCLUDE_FROM_ALL)
189 - if(NOT USE_SYSTEM_FMT)
190 - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/fmt ${CMAKE_CURRENT_BINARY_DIR}/external/fmt)
191 - else()
192 -@@ -32,7 +31,7 @@
193 - pkg_check_modules(LIBCURL REQUIRED IMPORTED_TARGET libcurl)
194 - endif()
195 -
196 --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
197 -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -lnfd")
198 -
199 - set(CMAKE_SHARED_LIBRARY_PREFIX "")
200 -
201
202 diff --git a/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch b/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch
203 deleted file mode 100644
204 index 511fe67ea..000000000
205 --- a/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch
206 +++ /dev/null
207 @@ -1,11 +0,0 @@
208 ---- a/plugins/libimhex/CMakeLists.txt
209 -+++ b/plugins/libimhex/CMakeLists.txt
210 -@@ -19,7 +19,7 @@
211 - find_package(fmt REQUIRED)
212 - endif()
213 -
214 --set(XDGPP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../external/xdgpp")
215 -+set(XDGPP_INCLUDE_DIRS "/usr/include")
216 - set(CMAKE_USE_MBEDTLS ON)
217 - set(BUILD_CURL_EXE OFF)
218 - set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
219
220 diff --git a/app-editors/imhex/imhex-1.10.0.ebuild b/app-editors/imhex/imhex-1.10.0.ebuild
221 deleted file mode 100644
222 index 511463ff0..000000000
223 --- a/app-editors/imhex/imhex-1.10.0.ebuild
224 +++ /dev/null
225 @@ -1,106 +0,0 @@
226 -# Copyright 1999-2021 Gentoo Authors
227 -# Distributed under the terms of the GNU General Public License v2
228 -
229 -EAPI=7
230 -
231 -CMAKE_BUILD_TYPE="Release"
232 -CMAKE_MAKEFILE_GENERATOR="emake"
233 -LLVM_MAX_SLOT=12
234 -PYTHON_COMPAT=( python3_{8..10} )
235 -
236 -inherit cmake desktop llvm python-single-r1 xdg-utils
237 -
238 -DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
239 -HOMEPAGE="https://github.com/WerWolv/ImHex"
240 -SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
241 -S="${WORKDIR}/ImHex-${PV}"
242 -
243 -LICENSE="GPL-2"
244 -SLOT="0"
245 -KEYWORDS="~amd64"
246 -
247 -DEPEND="
248 - ${PYTHON_DEPS}
249 - app-forensics/yara
250 - >=dev-cpp/nlohmann_json-3.10.2
251 - dev-cpp/xdgpp
252 - dev-libs/capstone
253 - >=dev-libs/libfmt-8.0.0
254 - dev-libs/nativefiledialog-extended
255 - dev-libs/openssl
256 - dev-libs/tre
257 - media-libs/freetype
258 - media-libs/glfw
259 - media-libs/glm
260 - net-libs/mbedtls
261 - net-misc/curl
262 - sys-apps/file
263 - sys-devel/llvm:${LLVM_MAX_SLOT}
264 - virtual/libiconv
265 - virtual/libintl
266 -"
267 -RDEPEND="${DEPEND}"
268 -BDEPEND="app-admin/chrpath"
269 -
270 -PATCHES=(
271 - "${FILESDIR}/${PN}-1.8.1-system-xdgpp.patch"
272 - "${FILESDIR}/${PN}-1.8.1-system-nativefiledialog.patch"
273 - "${FILESDIR}/${P}-fix-yara-linking.patch"
274 - "${FILESDIR}/${P}-no-lnlohmann_json.patch"
275 - "${FILESDIR}/${P}-link-mbedtls.patch"
276 -)
277 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
278 -
279 -src_prepare() {
280 - rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
281 - cmake_src_prepare
282 -}
283 -
284 -src_configure() {
285 - python-single-r1_pkg_setup
286 - local mycmakeargs=(
287 - -DPROJECT_VERSION="${PV}"
288 - -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
289 - -DUSE_SYSTEM_CURL=ON
290 - -DUSE_SYSTEM_FMT=ON
291 - -DUSE_SYSTEM_LLVM=ON
292 - -DUSE_SYSTEM_NLOHMANN_JSON=ON
293 - -DUSE_SYSTEM_YARA=ON
294 - )
295 - cmake_src_configure
296 -}
297 -
298 -src_install() {
299 - # can't use cmake_src_install, doing it manual
300 - dobin "${BUILD_DIR}/${PN}"
301 - insinto "/usr/$(get_libdir)"
302 - doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
303 - dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
304 - insinto "/usr/share/${PN}"
305 - doins "${S}/res/icon.ico"
306 - doins -r "${S}/res/resources"
307 -
308 - chrpath -d "${ED}/usr/bin/imhex"
309 - chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
310 -
311 - mypythondir="${D}/$(python_get_sitedir)/imhex"
312 - mkdir -p "${mypythondir}" || die
313 - mv "${S}"/python_libs/lib/* "${mypythondir}" || die
314 - python_optimize "${mypythondir}"
315 -
316 - # create desktop icon
317 - make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
318 -
319 - # install docs
320 - einstalldocs
321 -}
322 -
323 -pkg_postinst() {
324 - xdg_desktop_database_update
325 - xdg_mimeinfo_database_update
326 -}
327 -
328 -pkg_postrm() {
329 - xdg_desktop_database_update
330 - xdg_mimeinfo_database_update
331 -}
332
333 diff --git a/app-editors/imhex/imhex-1.10.1.ebuild b/app-editors/imhex/imhex-1.10.1.ebuild
334 deleted file mode 100644
335 index baed85f99..000000000
336 --- a/app-editors/imhex/imhex-1.10.1.ebuild
337 +++ /dev/null
338 @@ -1,104 +0,0 @@
339 -# Copyright 1999-2021 Gentoo Authors
340 -# Distributed under the terms of the GNU General Public License v2
341 -
342 -EAPI=7
343 -
344 -CMAKE_BUILD_TYPE="Release"
345 -CMAKE_MAKEFILE_GENERATOR="emake"
346 -LLVM_MAX_SLOT=12
347 -PYTHON_COMPAT=( python3_{8..10} )
348 -
349 -inherit cmake desktop llvm python-single-r1 xdg-utils
350 -
351 -DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
352 -HOMEPAGE="https://github.com/WerWolv/ImHex"
353 -SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
354 -S="${WORKDIR}/ImHex-${PV}"
355 -
356 -LICENSE="GPL-2"
357 -SLOT="0"
358 -KEYWORDS="~amd64"
359 -
360 -DEPEND="
361 - ${PYTHON_DEPS}
362 - app-forensics/yara
363 - >=dev-cpp/nlohmann_json-3.10.2
364 - dev-cpp/xdgpp
365 - dev-libs/capstone
366 - >=dev-libs/libfmt-8.0.0
367 - dev-libs/nativefiledialog-extended
368 - dev-libs/openssl
369 - dev-libs/tre
370 - media-libs/freetype
371 - media-libs/glfw
372 - media-libs/glm
373 - net-libs/mbedtls
374 - net-misc/curl
375 - sys-apps/file
376 - sys-devel/llvm:${LLVM_MAX_SLOT}
377 - virtual/libiconv
378 - virtual/libintl
379 -"
380 -RDEPEND="${DEPEND}"
381 -BDEPEND="app-admin/chrpath"
382 -
383 -PATCHES=(
384 - "${FILESDIR}/${P}-no-lLLVMDemangle.patch"
385 - "${FILESDIR}/${PN}-1.8.1-system-xdgpp.patch"
386 - "${FILESDIR}/${P}-system-nativefiledialog.patch"
387 -)
388 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
389 -
390 -src_prepare() {
391 - rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
392 - cmake_src_prepare
393 -}
394 -
395 -src_configure() {
396 - python-single-r1_pkg_setup
397 - local mycmakeargs=(
398 - -DPROJECT_VERSION="${PV}"
399 - -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
400 - -DUSE_SYSTEM_CURL=ON
401 - -DUSE_SYSTEM_FMT=ON
402 - -DUSE_SYSTEM_LLVM=ON
403 - -DUSE_SYSTEM_NLOHMANN_JSON=ON
404 - -DUSE_SYSTEM_YARA=ON
405 - )
406 - cmake_src_configure
407 -}
408 -
409 -src_install() {
410 - # can't use cmake_src_install, doing it manual
411 - dobin "${BUILD_DIR}/${PN}"
412 - insinto "/usr/$(get_libdir)"
413 - doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
414 - dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
415 - insinto "/usr/share/${PN}"
416 - doins "${S}/res/icon.ico"
417 - doins -r "${S}/res/resources"
418 -
419 - chrpath -d "${ED}/usr/bin/imhex"
420 - chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
421 -
422 - mypythondir="${D}/$(python_get_sitedir)/imhex"
423 - mkdir -p "${mypythondir}" || die
424 - mv "${S}"/python_libs/lib/* "${mypythondir}" || die
425 - python_optimize "${mypythondir}"
426 -
427 - # create desktop icon
428 - make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
429 -
430 - # install docs
431 - einstalldocs
432 -}
433 -
434 -pkg_postinst() {
435 - xdg_desktop_database_update
436 - xdg_mimeinfo_database_update
437 -}
438 -
439 -pkg_postrm() {
440 - xdg_desktop_database_update
441 - xdg_mimeinfo_database_update
442 -}
443
444 diff --git a/app-editors/imhex/imhex-1.8.1-r1.ebuild b/app-editors/imhex/imhex-1.8.1-r1.ebuild
445 deleted file mode 100644
446 index 72849a7cf..000000000
447 --- a/app-editors/imhex/imhex-1.8.1-r1.ebuild
448 +++ /dev/null
449 @@ -1,108 +0,0 @@
450 -# Copyright 1999-2021 Gentoo Authors
451 -# Distributed under the terms of the GNU General Public License v2
452 -
453 -EAPI="7"
454 -
455 -CMAKE_BUILD_TYPE="Release"
456 -CMAKE_MAKEFILE_GENERATOR="emake"
457 -LLVM_MAX_SLOT=12
458 -PYTHON_COMPAT=( python3_{8..10} )
459 -
460 -inherit cmake desktop llvm python-single-r1 xdg-utils
461 -
462 -DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
463 -HOMEPAGE="https://github.com/WerWolv/ImHex"
464 -SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
465 -S="${WORKDIR}/ImHex-${PV}"
466 -
467 -LICENSE="GPL-2"
468 -SLOT="0"
469 -KEYWORDS="~amd64"
470 -
471 -DEPEND="
472 - ${PYTHON_DEPS}
473 - app-forensics/yara
474 - dev-cpp/nlohmann_json
475 - dev-cpp/xdgpp
476 - dev-libs/capstone
477 - <dev-libs/libfmt-8.0.0
478 - dev-libs/nativefiledialog-extended
479 - dev-libs/openssl
480 - dev-libs/tre
481 - media-libs/freetype
482 - media-libs/glfw
483 - media-libs/glm
484 - net-libs/mbedtls
485 - net-misc/curl
486 - sys-apps/file
487 - sys-devel/llvm:${LLVM_MAX_SLOT}
488 - virtual/libiconv
489 - virtual/libintl
490 -"
491 -RDEPEND="${DEPEND}"
492 -BDEPEND="app-admin/chrpath"
493 -
494 -PATCHES=(
495 - "${FILESDIR}/${P}-gcc11.patch"
496 - "${FILESDIR}/${P}-system-xdgpp.patch"
497 - "${FILESDIR}/${P}-system-nativefiledialog.patch"
498 - "${FILESDIR}/${P}-fix-yara-linking.patch"
499 -)
500 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
501 -
502 -src_prepare() {
503 - rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
504 - cmake_src_prepare
505 -}
506 -
507 -src_configure() {
508 - python-single-r1_pkg_setup
509 - local mycmakeargs=(
510 - -DPROJECT_VERSION="${PV}"
511 - -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
512 - -DUSE_SYSTEM_CURL=ON
513 - -DUSE_SYSTEM_FMT=ON
514 - -DUSE_SYSTEM_LLVM=ON
515 - -DUSE_SYSTEM_NLOHMANN_JSON=ON
516 - -DUSE_SYSTEM_YARA=ON
517 - )
518 - cmake_src_configure
519 -
520 -}
521 -
522 -src_install() {
523 - # can't use cmake_src_install, doing it manual
524 - dobin "${BUILD_DIR}/${PN}"
525 - insinto "/usr/$(get_libdir)"
526 - doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
527 - dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
528 - insinto "/usr/share/${PN}"
529 - doins "${S}/res/icon.ico"
530 - doins -r "${S}/res/resources"
531 - insinto "/usr/share/${PN}/magic"
532 - newins "${BUILD_DIR}/magic_dbs.mgc" "magic.mgc"
533 -
534 - chrpath -d "${ED}/usr/bin/imhex"
535 - chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
536 -
537 - mypythondir="${D}/$(python_get_sitedir)/imhex"
538 - mkdir -p "${mypythondir}" || die
539 - mv "${S}"/python_libs/lib/* "${mypythondir}" || die
540 - python_optimize "${mypythondir}"
541 -
542 - # create desktop icon
543 - make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
544 -
545 - # install docs
546 - einstalldocs
547 -}
548 -
549 -pkg_postinst() {
550 - xdg_desktop_database_update
551 - xdg_mimeinfo_database_update
552 -}
553 -
554 -pkg_postrm() {
555 - xdg_desktop_database_update
556 - xdg_mimeinfo_database_update
557 -}