gentoo auto-resync : 05:09:2023 - 16:23:54

4 files changed, 27 insertions, 3 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index b7955bc595ec..a809f0e49a85 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 1e60e1ce6d67..8237304b4363 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,8 +1,9 @@
+AUX lhapdf-6.3.0-egg.patch 749 BLAKE2B 6fbe8b3f9723fb45674d643b4825b0d73b6ddc3bb12502a3ff477cbb2733f7b522e9881129b65062e17b7c4d98f07567e89d895219c6dc4a3e942bd727e19ad9 SHA512 3355e16674c9c3caf51bfa5317819cd8411442d075cd35936b76e8e2926221a862437b6daf3f7ffd6030d5ae05cc83dfdada8fbab99a16e1afcdf567a9dcf15f
 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.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-r1.ebuild 1512 BLAKE2B 6babf52606b5f509a2b09aff16dc6a26807974cdaa0a41c244a6f03a9c08588c752f2e21010b90fb6a5fe4c0d3a0e816cf82551aa81fc0387ee8f4a954d07808 SHA512 75b5884356c2f462a8a93db21d479baccabad0f0d956aaade814ca1c7663dce8c0ce8f4316d37ed4fa4e32e7d0dc131c26e3e5a5ac54d6077050d70445038258
+EBUILD lhapdf-6.3.0-r2.ebuild 1615 BLAKE2B 0c294a84d4a59c43dc5e19c53afcf51c00d2631517ab05d0568c1b2a600a92e92da9f8c244ef5e4cee03a37ef9fa61d0a25755c62e767fadbeaa6cb0baddcecf SHA512 2631fa6871e55b9912493cfd27b8935e3f7635688f126364b4db5f90bc28746b3c5a47a29263098770687ff53cc9373e5b6ed6eb75db92ec4a202f5894d27739
 EBUILD lhapdf-6.5.3-r1.ebuild 1161 BLAKE2B aaa67027ed213ed83386023de26f200d022143048182fa3531fc1a2b564abc64f3d9d644f344f5803a0d2bc1d5fbe4934b5c65b6689dd147a8bb941b4573454e SHA512 1228c4d723d919928b50a07943143d1783876b996c5070c3717f649d0569985b4f794d331dc616625d2f42f5c21db0baec967f9e597cf61f19ce08d28eeecf7d
 EBUILD lhapdf-6.5.4.ebuild 1221 BLAKE2B 3cdb832c19c56115eab8c3528b5e0ac2af6095ca61b9e6d89eab24c573a421a1d40ddc2fb9798b8ac0144f97c5b4650e72935c1a4c98d173fd6e9d4d59fa6589 SHA512 787fc25a54fedfea6b2bc3054b60767639b24dfc616ef4f929735e2647fd7d265134ef55b5abda72cac4cc32cd06f34c28370fb1fb833a068bfbcc22b7baeaa0
 EBUILD lhapdf-9999.ebuild 1317 BLAKE2B d988647eeed4d92e9eaa0954339e3865cd57a8fd50b2ee3c5ff8d6945d94fb593201aa767f48faf48afd1b1eb8a6a8b3b4f26801016e1b11bc76a21e3ee78c3f SHA512 4fddbc87790e443cb832e10251026bca3509fda570be1663c8b4f4f7a7a34e41dc44c0340f5a900b0762ebfafff75e01a7b8bba447693b61510f369b2369445c
diff --git a/sci-physics/lhapdf/files/lhapdf-6.3.0-egg.patch b/sci-physics/lhapdf/files/lhapdf-6.3.0-egg.patch
new file mode 100644
index 000000000000..9122b8eaf7ff
--- /dev/null
+++ b/sci-physics/lhapdf/files/lhapdf-6.3.0-egg.patch
@@ -0,0 +1,16 @@
+--- a/wrappers/python/Makefile.am	2023-09-01 11:38:37.567370819 +0200
++++ b/wrappers/python/Makefile.am	2023-09-01 11:37:50.641123445 +0200
+@@ -29,10 +29,10 @@
+ 
+ ## Always force setup.py, it's not good at guessing what needs to rebuild
+ all-local: fix-out-of-source
+-	$(PYEXT_ENV) $(PYTHON) setup.py install --install-lib=build/ --force
++	$(PYEXT_ENV) $(PYTHON) setup.py install --single-version-externally-managed --root=/ --install-lib=$(S)/build/ --force
+ 
+ install-exec-local:
+-	$(PYEXT_ENV) $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --force
++	$(PYEXT_ENV) $(PYTHON) setup.py install --single-version-externally-managed --root=/ --prefix=$(DESTDIR)$(prefix) --force
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(PYTHON_PATH)/lhapdf.so
+
diff --git a/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0-r2.ebuild
index b2a2781f660e..03dda6b30a7f 100644
--- a/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	dev-texlive/texlive-bibtexextra
@@ -14,7 +14,8 @@ DOCS_DEPEND="
 "
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 docs
+DISTUTILS_EXT=1
+inherit distutils-r1 docs autotools
 
 MY_PV=$(ver_cut 1-3)
 MY_PF=LHAPDF-${MY_PV}
@@ -23,6 +24,7 @@ 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}"
+DOCS_DIR="${S}/doc"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,10 +40,15 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-egg.patch
+)
+
 src_prepare() {
 	default
 	# Let cython reproduce this for more recent python versions
 	rm wrappers/python/lhapdf.cpp || die
+	eautoreconf
 }
 
 src_configure() {