gentoo auto-resync : 18:01:2023 - 17:57:26

8 files changed, 25 insertions, 310 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ed6199c42978..3518b4837b81 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 20adc31550f7..9cf819d6c5ba 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,14 +1,7 @@
 AUX lhapdf-6.5.2-py.patch 391 BLAKE2B f5d904659a9163ec2e269e5c950c0610c9604dd936f307600641f68e5b22eb2e36fbc013b8d7432b158f61ca83ce2e8bcfb5202fff95a57e85ce0766299169f5 SHA512 c344b98d9f604cb530fa179b5ad4511edc7d1f56b5de3ec385d57a2823526b634bf8cf3cc0e51ca0b5dc868116fd5569bfb9e59d3dfbb1ffc377945570329b6a
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
-DIST LHAPDF-6.5.1.tar.gz 843942 BLAKE2B 4b86b2b3c32d8c02839946aee831d57657eccc7c80efaa49af9052f8437d1ae86b95a6acc5120e3337d528a184d8af5b4dde75a23ac6deeb85ed0d745f73647b SHA512 eeca814a60d7ae03491e82991f328bc4216d46ad94834ce19fb813e59f2d6e9bb7450678c8f6cdf1aaa3d700e56ef8dfc1363e46120893fa8be4d451c37603d2
-DIST LHAPDF-6.5.2.tar.gz 865088 BLAKE2B 630846f6105351d0561619f59810d23d936043842b0524d3818153416d116833ca550a940824a74ee9c6684d8d2ea59e72f3a74b3238fd3dc2828937c1422185 SHA512 14dc815a1abb22398d5dc2d4bbe21b0be4dbf16b834fe6be467f11c65d9e13e34548e93d29358740cdb0afedd141e950608258ddd6c0a5d83174861cffdc8f8d
 DIST LHAPDF-6.5.3.tar.gz 864918 BLAKE2B 2dd1b5b94523c0cadac2b63d3dcbc73c5d621463ec9a0e6736b40cb24f6f4da744cf74484b6a5cfb1cfc10054171858dfb3968b22da565747d9b0d00cb3f545c SHA512 444e1dd75c087b0618a65b0ebda0d06dac640d75e43de3a2e4cd5733dd2eaa6eeb6cb0aac437ee559b00b60a6b839a4125b3b26d398da81d52a3a97a7b875662
+EBUILD lhapdf-6.3.0-r1.ebuild 1513 BLAKE2B 31072c0e191f75582096b6c6dc7ca649bcb88d5b133ebb5ee3d7ca1c6599526f2e7a13be5d83abda3530d58aec9b47f3ade413793817a0a2e6a0e424b8c726e7 SHA512 a0307ca5a1c5164817c6057af49672e2a9b706480bf42541272c04c29e5a73c8f03feb91289432a964643cf1d6fd046d66cb8e425a59c69dbc4a5cf0da6deeb4
 EBUILD lhapdf-6.3.0.ebuild 1661 BLAKE2B 2cf9ce02a81e05197e97c17fbd9dabac3f1c7b6b67aa9a4a272ab6170b764366f135642d262c5c157a95bb4f491132ea7ec0e6428267b915450bee7f0ef440d4 SHA512 0211fc83a79b37e397a3e5973266124847a6b51636b03caeb8b70993e92dac75d66178c343a255351a89ef000ae05c439b4b97037303f1c4dfaecd3ddfae7261
-EBUILD lhapdf-6.5.1-r1.ebuild 1117 BLAKE2B 897250bc6f6a4ebc88337b51c056e28d11a8a44fa3e4344f0b9094b10f5d30ae390bc0fe6157f663fe556ee7c61e442e83550f565618513406e510e58be138f4 SHA512 71061a7f944431d14892dfc3de231b12c38e2f84e8b3b85f695a354caf1e7ecbfbc70fc92926a7cf71b21a97d89de56073e5cd59e129eac990cf4580450c8f9e
-EBUILD lhapdf-6.5.1.ebuild 1137 BLAKE2B b9871e68f0d0ab81d7d14d2f40eeffe974d358b1de95ae82194097f48577c93d41aa77128fcc2cada9a9ca52b8db290eb5c06ca8444dac3157c50a25a62c47e6 SHA512 257a6b45bd58dd41d298ca8920094c1b2c11658fa62705b1141ef62ffbaba7ca08a3d6b729b36ebbe78ec73a8722d14d49ea9a03787bf146b2bac2277412c2ba
-EBUILD lhapdf-6.5.2-r1.ebuild 1201 BLAKE2B f93cde1d486aa5c4a54c29e91de73484bc0555a624a8ce1291733543cafeadde8321af845ab28e5819e266fe09e5d398283d7191c31c0df93c3ff344d71d12cb SHA512 8285ea9f86b630268e1aec034fa7636ae36165f0be420435e60ac456d62d7c8a835966da3e6ab044efcb5c1e4bd1168971c27fadeaba3dbf0a58d34244c6ffb2
-EBUILD lhapdf-6.5.2-r2.ebuild 1181 BLAKE2B ae2becec1f798fff25763238bc449a17ae10c5911b73f99a578049fe799360ccc7b0cfd983fa0d263c0d234d61abf5cb5d061cdee794621c86dbb763f9ef82bd SHA512 bd07eed26f28097ee292dd74b9403a0b49fb07990a7ff566cc46b79899a2ea0795b646a4c1ff63dbe5ee4aa592220a7b32e3747c5c7677aede34708668172eb7
-EBUILD lhapdf-6.5.2.ebuild 1161 BLAKE2B 31b99e0877b96d05ed159b2c8f639a6da6a0c6f32bb076eea1cd9ddca00b968a45f6067058083b001f281ae7bcebf5603b86bc38501e4afe80057e2d5fe206af SHA512 2fcdde81472e5934f6ce0f9b41791364ef36ec94cb91660cfb0930736a51db17483cf83023c2ce2037d6f8ac234f6bbcb96cb953018579821003296b89645a84
 EBUILD lhapdf-6.5.3-r1.ebuild 1161 BLAKE2B aaa67027ed213ed83386023de26f200d022143048182fa3531fc1a2b564abc64f3d9d644f344f5803a0d2bc1d5fbe4934b5c65b6689dd147a8bb941b4573454e SHA512 1228c4d723d919928b50a07943143d1783876b996c5070c3717f649d0569985b4f794d331dc616625d2f42f5c21db0baec967f9e597cf61f19ce08d28eeecf7d
