gentoo auto-resync : 30:06:2024 - 08:00:50

5 files changed, 95 insertions, 13 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index d5bb30a675f8..32bf4b586dde 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/scamp/Manifest b/sci-astronomy/scamp/Manifest
index e8bc17fd7a62..1006b8e8fddb 100644
--- a/sci-astronomy/scamp/Manifest
+++ b/sci-astronomy/scamp/Manifest
@@ -1,3 +1,6 @@
+AUX scamp-2.10.0-spread_bits64.patch 510 BLAKE2B b5215c79a6e13d3393f119f661a51cca8ec9afe43c112e12a6c4c44eebd9a165e6b180ef709811099c492fc7a77c418a9b3dd592b458fbff77c0c8b9e091fc45 SHA512 e2416122dbdf33c1b33c9e02f3e27cc257379d52962cb65ae9758dc08f8f506c55d6925e8819ce4ad9530dab8795797f61c1023842556e55d30d9dc8c8798caf
 DIST scamp-2.0.4.tar.gz 4876618 BLAKE2B 4dc513bee48ec0c3bc8e90febc46e86d78f59a78fdbca0ee3efd2c0d39b5b32f2c4fb8655b3d4be74ca211deafb16645c295dd272c8fa9c426ba82ab1b97f36a SHA512 ed0a824ddcc3f9c791121323bb59969e89f509a2c429c0abb45655e6852bc452bd46c539dbebfd23097af1c7dbef9d3d905030083828974f75233ea4af4484d5
+DIST scamp-2.10.0.tar.gz 56354286 BLAKE2B b31d292413160f85f8086d848d81f36adde3bc560c737adfe77245d23eb6eab19e5f73a343669b462453542a140d89fb3d12b5d6a481949205722c6e2f5234cd SHA512 7c7a4ab167a3c03b7fd862f39ccd9368d6ac31270a86b336f1ee2a52f8e4324e29e6324047416159c0b73bb54b05f12b7b70c2de3cb4197999cb848fc5ce4c0d
 EBUILD scamp-2.0.4.ebuild 1255 BLAKE2B ec49ad234cbbdbe3efcaee10470270feefb230e53922972d20bd72e344361dd3bbc913922e9dfe136370da0477f3c957a6db8705c87f80657871d2d4c722ef4d SHA512 37430a787951f0fd17dff5849123974d7cbd5a6083e310f051dc708a1e78405a418e7d8c85964e91461050bb79b7e4bd5bf393309c48190d5e1cc7f8f13857da
-MISC metadata.xml 610 BLAKE2B d629e947c2f674928e645f6156387b564063f91fc3847982c0294533e1f81c08de0391398242f784c63d487d05c59c3b30e433ffdc9dab982dd03a94f92671be SHA512 b3feca598a3d92181a32b9537a3bf3f6fdaf6a117342f2ab1dadc7758f2b011735b9846779c2290bf39b67186f0f5916eff53caa23f446946609a48d205cbfed
+EBUILD scamp-2.10.0.ebuild 1080 BLAKE2B 97e6d7908876781e7965db5a322b51ce10f97698ddc0610ae4f28e7f1b14db31beced8652a0a32a7d771cf66e13fd9cdd0f4b4ba998078784360e79f082e4666 SHA512 e9926c55ee6c3e42edb8d3a34466a147ff3483562306dce096bf4309b9355764e6091c3d0a65c0d7bbaa10c8065dc8311e2648bac95f19a876f1833b79b47ed2
+MISC metadata.xml 968 BLAKE2B 6b1b4f89766c740c93f2f058dc210b9e50c71f57bdc536d7fa3e7674c3b050358c348acbb0c96ebceeb1803b96cd815bef69b3f6ecd697d837706dcba59d6d74 SHA512 aa606c3f3d96e3ffa5aa006ed4a48c0f14c493e225b5aff4553aaca6975336b892a243f73b3b0f83ad2962d849e551292a99e4e4d21ba4c3c2733abcc3eda736
diff --git a/sci-astronomy/scamp/files/scamp-2.10.0-spread_bits64.patch b/sci-astronomy/scamp/files/scamp-2.10.0-spread_bits64.patch
new file mode 100644
index 000000000000..e126dc6e8c79
--- /dev/null
+++ b/sci-astronomy/scamp/files/scamp-2.10.0-spread_bits64.patch
@@ -0,0 +1,18 @@
+--- a/src/chealpix.c
++++ b/src/chealpix.c
+@@ -532,7 +532,6 @@
+     return (long) res;
+ }
+ 
+-#ifndef __BMI2__
+ static int64_t spread_bits64(int v) {
+     return (int64_t) (utab[v & 0xff])
+             | ((int64_t) (utab[(v >> 8) & 0xff]) << 16)
+@@ -548,6 +547,7 @@
+             | (ctab[(raw >> 40) & 0xff] << 20);
+ }
+ 
++#ifndef __BMI2__
+ static int64_t xyf2nest64(int64_t nside, int ix, int iy, int face_num) {
+     return (face_num * nside * nside) + spread_bits64(ix)
+             + (spread_bits64(iy) << 1);
diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
index d365168aea8b..74915547c749 100644
--- a/sci-astronomy/scamp/metadata.xml
+++ b/sci-astronomy/scamp/metadata.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  SCAMP computes astrometric and photometric solutions from SExtractor catalogs
-  and stores them in header files. These headers files can be read by SWarp to
-  coadd images.
-</longdescription>
-<use>
-  <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-</use>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		SCAMP computes astrometric and photometric solutions from SExtractor catalogs
+		and stores them in header files. These headers files can be read by SWarp to
+		coadd images.
+	</longdescription>
+	<use>
+		<flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">astromatic/scamp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/scamp/scamp-2.10.0.ebuild b/sci-astronomy/scamp/scamp-2.10.0.ebuild
new file mode 100644
index 000000000000..d64241c9cb76
--- /dev/null
+++ b/sci-astronomy/scamp/scamp-2.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Astrometric and photometric solutions for astronomical images"
+HOMEPAGE="http://www.astromatic.net/software/scamp https://github.com/astromatic/scamp"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/astromatic/${PN}.git"
+else
+	SRC_URI="https://github.com/astromatic/scamp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="plplot threads"
+
+RDEPEND="
+	sci-astronomy/cdsclient
+	sci-libs/atlas[lapack,threads=]
+	sci-libs/fftw:3.0
+	plplot? ( sci-libs/plplot:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.0-spread_bits64.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e "s/lapack_atlas/atlclapack/g" -i m4/acx_atlas.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_enable plplot)
+		$(use_enable threads)
+	)
+
+	econf "${myeconfargs[@]}"
+}