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 F3783158087 for ; Fri, 28 Jan 2022 05:18:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3985E2BC04F; Fri, 28 Jan 2022 05:18:46 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C27C62BC04F for ; Fri, 28 Jan 2022 05:18:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1A563432C3 for ; Fri, 28 Jan 2022 05:18:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07EF72BF for ; Fri, 28 Jan 2022 05:18:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643347007.64bedcd835cc05c4397317c094909d3764f2ba56.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/unicorn/unicorn-2.0.0_rc5.ebuild dev-util/unicorn/unicorn-9999.ebuild X-VCS-Directories: dev-util/unicorn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 64bedcd835cc05c4397317c094909d3764f2ba56 X-VCS-Branch: master Date: Fri, 28 Jan 2022 05:18:42 +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: fd943a41-b495-4981-90bb-b2fab65cc6db X-Archives-Hash: c2a5abd7013ffb099534c324d97c080d commit: 64bedcd835cc05c4397317c094909d3764f2ba56 Author: Sam James gentoo org> AuthorDate: Fri Jan 28 04:40:40 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 28 05:16:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bedcd8 dev-util/unicorn: minor cleanups - Define subslot (tools like this often end up breaking ABI and it's useful to set it proactively here) - Use PEP517 - Add a missing `|| die` - Minor whitespace changes - HTTPSify HOMEPAGE See: https://github.com/gentoo/gentoo/pull/23806 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 31 +++++++++++++++++-------------- dev-util/unicorn/unicorn-9999.ebuild | 30 ++++++++++++++++-------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index c0be1c278b68..1a1090444ff1 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -5,12 +5,13 @@ EAPI=8 MY_PV=${PV/_/-} +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="http://www.unicorn-engine.org" +HOMEPAGE="https://www.unicorn-engine.org" if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -20,21 +21,19 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="GPL-2" -SLOT="0" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +S="${WORKDIR}/${PN}-${MY_PV}" +LICENSE="GPL-2" +SLOT="0/2" IUSE="python static-libs" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="dev-libs/glib:2 - virtual/pkgconfig - ${PYTHON_DEPS}" +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}-${MY_PV}" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" wrap_python() { if use python; then @@ -44,13 +43,14 @@ wrap_python() { pushd bindings/python >/dev/null || die distutils-r1_${1} "$@" - popd >/dev/null + popd >/dev/null || die fi } src_prepare() { - # build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuild" + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + cmake_src_prepare wrap_python ${FUNCNAME} } @@ -58,15 +58,18 @@ src_prepare() { src_configure(){ local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED="$(usex static-libs OFF ON)" + -DUNICORN_BUILD_SHARED=$(usex !static-libs) -DUNICORN_ARCH="${UNICORN_TARGETS}" ) + cmake_src_configure + wrap_python ${FUNCNAME} } src_compile() { cmake_src_compile + wrap_python ${FUNCNAME} } diff --git a/dev-util/unicorn/unicorn-9999.ebuild b/dev-util/unicorn/unicorn-9999.ebuild index c0be1c278b68..0c2d81bebca9 100644 --- a/dev-util/unicorn/unicorn-9999.ebuild +++ b/dev-util/unicorn/unicorn-9999.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="http://www.unicorn-engine.org" +HOMEPAGE="https://www.unicorn-engine.org" if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -20,21 +20,19 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="GPL-2" -SLOT="0" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +S="${WORKDIR}/${PN}-${MY_PV}" +LICENSE="GPL-2" +SLOT="0/2" IUSE="python static-libs" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="dev-libs/glib:2 - virtual/pkgconfig - ${PYTHON_DEPS}" +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}-${MY_PV}" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" wrap_python() { if use python; then @@ -44,13 +42,14 @@ wrap_python() { pushd bindings/python >/dev/null || die distutils-r1_${1} "$@" - popd >/dev/null + popd >/dev/null || die fi } src_prepare() { - # build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuild" + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + cmake_src_prepare wrap_python ${FUNCNAME} } @@ -58,15 +57,18 @@ src_prepare() { src_configure(){ local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED="$(usex static-libs OFF ON)" + -DUNICORN_BUILD_SHARED=$(usex !static-libs) -DUNICORN_ARCH="${UNICORN_TARGETS}" ) + cmake_src_configure + wrap_python ${FUNCNAME} } src_compile() { cmake_src_compile + wrap_python ${FUNCNAME} }