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 1D622158087 for ; Fri, 28 Jan 2022 05:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49CEB2BC058; 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 ECD9E2BC058 for ; Fri, 28 Jan 2022 05:18:45 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBB6C3432C8 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 2CF882C4 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: <1643347008.2627b3cc74876e07a34fe1766997d4faea723ebf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gef/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gef/gef-2021.10.ebuild dev-util/gef/gef-9999.ebuild X-VCS-Directories: dev-util/gef/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2627b3cc74876e07a34fe1766997d4faea723ebf 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: a3e9122a-0811-42a2-829b-def83db51301 X-Archives-Hash: 79dde2de8c5a56071b906ce6b9a30bc5 commit: 2627b3cc74876e07a34fe1766997d4faea723ebf Author: Sam James gentoo org> AuthorDate: Fri Jan 28 05:13:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 28 05:16:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2627b3cc dev-util/gef: respect EPREFIX; wire up test dependencies Tests still hang though. See: https://github.com/gentoo/gentoo/pull/23806 Signed-off-by: Sam James gentoo.org> dev-util/gef/gef-2021.10.ebuild | 31 ++++++++++++++++++------------- dev-util/gef/gef-9999.ebuild | 31 ++++++++++++++++++------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dev-util/gef/gef-2021.10.ebuild b/dev-util/gef/gef-2021.10.ebuild index e69d14c8d8a6..0d0db6c0ae2b 100644 --- a/dev-util/gef/gef-2021.10.ebuild +++ b/dev-util/gef/gef-2021.10.ebuild @@ -10,7 +10,7 @@ inherit python-single-r1 wrapper DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers" HOMEPAGE="https://github.com/hugsy/gef" -if [[ "${PV}" == *9999 ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hugsy/gef" else @@ -20,9 +20,9 @@ fi LICENSE="MIT" SLOT="0" -IUSE="doc" -RESTRICT="test" - +IUSE="doc test" +# Seem to hang right now? +RESTRICT="!test? ( test ) test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -36,28 +36,33 @@ RDEPEND=" dev-util/unicorn[python,${PYTHON_USEDEP}] ')" -BDEPEND="doc? ( dev-python/mkdocs )" - -pkg_setup() { - python-single-r1_pkg_setup -} +BDEPEND="doc? ( dev-python/mkdocs ) + test? ( + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + )" src_compile() { + # Tries to compile tests : } src_install() { - insinto "/usr/share/${PN}" + insinto /usr/share/${PN} doins -r *.py - python_optimize "${D}/usr/share/${PN}" + python_optimize "${ED}"/usr/share/${PN} make_wrapper "gdb-gef" \ - "gdb -ex \"source /usr/share/${PN}/gef.py\"" || die + "gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die if use doc; then + # TODO: docs.eclass? mkdocs build -d html || die - rm "${WORKDIR}/${P}/html/sitemap.xml.gz" || die + + rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die dodoc -r html/ fi diff --git a/dev-util/gef/gef-9999.ebuild b/dev-util/gef/gef-9999.ebuild index e69d14c8d8a6..0d0db6c0ae2b 100644 --- a/dev-util/gef/gef-9999.ebuild +++ b/dev-util/gef/gef-9999.ebuild @@ -10,7 +10,7 @@ inherit python-single-r1 wrapper DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers" HOMEPAGE="https://github.com/hugsy/gef" -if [[ "${PV}" == *9999 ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hugsy/gef" else @@ -20,9 +20,9 @@ fi LICENSE="MIT" SLOT="0" -IUSE="doc" -RESTRICT="test" - +IUSE="doc test" +# Seem to hang right now? +RESTRICT="!test? ( test ) test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -36,28 +36,33 @@ RDEPEND=" dev-util/unicorn[python,${PYTHON_USEDEP}] ')" -BDEPEND="doc? ( dev-python/mkdocs )" - -pkg_setup() { - python-single-r1_pkg_setup -} +BDEPEND="doc? ( dev-python/mkdocs ) + test? ( + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + )" src_compile() { + # Tries to compile tests : } src_install() { - insinto "/usr/share/${PN}" + insinto /usr/share/${PN} doins -r *.py - python_optimize "${D}/usr/share/${PN}" + python_optimize "${ED}"/usr/share/${PN} make_wrapper "gdb-gef" \ - "gdb -ex \"source /usr/share/${PN}/gef.py\"" || die + "gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die if use doc; then + # TODO: docs.eclass? mkdocs build -d html || die - rm "${WORKDIR}/${P}/html/sitemap.xml.gz" || die + + rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die dodoc -r html/ fi