gentoo resync : 08.07.2021

3 files changed, 21 insertions, 21 deletions

diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 0ffda0afa17e..3d77092a44d5 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
-DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
-EBUILD graph-tool-2.35-r1.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
-EBUILD graph-tool-9999.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
+DIST graph-tool-2.43.tar.bz2 15170272 BLAKE2B 96570242cf2003c262024545a074bcd0f0cf9351b0c8c68035529d38d535411386d5440bb5166cfb70f24ba1540d9ce65324c659564f2ab50358dbd77bafed99 SHA512 e72dec9656acb2bb7ba43e19673fa4ff70ff4819e76bb5f00e9943e4cfe6a85f1e0eaa58c8be2921ebd783ef3d978294a347238f3700a457aaff8a98ea8ed4fc
+EBUILD graph-tool-2.43.ebuild 1828 BLAKE2B 129b774dac80943f0b78f5931a99d14e973bf68fbc9021c0bb9dcf2c9e341f3dfc4265b9e2676688f4a0cb0943dc695aae92bbeef4f7c40c4e1a0088961384ea SHA512 a3d9b51f8bf4023ae67cbf06c912c1acea0dcfd760a05d48e8733755c0f9cb619a7f65d77799250346f94c6bd09357acc87b230efa459f0771c46223aad855db
+EBUILD graph-tool-9999.ebuild 1828 BLAKE2B 129b774dac80943f0b78f5931a99d14e973bf68fbc9021c0bb9dcf2c9e341f3dfc4265b9e2676688f4a0cb0943dc695aae92bbeef4f7c40c4e1a0088961384ea SHA512 a3d9b51f8bf4023ae67cbf06c912c1acea0dcfd760a05d48e8733755c0f9cb619a7f65d77799250346f94c6bd09357acc87b230efa459f0771c46223aad855db
 MISC metadata.xml 436 BLAKE2B f588384060513f0fa8ad9c77222cc04da4767e56521404f532f4e1ce61f2f0adc7aa2b7dea2f1b194703b32db7982fe61587a4e7d4bd7e0af3ed240e49c4ddde SHA512 ec4288006fa779dcb7291d2aeffecfef11bf516f6a4a8ff856f67ae21a8cc25252e49b65df7b8657ee8a35f224275bf188b05c5b10d202a5111b281b8b47e561
diff --git a/dev-python/graph-tool/graph-tool-2.35-r1.ebuild b/dev-python/graph-tool/graph-tool-2.43.ebuild
index 7f89339ef83d..cf2e5589ad5e 100644
--- a/dev-python/graph-tool/graph-tool-2.35-r1.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.43.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
@@ -26,15 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat:=
+	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}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
 BDEPEND="virtual/pkgconfig"
@@ -58,27 +58,27 @@ src_prepare() {
 }
 
 src_configure() {
-	configure() {
+	my_configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
 			--with-boost-python="boost_${EPYTHON/./}"
 	}
-	python_foreach_impl run_in_build_dir configure
+	python_foreach_impl run_in_build_dir my_configure
 }
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir default
+	python_foreach_impl run_in_build_dir emake -j2
 }
 
 src_install() {
-	python_install() {
+	my_python_install() {
 		default
 		python_optimize
 	}
-	python_foreach_impl run_in_build_dir python_install
+	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-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 7f89339ef83d..cf2e5589ad5e 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
@@ -26,15 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat:=
+	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}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
 BDEPEND="virtual/pkgconfig"
@@ -58,27 +58,27 @@ src_prepare() {
 }
 
 src_configure() {
-	configure() {
+	my_configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
 			--with-boost-python="boost_${EPYTHON/./}"
 	}
-	python_foreach_impl run_in_build_dir configure
+	python_foreach_impl run_in_build_dir my_configure
 }
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir default
+	python_foreach_impl run_in_build_dir emake -j2
 }
 
 src_install() {
-	python_install() {
+	my_python_install() {
 		default
 		python_optimize
 	}
-	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl run_in_build_dir my_python_install
 
 	find "${ED}" -name '*.la' -delete || die
 }