From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- dev-python/graph-tool/Manifest | 7 +- ...ompilation-with-boost-1.83-and-boost-1.76.patch | 28 ------- dev-python/graph-tool/graph-tool-2.58.ebuild | 88 ---------------------- dev-python/graph-tool/graph-tool-2.71.ebuild | 88 ---------------------- dev-python/graph-tool/graph-tool-2.75.ebuild | 84 +++++++++++++++++++++ 5 files changed, 86 insertions(+), 209 deletions(-) delete mode 100644 dev-python/graph-tool/files/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch delete mode 100644 dev-python/graph-tool/graph-tool-2.58.ebuild delete mode 100644 dev-python/graph-tool/graph-tool-2.71.ebuild create mode 100644 dev-python/graph-tool/graph-tool-2.75.ebuild (limited to 'dev-python/graph-tool') diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 703f5d41aba8..631ce0562e67 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -1,7 +1,4 @@ -AUX 0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch 789 BLAKE2B 6117f7f3dd0d2ec73ec2009f0cfce6721c6fbbfc5e50efdd23e220f26b135b7e31fbf645ed9fcde6d863631f6ad564ad58235cb26bcd8133c8e958334604862f SHA512 93766f3b8603f4d1b3af9c26f6fa01b4d2ffcc9290b05bcd7f213d9823f33ca4ebff52c385810416f2a0457e2dd05792f9e22f5fb983ddedb44c819cb7882910 -DIST graph-tool-2.58.tar.xz 14949712 BLAKE2B f7edfc112e737aad09317b2a754eefa8fad0135d580766b24ef5eb08d9e748a65a7372d95b9b00ffd891a2fe033f7ca29348b700e145361c48c95fe31a9f1500 SHA512 bfb604073c71b1f4a605008e5bfa6414370bc5c14e1b501e1821c1d363370e2f1f7c6dcedabf67723286cac07def1442c24577308458a75c4fc70aee69bf22ee -DIST graph-tool-2.71.tar.xz 14997876 BLAKE2B c23b4729065ebba43ba3501bca63980a40354e2ff6727ea3b663c60521cdf571ab794eb83f9cfb56909d92e3be90ac5d94c7dcd7f6639cb2c2fb9ee5c675697f SHA512 caedba222e499b81d93d51097c526a8a64dd1f3b91141012c67ffe40532f6168294e430887484522f75709828d280f95cc75bc400a886e71bf73d64efd9b7833 -EBUILD graph-tool-2.58.ebuild 1875 BLAKE2B 6b64463785d873278b4aa1b5a4a8d027342842f1e55964e26d26bf45d79144642b724cb8680ec85effbe06fc56a961bdadecd9e2bfa2f741d5f0ba3e55d6da89 SHA512 8e9aa23c6e4f1f2dab7d76dbea33fa0f089e8ffb68d4a99ad1ebfe0dec6f5f423c64f15f6805ee74277a0fa29ce2beab4b5f8dae38dad1eebace132712dfe2ca -EBUILD graph-tool-2.71.ebuild 1875 BLAKE2B 6b64463785d873278b4aa1b5a4a8d027342842f1e55964e26d26bf45d79144642b724cb8680ec85effbe06fc56a961bdadecd9e2bfa2f741d5f0ba3e55d6da89 SHA512 8e9aa23c6e4f1f2dab7d76dbea33fa0f089e8ffb68d4a99ad1ebfe0dec6f5f423c64f15f6805ee74277a0fa29ce2beab4b5f8dae38dad1eebace132712dfe2ca +DIST graph-tool-2.75.tar.xz 15001276 BLAKE2B f329d87becfdee08aafc74ad29f496c1ea973a31d84e6e120056808d9d829cdb79db247991d83461635f06451f68197d7bb815f64ca375a5b0775dac74831d01 SHA512 cb9c0a677bb8dda7dcc56b271f5865675d02509b273fa665c5c84664d645d1b90d015e2a16571bc194fc0583036f3142c5e5e359c815bf13ae882ce6862644fc +EBUILD graph-tool-2.75.ebuild 1778 BLAKE2B 7249b7e5d6ffbccf5967287ccf3e5ccd24b6e90300485ca623e99bb91e01c8f5316901c01d7b90b0d5468d41331dd73b2503c1339362fe19185eb31bf9cf2ee8 SHA512 75f70b1688eac59bbfadc826c70808bcb9325b23d8c7eae16b6cddffbc66ee372b48e3b96ac41d6d093fd76f0503b7774f2457e4b65a133a393c05ad99ffa9e0 EBUILD graph-tool-9999.ebuild 1778 BLAKE2B 7249b7e5d6ffbccf5967287ccf3e5ccd24b6e90300485ca623e99bb91e01c8f5316901c01d7b90b0d5468d41331dd73b2503c1339362fe19185eb31bf9cf2ee8 SHA512 75f70b1688eac59bbfadc826c70808bcb9325b23d8c7eae16b6cddffbc66ee372b48e3b96ac41d6d093fd76f0503b7774f2457e4b65a133a393c05ad99ffa9e0 MISC metadata.xml 318 BLAKE2B f5a87067223b56a1c2f2a89278b2b7b8ab612a1575264999e40a3bb34853cf603a7a11546c7ff9aa4f253beeb09c2fd26abc8fda1c6f2de5bda35069e9f932bc SHA512 b3bf8fc36dd5ae8e8b773cf9a0670fa1c6a2ee3730c9f2980abf5823f52879c5ef87a357c25d025896bd75ced32ffcec82ecdb1f080babc4fe13d2a2b70624b1 diff --git a/dev-python/graph-tool/files/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch b/dev-python/graph-tool/files/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch deleted file mode 100644 index bac83a8c0337..000000000000 --- a/dev-python/graph-tool/files/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 005b377fa09c28a5f61f11319f337ceea640f4ab Mon Sep 17 00:00:00 2001 -From: Tiago de Paula Peixoto -Date: Fri, 1 Sep 2023 10:27:28 +0200 -Subject: [PATCH] Fix compilation with boost 1.83 and boost < 1.76 This unites - upstream commits: 0a837b40 and 5517e370. - ---- - src/graph/gml.hh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/graph/gml.hh b/src/graph/gml.hh -index 7bea0ca3..b4cb84db 100644 ---- a/src/graph/gml.hh -+++ b/src/graph/gml.hh -@@ -26,6 +26,10 @@ - #include - #include - -+#if BOOST_VERSION >= 107600 -+#include -+#endif -+ - #include - - #include --- -2.41.0 - diff --git a/dev-python/graph-tool/graph-tool-2.58.ebuild b/dev-python/graph-tool/graph-tool-2.58.ebuild deleted file mode 100644 index cc33f7016710..000000000000 --- a/dev-python/graph-tool/graph-tool-2.58.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs python-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git" - inherit autotools git-r3 -else - SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" -HOMEPAGE="https://graph-tool.skewed.de/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+cairo openmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/boost:=[context,python,${PYTHON_USEDEP}] - dev-libs/expat - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - sci-mathematics/cgal:= - dev-python/matplotlib[${PYTHON_USEDEP}] - cairo? ( - dev-cpp/cairomm:0 - dev-python/pycairo[${PYTHON_USEDEP}] - x11-libs/cairo[X] - )" -DEPEND="${RDEPEND} - dev-cpp/sparsehash" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch # backport -) - -# bug 453544 -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - check-reqs_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf - python_copy_sources -} - -src_configure() { - my_configure() { - econf \ - --disable-static \ - $(use_enable openmp) \ - $(use_enable cairo) \ - --with-boost-python="boost_${EPYTHON/./}" - } - python_foreach_impl run_in_build_dir my_configure -} - -src_compile() { - python_foreach_impl run_in_build_dir emake -} - -src_install() { - my_python_install() { - default - python_optimize - } - python_foreach_impl run_in_build_dir my_python_install - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-python/graph-tool/graph-tool-2.71.ebuild b/dev-python/graph-tool/graph-tool-2.71.ebuild deleted file mode 100644 index cc33f7016710..000000000000 --- a/dev-python/graph-tool/graph-tool-2.71.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs python-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git" - inherit autotools git-r3 -else - SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" -HOMEPAGE="https://graph-tool.skewed.de/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+cairo openmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/boost:=[context,python,${PYTHON_USEDEP}] - dev-libs/expat - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - sci-mathematics/cgal:= - dev-python/matplotlib[${PYTHON_USEDEP}] - cairo? ( - dev-cpp/cairomm:0 - dev-python/pycairo[${PYTHON_USEDEP}] - x11-libs/cairo[X] - )" -DEPEND="${RDEPEND} - dev-cpp/sparsehash" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch # backport -) - -# bug 453544 -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - check-reqs_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf - python_copy_sources -} - -src_configure() { - my_configure() { - econf \ - --disable-static \ - $(use_enable openmp) \ - $(use_enable cairo) \ - --with-boost-python="boost_${EPYTHON/./}" - } - python_foreach_impl run_in_build_dir my_configure -} - -src_compile() { - python_foreach_impl run_in_build_dir emake -} - -src_install() { - my_python_install() { - default - python_optimize - } - python_foreach_impl run_in_build_dir my_python_install - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-python/graph-tool/graph-tool-2.75.ebuild b/dev-python/graph-tool/graph-tool-2.75.ebuild new file mode 100644 index 000000000000..933f090ee1fa --- /dev/null +++ b/dev-python/graph-tool/graph-tool-2.75.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs python-r1 toolchain-funcs + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git" + inherit autotools git-r3 +else + SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" +HOMEPAGE="https://graph-tool.skewed.de/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+cairo openmp" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/boost:=[context,python,${PYTHON_USEDEP}] + dev-libs/expat + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + sci-mathematics/cgal:= + dev-python/matplotlib[${PYTHON_USEDEP}] + cairo? ( + dev-cpp/cairomm:0 + dev-python/pycairo[${PYTHON_USEDEP}] + x11-libs/cairo[X] + )" +DEPEND="${RDEPEND} + dev-cpp/sparsehash" +BDEPEND="virtual/pkgconfig" + +# bug 453544 +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + check-reqs_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + [[ ${PV} == *9999 ]] && eautoreconf + python_copy_sources +} + +src_configure() { + my_configure() { + econf \ + --disable-static \ + $(use_enable openmp) \ + $(use_enable cairo) \ + --with-boost-python="boost_${EPYTHON/./}" + } + python_foreach_impl run_in_build_dir my_configure +} + +src_compile() { + python_foreach_impl run_in_build_dir emake +} + +src_install() { + my_python_install() { + default + python_optimize + } + python_foreach_impl run_in_build_dir my_python_install + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3