| 1 |
commit: badd0bc7e1c65e6d985560a3ed30fd299fac65be |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 23 14:49:11 2021 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 23 14:49:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badd0bc7 |
| 7 |
|
| 8 |
dev-cpp/cpp-taskflow: QA fixes and add live ebuild |
| 9 |
|
| 10 |
- add a live ebuild as suggested in #733106 |
| 11 |
|
| 12 |
- remove 3rd-party directory to make sure that bundled software is not |
| 13 |
used. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/733106 |
| 16 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 17 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild | 19 ++++++++++++++++--- |
| 20 |
...taskflow-3.2.0.ebuild => cpp-taskflow-9999.ebuild} | 19 ++++++++++++++++--- |
| 21 |
2 files changed, 32 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild |
| 24 |
index fc6e30fbb60c..e4f2f9e403b5 100644 |
| 25 |
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild |
| 26 |
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild |
| 27 |
@@ -7,17 +7,30 @@ inherit cmake |
| 28 |
|
| 29 |
DESCRIPTION="Modern C++ Parallel Task Programming" |
| 30 |
HOMEPAGE="https://cpp-taskflow.github.io" |
| 31 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 32 |
-S="${WORKDIR}/taskflow-${PV}" |
| 33 |
+if [[ ${PV} == 9999 ]]; then |
| 34 |
+ EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" |
| 35 |
+ inherit git-r3 |
| 36 |
+ KEYWORDS="" |
| 37 |
+ S="${WORKDIR}/cpp-taskflow-${PV}" |
| 38 |
+else |
| 39 |
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 40 |
+ KEYWORDS="~amd64 ~x86" |
| 41 |
+ S="${WORKDIR}/taskflow-${PV}" |
| 42 |
+fi |
| 43 |
|
| 44 |
LICENSE="MIT" |
| 45 |
SLOT="0" |
| 46 |
-KEYWORDS="~amd64 ~x86" |
| 47 |
IUSE="examples test" |
| 48 |
RESTRICT="!test? ( test )" |
| 49 |
|
| 50 |
HTML_DOCS=( docs/. ) |
| 51 |
|
| 52 |
+src_prepare() { |
| 53 |
+ rm -r "${S}/3rd-party" || die "rm failed" |
| 54 |
+ default |
| 55 |
+ cmake_src_prepare |
| 56 |
+} |
| 57 |
+ |
| 58 |
src_configure() { |
| 59 |
# TODO: enable CUDA via USE flag |
| 60 |
local mycmakeargs=( |
| 61 |
|
| 62 |
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild |
| 63 |
similarity index 56% |
| 64 |
copy from dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild |
| 65 |
copy to dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild |
| 66 |
index fc6e30fbb60c..e4f2f9e403b5 100644 |
| 67 |
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild |
| 68 |
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild |
| 69 |
@@ -7,17 +7,30 @@ inherit cmake |
| 70 |
|
| 71 |
DESCRIPTION="Modern C++ Parallel Task Programming" |
| 72 |
HOMEPAGE="https://cpp-taskflow.github.io" |
| 73 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 74 |
-S="${WORKDIR}/taskflow-${PV}" |
| 75 |
+if [[ ${PV} == 9999 ]]; then |
| 76 |
+ EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git" |
| 77 |
+ inherit git-r3 |
| 78 |
+ KEYWORDS="" |
| 79 |
+ S="${WORKDIR}/cpp-taskflow-${PV}" |
| 80 |
+else |
| 81 |
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 82 |
+ KEYWORDS="~amd64 ~x86" |
| 83 |
+ S="${WORKDIR}/taskflow-${PV}" |
| 84 |
+fi |
| 85 |
|
| 86 |
LICENSE="MIT" |
| 87 |
SLOT="0" |
| 88 |
-KEYWORDS="~amd64 ~x86" |
| 89 |
IUSE="examples test" |
| 90 |
RESTRICT="!test? ( test )" |
| 91 |
|
| 92 |
HTML_DOCS=( docs/. ) |
| 93 |
|
| 94 |
+src_prepare() { |
| 95 |
+ rm -r "${S}/3rd-party" || die "rm failed" |
| 96 |
+ default |
| 97 |
+ cmake_src_prepare |
| 98 |
+} |
| 99 |
+ |
| 100 |
src_configure() { |
| 101 |
# TODO: enable CUDA via USE flag |
| 102 |
local mycmakeargs=( |
Archives