-EBUILD lhapdf-6.5.3.ebuild 1181 BLAKE2B 2e3998b83156867afc04b31106df0b31ad7a439efd7d311fb2ae3b8d48c61a623733500e85a96e029f274b89cc1ac123d9f6e5f52c96d39cc226a6f10e74b42e SHA512 51869f67c4cb61243da0cf7de559564c1d23128e2275a870b9451ad8a2680ec69ffb4b1c4fa91b672cd632c82d0e7a85c93af1daed57b7e13b6fbd4a0ac1d5a7
 MISC metadata.xml 1074 BLAKE2B fdd2f72c76bfe83ce7d3bd16b008325849116bb5ae5d9056ae66309dd6506369f975aad00da9d3bd5c2bd75bec43ef6dc8a507ee9b80f6abda6208900b898e54 SHA512 7768e9988fcd218bd5894d6be78a40652a94455938e037d42e1b77bc0a263097c708821f44e298dd8fe6b027dcb0d9cc799628390547ab6cea8f00fc1999ec8e
diff --git a/sci-physics/lhapdf/lhapdf-6.5.2-r2.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
index 72bde961dd89..a26dcc0d2f80 100644
--- a/sci-physics/lhapdf/lhapdf-6.5.2-r2.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
@@ -12,7 +12,9 @@ DOCS_DEPEND="
 	dev-texlive/texlive-latex
 	dev-texlive/texlive-latexextra
 "
-inherit python-single-r1 docs
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 docs
 
 MY_PV=$(ver_cut 1-3)
 MY_PF=LHAPDF-${MY_PV}
@@ -24,24 +26,38 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	$(python_gen_cond_dep '
+	     >=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	')
+"
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${P}-py.patch
-)
+
+src_prepare() {
+	default
+	# Let cython reproduce this for more recent python versions
+	rm wrappers/python/lhapdf.cpp || die
+}
+
 src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
 	econf \
 		--disable-static \
 		--enable-python
+
+	cd "${S}"/wrappers/python || die
+	distutils-r1_src_prepare
 }
 
 src_compile() {
 	emake all $(use doc && echo doxy)
+
+	cd "${S}"/wrappers/python || die
+	distutils-r1_src_compile
 }
 
 src_test() {
@@ -53,7 +69,8 @@ src_install() {
 	use doc && dodoc -r doc/doxygen/.
 	use examples && dodoc examples/*.cc
 
-	python_optimize
+	cd "${S}"/wrappers/python || die
+	distutils-r1_src_install
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-physics/lhapdf/lhapdf-6.5.1-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.1-r1.ebuild
deleted file mode 100644
index 6dca75660421..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_9 )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-inherit python-single-r1 docs
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="https://lhapdf.hepforge.org/"
-SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		--enable-python
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/.
-	use examples && dodoc examples/*.cc
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.5.1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.1.ebuild
deleted file mode 100644
index 9b6b9e8f8376..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_9 )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-inherit python-single-r1 docs
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="https://lhapdf.hepforge.org/"
-SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		--enable-python
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/.
-	use examples && dodoc examples/*.cc
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.5.2-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.2-r1.ebuild
deleted file mode 100644
index 847df333d690..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-inherit python-single-r1 docs
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="https://lhapdf.hepforge.org/"
-SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${P}-py.patch
-)
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		--enable-python
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/.
-	use examples && dodoc examples/*.cc
-
-	python_optimize
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.5.2.ebuild b/sci-physics/lhapdf/lhapdf-6.5.2.ebuild
deleted file mode 100644
index 3655b125aee8..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-inherit python-single-r1 docs
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="https://lhapdf.hepforge.org/"
-SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		--enable-python
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/.
-	use examples && dodoc examples/*.cc
-
-	python_optimize
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.5.3.ebuild b/sci-physics/lhapdf/lhapdf-6.5.3.ebuild
deleted file mode 100644
index 2443afa2bca5..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-inherit python-single-r1 docs
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="https://lhapdf.hepforge.org/"
-SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2-py.patch
-)
-
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		--enable-python
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/.
-	use examples && dodoc examples/*.cc
-
-	python_optimize
-
-	find "${ED}" -name '*.la' -delete || die
-}