public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/
Date: Wed, 25 Sep 2024 10:23:08 +0000 (UTC)	[thread overview]
Message-ID: <1727259753.905627a0d2ef61d53bc990a71831e3438a69496e.andrewammerlaan@gentoo> (raw)

commit:     905627a0d2ef61d53bc990a71831e3438a69496e
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Tue Sep 24 10:04:10 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 10:22:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905627a0

sci-physics/lhapdf: Only install cython with python

Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{lhapdf-9999.ebuild => lhapdf-6.5.4-r2.ebuild}    | 19 +++++++++++++------
 sci-physics/lhapdf/lhapdf-9999.ebuild                 |  8 +++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
similarity index 81%
copy from sci-physics/lhapdf/lhapdf-9999.ebuild
copy to sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
index 492a8fed8602..fe5288384d06 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r2.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"
 fi
 
 LICENSE="GPL-2"
@@ -37,23 +37,30 @@ 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}]
+		')
+	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.4-include-cstdint.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
-	# live git does not have a configure script
+	# Let cython reproduce this for more recent python versions
+	rm wrappers/python/lhapdf.cpp || die
 	eautoreconf
 }
 
 src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
+	local -x CONFIG_SHELL="${EPREFIX}/bin/bash"
 	econf \
 		--disable-static \
 		$(use_enable python)

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() {


             reply	other threads:[~2024-09-25 10:23 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-25 10:23 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-25 10:23 [gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/ Andrew Ammerlaan
2024-04-14 15:56 Andrew Ammerlaan
2024-04-14 15:56 Andrew Ammerlaan
2024-04-12 17:05 Andrew Ammerlaan
2024-03-20 19:45 Andrew Ammerlaan
2023-10-23  1:44 Sam James
2023-06-09 15:06 Arthur Zamarin
2023-03-22  1:20 Sam James
2023-03-22  1:20 Sam James
2023-03-22  1:20 Sam James
2023-01-19  7:31 Andrew Ammerlaan
2023-01-18 21:54 Sam James
2023-01-18 21:54 Sam James
2023-01-18 14:50 Andrew Ammerlaan
2023-01-18 14:50 Andrew Ammerlaan
2023-01-13 12:47 Sam James
2022-10-30  9:35 Sam James
2022-10-30  9:35 Sam James
2022-10-05 15:59 Sam James
2022-09-04 12:23 David Seifert
2022-08-31 13:17 Andrew Ammerlaan
2022-07-06 12:56 Andrew Ammerlaan
2021-05-31 21:00 Michał Górny
2021-05-23 13:29 Andrew Savchenko
2021-04-18 21:26 Sam James
2021-04-18 21:20 Sam James
2021-03-04  6:24 Sam James
2021-02-13 22:52 David Seifert
2020-11-14 20:22 David Seifert
2020-07-20 21:34 Andreas Sturmlechner
2020-07-20  6:42 Agostino Sarubbo
2020-07-19  7:43 Agostino Sarubbo
2020-03-01 18:36 Matthias Maier
2020-02-11 12:25 Michał Górny
2019-09-27 13:41 Guilherme Amadio
2019-09-27 13:41 Guilherme Amadio
2017-05-29 16:33 Pacho Ramos
2016-03-28 15:09 David Seifert
2016-01-12  0:55 Guilherme Amadio
2016-01-12  0:55 Guilherme Amadio
2016-01-12  0:55 Guilherme Amadio
2016-01-11 21:37 Guilherme Amadio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1727259753.905627a0d2ef61d53bc990a71831e3438a69496e.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox