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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70EFE158089 for ; Wed, 11 Oct 2023 02:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3B822BC016; Wed, 11 Oct 2023 02:14:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9A48F2BC016 for ; Wed, 11 Oct 2023 02:14:40 +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 806E0335C31 for ; Wed, 11 Oct 2023 02:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB892EC5 for ; Wed, 11 Oct 2023 02:14:37 +0000 (UTC) From: "Brett Alcox" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brett Alcox" Message-ID: <1696990455.7b558129bb24e7be7a13149c9f529140f9c8947e.brettalcox@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/mission-center/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-apps/mission-center/mission-center-0.3.2.ebuild X-VCS-Directories: sys-apps/mission-center/ X-VCS-Committer: brettalcox X-VCS-Committer-Name: Brett Alcox X-VCS-Revision: 7b558129bb24e7be7a13149c9f529140f9c8947e X-VCS-Branch: dev Date: Wed, 11 Oct 2023 02:14:37 +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: 62a01d22-fea2-4760-9824-3181b7f2ab71 X-Archives-Hash: 3b5b49c953e42fe79b73149ffba30cd0 commit: 7b558129bb24e7be7a13149c9f529140f9c8947e Author: brettalcox gmail com> AuthorDate: Wed Oct 11 02:14:15 2023 +0000 Commit: Brett Alcox gmail com> CommitDate: Wed Oct 11 02:14:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b558129 sys-apps/mission-center: clean up ebuild adding a --nonet flag to the appstream validate tests simplifying the ebuild and removing some unnecessary moves/copys adding qa flag because rust doesn't use make.conf *FLAGS Signed-off-by: brettalcox gmail.com> .../mission-center/mission-center-0.3.2.ebuild | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-apps/mission-center/mission-center-0.3.2.ebuild b/sys-apps/mission-center/mission-center-0.3.2.ebuild index bead8ac09b..ddddd1ce40 100644 --- a/sys-apps/mission-center/mission-center-0.3.2.ebuild +++ b/sys-apps/mission-center/mission-center-0.3.2.ebuild @@ -286,6 +286,9 @@ SRC_URI=" ${CARGO_CRATE_URIS} " +S="${WORKDIR}/${PN}-v${PV}" +BUILD_DIR="${S}-build" +ECARGO_HOME="${S}-build/cargo-home" LICENSE="GPL-3+" SLOT="0" @@ -312,19 +315,16 @@ BDEPEND=" dev-util/blueprint-compiler " -BUILD_DIR=${WORKDIR}/${P}/_build - src_unpack() { unpack ${P}.tar.bz2 - mv "${WORKDIR}/${PN}-v${PV}/" "${WORKDIR}/${P}" unpack nvtop-${NVTOP_COMMIT}.tar.gz - mv nvtop-${NVTOP_COMMIT} "${WORKDIR}/${P}/subprojects" + mv nvtop-${NVTOP_COMMIT} "${S}/subprojects" cargo_src_unpack } src_prepare() { eapply_user - cd "${WORKDIR}/${P}/subprojects/nvtop-${NVTOP_COMMIT}" + cd "${S}/subprojects/nvtop-${NVTOP_COMMIT}" find ../packagefiles -type f -name 'nvtop-*' -exec sh -c 'patch -p1 < {}' \; } @@ -334,16 +334,13 @@ src_configure() { --prefix=/usr ) meson_src_configure - cp -r "${WORKDIR}/cargo_home" "${WORKDIR}/${P}/_build/cargo-home" - cp -r "${WORKDIR}/cargo_home" "${WORKDIR}/${P}/_build/src/sys_info_v2/gatherer/cargo-home" -} - -src_compile() { - meson_src_compile -C _build + cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" } -src_install() { - meson_src_install -C _build +src_test() { + # patch the appstream-util validate command to use --nonet when validating the urls + sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}/data/meson.build" + meson_src_test } pkg_postinst() { @@ -357,3 +354,7 @@ pkg_postrm() { xdg_icon_cache_update xdg_desktop_database_update } + +# rust does not use *FLAGS from make.conf, silence portage warning +# update with proper path to binaries this crate installs, omit leading / +QA_FLAGS_IGNORED="usr/bin/${PN}"