commit: 8ffc533170a70241b357e7fca450f2b23efdacab Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jul 17 20:29:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 17 20:29:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffc5331
dev-python/tweedledum: fix build w/ newer fmt Closes: https://bugs.gentoo.org/858200 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/tweedledum/Manifest | 1 + ...dum-1.1.1.ebuild => tweedledum-1.1.1-r1.ebuild} | 23 ++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-python/tweedledum/Manifest b/dev-python/tweedledum/Manifest index b9d0d3528a97..0ca31a66f0e4 100644 --- a/dev-python/tweedledum/Manifest +++ b/dev-python/tweedledum/Manifest @@ -1 +1,2 @@ +DIST tweedledum-1.1.1-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch 4394926 BLAKE2B 1035945714e7a5f5ac8cc41f9b799c6a3f0ded13b2f86098be11705d09029578d7e019cd784c6fb783c1bbaddb49425b5e2ec4bed142f01436620c6ac793e8f5 SHA512 1307e63be3366ec0b52e4238e3ac58c793f437acca95840b0bf15499efb3eae0e339d3c75c61b9a0c2734eaa6be416b6a35b51f784884aef98d86613e0b540d1 DIST tweedledum-1.1.1.gh.tar.gz 5105832 BLAKE2B 71e3e9baaccc345910d5be3831ea0476b06bc3171311d17fc3f160b7d4c9026bab719b1e80f1d462183cdcc1feb750542e2649c2aab5cdc6d4551ab258866649 SHA512 eda9c0d895d59450150946d52d942174652d305a863a10bafa60300cde63a692a8105b7bb5dcc86aeb610b666945215905cf95859f3726b875c88d5cd3d34891 diff --git a/dev-python/tweedledum/tweedledum-1.1.1.ebuild b/dev-python/tweedledum/tweedledum-1.1.1-r1.ebuild similarity index 57% rename from dev-python/tweedledum/tweedledum-1.1.1.ebuild rename to dev-python/tweedledum/tweedledum-1.1.1-r1.ebuild index 392e1dd17b22..48368b47ba02 100644 --- a/dev-python/tweedledum/tweedledum-1.1.1.ebuild +++ b/dev-python/tweedledum/tweedledum-1.1.1-r1.ebuild @@ -11,21 +11,32 @@ inherit distutils-r1 DESCRIPTION="Library for analysis, compilation, synthesis, optimization of quantum circuits" HOMEPAGE="https://github.com/boschmitt/tweedledum"; SRC_URI="https://github.com/boschmitt/tweedledum/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +# Drop on next bump, see bug #858200 +SRC_URI+=" https://github.com/boschmitt/tweedledum/commit/e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch -> ${P}-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -# >=dev-python/setuptools-42.0.0 -# >=dev-python/wheel -# dev-util/ninja -BDEPEND=" - >=dev-util/cmake-3.18 - >=dev-python/scikit-build-0.12.0" +# Unbundle dev-python/pybind11[${PYTHON_USEDEP}]? +RDEPEND=" + dev-cpp/nlohmann_json + dev-libs/libfmt:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen +" +BDEPEND=">=dev-python/scikit-build-0.12.0" + +PATCHES=( + "${DISTDIR}"/${P}-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch +) distutils_enable_tests pytest python_compile() { + # -DTWEEDLEDUM_USE_EXTERNAL_PYBIND11=ON local -x SKBUILD_CONFIGURE_OPTIONS="-DCMAKE_BUILD_TYPE=RelWithDebInfo" distutils-r1_python_compile }
