commit:     a053b0c31a6791fe1a2d8d4c116070b81b0625dd
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> 
de>
AuthorDate: Tue Dec 17 14:48:48 2024 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 09:16:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a053b0c3

sci-physics/lhapdf: add 6.5.5

Closes: https://bugs.gentoo.org/937943
Closes: https://github.com/gentoo/gentoo/pull/39753

Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/lhapdf/Manifest                            |  1 +
 .../lhapdf/{lhapdf-9999.ebuild => lhapdf-6.5.5.ebuild} | 18 ++++++++----------
 sci-physics/lhapdf/lhapdf-9999.ebuild                  | 10 +++++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index e1a95ddbe41e..e30392a786dd 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,2 +1,3 @@
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 
02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9
 SHA512 
4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 DIST lhapdf-6.5.4.tar.gz 869707 BLAKE2B 
9bd214f29ef0fb662095a045acf449bac60c2f12fb0e182c9c590ec51651f1c08d213a3f9280eda0711ec9a0d5cae620918f048c362838a9de8e69cc84f34798
 SHA512 
0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b
+DIST lhapdf-6.5.5.tar.gz 946776 BLAKE2B 
14677cfb0e40e61006eb2cd69373a14d8c4049a6c19d2a504b736c733be35c25a11362e5aa0d0fe233d7c477fe5f9ef60084ca71330566b2728908017ccf90e7
 SHA512 
80012d5eab1b09a38d8e65bc45f012125508f8d43d1ffcaa76976970f1a3d36305ad29c620715c676cd3c5d6f8bb4c0b55444c952059a742052d9c8bfd5866ac

diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild 
b/sci-physics/lhapdf/lhapdf-6.5.5.ebuild
similarity index 85%
copy from sci-physics/lhapdf/lhapdf-9999.ebuild
copy to sci-physics/lhapdf/lhapdf-6.5.5.ebuild
index d950f1329d20..5146d3cd56fc 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.5.5.ebuild
@@ -12,7 +12,7 @@ DOCS_DEPEND="
        dev-texlive/texlive-latex
        dev-texlive/texlive-latexextra
 "
-inherit python-single-r1 docs autotools
+inherit python-single-r1 docs
 
 MY_PV=$(ver_cut 1-3)
 MY_PF=LHAPDF-${MY_PV}
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz -> 
${P}.tar.gz"
        S="${WORKDIR}/${MY_PF}"
-       KEYWORDS="amd64"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -34,7 +34,10 @@ SLOT="0"
 IUSE="examples +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="
+       dev-cpp/yaml-cpp
+       python? ( ${PYTHON_DEPS} )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
        python? (
@@ -48,16 +51,11 @@ pkg_setup() {
        use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-       default
-       # live git does not have a configure script
-       eautoreconf
-}
-
 src_configure() {
-       CONFIG_SHELL="${EPREFIX}/bin/bash" \
+       local -x CONFIG_SHELL="${EPREFIX}/bin/bash"
        econf \
                --disable-static \
+               --with-yaml-cpp="${EPREFIX}/usr" \
                $(use_enable python)
 }
 

diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild 
b/sci-physics/lhapdf/lhapdf-9999.ebuild
index d950f1329d20..c0934bb24f79 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-9999.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz -> 
${P}.tar.gz"
        S="${WORKDIR}/${MY_PF}"
-       KEYWORDS="amd64"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -34,7 +34,10 @@ SLOT="0"
 IUSE="examples +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="
+       dev-cpp/yaml-cpp
+       python? ( ${PYTHON_DEPS} )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
        python? (
@@ -55,9 +58,10 @@ src_prepare() {
 }
 
 src_configure() {
-       CONFIG_SHELL="${EPREFIX}/bin/bash" \
+       local -x CONFIG_SHELL="${EPREFIX}/bin/bash"
        econf \
                --disable-static \
+               --with-yaml-cpp="${EPREFIX}/usr" \
                $(use_enable python)
 }
 

Reply via email to