gentoo auto-resync : 26:09:2024 - 01:25:46

5 files changed, 92 insertions, 67 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 7859925cd1fd..6386a11716b6 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 18e1422266ea..be9a67a2fdd0 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -2,10 +2,9 @@ AUX lhapdf-6.3.0-egg.patch 749 BLAKE2B 6fbe8b3f9723fb45674d643b4825b0d73b6ddc3bb
 AUX lhapdf-6.5.2-py.patch 391 BLAKE2B f5d904659a9163ec2e269e5c950c0610c9604dd936f307600641f68e5b22eb2e36fbc013b8d7432b158f61ca83ce2e8bcfb5202fff95a57e85ce0766299169f5 SHA512 c344b98d9f604cb530fa179b5ad4511edc7d1f56b5de3ec385d57a2823526b634bf8cf3cc0e51ca0b5dc868116fd5569bfb9e59d3dfbb1ffc377945570329b6a
 AUX lhapdf-6.5.4-include-cstdint.patch 1081 BLAKE2B 7e197ae51621a0984f74530240270fa845d35a739bd36264028f1bb975c2bfb04088c93c982d3866e847c64153517a181f95c3b518fd53e5f297a325d0a76e5f SHA512 204ab268e97600e7f2cfde1842d958cbfb8e77633c341a8cde304c846e59ffa6215cfaee7e1435a26d9dec8e0f30a8744fe30f6b866b301004e593a48fc58010
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
-DIST LHAPDF-6.5.3.tar.gz 864918 BLAKE2B 2dd1b5b94523c0cadac2b63d3dcbc73c5d621463ec9a0e6736b40cb24f6f4da744cf74484b6a5cfb1cfc10054171858dfb3968b22da565747d9b0d00cb3f545c SHA512 444e1dd75c087b0618a65b0ebda0d06dac640d75e43de3a2e4cd5733dd2eaa6eeb6cb0aac437ee559b00b60a6b839a4125b3b26d398da81d52a3a97a7b875662
 DIST lhapdf-6.5.4.tar.gz 869707 BLAKE2B 9bd214f29ef0fb662095a045acf449bac60c2f12fb0e182c9c590ec51651f1c08d213a3f9280eda0711ec9a0d5cae620918f048c362838a9de8e69cc84f34798 SHA512 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b
 EBUILD lhapdf-6.3.0-r2.ebuild 1714 BLAKE2B d800df7bdce87a40b72cf735ab6cb1c57f31385b38ee658478f08042316c1549712693a7ccc97cb119d6fc156bc4b55f89b20dd1484900843fa2e7801763a696 SHA512 b9660c65fe43c6ca0337c9faac28ae989f96845df722860f0e5c757128a98106867bd02cebbfb47b4461088c22367386d2e260104ff5c47a4b22ceb3f0b9b102
-EBUILD lhapdf-6.5.3-r1.ebuild 1168 BLAKE2B 659e092021b862c0bad7bb4b2c7cfb32103fdee72cb104e8c418269db1f829c31364765b473402af02e9465ba673522c9790771cfc526ddddb2d0f6355c4e1ef SHA512 7f3d34efe807d7820159fb1e9eb905fe968f5186da3b84b9da9662f67e2abda3b367f5adc949d73088c888a8127855c8acf9b1a39f5b8f2dcb41e89e3618c46f
 EBUILD lhapdf-6.5.4-r1.ebuild 1651 BLAKE2B 009ca7a9ead036af3cb3372329ea52f5e7f66824332b36de9922f1511d893649d8e50f537fba6c2a9a3c80a0cea904db4dea1de78fb187d49a79c647892038ea SHA512 585d8f58f3ba53ebaf6bc18dba9a2935d08f8be0536fe05b9235dacec47ac4bef773c3dd9616752df374dbeb68902a091e67774088ebf34bfa8173ef75e6b0c2
-EBUILD lhapdf-9999.ebuild 1528 BLAKE2B e16564e6b107acf1acf3bd8f7e7ae3d1b4dc29d73484583a88c27c964ca3bd11b57fa0259ed8b9f76a0770b584c406bc932fce8ff65f1c603a4112a61a7d716b SHA512 042708303d7bbd5bb5291d25785300e843e767badfc373c3dd867d529e43d404d1eab42d8235df7de016a273a8afe8db9f6f8090fee28c1dcd75aaed668d4f6e
+EBUILD lhapdf-6.5.4-r2.ebuild 1669 BLAKE2B c3421a4728e22430e511494578b7313fccec9e0d2ac08e96369946fce7cfd2a368fc1db844f8cc87e02cce616199d23d37a77910e537e4a4167ef3fe8f8db598 SHA512 c6ffe32b342add9312ea0fecc806318b5866b750fac6161afd12ed1ad29f26fb0c10e5fa0b15e83864d726c3845b17cf68426f9d93edbae5ae04a7267943e028
+EBUILD lhapdf-9999.ebuild 1545 BLAKE2B ff34e9269debe214bb40206e162e98c6332da03c722a6fa7aef097651b9f7fc5ba0c6618414680151da98d5fb6be5399e4f25432fa4333091af01a45fd77ea72 SHA512 6a6d6a2c762388a14242749ab0d1020ca6bbf4fccc6839c32b0bd0579c6e1b78e40936738b9a2fdf40f3d38a2732b046786e5763dbbb814271af66e1de93276d
 MISC metadata.xml 1234 BLAKE2B 059e7abca0dd0583b71bbc3b48c3125952c1642c4bad30d2776b2d6a5ea44eaee0ce6f1ac44e92a7c179b11d50bbe24ed2f947bf870ebee51c6c3d49a6a6b98e SHA512 2c94513c3e3287fe186b6212e48b9aa09fee0da5bee50887432a985b1466aa40b3d2086955ee0b9d03b70bdb615b72caa3e0c74ca1d0c32590f7ad1d31a45a0e
diff --git a/sci-physics/lhapdf/lhapdf-6.5.3-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.3-r1.ebuild
deleted file mode 100644
index fc3184079097..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.5.3-r1.ebuild
+++ /dev/null
@@ -1,61 +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="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2-py.patch
-)
-
-src_configure() {
-	local -x 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.4-r2.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
new file mode 100644
index 000000000000..fe5288384d06
--- /dev/null
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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 autotools
+
+MY_PV=$(ver_cut 1-3)
+MY_PF=LHAPDF-${MY_PV}
+
+DESCRIPTION="Les Houches Parton Density Function unified library"
+HOMEPAGE="https://lhapdf.hepforge.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/hepcedar/lhapdf"
+else
+	SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PF}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.4-include-cstdint.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# Let cython reproduce this for more recent python versions
+	rm wrappers/python/lhapdf.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	local -x CONFIG_SHELL="${EPREFIX}/bin/bash"
+	econf \
+		--disable-static \
+		$(use_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
+
+	use python && python_optimize
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild b/sci-physics/lhapdf/lhapdf-9999.ebuild
index 492a8fed8602..fc2455e2129f 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-9999.ebuild
@@ -37,9 +37,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.19[${PYTHON_USEDEP}]
-	')
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 pkg_setup() {