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 BB676158086 for ; Tue, 23 Nov 2021 14:50:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5065DE086F; Tue, 23 Nov 2021 14:49:58 +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 0565EE07E0 for ; Tue, 23 Nov 2021 14:49:58 +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 02D5F342F5E for ; Tue, 23 Nov 2021 14:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F6671DD for ; Tue, 23 Nov 2021 14:49:55 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1637678986.badd0bc7e1c65e6d985560a3ed30fd299fac65be.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild X-VCS-Directories: dev-cpp/cpp-taskflow/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: badd0bc7e1c65e6d985560a3ed30fd299fac65be X-VCS-Branch: master Date: Tue, 23 Nov 2021 14:49:55 +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: 62ce9e12-c6f4-438e-9240-23ea3746aded X-Archives-Hash: 9764349daca64aed63d7b76a1d1acac9 commit: badd0bc7e1c65e6d985560a3ed30fd299fac65be Author: Matthias Maier gentoo org> AuthorDate: Tue Nov 23 14:49:11 2021 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Nov 23 14:49:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badd0bc7 dev-cpp/cpp-taskflow: QA fixes and add live ebuild - add a live ebuild as suggested in #733106 - remove 3rd-party directory to make sure that bundled software is not used. Closes: https://bugs.gentoo.org/733106 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Matthias Maier gentoo.org> dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild | 19 ++++++++++++++++--- ...taskflow-3.2.0.ebuild => cpp-taskflow-9999.ebuild} | 19 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild index fc6e30fbb60c..e4f2f9e403b5 100644 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild +++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild @@ -7,17 +7,30 @@ inherit cmake DESCRIPTION="Modern C++ Parallel Task Programming" HOMEPAGE="https://cpp-taskflow.github.io" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/taskflow-${PV}" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" + inherit git-r3 + KEYWORDS="" + S="${WORKDIR}/cpp-taskflow-${PV}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/taskflow-${PV}" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="examples test" RESTRICT="!test? ( test )" HTML_DOCS=( docs/. ) +src_prepare() { + rm -r "${S}/3rd-party" || die "rm failed" + default + cmake_src_prepare +} + src_configure() { # TODO: enable CUDA via USE flag local mycmakeargs=( diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild similarity index 56% copy from dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild copy to dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild index fc6e30fbb60c..e4f2f9e403b5 100644 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild +++ b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild @@ -7,17 +7,30 @@ inherit cmake DESCRIPTION="Modern C++ Parallel Task Programming" HOMEPAGE="https://cpp-taskflow.github.io" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/taskflow-${PV}" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" + inherit git-r3 + KEYWORDS="" + S="${WORKDIR}/cpp-taskflow-${PV}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/taskflow-${PV}" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="examples test" RESTRICT="!test? ( test )" HTML_DOCS=( docs/. ) +src_prepare() { + rm -r "${S}/3rd-party" || die "rm failed" + default + cmake_src_prepare +} + src_configure() { # TODO: enable CUDA via USE flag local mycmakeargs=(