From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDC6915800F for ; Fri, 13 Jan 2023 07:35:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CDD9E07D1; Fri, 13 Jan 2023 07:35:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19BACE07D1 for ; Fri, 13 Jan 2023 07:35:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C562E340B0B for ; Fri, 13 Jan 2023 07:35:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02FD0807 for ; Fri, 13 Jan 2023 07:35:52 +0000 (UTC) From: "Rui Huang" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rui Huang" Message-ID: <1673591799.c3ae2c07fd0ca865577f36223dfde792994a5512.vowstar@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/imhex/imhex-1.26.2-r1.ebuild app-editors/imhex/imhex-1.26.2.ebuild X-VCS-Directories: app-editors/imhex/ X-VCS-Committer: vowstar X-VCS-Committer-Name: Rui Huang X-VCS-Revision: c3ae2c07fd0ca865577f36223dfde792994a5512 X-VCS-Branch: dev Date: Fri, 13 Jan 2023 07:35:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 060fe440-f786-4391-853f-fd56527555cb X-Archives-Hash: f739afad1d1a9711c04580af7ce3e2b9 commit: c3ae2c07fd0ca865577f36223dfde792994a5512 Author: Huang Rui gmail com> AuthorDate: Fri Jan 13 06:36:39 2023 +0000 Commit: Rui Huang gmail com> CommitDate: Fri Jan 13 06:36:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3ae2c07 app-editors/imhex: fix build when enable python Upstream pemoved all usages of Python https://github.com/WerWolv/ImHex/commit/85823e8e5dba0f42297430cb4df5a586bfd08718 Signed-off-by: Huang Rui gmail.com> ...{imhex-1.26.2.ebuild => imhex-1.26.2-r1.ebuild} | 23 +++------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/app-editors/imhex/imhex-1.26.2.ebuild b/app-editors/imhex/imhex-1.26.2-r1.ebuild similarity index 84% rename from app-editors/imhex/imhex-1.26.2.ebuild rename to app-editors/imhex/imhex-1.26.2-r1.ebuild index 0b29cdc18..3297637f4 100644 --- a/app-editors/imhex/imhex-1.26.2.ebuild +++ b/app-editors/imhex/imhex-1.26.2-r1.ebuild @@ -5,9 +5,8 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake desktop llvm python-r1 toolchain-funcs xdg +inherit cmake desktop llvm toolchain-funcs xdg DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight" HOMEPAGE="https://github.com/WerWolv/ImHex" @@ -21,11 +20,8 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND=" - python? ( ${PYTHON_DEPS} ) app-forensics/yara >=dev-cpp/nlohmann_json-3.10.2 dev-libs/capstone @@ -33,6 +29,7 @@ DEPEND=" media-libs/freetype media-libs/glfw media-libs/glm + net-libs/libssh2 net-libs/mbedtls net-misc/curl sys-apps/dbus @@ -67,8 +64,6 @@ src_prepare() { } src_configure() { - use python && python_setup - local mycmakeargs=( -D CMAKE_BUILD_TYPE="Release" \ -D CMAKE_C_COMPILER_LAUNCHER=ccache \ @@ -91,9 +86,7 @@ src_configure() { -D USE_SYSTEM_NLOHMANN_JSON=ON \ -D USE_SYSTEM_YARA=ON ) - if use python; then - mycmakeargs+=( -D PYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\"" ) - fi + cmake_src_configure } @@ -126,16 +119,6 @@ src_install() { doicon -s "${i}" "${T}/${i}x${i}/${PN}.png" done - if use python; then - installation() { - mypythondir="${D}/$(python_get_sitedir)/${PN}" - mkdir -p "${mypythondir}" || die - cp -r "${S}"/resources/lib/python/lib/* "${mypythondir}" || die - python_optimize "${mypythondir}" - } - python_foreach_impl installation - fi - # Install docs einstalldocs