commit: badd0bc7e1c65e6d985560a3ed30fd299fac65be Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Tue Nov 23 14:49:11 2021 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> 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 <tamiko <AT> 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=(
