diff options
Diffstat (limited to 'sci-astronomy')
61 files changed, 551 insertions, 1307 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz Binary files differindex e9840741705c..46a14f8aa29d 100644 --- a/sci-astronomy/Manifest.gz +++ b/sci-astronomy/Manifest.gz diff --git a/sci-astronomy/aatm/Manifest b/sci-astronomy/aatm/Manifest deleted file mode 100644 index 4a19980880a8..000000000000 --- a/sci-astronomy/aatm/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST aatm-0.6.tar.gz 613800 BLAKE2B 234d6db5c38b45182d525347357458d791d9fe11650391eab4694cb4271c823c0ec86b0e99c50d7b85624e9aafc79f8c9213954675878596f1219810f80614c8 SHA512 aef2d0fccc83a8a5817bd414b60c5167f7e378b434f9a3e9ce2bc2eeceec1cc1fb1b141cec07d78cb325dbfceac2804c07866291b2863f6839dfb6143ed9188a -EBUILD aatm-0.6.ebuild 870 BLAKE2B ff65f7cb39db0350073a5a14b324172cb26ac780ae83552397c80b8e5691992413e13f673da782b7daeb9aa45fad519e9501d0a5d2828301e694ae800b93bffe SHA512 e5cd3646a888504113d25f18f7352005c85d5e3840d11990dba61b1c7c6714699f31190f59d4f40f4569c9ca8301bd5aabfe264b66dc4a2637b452a285095def -MISC metadata.xml 715 BLAKE2B a542589714983af3cfbad38ab359979870b0a3e51b49792bd37c902023fbae0ef93edbb3645341c2e5e6fc33d16a61d7dd7d0127f52c06031029e73c4f5f369d SHA512 69bb7f6d56444eb88376ec7c9b4e76fe6521872b27e4720da2be4cec5cda24c4b445206abab75a3871b289d5b8672682dd6c1ad0080e107e3ff64a97292669ad diff --git a/sci-astronomy/aatm/aatm-0.6.ebuild b/sci-astronomy/aatm/aatm-0.6.ebuild deleted file mode 100644 index cbab46b7bf58..000000000000 --- a/sci-astronomy/aatm/aatm-0.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Atmospheric Modelling for ALMA Observatory" -HOMEPAGE="https://svn.cv.nrao.edu/view/aatm/devel/casa/" -# tar ball is made from the HOMEPAGE and running ./configure && make dist -SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-libs/boost:= - doc? ( app-text/doxygen[dot] )" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_compile() { - emake - use doc && doxygen doc/developer.doxy -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - if use doc; then - dodoc -r developer/html - docompress -x /usr/share/doc/${PF}/html - fi -} diff --git a/sci-astronomy/aatm/metadata.xml b/sci-astronomy/aatm/metadata.xml deleted file mode 100644 index ce563238f3cb..000000000000 --- a/sci-astronomy/aatm/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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"> - ATmospheric Modeling for ALMA is a library of routines for modelling - transmission of cm/mm/sub-mm wavelength radiation through the Earths - atmosphere. It is designed to simulate both the absorption/emission - of radiation and the dispersion (i.e., the frequency dependent - refractive index of the atmosphere). - </longdescription> - <upstream> - <remote-id type="launchpad">aatm</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest index b41584448154..65538a450ced 100644 --- a/sci-astronomy/calcmysky/Manifest +++ b/sci-astronomy/calcmysky/Manifest @@ -1,5 +1,5 @@ -DIST calcmysky-0.3.1.tar.gz 2166487 BLAKE2B d1e2bf0a5a2118e3679427e705f5265c9d6c8962adb58b4a5a6464252ee10fcba396758ef3a1a8c1e57b2291a076bc034e4231ea21a6fc464eda3c5ffd376bc1 SHA512 3038feffdf3a61d49d39304b72f1c2809ea5e3a835c4b3c1603162802afc3d27af6cdfd63eb3286e9e614850b73e338e1cc2cf6a6e915ea968194c0a7a9a56eb DIST calcmysky-0.3.2.tar.gz 2166906 BLAKE2B c306b780b76ace936c373c4c554ed25fdfc3a507ebe34950634527c32deb59b99feb4d55e1b82150dd0611caf8835a1d178ec2a044a2ddf7b2ade604d6edb67a SHA512 a7f69b25c54be86ce179a118ca8a6d606e2c0fe7dc238b46620237e311dc5198a2aeb70e4885cc6553a26f7c38b78b5a338115a4606161fa249a806e891f88b6 -EBUILD calcmysky-0.3.1.ebuild 1220 BLAKE2B 96fa75434224737253e61900154f96a9a1577c3a5afdcc927daf1fcc7e30652b9b6c55829efbc68efead24cae846ce0b2fb0cc96d089780dc965da4a3031e17f SHA512 cd3bee65131528c9a98304bce978b2cefd8cdaba347e3ff59d451d849b070e7fccf72b07be02c3c945fcafdf3d3bb85cdbab6aff091235b765cebfab59881c84 +DIST calcmysky-0.3.3.tar.gz 2167016 BLAKE2B 93c1990a96ce4eb7c033ba3763aac2f347c5575c860522d99d7a0ab813d7bffbd678df32cbf3a249e8043e53560d355cb8656d9fce54df07aa9eb82cdfbdb0f7 SHA512 186281ad2aafac7006117cfb65d91c8053ab3caa9d4f67e5463471538bae40fd8fcc954c3fe9b9d2ca7bba4e6a1fdf8de33980469930cc23b1c21ee4b333917e EBUILD calcmysky-0.3.2.ebuild 1221 BLAKE2B a7bec01e878b0b3b96f2eca6779c4a5207a7afe39089950350f334e23ecdfcad281d24ba4a70ed6545dfd13876ed9920026b239da394406b17895647ddd3aaf7 SHA512 a34625b4a8409eedf26025666c9f6b05904cf71d2fd46751c8c37f0fee5bc8e7773fb01a8590c89cfd4c25b8bfe4f3848c6d90563fb14d1ba87326410a6d49fd -MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408 +EBUILD calcmysky-0.3.3.ebuild 1222 BLAKE2B 256649c71dc225387a4808ea0c1e2c03f81cbf74d13274005fcf18b3869eeb91872476f84d3ae603211b1f481b23f10658898b726ab0c4ad96a08c9207fc1ded SHA512 f8e8dcb45e5899df5fb2bc713f65e944b3682daf6237db56fcbb62bb62a7c5c2251df4e8df58b86e654e4a41be5689e9f72efeb7babd3bef82105a1e2017e8e2 +MISC metadata.xml 583 BLAKE2B 796ee2e5ee532cde2207c3ba32bd508a2ce335b8b5907b8065e196489850fe24f48e975680fed14460322096c780571b986a5a18e9e89f2abdb255dbf8874346 SHA512 f5cfcad23404c3a0da231d35aefa72e02effc420b448c1864e65021a346e3c7c259cd8cc109bdb5240a0d3344f384efe1245ea4afb5eccf6ace1041e62553487 diff --git a/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild index 577176466199..bd1d665e6e80 100644 --- a/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild +++ b/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-3" # subslot is soversion SLOT="0/15" -KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="qt5 qt6" REQUIRED_USE="|| ( qt5 qt6 )" diff --git a/sci-astronomy/calcmysky/metadata.xml b/sci-astronomy/calcmysky/metadata.xml index ef26156cdf6d..7f708fb4e379 100644 --- a/sci-astronomy/calcmysky/metadata.xml +++ b/sci-astronomy/calcmysky/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>alexey+gentoo@asokolov.org</email> diff --git a/sci-astronomy/erfa/Manifest b/sci-astronomy/erfa/Manifest index fa6d1cc17d85..24a5febb4000 100644 --- a/sci-astronomy/erfa/Manifest +++ b/sci-astronomy/erfa/Manifest @@ -1,5 +1,3 @@ -DIST erfa-1.4.0.tar.gz 641051 BLAKE2B 448f9f883d85a3c39a58497c6211542719c77b05b6bf4087519b710642c144939a9e27ba44b82a42d759dc04e1effe9833ae087487292846f954e6c3f93fb8db SHA512 2befe5a45486dbbd2ee88229cce7a6101462254bd346d3a2859e294f31119eb5cf5e4113e4061fa3e371216ed793a79ea1ba98fc6fd8aa53d2ba4170e1e135e2 DIST erfa-2.0.0.tar.gz 729292 BLAKE2B af081b44bdcde4457aba661b08b6bc941e8a4e4fad4a61c40a529dd719eb125263662126246cee83dfa73eb81032888331522e04fe824d0e54fd66bd6ce8b222 SHA512 6761a8c1e1fc20f8603b451a47a47c872fe99e39ec805f131f3db24aeb5b6ac3ac480c89630ff9defbedd0e621fb7e2b7922869b8c29ada1fd41cb9793c9ca0a -EBUILD erfa-1.4.0.ebuild 549 BLAKE2B bb8c9e3f72b8c30bf4aa003bce69305238f200d0ce547fef3245397d22dcaa88e2611fb99d06e03fa28d8a42b8daf83d30f2879df60ad2c5c205bec874f55a61 SHA512 a357a4d43a3eafbce4407efc996432c6db6c5375936691e0859ec77366e370563bd2184b83ac30c70083266968748f3ff315870e6971b42da5bf86ee2c91d6f2 EBUILD erfa-2.0.0.ebuild 540 BLAKE2B f5c04f9c7d4c3d320fb31090e0333bb55d8d313c50c70798a2db856c22648ba98b149b47cba5866d1aefea673252161e64b59789f02912a90064b68305707531 SHA512 001ebf17820e16520bdae8c391d78a0fd3b89faf1998dd271e76c969bf5b59da19f9c8be429790490cb67d934de70b7c38cba27764ba8df618f414d9224e08e8 MISC metadata.xml 603 BLAKE2B 38def9126519f315cdef6df3fc6bd26936083228b7a33accb821373f436fd31f14a62e8d5242da86b5bc51a3dd05a7d749faee41d4e816d0413a4404a877902d SHA512 60ccfd3237909339c96ea12ab7e0ad18dc1ea0246aa0d20ab99ed59bf613d8a8c33f6fb2d2dff4948f838f209aea509386d9a9645e24a53b349052290c307540 diff --git a/sci-astronomy/erfa/erfa-1.4.0.ebuild b/sci-astronomy/erfa/erfa-1.4.0.ebuild deleted file mode 100644 index 0f22559424f9..000000000000 --- a/sci-astronomy/erfa/erfa-1.4.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Essential Routines for Fundamental Astronomy" -HOMEPAGE="https://github.com/liberfa/erfa" -SRC_URI="https://github.com/liberfa/erfa/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-astronomy/esomidas/Manifest b/sci-astronomy/esomidas/Manifest deleted file mode 100644 index 89e80855fe9e..000000000000 --- a/sci-astronomy/esomidas/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX esomidas-17.02-gentoo-setup.patch 369 BLAKE2B d592a379c96f2dfb88d47b54faef6535671f53fe7e9c1822880983c4b6797e0e90d8a1c6608940376f457f01867bd350544274c6e68a8722ea41c825cf002be4 SHA512 e55aac27cfa0034d9fdeb7f91e010a70f058fff00ed39858badd7b4561fefbb366c5ff0aba6a6265f2af4ab23ebca75e37c7067278688874c3294d583bfa2dfc -AUX esomidas-17.02-output_to_stdout.patch 1276 BLAKE2B c2e7daa65375ea6775afb0fe4d835072476772d61ec474572d96d242d1c7cbbf7d4cc90879bd6032591703023cbe2139050c69f494045e19245488871b8acaee SHA512 b97402212ba45e45220ecf0bb4e8374c24c02dae554a686716b3de6fd3b40825df7150d0da7a389100176cadca2f29f1419a01efc763042d8b1f81f679ded057 -AUX esomidas-17.02-rpc.patch 1300 BLAKE2B 14ba1ba6a4387aac7704c9893863b2983bd5f8f18bcbeaa93dd735d80af66bceb624c6ce0bdae49f2e85a7a38e41ea5edf88f3b165bbf742a4fbebba4e40b323 SHA512 5ecc989ef8f1ed6c1aa586088f1d1e880020f2ff134d21162563c66c3cc631ebf6deb3b3dfc7ebe0901385e548981df907264ad1b49a7638dd4e5917d40e2c7f -DIST esomidas-17.02.tar.gz 60771186 BLAKE2B 75e184d61ab2ec9eb30ea83c35feea329bd4dec9afa04b68bc7be22ef0f88d1d0aa0e4a79c1111ce57846e042b26ef394374c9db2d12547dfa481d75e06deadf SHA512 7e4c6a8d8349a9e1647e48571bf5e04abd239c24020ffdf5984a0598b837061ca7765e31209869a4e302e1f85c3494852a22541149c10cc916376048e40b6324 -EBUILD esomidas-17.02-r1.ebuild 4440 BLAKE2B 5125b074344d5303f4f74aa19c8934e05e2eb62c5381fa7d6cae07c335797d0a9e7d3e92c9080adad1d3603da65c9aaedca8ee795b33981774f3490a58cea47b SHA512 d7f436db7e56548a2abbe62e7ae06b90f221c46725b96fedfa89f63c9014cfdcaf49ce959d3f738ebeadb649629f9bae81eff925b7feca9f7784b962871086e2 -MISC metadata.xml 805 BLAKE2B d6097e0beaedb7f209327d1511f852ac71542c35aad1a9bb6beef984a51d3ebb5a790ef979e35210d7774c163bf533cd71ff576cfd2ecfafb284fc378e5f8944 SHA512 9327417886bfc8b235267dd27ac874ac6e96769286e5066a3c6b425994060f37c4a6574d4db8d3d4f08d8ab50a7d17ea75175b494689c55bd26fb570958f4a2f diff --git a/sci-astronomy/esomidas/esomidas-17.02-r1.ebuild b/sci-astronomy/esomidas/esomidas-17.02-r1.ebuild deleted file mode 100644 index e39f3110cc14..000000000000 --- a/sci-astronomy/esomidas/esomidas-17.02-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fortran-2 toolchain-funcs flag-o-matic - -# MIDVERS is actually used by MIDAS configuration scripts -export MIDVERS="17FEBpl1.2" - -DESCRIPTION="European Southern Observatory Munich Image Data Analysis System" -HOMEPAGE="http://www.eso.org/projects/esomidas/" -SRC_URI="ftp://ftp.eso.org/pub/midaspub/17FEB/sources/${MIDVERS}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8" -KEYWORDS="~amd64 ~x86" - -IUSE="+libtirpc" - -RDEPEND=" - sys-libs/readline:0= - x11-libs/motif:0= - x11-libs/libX11:= - x11-libs/libXt:= - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MIDVERS}" - -PATCHES=( - "${FILESDIR}/${P}-output_to_stdout.patch" - "${FILESDIR}/${P}-gentoo-setup.patch" - "${FILESDIR}/${P}-rpc.patch" -) - -src_prepare() { - default - # variables for all phases and midas internal build system - export MIDASHOME="${WORKDIR}" - export MID_HOME="${S}" - export MID_HOME0="/usr/$(get_libdir)/esomidas/${MIDVERS}" - export MID_INSTALL="${MID_HOME}/install/unix" - export MID_SYS="${MID_HOME}/system/unix/" - export MID_WORK="${MIDASHOME}/midwork" - - # sadly this enforces static linking - if use libtirpc ; then - RPC_OPT="-I/usr/include/tirpc" - RPC_LIB="-ltirpc" - else - RPC_OPT="" - RPC_LIB="" - fi - - # create a gentoo option file - mkdir ${MID_INSTALL}/systems/Gentoo || die - cat >> ${MID_INSTALL}/systems/Gentoo/make_options <<-EOF - CC=$(tc-getCC) - LDCC=$(tc-getCC) - F77=$(tc-getFC) - FC=$(tc-getFC) - LD77_CMD=$(tc-getFC) - AR=$(tc-getAR) - RANLIB=$(tc-getRANLIB) - F_OPT= - C_OPT= - E_OPT=$(use amd64 && echo -Z) - SYS= - SH_OPT=-fPIC - SH_CMD=${MIDASHOME}/${MIDVERS}/local/make_shared - GUI_OPT=-DPATH_MAX=1024 - STRIP=echo - EDITFLAGS=-DVOID_SIGHANDLER -DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_GETPW_DECLS -DHAVE_DIRENT_H -DHAVE_STRING_H -DLinux -DHAVE_UNISTD_H -DHAVE_STDLIB_H - EDITLIBS=-lreadline - UIMX=uimxR5 - INSTALL_FLAG=auto - RPC_OPT=${RPC_OPT} - RPC_LIB=${RPC_LIB} - EOF - sed -e "s|gcc|$(tc-getCC) \${LDFLAGS}|" \ - ${MID_INSTALL}/systems/Linux/make_shared \ - > ${MID_INSTALL}/systems/Gentoo/make_shared || die - sed -e 's|PC/Linux|Gentoo|' \ - ${MID_INSTALL}/systems/Linux/setup \ - > ${MID_INSTALL}/systems/Gentoo/setup || die - - # gentoo readline avoids exporting the xmalloc,xrealloc and xfree - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free -} - -src_configure() { - ${MID_INSTALL}/select all || die "packages selection failed" - ${MID_INSTALL}/preinstall -a || die "preinstallation failed" - ${MID_INSTALL}/install2 || die "configuration failed" - chmod 755 ${MID_HOME}/local/make_shared - append-fflags -fallow-argument-mismatch - append-cflags -fcommon -} - -src_compile() { - CMND_YES=2 ${MID_INSTALL}/install3 -a || die "compilation failed" - [[ -x ${MID_HOME}/monit/midasgo.exe ]] || die "somewhere compilation failed" - emake -C monit syskeys.unix - ${MID_SYS}/inmidas -m ${MID_WORK} -j "@ compile.all" - ${MID_SYS}/inmidas -m ${MID_WORK} -j "@ ascii_bin no ; bye" -} - -src_test() { - local test_dir="${WORKDIR}/test_tmp" - mkdir ${test_dir} && cd ${test_dir} - ${MID_SYS}/inmidas -m ${MID_WORK} -j "@ vericopy ; @@ veriall -nodisplay ; bye" || die - test -f ${MID_WORK}/veriall_* || die "tests failed somewhere" - rm -rf ${test_dir} -} - -src_install() { - yes | ${MID_SYS}/cleanmidas - find ${MID_HOME} \( \ - -name "*.a" -o \ - -name "makefile" -o \ - -name "default.mk" -o \ - -name "*.h" -o \ - -name "*.inc" -o \ - -name COPYING -o \ - -name "*~" -o \ - -name "*.mod" \) -delete - rm -rf ${MID_HOME}/libsrc/ftoc* - find ${MID_HOME} -type d -empty -delete - - sed -e "s:^MIDVERS0=.*:MIDVERS0=${MIDVERS}:" \ - -e "s:^MIDASHOME0=.*:MIDASHOME0=/usr/$(get_libdir)/esomidas:" \ - -i ${MID_HOME}/system/unix/{inmidas,helpmidas,drs} - - cd "${WORKDIR}" - dodir /usr/$(get_libdir)/esomidas - mv "${S}" "${ED}"${MID_HOME0} - chmod 0644 "${ED}"${MID_HOME0}/contrib/baches/*/*.fit \ - "${ED}"${MID_HOME0}/contrib/baches/*/*.fmt \ - "${ED}"${MID_HOME0}/contrib/baches/*/*.datorg \ - "${ED}"${MID_HOME0}/contrib/baches/*/*.prg \ - "${ED}"${MID_HOME0}/contrib/baches/*/*.README - find "${ED}"${MID_HOME0} -name \*.sh | xargs chmod 0755 - chmod 0755 "${ED}"${MID_HOME0}/util/bench/brun - - dosym ${MID_HOME0}/system/unix/inmidas /usr/bin/inmidas - dosym ${MID_HOME0}/system/unix/gomidas /usr/bin/gomidas - dosym ${MID_HOME0}/system/ftoc-new ${MID_HOME0}/system/good-ftoc -} diff --git a/sci-astronomy/esomidas/files/esomidas-17.02-gentoo-setup.patch b/sci-astronomy/esomidas/files/esomidas-17.02-gentoo-setup.patch deleted file mode 100644 index f6fb0515ee74..000000000000 --- a/sci-astronomy/esomidas/files/esomidas-17.02-gentoo-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/install/unix/preinstall 2017-06-29 23:49:01.295996178 +0000 -+++ b/install/unix/preinstall 2017-06-29 23:50:21.835445329 +0000 -@@ -124,6 +124,9 @@ - if [ -d "Debian" -a -f "/etc/debian_version" ]; then - system="Debian" - -+elif [ -d "Gentoo" -a -f "/etc/gentoo-release" ]; then -+ system="Gentoo" -+ - elif [ "$uname" = "Darwin" ]; then - system="Darwin" - diff --git a/sci-astronomy/esomidas/files/esomidas-17.02-output_to_stdout.patch b/sci-astronomy/esomidas/files/esomidas-17.02-output_to_stdout.patch deleted file mode 100644 index bd24c3801d99..000000000000 --- a/sci-astronomy/esomidas/files/esomidas-17.02-output_to_stdout.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Ole Streicher <debian@liska.ath.cx> -Date: Wed, 1 Mar 2017 09:31:31 +0100 -Subject: Run compilation in foreground and write log to stdout instead of a - file. - ---- - install/unix/install3 | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/install/unix/install3 b/install/unix/install3 -index ef2a415..1cc0b4e 100755 ---- a/install/unix/install3 -+++ b/install/unix/install3 -@@ -112,8 +112,6 @@ fi - - echo "" - echo "WARNING: MIDAS installation will delete all dependent files." --echo " It will run in background and the output will be sent to" --echo " the file <$MID_HOME/tmp/install.$$>" - echo "" - echo "Do you want to continue [yn]? (y): " $SV_NONL - unset answ -@@ -138,17 +136,9 @@ fi - - # do we have the 'time' command? - if [ $CMND_YES = 2 ] ; then -- /bin/bash $MID_INSTALL/install -i > $MID_HOME/tmp/install.$$ 2>&1 & -+ /bin/bash $MID_INSTALL/install -i - else -- time /bin/bash $MID_INSTALL/install -i > $MID_HOME/tmp/install.$$ 2>&1 & -+ time /bin/bash $MID_INSTALL/install -i - fi - --echo "Running install in background" --echo "Results are coming in $MID_HOME/tmp/install.$$" --if [ "$1" = "-a" ]; then -- echo "Waiting for MIDAS installation to finish..." $SV_NONL -- wait -- echo "Finished." -- echo "" --fi - exit 0 diff --git a/sci-astronomy/esomidas/files/esomidas-17.02-rpc.patch b/sci-astronomy/esomidas/files/esomidas-17.02-rpc.patch deleted file mode 100644 index d56ec03346c9..000000000000 --- a/sci-astronomy/esomidas/files/esomidas-17.02-rpc.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN 17FEBpl1.2.orig/lib/makefile 17FEBpl1.2/lib/makefile ---- 17FEBpl1.2.orig/lib/makefile 2017-04-26 11:44:02.000000000 +0200 -+++ 17FEBpl1.2/lib/makefile 2017-09-25 21:08:51.359595847 +0200 -@@ -58,7 +58,7 @@ - ## Ubuntu version 13.10 on - ## - ## $(SH_CMD) -o $(LIBMIDAS_SH) *.o $(DEV_NULL) -- $(SH_CMD) -o $(LIBMIDAS_SH) *.o -lm $(F2C_LIBS) $(DEV_NULL) -+ $(SH_CMD) -o $(LIBMIDAS_SH) *.o -lm $(F2C_LIBS) $(RPC_LIB) $(DEV_NULL) - - # for the AltLinux distro we had to change the line above to: - # $(SH_CMD) -o $(LIBMIDAS_SH) *.o -lm $(DEV_NULL) -diff -ruN 17FEBpl1.2.orig/libsrc/os/unix/makefile 17FEBpl1.2/libsrc/os/unix/makefile ---- 17FEBpl1.2.orig/libsrc/os/unix/makefile 2017-04-26 11:44:32.000000000 +0200 -+++ 17FEBpl1.2/libsrc/os/unix/makefile 2017-09-25 21:08:48.747583816 +0200 -@@ -19,7 +19,7 @@ - - include ../../../local/default.mk - --CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) -+CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(RPC_OPT) - - LIB = $(LIBDIR)/libos.a - -@@ -43,7 +43,7 @@ - # testos.exe only for checking the linking process, in cannot be executed... - - testos.exe: testos.o $(LIB) -- $(LDCC) testos.o $(LIB) $(MLIB) $(SLIB) -o $@ -+ $(LDCC) testos.o $(LIB) $(MLIB) $(SLIB) $(RPC_LIB) -o $@ - $(STRIP) $@ - - $(LIB): $(OBJ) diff --git a/sci-astronomy/esomidas/metadata.xml b/sci-astronomy/esomidas/metadata.xml deleted file mode 100644 index 00ef471241c4..000000000000 --- a/sci-astronomy/esomidas/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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"> - The ESO-MIDAS system provides general tools for image processing and data - reduction with emphasis on astronomical applications including imaging and - special reduction packages for ESO instrumentation at La Silla and the VLT at - Paranal. In addition it contains applications packages for stellar and - surface photometry, image sharpening and decomposition, statistics and - various others. -</longdescription> -<use> - <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag> -</use> -</pkgmetadata> diff --git a/sci-astronomy/funtools/Manifest b/sci-astronomy/funtools/Manifest index c2273eff9c93..2b8a82acd859 100644 --- a/sci-astronomy/funtools/Manifest +++ b/sci-astronomy/funtools/Manifest @@ -1,5 +1,3 @@ -DIST funtools-1.4.7.tar.gz 3270079 BLAKE2B 8c366d70d9d7e48c41dcd1f82374dce818c6f8e367b971b6ae44f36491bc41008645cfa02526b6173f8248c172639f7461f5a142434fe2791177718503f66332 SHA512 d53bdb00a2eb9cd70bf60e34a10e5e16435a10b96f89cd55f0ffb686fac30438e2dfc1d823578286be51bee5caf0dcd1c0f257cd8e725cf8e5aa798a6f3c245a DIST funtools-1.4.8.tar.gz 3281636 BLAKE2B dd1fd341786e09662a6de88a102a01f02be78775bdada938c4df79f6bae388d07d711df46f52eaea6557589450e104aaff65b0823758161f1aea3301f5a82338 SHA512 f916ce582d66f0350448912be6ec427b0c697e7da49595ec04e86b105af76d229d7721b5fee8844f843b1734129b53402228d7736e55fbae83df405362fb8a6c -EBUILD funtools-1.4.7.ebuild 1845 BLAKE2B 65b29c6521c44414234aaca538018bfa0fe2ef54868ed2fae88d466a4b8ae8bc9939671ed3a06a69a3953f18d51650f6fe0e3c432bd76f78d4ef6704374e0d49 SHA512 9d09686142ed4aa567276c83305cfbbdcc83776a0c135b5ea9da2630f5160c2b15b3062186c17655ef7375d6eb0b0db56139c847c6d865ebb9cea42684ed7ad9 -EBUILD funtools-1.4.8.ebuild 1917 BLAKE2B 8efd1f8f061610a7cf6d914f4f6e783cd99d7c8cc6fdddceac5d3e718288e772de8c311acbec77fc7ead4d94091061b0d109f6734c3bbbdf87a157c114bbfea2 SHA512 df6c93e2e07b860f80c59d6fb08d545ee78320c998095fa4ccabd3aab44ba994f76d395a229fdcb92903e009dc75aeadbfb200b62ed1665cefe55218f180209c +EBUILD funtools-1.4.8-r1.ebuild 1980 BLAKE2B bbca48af4922dff3bc49a1abf68c4819923ab35f95f8fcfe30f504d7cff99e1799b14f66ce955a3c6898ea95eb0662e01f056e4fa954268f053ad6941819c9ba SHA512 ada02db5055e53d92056d7ef0a1f8818f80ac071dfab0b7bf33d76b877fb161ffb32a1be544e20539f949d8b9eace8893206872815b127ad28a728bf89e2c488 MISC metadata.xml 730 BLAKE2B f61bfa4bd01e5cbc059bcd3632090177da35ae6ac6b91362b408630f9ef533d598e70bdaa46c4ae9e33d2a1dc5f82b4bcb3c9f2fc94548d07aab045229085f4a SHA512 08e091dd36f285586fc6973d7ca3e59497ce05ca13fc66d5e543b0d27b710b2abedb6e210bfa074ae24a3cdc55db4e767f51fba8e459753903bc2c6fa799d03d diff --git a/sci-astronomy/funtools/funtools-1.4.7.ebuild b/sci-astronomy/funtools/funtools-1.4.7.ebuild deleted file mode 100644 index 05371d13bf15..000000000000 --- a/sci-astronomy/funtools/funtools-1.4.7.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs autotools - -DESCRIPTION="FITS library and utlities for astronomical images" -HOMEPAGE="https://github.com/ericmandel/funtools" -SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND=" - dev-lang/tcl:0= - sci-astronomy/wcstools:0= - sci-visualization/gnuplot - sys-libs/zlib:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - # respect libdir, dont build wcs, respect toolchain - sed -e "/INSTALL/s|/lib|/$(get_libdir)|g" \ - -e 's|${OBJS}|$(OBJS)|g' \ - -e '/^SUBLIBS/s|wcs||g' \ - -e 's/mkdir/mkdir -p/g' \ - -e '/mklib/s|-o $(PACKAGE)|-o $(PACKAGE) $(LIBS)|g' \ - -e "s| ar| $(tc-getAR)|g" \ - -e "s|ar cruv|$(tc-getAR) cruv|g" \ - -e "s|WCS_INC.*=.*|WCS_INC = $($(tc-getPKG_CONFIG) --cflags wcstools)|g" \ - -i Makefile.in */Makefile.in || die - # fix race condition (when ccache is on) - sed -e 's|$(LIB):|$(LIB): FORCE|g' \ - -e '$aFORCE:' \ - -i */Makefile.in || die - eautoreconf -} - -src_configure() { - econf \ - --exec-prefix="${EPREFIX}/usr" \ - --enable-shared \ - --enable-dl \ - --with-wcslib="$($(tc-getPKG_CONFIG) --libs wcstools)" \ - --with-zlib="$($(tc-getPKG_CONFIG) --libs zlib)" \ - --with-tcl="${EPREFIX}/usr/$(get_libdir)" -} - -src_compile() { - emake - emake shtclfun -} - -src_install() { - default - # install missing includes - insinto /usr/include/funtools/fitsy - doins fitsy/*.h - # fix bug #536630 - mv "${ED}"/usr/share/man/man3/funopen.3 \ - "${ED}"/usr/share/man/man7/funopen.7 \ - || die - use doc && dodoc doc/*.pdf doc/*html doc/*c \ - && docompress -x /usr/share/doc/${PF}/*.c - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/sci-astronomy/funtools/funtools-1.4.8.ebuild b/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild index c7ba18476c52..ae1f275205f0 100644 --- a/sci-astronomy/funtools/funtools-1.4.8.ebuild +++ b/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild @@ -16,7 +16,7 @@ IUSE="doc static-libs" RDEPEND=" dev-lang/tcl:0= - sci-astronomy/wcstools:0= + sci-astronomy/wcstools sci-visualization/gnuplot sys-libs/zlib:0= " @@ -31,6 +31,7 @@ src_prepare() { -e '/^SUBLIBS/s|wcs||g' \ -e 's/mkdir/mkdir -p/g' \ -e '/mklib/s|-o $(PACKAGE)|-o $(PACKAGE) $(LIBS)|g' \ + -e 's|./mklib|& -linker "$(CC)" -ldflags "$(LDFLAGS)"|' \ -e "s| ar| $(tc-getAR)|g" \ -e "s|ar cruv|$(tc-getAR) cruv|g" \ -e "s|WCS_INC.*=.*|WCS_INC = $($(tc-getPKG_CONFIG) --cflags wcstools)|g" \ @@ -71,11 +72,11 @@ src_install() { || die if use doc; then - dodoc doc/*.pdf doc/*html doc/*c \ + dodoc doc/*.pdf doc/*html doc/*c docompress -x /usr/share/doc/${PF}/*.c fi if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die + find "${ED}" -name "*.a" -type f -delete || die fi } diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest index 5c27a5c08650..a1e15b92e813 100644 --- a/sci-astronomy/gasgano/Manifest +++ b/sci-astronomy/gasgano/Manifest @@ -1,4 +1,4 @@ DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 BLAKE2B f58191ca9f1bd72f78e73eceecbfc32331fb88abcaed0eb27f7beb444e47788a95d43f3e8421b235e7637d452d22a773f7363934690644e2cc02acfdfd5cbb11 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1 DIST gasgano-2.4.8.tar.gz 9211627 BLAKE2B df0a7856ec8b06cb590ff180798841a18f919c55eef4553fb9712e2b8a17d8a39fdeb642c941f8169b866baa2a1fd9ca0795f7c331adfb6ed56c69098abdb9bd SHA512 94fbc9721077b15d2ec06e296d1503a0e33cb845c831a4102740b84d600bc900324ec5293b9a977df0956bd02cd5adf9cc62989be860417e8014e97ead41967c -EBUILD gasgano-2.4.8-r1.ebuild 976 BLAKE2B a1b5969cb9c8c896cafb4ecf874d55515b923f65338dc584dc633972176b92e800b90aee8650f2a6a1bfd7329b721921f6a8088620d55f67b936fa6958a55b7b SHA512 3579a73e728c43d0bc6081c9a6acae85e0478f7f781db9fd77100722c6c3bf04a33969ef3cdfdfb2956822275d36e859dfd045fe8625dd936d48c52c2f5f2281 +EBUILD gasgano-2.4.8-r1.ebuild 971 BLAKE2B 08b2d60f7c4a76c2f503389b6ad79072c9220b32b7f2b56729e6569393d60c8f35ef463cc9797a65175c2a15d242e77abd321d8f80535696522d3474808f3a99 SHA512 5919437f2e33ad4058cbd15a4907c90546f5bd770663c75c10c5de7e847c30c38174a6b9ee25dfa59070512a8d2c25e145d85de917a64be934b2fcfceeb622a8 MISC metadata.xml 737 BLAKE2B 0e0ee3a471a3b6e9e37daf2109d72e64f8bcb0c5823b590051ec3de1113d957c79379caa43d2cae18b85a6e4d0c8cb9d969b6f1c59f948273820e26a516adc3d SHA512 a30d8a4d7c0323a1933fc510e586afc85a6910a2b2ace1fa6d699d10eb502cb6d664ba512787cfbc169b4f9b8e93a3949ffcb3ce36c293f0da47206bbe5a2f13 diff --git a/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild index 2aeaa63b02a0..5bdc9d58f289 100644 --- a/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild +++ b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz LICENSE="Apache-1.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux" IUSE="doc" DEPEND=">=virtual/jdk-1.8:*" diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest index 0e8bcdfbd3b2..a89f9dec8e51 100644 --- a/sci-astronomy/kstars/Manifest +++ b/sci-astronomy/kstars/Manifest @@ -1,5 +1,5 @@ -DIST kstars-2.6.9.tar.xz 150693400 BLAKE2B 5f1efb2f3ac4a8067504cbe3f595b646c54e5d86256f64c2a325db3da43dcd8b454504ca430defa3f7b8f0cfb5d5be4b95bd8af837b3446f91b0b51d5306a3d7 SHA512 58f33a83d6be4ee3bd93f0e12e9fce2d4cbec25e8382a2f6f45f09b67dc4c254b629683e5fac7838af21310b9c89fd1a61b89e2021136804689e7c426bea6038 -DIST kstars-3.7.0.tar.xz 170110716 BLAKE2B c23734c615f2122a32302b0c4c3daf347986bbc1f3f84ee50645c81ad033edff41051866a8ecd589ee2e83d2329ba90b9d82fc0851da4015e6c2d0257ac1715e SHA512 b62ccc4706dcc23aee2098c8b7614514110b22fd8150efe6119be056d9bd17f29fcf1943b0282364b02e02b32d1d7cfd2f1175a2cf79e4f4d0085865b4716c79 -EBUILD kstars-3.6.9.ebuild 2621 BLAKE2B 79a6b7cf263e752d2c36ec57adf0218fb87eab3f0caf033f67b2adb5391f7f25d64776a287697144217488b5a72a254aeae5162b57eb3702838af859ad430545 SHA512 ccf3e71712d1d32cde781ca80b1e40501bd71505975f6b6619a078400393b62896ad1c8dcd81412a2ae20371c6fade06a254ef44c473dbbe6eb1adf0b80c2cc2 -EBUILD kstars-3.7.0.ebuild 2558 BLAKE2B 2bc7995dc73d515906f0db054231a2bc2c337a15e5c3c69570f19bd3531d8c00e59e1d9a0aa4d63397684b6fea8ebb445f3b64ef00318c33e0377d278a877000 SHA512 ab14ac1ca60ce893934fcb3762197e8ae9c64cd844a603a3b36b219b3a998ef02a987243958521a76498311344b2e83ad4ec4cff9dfa884aaa99fbf1fb9fbfaa +DIST kstars-3.7.1.tar.xz 160104144 BLAKE2B 50ae2a534a3fbec962c8c609f2572e05a1b1f3128c3b5a48492c8e2599f4f831dd9f78ee08a69c8172f7138e2521b522cedccf625b3ce36d52029659ddfacde0 SHA512 89c226012ce3679006706f2f21a669dbd53ced008a0d6f75cc9a6d72c98d126fe2119eb673a08a6e626e3766ac5974fa58febfacab3f196de65b677417adb389 +DIST kstars-3.7.3.tar.xz 162015484 BLAKE2B 650198b01c6e51d6725cce68fa3ac51d04e415355a24d36d75d0267b6c5536c1f13962307e36359452ae857364eaf7e548c17068568030946d388189e4982b2e SHA512 981e7040745bfc1e52339a653945ec3283cb4bfa8f5018cf890a1ae8b10a7e860de5c4c99ab7b3f14e6eae856c6ac65e39cf1856263609cf1d6541bd7224e87f +EBUILD kstars-3.7.1.ebuild 2563 BLAKE2B d9994f329dd87cc2320a890b10d6282799d42b7c1cfcbc710b93e5a86782658ddfa7991b7ac7e9aff0c841a5fc1cecd03a42c3870515a7629e4b859554f82458 SHA512 5dec631a6a8ec9c12961b979faa116da9769ecaaca927b92409d9c02564f434a20da33234be101b341c55c039fc94de45856cfc2bba56edbb95ca6a109a485a2 +EBUILD kstars-3.7.3.ebuild 2818 BLAKE2B 07ce661dab866ab315b7558849d82e8e28cd8d89150f97659a447dc5852d9211ac2aa9af4bb9e6bb02c6e201bf646284647a6fe241c10e363e4443e5bfc982db SHA512 5d4f85c14bc0a70364fb577b6fd009365abd67a9f50765e03e8b9b6b54ee4c2fae61a25e33787efecc7f0d6dc35570b425613aa0c967a620049325b692abbf41 MISC metadata.xml 514 BLAKE2B 59cb277db1acfe3514683284ae5b608e51d63b30fe5722cb1e8f8934848f04790ec82ab74ebab38eb565097b803e8132b8abfacbef4cee7197e3b8b0ae1a10ef SHA512 ab9e49e872c880b13ddbc698fbeef9366d642423ada0d64fdd4b1ebadeeba09dbf289855084153c444a77f1b1f03deaf54baf68d8b64a6c57f684e7ceee02c43 diff --git a/sci-astronomy/kstars/kstars-3.7.0.ebuild b/sci-astronomy/kstars/kstars-3.7.1.ebuild index 5652889013cb..40643518db3d 100644 --- a/sci-astronomy/kstars/kstars-3.7.0.ebuild +++ b/sci-astronomy/kstars/kstars-3.7.1.ebuild @@ -13,8 +13,8 @@ DESCRIPTION="Desktop Planetarium" HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-2+ GPL-3+" diff --git a/sci-astronomy/kstars/kstars-3.6.9.ebuild b/sci-astronomy/kstars/kstars-3.7.3.ebuild index 3db1ca6cb9fa..818f197a4550 100644 --- a/sci-astronomy/kstars/kstars-3.6.9.ebuild +++ b/sci-astronomy/kstars/kstars-3.7.3.ebuild @@ -5,17 +5,15 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.106.0 -QTMIN=5.15.9 +KFMIN=5.115.0 +QTMIN=5.15.12 inherit ecm kde.org optfeature DESCRIPTION="Desktop Planetarium" HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - THEIR_PV="2.6.9" - SRC_URI="mirror://kde/stable/${PN}/${PN}-${THEIR_PV}.tar.xz" - S="${WORKDIR}/${PN}-${THEIR_PV}" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" KEYWORDS="amd64 ~x86" fi @@ -23,7 +21,8 @@ LICENSE="GPL-2+ GPL-3+" SLOT="5" IUSE="+password raw wcs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# IUSE wcs needed by TestPolarAlign +REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( wcs )" COMMON_DEPEND=" >=dev-qt/qtdatavis3d-${QTMIN}:5 @@ -75,6 +74,15 @@ RDEPEND="${COMMON_DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 " +CMAKE_SKIP_TESTS=( + # bug 842768, test declared unstable by upstream + TestKSPaths + # bugs 923871, 939788 + TestPlaceholderPath # ki18n (KLocalizedString) failure + # all fail with offscreen plugin + TestEkos{Capture,FilterWheel,Focus,Mount,Scheduler{,Ops},Simulator} +) + src_configure() { local mycmakeargs=( -DBUILD_PYKSTARS=OFF @@ -89,12 +97,7 @@ src_configure() { } src_test() { - # bug 842768, test declared unstable by upstream - local myctestargs=( - -E "(TestKSPaths)" - ) - - ecm_src_test + LC_NUMERIC="C" LC_TIME="C" TZ=UTC ecm_src_test } pkg_postinst() { diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest deleted file mode 100644 index 424ec49a0b42..000000000000 --- a/sci-astronomy/predict/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX predict-2.2.3-earthtrack.patch 1175 BLAKE2B 17e1327695b12321abce6cb01e8211414ef1c640d1b2818d09825c56df95b5817e7a23689b9f7e912b30d55c0eeeaeb0134ddf809f71d23275f742d896629214 SHA512 908d5b323606d2655787fb50f456fba894b87398bc55298d9ce99d065b6a7625a3c564a0a047011d83a31af640f3b0f8a1b38e467ec7017159601bb9bc237fd3 -AUX predict-update 4039 BLAKE2B 856aea796dcd612d17cdcc8d9aa7015e59faaa42a66caf42bd01c3e51c4193119208eb2c9015d215a014e2c08511c6ebbd13b78d4a4a0f86b7b133e4363d0ed2 SHA512 8bcc89babe25f44ca985776b994265a12be8e3d6390e4301594f7a8d1402d7d42aa66f6ae1ab6f51c2d8d910d9f012920382928c0238fce4e1707cb8843a739a -DIST predict_2.2.3-3.1.diff.gz 78624 BLAKE2B c80ffcf2b624a36e919d0f659c4cb46dbb4d00c83dd7c0e900d052a7258be92a4435a8de7ff319d16169373eab1061bed61a2311c5344eb5fc2f43183c0b8b46 SHA512 9fe2e3ffd931be7ab85f10db4cd35a2091a459c3fd0c48e9ecf8a4482c20400c267b38d31f72d28270d50b7305bc49418fefe35ff013ac9be1627d853205bd5f -DIST predict_2.2.3.orig.tar.gz 1444530 BLAKE2B 0bcca42aa0b7294d5276d5f9db2e321b1d47afdcb5194eeeb90d6912bd6f38c02a21036638febc45a72e304b9ae4737840f6ee3f4550eccf557e830272ef3956 SHA512 260f7f4dbc72cca4b0b5f7bc9dcf612b8a7e3ef12ab6f34afa3c06b1ac24427435af1c4bae9d39e7cbcdff6cccad72e3235dd191605464642f014207651d8c11 -EBUILD predict-2.2.3-r2.ebuild 5745 BLAKE2B 44f10d329f1e65c463061423e439e3668f62ab8562b540aebead9e6799a15848903e6a3447cdc84e5490c2bfeabd626c549e5626cb7eb0e05454acd9838bb94a SHA512 f1cdbb8661ec591a22ea92366260157b00aa7d9c24df03cffd80724e83e62b7b2ca73795b8ca038f1bb32fa27b9fe3e8795721d77451e4520bfa145eac7078ce -MISC metadata.xml 837 BLAKE2B f970f2e44a77574ff97ce39603a9ed5748fd4e8db136cabb174a9974060d1be085d5b3dbe58123b1c42ae992e06e34f00e28e5299ef311d42fe0b050b1da655e SHA512 90958bd68ac91ccf04d1b53b3f99123960623f4351af4717df3a92fd8a877b757d75548f5d2b83d9e073953bc108722b7a07af6511bf96c0937c8760248a41eb diff --git a/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch b/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch deleted file mode 100644 index 65f18bf9512d..000000000000 --- a/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur a/clients/earthtrack/earthtrack.c b/clients/earthtrack/earthtrack.c ---- a/clients/earthtrack/earthtrack.c 2013-06-08 20:03:55.629967192 +0200 -+++ b/clients/earthtrack/earthtrack.c 2013-06-08 20:05:15.559966743 +0200 -@@ -495,11 +495,11 @@ - - fprintf(fd,"marker_file=%s\n",markerfile); - fprintf(fd,"arc_file=%s\n",greatarcfile); -- fprintf(fd,"marker_font=/usr/local/share/xplanet/fonts/FreeMonoBold.ttf\n"); -- fprintf(fd,"\n## Your \"/usr/local/share/xplanet/config/default\" configuration file follows:\n\n"); -+ fprintf(fd,"marker_font=/usr/share/xplanet/fonts/FreeMonoBold.ttf\n"); -+ fprintf(fd,"\n## Your \"/usr/share/xplanet/config/default\" configuration file follows:\n\n"); - fclose(fd); - -- x=AppendFile("/usr/local/share/xplanet/config/default",configfile); -+ x=AppendFile("/usr/share/xplanet/config/default",configfile); - - if (x==1) - { -@@ -509,7 +509,7 @@ - - if (x==2) - { -- fprintf(stderr,"%c*** Error: Could not read \"/usr/local/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7); -+ fprintf(stderr,"%c*** Error: Could not read \"/usr/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7); - exit(-1); - } - } diff --git a/sci-astronomy/predict/files/predict-update b/sci-astronomy/predict/files/predict-update deleted file mode 100644 index b0634e148e46..000000000000 --- a/sci-astronomy/predict/files/predict-update +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -oldpwd=$PWD - -if [ ! -f ~/.predict/predict.tle ]; then - mkdir -p ~/.predict - cd ~/.predict - cat > predict.tle << EOF -OSCAR-10 -1 14129U 02217.21791401 .00000442 00000-0 00000-0 0 7 -2 14129 25.6686 197.8739 6086930 273.5039 23.0795 2.05866525116000 -OSCAR-11 -1 14781U 02217.20425383 .00001813 00000-0 00000-0 0 6 -2 14781 98.0880 185.1059 0010359 119.2373 240.9876 14.76997913987094 -OSCAR-14 -1 20437U 02217.20572416 .00000181 00000-0 00000-0 0 8 -2 20437 98.3009 264.9286 0011799 68.5863 291.6580 14.31121869654267 -PACSAT -1 20439U 02217.25154490 .00000231 00000-0 00000-0 0 9 -2 20439 98.3472 275.4922 0012032 74.6777 285.5743 14.31332429654304 -LUSAT -1 20442U 02216.75520291 .00000242 00000-0 00000-0 0 5 -2 20442 98.3779 280.4632 0012985 73.9191 286.3409 14.31575156654338 -OSCAR-20 -1 20480U 02217.54003808 -.00000027 00000-0 00000-0 0 7 -2 20480 99.0206 212.5786 0540948 90.2870 276.0202 12.83318863585245 -OSCAR-22 -1 21575U 02216.97001758 .00000422 00000-0 00000-0 0 9 -2 21575 98.1264 214.2386 0008207 17.4055 342.7413 14.38915947579867 -OSCAR-23 -1 22077U 02216.94266766 -.00000037 00000-0 00000-0 0 9 -2 22077 66.0844 179.5905 0009538 319.0308 40.9993 12.86398497468888 -OSCAR-25 -1 22828U 02217.51170770 .00000176 00000-0 00000-0 0 9 -2 22828 98.2949 253.2889 0010744 97.6953 262.5454 14.29395258429974 -ITAMSAT -1 22826U 02216.71294910 .00000212 00000-0 00000-0 0 2 -2 22826 98.2981 252.2691 0009565 119.2021 241.0116 14.29035332461667 -OSCAR-27 -1 22825U 02217.14273416 .00000182 00000-0 00000-0 0 3 -2 22825 98.2952 251.6595 0009305 119.9116 240.3013 14.28824165461683 -OSCAR-29 -1 24278U 02216.92953700 -.00000035 00000-0 00000-0 0 1 -2 24278 98.5168 30.2010 0351470 9.0561 351.6706 13.52846361294584 -OSCAR-36 -1 25693U 02217.47022698 .00000460 00000-0 00000-0 0 8 -2 25693 64.5605 253.8004 0008708 253.5019 106.5150 14.74585281177168 -OSCAR-40 -1 26609U 02217.05030362 -.00000251 00000-0 00000-0 0 6 -2 26609 7.5635 101.4360 7924755 75.7827 352.4675 1.25596086 8104 -RS-12/13 -1 21089U 02216.81449027 .00000082 00000-0 00000-0 0 9 -2 21089 82.9235 328.1138 0030158 114.6154 245.8150 13.74373061576622 -RS-15 -1 23439U 02216.86493965 -.00000037 00000-0 00000-0 0 6 -2 23439 64.8185 1.1847 0152424 152.9684 207.9281 11.27546726313309 -NOAA-12 -1 21263U 02216.96410173 .00000410 00000-0 00000-0 0 4 -2 21263 98.6066 205.1774 0011736 236.4413 123.5645 14.24842312583078 -NOAA-14 -1 23455U 02216.94655308 .00000224 00000-0 00000-0 0 1 -2 23455 99.1906 225.2382 0010223 66.1025 294.1215 14.13170722391563 -NOAA-15 -1 25338U 02216.96832533 .00000312 00000-0 00000-0 0 0 -2 25338 98.5657 239.3255 0010503 167.6220 192.5219 14.24094451219673 -UARS -1 21701U 02217.09598012 .00001106 00000-0 00000-0 0 8 -2 21701 56.9808 110.9304 0004474 115.3921 244.7510 15.02171395596038 -HUBBLE -1 20580U 02217.09786941 .00002710 00000-0 00000-0 0 4 -2 20580 28.4663 239.6798 0003524 339.3283 57.0940 14.96472945473016 -ISS -1 25544U 02217.52476852 .00025143 00000-0 00000-0 0 9 -2 25544 51.6355 165.2615 0018093 106.6267 56.5198 15.57209040211722 -PCSAT -1 26931U 02217.22743486 .00000269 00000-0 00000-0 0 9 -2 26931 67.0531 43.5764 0007786 258.8522 101.1704 14.28921812 44150 -STARSHINE 3 -1 26929U 02216.67548843 .00042169 00000-0 00000-0 0 9 -2 26929 67.0426 246.5544 0011326 237.9129 122.0981 15.57367567 47636 -EOF -fi - -mkdir /tmp/predict-$$ || exit 1 -cd /tmp/predict-$$ - -wget -qc www.celestrak.com/NORAD/elements/amateur.txt -O ./amateur.txt -wget -qc www.celestrak.com/NORAD/elements/visual.txt -O ./visual.txt -wget -qc www.celestrak.com/NORAD/elements/weather.txt -O ./weather.txt -predict -u ./amateur.txt ./visual.txt ./weather.txt - -cd ${oldpwd} -rm -fr /tmp/predict-$$ diff --git a/sci-astronomy/predict/metadata.xml b/sci-astronomy/predict/metadata.xml deleted file mode 100644 index 09bf6393ef3a..000000000000 --- a/sci-astronomy/predict/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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"> - Predict is a satellite tracking program. It is probably mostly of interest - to users of amateur satellites, but includes support for optionally - announcing azimuth and elevation to help in manual antenna pointing, - or optical observation of satellites. -</longdescription> -<use> - <flag name="xforms">Add a "map" client which uses the - <pkg>x11-libs/xforms</pkg> library for its GUI</flag> - <flag name="xplanet">Project predict data onto world maps generated by - <pkg>x11-misc/xplanet</pkg> / <pkg>x11-misc/xearth</pkg></flag> -</use> -</pkgmetadata> diff --git a/sci-astronomy/predict/predict-2.2.3-r2.ebuild b/sci-astronomy/predict/predict-2.2.3-r2.ebuild deleted file mode 100644 index 3b3f89fbfc61..000000000000 --- a/sci-astronomy/predict/predict-2.2.3-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -DEB_P="${PN}_${PV}" -DEB_PR=3.1 - -DESCRIPTION="Satellite tracking and orbital prediction" -HOMEPAGE="https://www.qsl.net/kd2bd/predict.html" -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc gtk nls xforms xplanet" -KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - sys-libs/ncurses:0= - gtk? ( x11-libs/gtk+:2 ) - xforms? ( x11-libs/xforms ) - xplanet? ( x11-misc/xplanet[truetype] )" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-earthtrack.patch - "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff -) - -src_prepare() { - default - sed -i -e 's:predict\(.*\)/:predict-2.2.3\1/:g' \ - debian/patches/140*.diff || die - sed -i -e 's:\(a\|b\)/:predict-2.2.3/:g' \ - debian/patches/180*.diff || die - eapply debian/patches/. - # fix some further array out of bounds errors - sed -i -e "s/satname\[ 26/satname\[ 25/g" \ - clients/gsat-1.1.0/src/db.c || die - sed -i -e "s/satname\[ 26/satname\[ 25/g" \ - clients/gsat-1.1.0/src/comms.c || die - sed -i -e "s/output\[20\];/output[21];/" \ - utils/moontracker/moontracker.c || die - # fix underlinking - sed -i -e '/AC_OUTPUT/i \ -AC_SEARCH_LIBS([cos], [m]) \ -AC_SEARCH_LIBS([dlclose], [dl])' \ - -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - -e 's/configure.in/configure.ac/' \ - clients/gsat-1.1.0/configure.in || die - - mv clients/gsat-1.1.0/configure.{in,ac} || die - - sed -i \ - -e 's/gcc/$(CC) $(CFLAGS) $(LDFLAGS)/g' \ - -e 's/-o/-lm -o/g' \ - clients/gsat-1.1.0/plugins/Makefile || die - - # fix the hardcoded /usr/lib - PRED_DIR=/usr/$(get_libdir)/${PN} - sed -i -e "s:/usr/lib/${PN}:${EPREFIX}/${PRED_DIR}:g" \ - predict.h vocalizer/vocalizer.c || die - - sed -i -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - clients/gsat-1.1.0/src/globals.h || die - - if use gtk; then - cd "${S}"/clients/gsat-* || die - rm config.sub missing || die - eautoreconf - fi -} - -src_configure() { - append-cflags -fcommon - if use gtk; then - cd "${S}"/clients/gsat-* || die - econf $(use_enable nls) - fi -} - -src_compile() { - # predict uses a ncurses based configure script - # this is what it does if it was bash based ;) - - local COMPILER="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" - einfo "Compiling predict" - ${COMPILER} predict.c -lm $($(tc-getPKG_CONFIG) --libs ncurses) -lpthread \ - -o predict || die "failed predict" - einfo "Compiling predict-g1yyh" - ${COMPILER} predict-g1yyh.c -lm $($(tc-getPKG_CONFIG) --libs ncurses) -lpthread -lmenu \ - -o predict-g1yyh || die "failed predict-g1yyh" - einfo "Compiling vocalizer" - ${COMPILER} vocalizer/vocalizer.c \ - -o vocalizer/vocalizer || die "failed vocalizer" - local c - for c in fodtrack geosat moontracker; do - einfo "Compiling ${c}" - cd "${S}"/utils/${c}* || die - ${COMPILER} ${c}.c -lm -o ${c} || die "failed ${c}" - done - einfo "Compiling kep_reload" - cd "${S}"/clients/kep_reload - ${COMPILER} kep_reload.c \ - -o kep_reload || die "failed kep_reload" - - if use xplanet; then - einfo "Compiling earthtrack" - cd "${S}"/clients/earthtrack || die - ${COMPILER} earthtrack.c \ - -lm -o earthtrack || die "failed earthtrack" - fi - - if use xforms; then - einfo "Compiling map" - cd "${S}"/clients/map || die - ${COMPILER} map.c map_cb.c map_main.c -lforms -lX11 -lm \ - -o map || die "Failed compiling map" - fi - - if use gtk; then - einfo "Compiling gsat" - cd "${S}"/clients/gsat-* || die - emake - emake -C plugins - fi -} - -src_install() { - dobin predict predict-g1yyh "${FILESDIR}"/predict-update - dodoc CHANGES CREDITS HISTORY README NEWS debian/README.Debian - doman docs/man/predict.1 - newman debian/predict-g1yyh.man predict-g1yyh.1 - insinto ${PRED_DIR}/default - doins default/predict.* - use doc && dodoc docs/pdf/predict.pdf - - cd "${S}"/vocalizer || die - dobin vocalizer - dosym ../../../bin/vocalizer ${PRED_DIR}/vocalizer/vocalizer - insinto ${PRED_DIR}/vocalizer - doins *.wav - - cd "${S}"/clients/kep_reload || die - dobin kep_reload - newdoc README README.kep_reload - doman "${S}"/debian/kep_reload.1 - - cd "${S}"/utils/fodtrack-0.1 || die - insinto /etc - doins fodtrack.conf - doman fodtrack.conf.5 fodtrack.8 - dobin fodtrack - newdoc README README.fodtrack - - cd "${S}"/utils/geosat || die - dobin geosat - newdoc README README.geosa - newman "${S}"/debian/geosat.man geosat.1 - - cd "${S}"/utils/moontracker || die - dobin moontracker - newdoc README README.moontracker - doman "${S}"/debian/moontracker.1 - - if use xplanet; then - cd "${S}"/clients/earthtrack || die - ln -s earthtrack earthtrack2 || die - dobin earthtrack earthtrack2 - newdoc README README.earthtrack - doman "${S}"/debian/earthtrack.1 - fi - - if use xforms; then - cd "${S}"/clients/map || die - newbin map predict-map - newdoc CHANGES CHANGES.map - newdoc README README.map - doman "${S}"/debian/predict-map.1 - fi - - if use gtk; then - cd "${S}"/clients/gsat-* || die - exeinto /usr/$(get_libdir)/gsat/plugins - doexe plugins/radio_{FT736,FT847,ICR10,print,test} plugins/rotor_{print,pictrack} - dobin src/gsat - doman "${S}"/debian/gsat.1 - local i - for i in AUTHORS ChangeLog NEWS README Plugin_API; do - newdoc ${i} ${i}.gsat - done - fi -} - -pkg_postinst() { - einfo "To use the clients the following line will" - einfo "have to be inserted into /etc/services" - einfo "predict 1210/udp" - einfo "The port can be changed to anything" - einfo "the name predict is what is needed to work" - einfo "after that is set run 'predict -s'" - einfo "" - einfo "To get list of satellites run 'predict-update'" - einfo "before running predict this script will also update" - einfo "the list of satellites so they are up to date." -} diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest index 7c5481a9433b..21c023e62e25 100644 --- a/sci-astronomy/pyephem/Manifest +++ b/sci-astronomy/pyephem/Manifest @@ -1,6 +1,8 @@ AUX pyephem-4.1.3-clang-15.patch 1126 BLAKE2B 2a976402626fa74e1c9304230b996980f6364e0a82e0316f1994317bad9966fb5ca10cc1ddc1480c405a140a0196854ab7baa1a5e06b3287e2921dd650b4b741 SHA512 f5cfade697342512d8b8386eb73a766ad3730007546759dbe1d79b59609ef697baea7b910d8ebfe53949d5406c1135673b8108fb0482ac81d4fcc7048c65d20b DIST pyephem-4.1.1.gh.tar.gz 2659977 BLAKE2B e373857d3fb66e742f9db992165dbd1d50afbb6b91588f2cfcd299409d491ef1174c54a182dd59b5a8e298a07312899c8f8b5a8aaa63e6b31deb5f8b1cd3131e SHA512 2539f36b7110cacd6cf95e9ba0be26ca837a66ba81f092d4be01405029adf22478184861f46ecf09d6cd35927140874e0f0d228b06537d05f3e2eddbcb35da85 DIST pyephem-4.1.3.gh.tar.gz 2660800 BLAKE2B 272a96dfe5debe083274f911737246ea90dc15b12b141e41c018d0b4eff13e548fe1d99cfb75ea7d06d7784cd9cbce7f43149a08de051cd9e12a4b5d6a306607 SHA512 1d113e1adbe5c8175364a29ae405d80005e54a4f60d475534d6721dc51b4f58d314ad161ddaf791614fcd4b0550e4b2142f4e52ec4771ca0d1be6b10f3f8cc4d +DIST pyephem-4.1.5.gh.tar.gz 2662791 BLAKE2B a30d3103b0d626e0316e85d1188dc2e93782fd87db6792dd6933fd9efb1b3fd7be7073486ec45c96e068b7bf9e471bf369a5867af87df5b5d50e16fc1f1a0e4c SHA512 f462df23060abacc69698e67526503302306953891c92920f77bc67d977a9691ed0d176d2743fa2c7c95cb3ff558f5e4a77fa6acff82cff243b771ed7ad095c9 EBUILD pyephem-4.1.1.ebuild 1216 BLAKE2B 073d45a5b53a3b000bf701e1f6d60a457276403c556d935df253a6cac22e3ab8df37ce5338ce48e19728d8981402f4a59976e0be40a1b147babc5a4b290ebb97 SHA512 7579809a22743679bf299ca0b367494e422f00527e43d5f7e503293cce652c4064b40bfd0c131b7a85a2e346e8ca9289ee8507dcb0fa671e8a428fff09f4e563 EBUILD pyephem-4.1.3.ebuild 1264 BLAKE2B 801a075e0291b4cdfd7edca4e3a953adda3effddeba8d2b8675c65bf2dc128e5310fa388aa64bf42da2dc6596c2d28303fbd83979f8c1a854d647c499f0e0d47 SHA512 4bdb7343d3a24de83ca0ca4e1490d45ff5531efa88008bba4842a0340987cc0ce97f9d23883d3346a67d3ab2d729925628ae723f5073b4f7f695ec19f96d80b6 +EBUILD pyephem-4.1.5.ebuild 1234 BLAKE2B af4edf6b88cb32216ae2a26984dddaac781071a4319e3c3e4114b82b210ab84edcbe99d52e55b6195fb1845dd88f7f7d2d79db40316328792eeddae78d541553 SHA512 a84bd4eb2252c66f2144797febae071db7d7e4071cf28d27ced7893b7e2776a64c7bdc3c6a310227419da8fff37951b87051db0e492b6189e91ee5f8a11efc69 MISC metadata.xml 1010 BLAKE2B 3d603ea6d647cc50bcc0a0f31704a6e201e6deff6694f7604b3dd39184eeb6ca7fe72b38772aca9c89f0d7185b5ed14f9ff67ba624aba68baaa358ad893bbc59 SHA512 c09f86ba1462ad279f3336165a7b8be4cae8499de3a16282e658bf76eb60ddbe0cb86b9d8f5a74edec2dd4c148c66d687c6becd5f84df9483b0f9bf1beb9eec5 diff --git a/sci-astronomy/pyephem/pyephem-4.1.5.ebuild b/sci-astronomy/pyephem/pyephem-4.1.5.ebuild new file mode 100644 index 000000000000..0e0c52a4f510 --- /dev/null +++ b/sci-astronomy/pyephem/pyephem-4.1.5.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Astronomical routines for the Python programming language" +HOMEPAGE="https://rhodesmill.org/pyephem/" +SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +BDEPEND="doc? ( dev-python/sphinx )" + +EPYTEST_DESELECT=( + # Can't find its test files (class not loaded properly in test env?) + # bug #855461 + tests/test_jpl.py::JPLTest::runTest +) + +distutils_enable_tests pytest + +src_prepare() { + # Don't install rst files by default + sed -i -e "s:'doc/\*\.rst',::" setup.py || die + distutils-r1_src_prepare +} + +src_compile() { + distutils-r1_src_compile + if use doc; then + PYTHONPATH=. emake -C ephem/doc html + fi +} + +python_test() { + cd "${T}" || die + epytest --pyargs ephem +} + +src_install() { + use doc && HTML_DOCS=( ephem/doc/_build/html/. ) + distutils-r1_src_install +} + +python_install() { + distutils-r1_python_install + + rm -r "${D}$(python_get_sitedir)/ephem/tests" || die +} diff --git a/sci-astronomy/pysiril/Manifest b/sci-astronomy/pysiril/Manifest index dea8578eda56..0b82c222bd83 100644 --- a/sci-astronomy/pysiril/Manifest +++ b/sci-astronomy/pysiril/Manifest @@ -1,3 +1,3 @@ DIST pysiril-V0_0_15.tar.bz2 107650 BLAKE2B 94efb349e1e92e75bc7813d08a1fc1cd38b9c6199da8ba71e28f3b5b2420295cd770e4327c073558d600adf80efe39a295663b030f9048e9124a5fb71a7aba30 SHA512 e1820e14b14041eb99d2f5165fa81ba64d8e1459d50af6a0c748ac5cbef90447ce2f92c12bcfd8da784a7ae7f04c270b3bd75fe5369f1671840e3f9105271429 -EBUILD pysiril-0.0.15.ebuild 528 BLAKE2B f214a6ead75421dad08e1a6afb796d982e9ad395ebc67649b6d81e3cd88569c40ffd2076d3f9dc3a4f7b85a5487347f93ac1978d078bf460f5717742f25c2666 SHA512 505c8012bd4c14dec99e74155052aa0a23d089d4177a9aada4d9c83884f3af7d3295cef2b1dda08a283dc017e149d2c214119a6aa901ae8cce8807c60dae439a +EBUILD pysiril-0.0.15.ebuild 528 BLAKE2B cb5af2060d821fe7e7fbc81abfbbcc84ed66ccb486d085e9e5e97b1491593dc6ae4240cb4fc93945eaee5fe1f1d1b20e97833ecccb1047cc72971b01e53528aa SHA512 676d206529259fe0fbec920b997f280c5f07c6d93bc7d1db770a135d12c5d70b043d52255af767ce493e6945266d50843839f67b08f0d557ba42ce24adf733da MISC metadata.xml 494 BLAKE2B e7781f189c50537ef692224940af06eb26c7703e43edd89fa9a5b49d8eaca673afaf6c52254593fedc4e21ac4bff77dcffaae1fb34babdf233d10b986de8782f SHA512 f5387f6360b29b6f7df9f12f72b2760c8702d57d7c672ca0f3b525fb536f1bc3f5cf11860e83774c680a16984e2f732938354c45ed66eb6a8ac3647532e117d2 diff --git a/sci-astronomy/pysiril/pysiril-0.0.15.ebuild b/sci-astronomy/pysiril/pysiril-0.0.15.ebuild index 387d9bbea2da..41e33be2e0e1 100644 --- a/sci-astronomy/pysiril/pysiril-0.0.15.ebuild +++ b/sci-astronomy/pysiril/pysiril-0.0.15.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 DESCRIPTION="Python library to interface Python to a SiriL script" diff --git a/sci-astronomy/scamp/Manifest b/sci-astronomy/scamp/Manifest index e8bc17fd7a62..5734b5084b91 100644 --- a/sci-astronomy/scamp/Manifest +++ b/sci-astronomy/scamp/Manifest @@ -1,3 +1,4 @@ -DIST scamp-2.0.4.tar.gz 4876618 BLAKE2B 4dc513bee48ec0c3bc8e90febc46e86d78f59a78fdbca0ee3efd2c0d39b5b32f2c4fb8655b3d4be74ca211deafb16645c295dd272c8fa9c426ba82ab1b97f36a SHA512 ed0a824ddcc3f9c791121323bb59969e89f509a2c429c0abb45655e6852bc452bd46c539dbebfd23097af1c7dbef9d3d905030083828974f75233ea4af4484d5 -EBUILD scamp-2.0.4.ebuild 1255 BLAKE2B ec49ad234cbbdbe3efcaee10470270feefb230e53922972d20bd72e344361dd3bbc913922e9dfe136370da0477f3c957a6db8705c87f80657871d2d4c722ef4d SHA512 37430a787951f0fd17dff5849123974d7cbd5a6083e310f051dc708a1e78405a418e7d8c85964e91461050bb79b7e4bd5bf393309c48190d5e1cc7f8f13857da -MISC metadata.xml 610 BLAKE2B d629e947c2f674928e645f6156387b564063f91fc3847982c0294533e1f81c08de0391398242f784c63d487d05c59c3b30e433ffdc9dab982dd03a94f92671be SHA512 b3feca598a3d92181a32b9537a3bf3f6fdaf6a117342f2ab1dadc7758f2b011735b9846779c2290bf39b67186f0f5916eff53caa23f446946609a48d205cbfed +AUX scamp-2.10.0-spread_bits64.patch 510 BLAKE2B b5215c79a6e13d3393f119f661a51cca8ec9afe43c112e12a6c4c44eebd9a165e6b180ef709811099c492fc7a77c418a9b3dd592b458fbff77c0c8b9e091fc45 SHA512 e2416122dbdf33c1b33c9e02f3e27cc257379d52962cb65ae9758dc08f8f506c55d6925e8819ce4ad9530dab8795797f61c1023842556e55d30d9dc8c8798caf +DIST scamp-2.10.0.tar.gz 56354286 BLAKE2B b31d292413160f85f8086d848d81f36adde3bc560c737adfe77245d23eb6eab19e5f73a343669b462453542a140d89fb3d12b5d6a481949205722c6e2f5234cd SHA512 7c7a4ab167a3c03b7fd862f39ccd9368d6ac31270a86b336f1ee2a52f8e4324e29e6324047416159c0b73bb54b05f12b7b70c2de3cb4197999cb848fc5ce4c0d +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.0.4.ebuild b/sci-astronomy/scamp/scamp-2.0.4.ebuild deleted file mode 100644 index b9bc758d7dfa..000000000000 --- a/sci-astronomy/scamp/scamp-2.0.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Astrometric and photometric solutions for astronomical images" -HOMEPAGE="http://www.astromatic.net/software/scamp" -SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="GPL-3" -SLOT="0" -IUSE="doc plplot threads" - -RDEPEND=" - sci-astronomy/cdsclient - sci-libs/atlas[lapack,threads=] - sci-libs/fftw:3.0 - plplot? ( sci-libs/plplot:= )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - local mycblas=atlcblas myclapack=atlclapack - if use threads; then - [[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \ - mycblas=ptcblas - [[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \ - myclapack=ptclapack - fi - sed -e "s/-lcblas/-l${mycblas}/g" \ - -e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \ - -e "s|lapack_lib=\"lapack\"|lapack_lib=${myclapack}|" \ - -i acx_atlas.m4 || die - sed -e 's|plplotd|plplot|g' -i acx_plplot.m4 || die - eautoreconf -} - -src_configure() { - econf \ - --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \ - $(use_enable plplot) \ - $(use_enable threads) -} - -src_install() { - default - use doc && dodoc doc/* -} 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[@]}" +} diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 885eec26313e..a23d1bf1dbf8 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,9 +1,11 @@ -AUX siril-1.2-exiv2-0.28.patch 1171 BLAKE2B 5e64f52fb1b2eb7ba05dde0d0d84f910d8238eac3d58ca15137fa394b7fb2a75aff26bc01616ef6a46007c95a546403960627b64cf675aa21d0039119f3afc47 SHA512 1e339d6e1bd843146e4dd8124a4ef2177f7596cd5d9864a05886a7a055e00093a48a7341b5ad9c1bf82d9e4b2c0cc2559ef429d2c8f986951c846a0bf097da03 AUX siril-1.2-fseek64-musl.patch 1750 BLAKE2B d0c735b72c6856f9d965e3c145116384c3cc2da92db2b5bf25c7345b3b6dd511db5853ef8c280cc37eef421713ccb1571443104427b86b963065c7bcf13d2d8d SHA512 73cc6dbc0da759a2f127af9926ca7466ad31c400c4fd349c376058d0b64e8f8f65ab1c8486d2169160af24637aa10c1cbecd0d2fb934b0d4baf22bc919dd7798 +AUX siril-1.2.1-options.patch 4226 BLAKE2B da57338a600f4358d572a1d3618571152cc334ed6f23162b9d1199dc6d2245247c6431646d3af02ba7752eac95cf5f82d1fa587f2de38ff9956400e68a97e590 SHA512 0988ce57f43fe06fe2e0af2152295098fd91351d28d3c6dd8174b7e8cb8dddbfa80c06ef763f25ae6d2128d2e9ca7ff4100f473d7b74871b189f49d188dd4428 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72 -DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954 SHA512 7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c DIST siril-1.2.1.tar.bz2 4596163 BLAKE2B c461a397e623164ccb2310b26aede120bf587b3491a2af3fab446af5ecbfb716169120b549c496bb615d3b7ac6175629258173fe66682ef4684ef5cf01d64761 SHA512 352b3e761a2d863d4ce4e01b0bf4181d8fefa903478973b50ace76ff419dbf07775099a994e685cd83cc2210b34ca10fb98004cedfdea34fe0c1520b4892bb6d -EBUILD siril-1.2.0.ebuild 2172 BLAKE2B c2c1af672e50ee49f7e49011061c650a60d3507ab0bd7e2a4af76fdfc706260ef175523ae11a0072cc04e36e016c43412470cdc4c61c6368e6670558b5c7e8b5 SHA512 d30dd9d5d81e1f0c271d2613dc48ec97797675702b9f8eb3b27c85ed0ad82123bebaac89f90d4542aeaf1cdc159fc05390e23047aec8f079e51d2576529b61c6 -EBUILD siril-1.2.1.ebuild 2161 BLAKE2B eebb0933a0480dee9630eae5e4366c86fd3f15c57e774171dee9e722d62cd72c9e1d906f09ea08546f42bb00cdd6aed6a1a65a8a395521f5fdd7c7a110ef327c SHA512 3fb563bcdce358272c3ea6ae6603879c24faa2b14faa224c56151b03d352e5c03981670307ecf255d16c8a1f8cb46e7ddc2da8c9d8cd2aa717634ef24d5bde5d +DIST siril-1.2.3.tar.bz2 4615997 BLAKE2B f8464849fad03faca07f238b3abd08c59126dab567666d92f1a53d2cea302608fe40b5532c6544029e869c639d1fc625c8ccc98779e678457713675c43225a74 SHA512 52cfa86ce0ddede42a3572c3d422cccca72da02a6efe207231ec98de9d59cc48704edd35e8ae83e86318e6980ce80eca3b9dba639e93f8551355a1328156ed9a +DIST siril-1.2.4.tar.bz2 4615480 BLAKE2B 5546a58fb52b32d11df61efbaa5342574ed896e530850dab44e15e3c51c0298efc79affa20b0e59c5ccd796eaf6e6bb589a8ca5ba5ad4e60e16b59ebfb289fda SHA512 b0213df311f3b0b25fc5f2c38aee40b1eb55c3c7007a1d337545bef3a495d486522ec11a5eba9656ddf6e8274b866ebf429141ca506b85784f11fae05fc7c9da +EBUILD siril-1.2.1-r1.ebuild 2202 BLAKE2B 3189e4f4ed9e662bcb11162ec5a0400daefed701a550061f9b0647de6b972f70eeec488d5cd280bd3e9b273253efccd579376a437ed97ca2e3ff0b309d371907 SHA512 9e491e221f72b1372a100bd95cbf80a6a024f012f570c9e982dcb3cbf5ef880dd093bb9efae53cc0b24ebce6653044fb6ac7a6c04a55275c0dc4a829889d830b +EBUILD siril-1.2.3.ebuild 2202 BLAKE2B 3189e4f4ed9e662bcb11162ec5a0400daefed701a550061f9b0647de6b972f70eeec488d5cd280bd3e9b273253efccd579376a437ed97ca2e3ff0b309d371907 SHA512 9e491e221f72b1372a100bd95cbf80a6a024f012f570c9e982dcb3cbf5ef880dd093bb9efae53cc0b24ebce6653044fb6ac7a6c04a55275c0dc4a829889d830b +EBUILD siril-1.2.4.ebuild 2203 BLAKE2B f0174a4ad630c840b53adad2496d967d380e8e9ba482d5b0c7c89c73981f0de821608ca212bb8a2dfeef2f241c5531565ff8cbed0ffc925ead265546d9b1d119 SHA512 fa6944438a8a2b4100ed884c87ea891e48b798c0ab587e5554951ac762f170929de4cd7776e030b553e0d62da550095566edf53055b5ab00a3a8d3f45dfb52b5 EBUILD siril-9999.ebuild 2118 BLAKE2B ece544aded06995d0f87502c68558ec749b7a7f164df9abd6a1b3bc09b13683d701c49195651155192421082fa92c19706e3751637e35b09b54e9c411933e4c6 SHA512 49e5bf7f8d406ca42e13977fdc591fce9985bb9e6f76796b9bf38d123d380f11806a9590320dd8f065737bfe2b1a12b6f8fcc8b0e727e5d89fc4c66bb5ad4118 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1 diff --git a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch deleted file mode 100644 index 8678316bfc87..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch +++ /dev/null @@ -1,39 +0,0 @@ -* asturm 2023-08-20: Combination of two commits from upstream git master - 3c2579cd: Pick the only hunk relevant for exiv2-0.28... - 64583490: Blend with that to fix build w/o exiv2 and fix indendation... - - -From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001 -From: Cyril Richard <cyril.richard42@gmail.com> -Date: Sun, 4 Jun 2023 22:10:55 +0000 -Subject: [PATCH] XISF image import - -From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001 -From: Vincent Hourdin <vh@free-astro.org> -Date: Mon, 5 Jun 2023 00:27:56 +0200 -Subject: [PATCH] fixing exiv2 as optional - ---- a/src/core/exif.cpp -+++ b/src/core/exif.cpp -@@ -121,10 +121,18 @@ - #endif - } - -+#ifdef HAVE_EXIV2 -+#if EXIV2_TEST_VERSION(0,28,0) -+typedef Exiv2::Image::UniquePtr ImagePtr; -+#else -+typedef Exiv2::Image::AutoPtr ImagePtr; -+#endif -+#endif -+ - gchar* siril_get_date_from_exif(const char *filename) { - #ifdef HAVE_EXIV2 - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(WIDEN(filename)); -+ ImagePtr image = Exiv2::ImageFactory::open(WIDEN(filename)); - if (image.get() == 0) { - fprintf(stderr, "Error Cannot open the file.\n"); - return NULL; --- -GitLab diff --git a/sci-astronomy/siril/files/siril-1.2.1-options.patch b/sci-astronomy/siril/files/siril-1.2.1-options.patch new file mode 100644 index 000000000000..11a8bdeeef0c --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.2.1-options.patch @@ -0,0 +1,101 @@ +From 241b4b17d83285eb4bf4151dd77198427ac9fde4 Mon Sep 17 00:00:00 2001 +From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> +Date: Sun, 28 Apr 2024 14:09:19 +0200 +Subject: [PATCH] Fix multiple definition of struct options +Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/668 +Bug: https://bugs.gentoo.org/927345 + +--- a/src/filters/deconvolution/estimate_kernel.cpp ++++ b/src/filters/deconvolution/estimate_kernel.cpp +@@ -33,7 +33,7 @@ extern "C" float *estimate_kernel(estk_data *args, int max_threads) { + if (!cppfftwmultithreaded) + max_threads = 1; + img_t<float>::use_threading(max_threads); +- options opts; ++ estimate_kernel_options opts; + opts.ks = args->ks; + opts.lambda = args->lambda; + opts.lambda_ratio = args->lambda_ratio; +--- a/src/filters/deconvolution/estimate_kernel.hpp ++++ b/src/filters/deconvolution/estimate_kernel.hpp +@@ -56,7 +56,7 @@ void gaussian_downsample(img_t<float>& out, const img_t<float>& _in, float facto + } + } + +-struct options { ++struct estimate_kernel_options { + bool verbose; + int ks; + float lambda; +@@ -81,7 +81,7 @@ template <typename T> + class ImagePredictor { + public: + virtual void solve(img_t<T>& u, const img_t<T>& K, T lambda, T beta_init, T beta_rate, T beta_max, +- const options& opts) = 0; ++ const estimate_kernel_options& opts) = 0; + virtual ~ImagePredictor() {} + }; + +@@ -114,7 +114,7 @@ public: + } + + void solve(img_t<T>& u, const img_t<T>& K, +- T lambda, T beta_init, T beta_rate, T beta_max, const options& opts) { ++ T lambda, T beta_init, T beta_rate, T beta_max, const estimate_kernel_options& opts) { + assert(K.w % 2); + assert(K.h % 2); + +@@ -177,7 +177,7 @@ public: + template <typename T> + class KernelEstimator { + public: +- virtual void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) = 0; ++ virtual void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) = 0; + virtual ~KernelEstimator() {} + }; + +@@ -198,7 +198,7 @@ public: + } + + // implements Algorithm 3 +- void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) { ++ void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) { + k.resize(ks, ks); + + // solves the Equation (28) +@@ -313,7 +313,7 @@ public: + fv = fft::r2c(v); + } + +- void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) { ++ void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) { + if (k.w != ks || k.h != ks) + k.resize(ks, ks); + +@@ -407,7 +407,7 @@ public: + // estimates the sharp image and the kernel from a blurry image and an initialization of u + template <typename T> + void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, +- const img_t<T>& initu, struct options& opts) { ++ const img_t<T>& initu, struct estimate_kernel_options& opts) { + // static int it = 0; + ImagePredictor<T>* sharp_predictor = nullptr; + sharp_predictor = new L0ImagePredictor<T>(v); +@@ -463,7 +463,7 @@ void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, + // it assumes that the image was previously processed by preprocess_image + // the inner loop is implemented in l0_kernel_estimation + template <typename T> +-void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct options& opts) { ++void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct estimate_kernel_options& opts) { + std::vector<img_t<T>> vs; + std::vector<int> kernelSizes; + printf("Multiscale kernel estimation...\n"); +@@ -511,7 +511,7 @@ void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v + + // preprocess the input blurry image as describe in Section 2.1 + template <typename T> +-void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct options& opts) { ++void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct estimate_kernel_options& opts) { + img_t<T> v(_v.w, _v.h); + + // convert to grayscale diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild b/sci-astronomy/siril/siril-1.2.1-r1.ebuild index bef4fbc3421c..24b92345dc89 100644 --- a/sci-astronomy/siril/siril-1.2.1.ebuild +++ b/sci-astronomy/siril/siril-1.2.1-r1.ebuild @@ -53,6 +53,7 @@ BDEPEND="dev-build/cmake PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" "${FILESDIR}/${PN}-1.2-fseek64-musl.patch" + "${FILESDIR}/${PN}-1.2.1-options.patch" ) DOCS=( README.md NEWS ChangeLog AUTHORS ) diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild b/sci-astronomy/siril/siril-1.2.3.ebuild index 70a659136663..24b92345dc89 100644 --- a/sci-astronomy/siril/siril-1.2.0.ebuild +++ b/sci-astronomy/siril/siril-1.2.3.ebuild @@ -52,7 +52,8 @@ BDEPEND="dev-build/cmake PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" - "${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499 + "${FILESDIR}/${PN}-1.2-fseek64-musl.patch" + "${FILESDIR}/${PN}-1.2.1-options.patch" ) DOCS=( README.md NEWS ChangeLog AUTHORS ) diff --git a/sci-astronomy/siril/siril-1.2.4.ebuild b/sci-astronomy/siril/siril-1.2.4.ebuild new file mode 100644 index 000000000000..8b3fc3865d24 --- /dev/null +++ b/sci-astronomy/siril/siril-1.2.4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson optfeature toolchain-funcs xdg + +DESCRIPTION="A free astronomical image processing software" +HOMEPAGE="https://siril.org/" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git" +else + SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" +fi + +LICENSE="GPL-3+ Boost-1.0" +SLOT="0" +IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=dev-libs/json-glib-1.2.6 + media-libs/librtprocess + >=media-libs/opencv-4.4.0:= + sci-libs/cfitsio:= + sci-libs/fftw:3.0= + sci-libs/gsl:= + x11-libs/gdk-pixbuf:2 + x11-libs/cairo + x11-libs/pango + >=x11-libs/gtk+-3.20.0:3 + curl? ( net-misc/curl ) + exif? ( >=media-gfx/exiv2-0.25:= ) + ffmpeg? ( media-video/ffmpeg:= ) + heif? ( media-libs/libheif:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] ) + png? ( >=media-libs/libpng-1.6.0:= ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:= ) + wcs? ( >=sci-astronomy/wcslib-7.7:= ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND="dev-build/cmake + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}/${PN}-docfiles.patch" + "${FILESDIR}/${PN}-1.2-fseek64-musl.patch" + "${FILESDIR}/${PN}-1.2.1-options.patch" +) + +DOCS=( README.md NEWS ChangeLog AUTHORS ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local emesonargs=( + -Dffms2=false + -Dcriterion=false + $(meson_use exif exiv2) + $(meson_use ffmpeg) + $(meson_use heif libheif) + $(meson_use jpeg libjpeg) + $(meson_use libconfig) + $(meson_use openmp) + $(meson_use png libpng) + $(meson_use raw libraw) + $(meson_use tiff libtiff) + $(meson_use wcs wcslib) + $(usex curl -Denable-libcurl=yes -Denable-libcurl=no) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + optfeature "gnuplot support" sci-visualization/gnuplot +} diff --git a/sci-astronomy/sirilic/Manifest b/sci-astronomy/sirilic/Manifest index de2cc7b74da3..a212267752f8 100644 --- a/sci-astronomy/sirilic/Manifest +++ b/sci-astronomy/sirilic/Manifest @@ -1,5 +1,5 @@ -DIST sirilic-V1.15.7.tar.bz2 147712 BLAKE2B 9d7c87a65dffc122db7b33487d1fd509d012b9acee654db4c00cb485b329b4b584ae84f10e9510a69064d04833cfcbf796ada0984a9113d783116ec5381e6234 SHA512 6021986ade7b8f5e1cb7b7e8cee77706258f9dd9c5bf2c426518c93aab053f27a1733c664db86ca3c3a46c9752ba3e118c0c3698bd45785bb646e60b528a8eb1 -DIST sirilic-V1.15.8.tar.bz2 148215 BLAKE2B b943091d15934266c99a6aa7a145b1d79af2145582bb66b76955eb028bf46a545a7ee0d53fce3123829d037741cd81253e194495319628c0da5d69486f4b2dfc SHA512 539158dce3f0120289859a01fdbda08257e7b32a5279ecd107cef3492ce3a36f5e4709c420b4a9abca7fd0ba270449d647c050d05d8272ec65d9ebcbd55da297 -EBUILD sirilic-1.15.7.ebuild 615 BLAKE2B 136232c463dd8ccc2c3b2a40c537926c20bbdfae7e48c8235bdd82e897bb12d37521a4c0060a58846273b55edfb303802a0f59ad3b3f65f11cd33e291056f161 SHA512 33c9f24778525baf010b5af43c7134dc2622d8b4638af4325d58411beb1e6d86007016e3c4e5bfbb52fddddc6b92da2b59e8a4659e13db3e59e1f339156585bc -EBUILD sirilic-1.15.8.ebuild 615 BLAKE2B 7def243a6921032577cfd97111d08cc6bc2e740d0f2ce0706e70df54743c4d89fe939395b087b5f92c3d5258c7a8e31fa3e7b7f5a910904d50be99331228a9e8 SHA512 1dcaefaf529e43eb611adde093f3eb902e5926898cb098e7394fac018020eb1a588edf06cc48952d8f2c4a64e635eecab08e1877e36bdbac83d85aa69b7ce4ec +DIST sirilic-V1.15.12.tar.bz2 147469 BLAKE2B 9f746220bf16b916dba2cb406098c1a1a2a6599efda255301163da8ecfa3ef980388fa11907a7eee16d586b08639d8a5f82b76ed3c60065b49bf9b03fb861d64 SHA512 d2509c42c1093c81c07307d8b6880491e0a2363aeb68753c69e5c40545b98f6bfc0b888659704c81d5fbf6fb34ee978c0fdc7dc8e0c6ed5fe2125b2f2f347d54 +DIST sirilic-V1.15.9.tar.bz2 146812 BLAKE2B 8701b35018abb6cc70761f29ab10ed99188def5b3db5b1728c75a682fec8d874a7a5d335ccd7ee097a25bd134e3307ee4bdd9bff050d4e5ab3459d65ad3f520f SHA512 12464c64660acd076e06ccb43b4eb285e4935eb9c483e841b29f5551710ddea1c3a30a98f32aff84809a8eaf860861db966fa04bc7e6c411c5a34ea9b8667786 +EBUILD sirilic-1.15.12.ebuild 617 BLAKE2B cbedc380397b36a1d390189307acb091e411d7cdd0a14f1a55388367fbc01aaeb2bed2caa96b4b2ffcf61aca72b9c48ed2d885a4314f9c9a0bd1ecf17b68f57d SHA512 8c516805a29ea9d04cf3e6a99d4a85589e88575fade91ed22f6b61e939dd8937999a10c8506a01496b984a8e58172a4322f5d6105e13a6eb511a3eb08ae5be73 +EBUILD sirilic-1.15.9.ebuild 615 BLAKE2B 4b2975189283c7517160b30e71ca2fd486f91066296be50ee979861036df4360bd20b80ab869d6f9f41b18dfd4ea7f80717f3793deba5171cd7a5e51c655cad9 SHA512 296d20c4218c29e3e4ef089185b39e26f31efbd9cdbc721d585386bd5f26c0cb41713c44cd359e254d41bd6e0c984197405249fddf14d8c888ed6e48e2743188 MISC metadata.xml 689 BLAKE2B 95ee65f7f16fca17c7d63dbdfe19161d6b964902502fb088a3c56b529b2f78872feccfaf1a83cf7b53ab12eb63ac257208e0603d6e09c2c6ec520a64ff7eb692 SHA512 fd1c370fb355d80372dc8e6584e9ac17f9d1f971ad7cb884d0bbb0af9dc44ccad985adfbe81b14554e76c1b7444db004563e8366cccb81a9810141467cdf45ed diff --git a/sci-astronomy/sirilic/sirilic-1.15.7.ebuild b/sci-astronomy/sirilic/sirilic-1.15.12.ebuild index 34ddfd564289..dd5dcb825cc7 100644 --- a/sci-astronomy/sirilic/sirilic-1.15.7.ebuild +++ b/sci-astronomy/sirilic/sirilic-1.15.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Preparing acquisition files for processing with the SiriL software" @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV}" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" DEPEND=" dev-python/requests[${PYTHON_USEDEP}] diff --git a/sci-astronomy/sirilic/sirilic-1.15.8.ebuild b/sci-astronomy/sirilic/sirilic-1.15.9.ebuild index ec684a1eae87..8a430cca043d 100644 --- a/sci-astronomy/sirilic/sirilic-1.15.8.ebuild +++ b/sci-astronomy/sirilic/sirilic-1.15.9.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Preparing acquisition files for processing with the SiriL software" diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest index dde02655fe5f..bf333d9d63ce 100644 --- a/sci-astronomy/sofa_c/Manifest +++ b/sci-astronomy/sofa_c/Manifest @@ -1,4 +1,4 @@ -AUX sofa_c-makefile.patch 3345 BLAKE2B 4d137b742018c5b589d2dc2c834d3171c5caeb1778061cf0de07755cbc246d8bed1eb1d59f225813de77da25ea9d155192f2d4d6080316e2343c895173d6f064 SHA512 a38248d3912ef68aecbc2ed1b28181378b2c92a470b1447865f1cf9d9475f7fbc584ff1bcf7184e563f298b72b0284c81e4b905757208459cebb9b7cb4dbc26b -DIST sofa_c-20170420.tar.gz 1780577 BLAKE2B 80912027893957345e080f02eed059f764970bbf6b89d6979c355a65d6d144edc8073b6a6436d11d36009eab05f5d9ccad0270a7feef117e576055be6d8489d5 SHA512 f2dd806243e3aec51ea03a54e10e533d4c3c1a69d032d5f3ddd7cd823a75aeed8033491c91366813b8d8e5c0b66e0fd582e6ede03aa7b136311fdd7a4ebf20d3 -EBUILD sofa_c-20170420.ebuild 793 BLAKE2B a9559a01443926fef98c7acf2b861227d455414173397f1288581e8290a4d9829effb656f8cfa5fec47dac47c6b220c60a3e666bef95994394810c9ef6040dfb SHA512 250743503aee1951afa017502c801f6dcd9b901c8db82abe61c70ebe170e26f553dc48d885455906d8e40b47203fc2d7778555ea80b725375ff1507b90126065 +AUX sofa_c-20231011-makefile.patch 3335 BLAKE2B 6db237a3684ca2cf4661e03756c9b7443b21546b2d7019e4342e3e37c4e23b3087f0322ccc860b171c7cf1aef777d9a04665752a5270f0336e5d6c6359a16648 SHA512 8ae7ec5051069ba3fe5317fcefdb5d5deffbb8cfa6f80ee285e8eab095d35866d0ad26e8205626e0482dddef9db290c8310857b91ae178814898bd918b94066c +DIST sofa_c-20231011.tar.gz 3055571 BLAKE2B 4a2771599af61f06cab76c83af8d8bac321258bd2145f7558be9a7afed3b5cefc13bea2a24d05f9a7481409e617f807f4e29173d87ab58a403808d43aae477a5 SHA512 8e7d67f7ac7a285a96160c96d16b1921ccb7a9324b83280b1594efcbbd7eb78c4d41898c1e5acfa5081842e4aeee15a96572d21b466bfda7ef7582c58624d376 +EBUILD sofa_c-20231011.ebuild 753 BLAKE2B 0c75f0ed0dc7aa4a215bc7549799f0c9a8a36d29ee9f5d514297a08054bebc3da99e642d46482b79bfea603eed59d8917e063f046cd9b08896a055ddd1178d75 SHA512 b731e3f9108e928b3a5b6f3564b2211a0d225a97910e0adaad570ffce2946b0dca6b14d701c45c61095e2982e18979e97bc82860a09de8c73e8c73652265f004 MISC metadata.xml 977 BLAKE2B 1389565e20033490916bf9736c74d539ec0ac890a1cad5d7c579e203207a1d03cd0e5bb10a25f06767bd15da2afd90dd40e2b55982964f1b88649c51b1c4cae5 SHA512 255e0513f247fae86a7227afbc18d2b0269cef2f6648562572db48ca5a2501dfb7743c40ea7b91562a18c4ca312a10f3cf7b104c9cc25dfa986c3371a0247238 diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-20231011-makefile.patch index 00c1a6ae735d..9e923db1604a 100644 --- a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch +++ b/sci-astronomy/sofa_c/files/sofa_c-20231011-makefile.patch @@ -1,51 +1,51 @@ ---- src/makefile.orig -+++ src/makefile +--- a/makefile ++++ b/makefile @@ -49,7 +49,7 @@ - + # Specify the installation home directory. - + -INSTALL_DIR = $(HOME) +INSTALL_DIR = $(DESTDIR)/usr - + # Specify the installation directory for the library. - + @@ -63,9 +63,9 @@ # of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF # for functions, CFLAGX for executables) here. - + -CCOMPC = gcc --CFLAGF = -c -pedantic -Wall -W -O --CFLAGX = -pedantic -Wall -W -O +-CFLAGF = -c -pedantic -Wall -O +-CFLAGX = -pedantic -Wall -O +CCOMPC = $(CC) +CFLAGF = $(CPPFLAGS) -I. -c -fPIC $(CFLAGS) +CFLAGX = $(CPPFLAGS) -I. $(CFLAGS) - + #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE--------- - + @@ -80,6 +80,11 @@ SOFA_LIB_NAME = libsofa_c.a SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME) - + +# Name the SOFA/C library in its source and target locations. + +SOFA_SHLIB_NAME = libsofa_c.so +SOFA_SHLIB = $(SOFA_LIB_DIR)$(SOFA_SHLIB_NAME) + # Name the SOFA/C testbed in its source and target locations. - + SOFA_TEST_NAME = t_sofa_c.c @@ -88,7 +93,7 @@ # Name the SOFA/C includes in their source and target locations. - + SOFA_INC_NAMES = sofa.h sofam.h -SOFA_INC = $(SOFA_INC_DIR)sofa.h $(SOFA_INC_DIR)sofam.h +SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%) - + # The list of SOFA/C library object files. - -@@ -321,28 +326,31 @@ + +@@ -347,28 +352,30 @@ #----------------------------------------------------------------------- - + # Build (but do not install) the library. -all : $(SOFA_LIB_NAME) +all : $(SOFA_SHLIB_NAME) @@ -53,7 +53,7 @@ -@ echo "*** Now type 'make test'" \ " to install the library and run tests ***" -@ echo "" - + # Install the library and header files. -install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_INC) - cp $(SOFA_LIB_NAME) $(SOFA_LIB_DIR) @@ -61,41 +61,41 @@ + cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR) + ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0 + ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB) -+ - + # Deinstall the library and header files. uninstall: - - $(RM) $(SOFA_LIB) $(SOFA_INC) + - $(RM) $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC) - + # Test the build. -check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME) - $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \ +- -I. -lm -o $(SOFA_TEST) +- ./$(SOFA_TEST) +check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_SHLIB_NAME) + $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \ - -lm -o $(SOFA_TEST) -- ./$(SOFA_TEST) ++ -lm -o $(SOFA_TEST) + LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:." ./$(SOFA_TEST) - + # Test the installed library. -installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) +installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \ -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST) ./$(SOFA_TEST) -@@ -353,7 +361,7 @@ - +@@ -379,7 +386,7 @@ + # Delete all generated binaries in the current directory. realclean distclean : clean - - $(RM) $(SOFA_LIB_NAME) $(SOFA_TEST) + - $(RM) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)* $(SOFA_TEST) - + # Create the installation directories if not already present. $(INSTALL_DIRS): -@@ -363,6 +371,10 @@ +@@ -389,6 +396,10 @@ $(SOFA_LIB_NAME): $(SOFA_OBS) ar ru $(SOFA_LIB_NAME) $? - + +$(SOFA_SHLIB_NAME): $(SOFA_OBS) + $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 $? -lm -o $(SOFA_SHLIB_NAME).0.0 + ln -sfn $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 diff --git a/sci-astronomy/sofa_c/sofa_c-20170420.ebuild b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild index d8382b0d7524..fc542d499085 100644 --- a/sci-astronomy/sofa_c/sofa_c-20170420.ebuild +++ b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild @@ -1,34 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs YYYY=${PV:0:4} MMDD=${PV:4:4} -#PP=${PV:8:1} MYPV=${YYYY}${MMDD} DESCRIPTION="Library for algorithms for models in fundamental astronomy" HOMEPAGE=" http://www.iausofa.org/current_C.html" SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz" +S="${WORKDIR}/sofa/${MYPV}/c/src" LICENSE="SOFA" SLOT=0 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" -RDEPEND="" -DEPEND="" - -PATCHES=( "${FILESDIR}"/${PN}-makefile.patch ) - -S="${WORKDIR}/sofa/${MYPV}/c/src" +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) src_prepare() { default - sed -i -e "s:/lib:/$(get_libdir):" makefile || die + sed -e "s:/lib:/$(get_libdir):" -i makefile || die tc-export CC } diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 5367d9c4c3b3..8aaa2aaba4ee 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,20 +1,22 @@ AUX stellarium-0.23.4-unbundle-zlib.patch 920 BLAKE2B 8dbf677312956b9c75d698cb51ce49de119e2258b9ddf05f8d77ac6f0590c5f707fc18de10e98322c8fe09fb573305780704f33eb71227c144e3ad4ccc2b6a14 SHA512 57b12bb6581e8ad6d5ec2ca6af13648b50feea88f0a1f5ede0031b561817821882192e90800627b349215841a5a0a37102e7b513d6d5c7ccbeb9db936db79ebf +AUX stellarium-0.24.3-fast_float.patch 873 BLAKE2B 8ecd8bd2a63fd88f844481b2dd04bc166c241f0a948f48894e46c71866d0c7ffedeb0de3fe822bd076f65097d451522a7b3483fd59d0ef0dd356e00007799b4f SHA512 b3610ba7e9fb345fc962248e9d79ea953557862be58163792eb6215ab2848c7b915c06c31ffa2fe9f45e5855d4c98e3961a03a1375de4a6f00486b028c596d0a +AUX stellarium-0.24.3-tbb-emit.patch 1264 BLAKE2B adbd6bf228fddc565c865a9fe1014c9f2a4627e04f1f39bb01bfe3ca5656323027020a65219e1eca34141fe373bd0cbe3534635d7a0a2a8c6f2a8ecbd97249fb SHA512 3a3bfb67beaa879deccfb96798fc8a86677ac06c862d8beff6cd5faf87069f928ee4a9e8b5ad7ed9faedeafa0ae079d043722b8b8a01af5ed45849c402bb3956 DIST indilib-1.8.5.tar.gz 2122866 BLAKE2B 203b6c78664aaf3f87b7f697b76544e6ed0fa6db8ac0fe43e6ebcf00de404e96a49b8cd7f8b0be2e4ff5c7f902b3e34177a244a4a49069887f11d28aea073620 SHA512 4c583f7ff0d96d787c7d035e23074f42db3f836ec74a0a7a1595574ae2d32d56234b16abddabacaf9bd5a10cb88c6c37994aafcef86d65a665b2bceae87446f9 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 -DIST stellarium-23.4.tar.xz 324945696 BLAKE2B 8642015bf2d8b40b2310953a265f831ee4527062d0d30fdfada4ac8a2fe9b9b644b72dd0dfb8969dd241b5188fd9602842516173c7832decd4175e753ff3fcdc SHA512 877b2b07c3135763b038075c9d24487829d852da040601cf5e170dfbcb882d564946814f0ff95497aee157e6285ca5c5fbb714b7942b588c6a93af1c809bc17c -DIST stellarium-23.4.tar.xz.asc 313 BLAKE2B 7fc6b8dc82d12817ec41d00a365fdde0da888dcf06ea7daf86b7b5ff58fae2b2a3bff95da0f35b48dc85346f342472255ac8dae198ed91d4b1f790c7974d0fb0 SHA512 0aa11282c746f05bb128a6ab2fbdcb2008690dd6ca2c4a43bef65756bd21796a74891330dc7296f924eb8e390942a632b0ec5df28f404ec0f69bbcec0bc1747b -DIST stellarium-24.1.tar.xz 326391584 BLAKE2B 2950c877d8cd24ab1ab377c22630fd4c71b512a353dad5bc903b07d7b5518285c350ef2ac599255e44ff3831fb88e7d83b3e4cb395fec5162e525195e94a04bf SHA512 60e0e2afb214f4e2d9ba6640f4b699d18c97b05b9f33e9990787a87484c6bd1d7bc87685558956e6dc8a80e93abd8d7f677daeb55d38d8f4f8448e7936999246 -DIST stellarium-24.1.tar.xz.asc 309 BLAKE2B b829b2173f5bffad81117c39f15018256eea9dbd890ef649e9b6137d9f935a03bccc89377e98ab3e224a60076fabb8275c47253fd8229a37e15a6f01e477f609 SHA512 c2217a5cd1391f925b1ff1f092f062fde031111263a32fb0c699f9c38419be343e29962f34722153e15abff6600d9b4a0afc77b9186635abebb86b2c1e72544a +DIST stellarium-24.2.tar.xz 327084704 BLAKE2B b1d38a92d0487a6555f1aad2d544711527a3cf942f47506597c527a85035091a5c6ad787aeeab012f29242388c2f65b3d5e61527de01edfa576b9b7324c6917b SHA512 621d16a70036e2ddea3900c0fcd0d4caadb8f821afda8a5d9818c82d2a846107840e1497a4d79a954ec2a76e434bc99b021e6f15c2af6de2cc4044fb70096929 +DIST stellarium-24.2.tar.xz.asc 313 BLAKE2B d76fb00c0446ddeee90c42a3750989746e85334e9ac2bbb723959e87850bc6f9464b6f59d379e9354698d50e7ee447ab6c8ffbeab0fd0cbda9ad3be7765cad41 SHA512 dc5a6d30423f6ac389115c6235656f8f144ba97d2ba09f7f074a17bc6ec92be46a9da741a387f0c149a73e6b15d5906bd0eaec13f6e69b327beeae4512bcf992 +DIST stellarium-24.3.tar.xz 328039964 BLAKE2B 295114fce95e4c01d6f25051d4988328ebaa93b815fa9198e0b6e30f15395116a2cd0974d2d211ba162780e4ae586a33ba98396465d6942c50db3945a206a03c SHA512 8bb8ebdfdf57accf6d200f6c17d39edcda15c7ecdbfcd280f2a21e682fa62d62fc6523965d16b2033cee8f84da3dbb24db837c594a75144f5822d3576067000e +DIST stellarium-24.3.tar.xz.asc 313 BLAKE2B 8f5af1a52e29e029b6e0bf61cb5612ae7ebe688b315e87011661e178dfe309ff76125177cd88dbf9c999abf3bbe5ee4b9ae52235fd0029cb5c2ebf66332f3df4 SHA512 c88e238a311b382be4623c67414dc5cce19cb1accdcbe35077916a0690ecaf0adc34ef43bd1b100f14b0cad8a6a8eec479eff353c32f0ad79b6a3263acf30f64 DIST stellarium-dso-catalog-3.20.dat 28678745 BLAKE2B 24ddf76e81e91424cced5df74dd164d17a45fed2b65c1dc1e7065371c18a796350a1e1aab2da5860376eb90eac07e7c836ffdbb324a0d3eda6c91e8ce1c4ab3a SHA512 c84832bbf56d1097db3ff8fa8f3faadac1470a9f79d9ee759493915a48754dc86174551b5e705786f29331991bee57daa4cab6d7ecc2e4e00a2f895823ccfd87 DIST stellarium-dso-catalog-3.20.dat.asc 313 BLAKE2B a7d9a1977ff4e1b21a80239d85ad5123ad03c2dcd57422cec7c2585eddb1004bbfc2b29a934653bc36c438981218811d21ade7380ae49278ef2c4f387ab762e5 SHA512 e8a7b10bb157d15b550a31646c8d8ce9933a77f748900a9c75f0c78b9b9205ce5e4e2ec18248ba786aacd5fbf36da00bbaf578b8b011c75351a9237568e62f1b -DIST stellarium_user_guide-23.4-1.pdf 32943744 BLAKE2B 0f118a27cd0ce4e043702321ed79ffc185e6fcd755975176b9f2642373249970fd8d1e3af3d256e96fe3950265a938e3b4b1b02f11dc07e306dde320ded02919 SHA512 259a7b17d1d03979ac068564c9bafb1f275af56116f43a342c5d155cc4fc50a63a3ad053bb4e15513e6176d240f417f55749980d9d1f6cec69853309541d31d6 -DIST stellarium_user_guide-23.4-1.pdf.asc 313 BLAKE2B 0eb7556dc59b78b10ccefabefbfd96f635a4a560ef5b533b50ad4cc60c23b289709d2ffde9a946eb07512885e728e3fd4e13af82daf9f55e9540ff00ae17481a SHA512 5b72207483431eb2f8e4fc3fc8ce5d1f1e4d7ef61c944c7b3a21dfb1379f6fe3c3e15ffb87bf3de5d259d54a5ad9d1b65aa6d7c0e8aaa4bd1a2ffe8417862aaf -DIST stellarium_user_guide-24.1-1.pdf 32944397 BLAKE2B b99aae0d9c711746281e485175f9b576c7bddf5531c069c68c1a6dac8e64de2d93461ce0b4bc364046ff9a9a0c315a5fb1f5650fbd04afbda063f5dfd4244b88 SHA512 fab491fed6463375e33082551d95200ffa3e40422c09a3ab2cc7d607a30437890dead38e74db451a24e53f009dd1dedb7df16838ae18495b286396d9ca5741fc -DIST stellarium_user_guide-24.1-1.pdf.asc 313 BLAKE2B 8e2ef72fd04f694cacc1851e729a8ba5f137f76893bab146ee61c15d46bb64d23af6c1d4920baff4673c6a9bf49a3840addcbd1eb0d18befe04402d4afd9a6ce SHA512 2ea212e5be3858cb662cebed33ad2cb2438dfeb1cf65dde33c46981dc3d9bb8028a844af8f0d095b84df863a0a2a7b0f190c95311b13dc30091c9e257ca454c5 -EBUILD stellarium-23.4.ebuild 5963 BLAKE2B aa6dcfa6df7cc0cf05c13eec3431e8cfd5058f26c57da5812fb4c82208c5be2ebcb758b577733bd4dd4552f14427a805f642bac78b604b02a2a91202169e8a1c SHA512 5db5ef2fc9a57cb42418108c2f5583767a521487fb0057ef06c419b7fe4a802164444ef7106826c95972364563fa23301b177faab5b116b3ac18ad2ee0cf7a1e -EBUILD stellarium-24.1.ebuild 5966 BLAKE2B bdda1cbd560a047da8010b3a1e26cc5a0737028d277c8c1e1672051001ec0fafe89cc3068cfd79a5babf72dce704e450bee0366e8a6c45a3795bf6feb6626fc7 SHA512 104305fbb091f0d991aecff107dd691add6eec4a9f17325704dac7cda34c6fd176978b97a7d0d0e8439f7148315a0459547eaaf6b4ad8d7407931aad452efc1b -MISC metadata.xml 1745 BLAKE2B 46404a5e8352ad1eb9f365f7efc95569636a9c1c70c3b361361243e191763e6b08b7a481bc1a5732f38fcd0b257b97f0404b751ccae1ddb3ebf3c89b2c5b9834 SHA512 be2e183c283d5361202e1a4a59f02646b5a731e0bcab51e43ac5dd06d67270b2266a682d2ef1f63dd422e1b846c1aeab2ab38421b88b58711284e38734edabaa +DIST stellarium_user_guide-24.2-1.pdf 32957159 BLAKE2B 4a6b7d93484945dffbee72eb4b3eba52cbe7affae63c9989b95dfe86be00d09ba3c283629a2939bca140daa1fd987dd6faa6e346fe56456777990fabcb46eb36 SHA512 784005bbd13333d2ab7ea0d043077ace88f0e824aef51ad65e2b3c11e6e2761f75332f7d03aa15a271078406688237da316f9d2077eb4155eaa9aa683b22e616 +DIST stellarium_user_guide-24.2-1.pdf.asc 313 BLAKE2B 7e2093891fc6250982a95436f1e4fe39861f08e1adec3251d35fbe991c155cf5df0cfe1e78af3511da7e8f29268beae905e7f79a1e3e7677b649527c34df6aad SHA512 c5cd4603e6d1f02569be9d5bbb54a051b60143eb3967b56aa727525de67f8af4e4405d26b1ca25bc118d400d49f06f32cbafdbbecf6b2339000ab3366a722a7a +DIST stellarium_user_guide-24.3-1.pdf 33106635 BLAKE2B 60b165bcb4d6ce8d0226e6c8c341a87ac38939e6f91155ea647b73e365f5dd76d812f48f10d36995fa27e8f56c7433256c8e6e4b190fc6cabf2c712a506fc8a6 SHA512 ba87fcb9b64faa123965c710b06e585ae20594e84aef59fe804d858f33497683fe4a5a2de6e0d7b1eff071e654d8ee3802e625a2f3f76712ec5962f919cc0ff1 +DIST stellarium_user_guide-24.3-1.pdf.asc 313 BLAKE2B a61d77585af364b977c1eb4ca40910c2dffc4905ba04426aa4c664975a5021c97f681395a64b7cf3556887d96a49f851ca289f74325283344d442b89ecc6783b SHA512 1aa60a229336aa17b22364589425a1001175d7478ec5a5258d5b305ac6b6e2c508d97224a497d1b64d9f961cc454b39a1a7a95c4e0333c9e6fddfc1b3f54cca8 +EBUILD stellarium-24.2.ebuild 5964 BLAKE2B 0e1389ef1b1db50f6262f72167f3bfac6b99507897e47e20b56fbe46f84c67ea82ade7e773a79ae898be016f84a968a94c53c2702a81b23074d15e97d90a4283 SHA512 24186d504fbc48035bfc52cd138f95c44d09f13ca62e2e1eb967e89a22d90e9175afdca453dfc00450dc57ea3fc8fc9a402b030c4f5df1b5974c1648f2673533 +EBUILD stellarium-24.3.ebuild 6398 BLAKE2B c7e24a23b751aba655b04a01f3686947f3edaf3352f1777b8e653e9f2662de73f8092a4eee94d0f357aeb95f77ee28443aaa8d58d4ee4de1f74eed7d4a2abfb1 SHA512 e76eaec5429486fab408372ca2ecb45acb7e1d21f8cb42a8448e6461c0f4f156946597df5db38f768f173fbd26a4107dfd14e53a4384366d91adcb832ff1b99f +MISC metadata.xml 1838 BLAKE2B 67fa2ad6e5fe2c1dd3f7aa678d41f0f6f2749e44b2cf76730f60a84af792e3b78f293b487c7a2732da171f2c291afbe49d9126a29e4e66e569873a9861200509 SHA512 f9d117746a3bec0b6726ec66c322f7e7cfb00bf3735b1f4f85b2388b310337abdd90881fff048e3abaf05eee74338c98975619e9255e9fd111485337a8d9374a diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch new file mode 100644 index 000000000000..bc46b58c137b --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch @@ -0,0 +1,23 @@ +https://github.com/Stellarium/stellarium/pull/3949 + +libc++ doesn't support std::from_chars yet, and in such case Stellarium uses an external library + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1053,13 +1053,13 @@ ENDIF() + + include("cmake/Check-from_chars.cmake") + IF(NOT FROM_CHARS_WORKS) +- CPMFindPackage(NAME fast_float ++ CPMFindPackage(NAME FastFloat + GIT_REPOSITORY https://github.com/fastfloat/fast_float + VERSION 6.1.0 + EXCLUDE_FROM_ALL yes) +- GET_TARGET_PROPERTY(fast_float_INCLUDE_DIRECTORIES ++ GET_TARGET_PROPERTY(FastFloat_INCLUDE_DIRECTORIES + FastFloat::fast_float INTERFACE_INCLUDE_DIRECTORIES) +- INCLUDE_DIRECTORIES(${fast_float_INCLUDE_DIRECTORIES}) ++ INCLUDE_DIRECTORIES(${FastFloat_INCLUDE_DIRECTORIES}) + ADD_DEFINITIONS(-DUSE_FAST_FLOAT) + ENDIF() + diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch new file mode 100644 index 000000000000..3cb67584d056 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch @@ -0,0 +1,35 @@ +From 02e37f3b76ef20786f10a6d89d23944e330aecf4 Mon Sep 17 00:00:00 2001 +From: Ruslan Kabatsayev <b7.10110111@gmail.com> +Date: Mon, 23 Sep 2024 22:40:01 +0400 +Subject: [PATCH] Include <execution> before any Qt headers + +Fixes #3905. +--- a/src/core/modules/SolarSystem.cpp ++++ b/src/core/modules/SolarSystem.cpp +@@ -19,6 +19,8 @@ + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. + */ + ++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs ++ + #include "SolarSystem.hpp" + #include "StelTexture.hpp" + #include "EphemWrapper.hpp" +@@ -48,7 +50,6 @@ + #include "StelObserver.hpp" + + #include <algorithm> +-#include <execution> + + #include <QTextStream> + #include <QSettings> +--- a/src/stelMain_pch.hpp ++++ b/src/stelMain_pch.hpp +@@ -28,6 +28,7 @@ + // It seems that inclusion of some headers is actually bad for build time, these are commented away again. More teting or other compiler combinations may have slightly other results. + + // Base time was 284s from first test without PCH ++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs + #include "StelApp.hpp" + #include<QDebug> + #include "StelUtils.hpp" diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml index da8ff2303389..684dbcfe02e5 100644 --- a/sci-astronomy/stellarium/metadata.xml +++ b/sci-astronomy/stellarium/metadata.xml @@ -22,6 +22,7 @@ <use> <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag> <flag name="lens-distortion">Enable lens distortion estimator plugin</flag> + <flag name="libcxx">Use external libraries for STL features not available in libc++</flag> <flag name="media">Enable sound and video support</flag> <flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag> <flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag> diff --git a/sci-astronomy/stellarium/stellarium-23.4.ebuild b/sci-astronomy/stellarium/stellarium-24.2.ebuild index 0fdde33bc389..5065b8b36107 100644 --- a/sci-astronomy/stellarium/stellarium-23.4.ebuild +++ b/sci-astronomy/stellarium/stellarium-24.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx DESCRIPTION="3D photo-realistic skies in real time" diff --git a/sci-astronomy/stellarium/stellarium-24.1.ebuild b/sci-astronomy/stellarium/stellarium-24.3.ebuild index ba7ba546a798..45f2afd4515e 100644 --- a/sci-astronomy/stellarium/stellarium-24.1.ebuild +++ b/sci-astronomy/stellarium/stellarium-24.3.ebuild @@ -3,8 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg verify-sig virtualx DESCRIPTION="3D photo-realistic skies in real time" HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium" @@ -33,8 +33,8 @@ SRC_URI=" LICENSE="GPL-2+ SGI-B-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="debug deep-sky doc gps +lens-distortion media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx" +KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" +IUSE="debug deep-sky doc gps +lens-distortion libcxx media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx" # Python interpreter is used while building RemoteControl plugin BDEPEND=" @@ -47,7 +47,9 @@ BDEPEND=" ) verify-sig? ( sec-keys/openpgp-keys-stellarium ) " +# TODO: review need for dev-cpp/tbb after several releases of gcc and clang RDEPEND=" + dev-cpp/tbb:= media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) @@ -58,6 +60,7 @@ RDEPEND=" media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 + dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 @@ -77,7 +80,7 @@ RDEPEND=" xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( - dev-qt/qtbase:6=[gui,network,widgets] + dev-qt/qtbase:6=[concurrent,gui,network,widgets] dev-qt/qtcharts:6 >=sci-astronomy/calcmysky-0.3.0:=[qt6] gps? ( @@ -94,20 +97,28 @@ RDEPEND=" ) " DEPEND="${RDEPEND} + libcxx? ( dev-cpp/fast_float ) !qt6? ( - dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) ) - qt6? ( dev-qt/qtbase:6=[concurrent] ) " RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch" + "${FILESDIR}/stellarium-0.24.3-fast_float.patch" + "${FILESDIR}/stellarium-0.24.3-tbb-emit.patch" ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc + +pkg_setup() { + if tc-is-clang && ! use libcxx && [[ $(tc-get-cxx-stdlib) == libc++ ]]; then + die "When using libc++, please enable USE=libcxx" + fi +} + src_unpack() { # stars-2.0 are not signed if use verify-sig; then @@ -127,6 +138,7 @@ src_prepare() { cmake_src_prepare use debug || append-cppflags -DQT_NO_DEBUG #415769 + rm -r src/external/qtcompress/ || die rm -r src/external/zlib/ || die # for glues_stel aka libtess I couldn't find an upstream with the same API @@ -143,6 +155,7 @@ src_configure() { local mycmakeargs=( -DCCACHE_PROGRAM=no -DCPM_LOCAL_PACKAGES_ONLY=yes + -DUSE_BUNDLED_QTCOMPRESS=no -DENABLE_GPS="$(usex gps)" -DENABLE_MEDIA="$(usex media)" -DENABLE_NLS="$(usex nls)" diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest index 94bb5fab5714..450563060ecb 100644 --- a/sci-astronomy/wcslib/Manifest +++ b/sci-astronomy/wcslib/Manifest @@ -1,11 +1,3 @@ -DIST wcslib-7.11.tar.bz2 2946962 BLAKE2B 7c812f50e3c539da3d58a70acd9128bd957fccd463b0c404c4a55740fb6d7df88f9992d1a2c5c303091dfce91943a6e5bcca73b553354f67c2d522ebb77d6dc3 SHA512 28aa67edad31a8fe27bc8b04e060a17ee75d8fa5e9ec82ccbdb72136558e03d1196151214c9ce4026df88cb807ce2645f5df80bbc479ec91cfa749bf8b9477ec -DIST wcslib-7.12.tar.bz2 2989693 BLAKE2B 8070cdddb9e89478464443411d165706d44593e33290149da11d2c2857bad202f5dd6ad98b5840167f618eceb9ec47e35f3ee332a8c6e1719fc2b20fe2f31ef2 SHA512 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23 -DIST wcslib-7.3.1.tar.bz2 2434274 BLAKE2B 9789a8eb34fe37c96b52e20efe3c14368499058e5c46aad4853b2be5f32a31df26525ec2c38d0ce87bcb7891b91a3ec3ac537e3c662c716a7c4381f26cd715e4 SHA512 753e0e202fb4250d321c36a0df9cd45ed88697111a06e108bc3e5397ddecc60d460cda2b4d45b5311dd72b88b66d4c70ff150b03e2da46c834b024f15304779b -DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892 -DIST wcslib-8.2.2.tar.bz2 3187577 BLAKE2B cd75652eac5777bce4a66ea1de03796b12c77f7269c6050eda95518d28a17be2ad8ae46b57e0a21f8d03dcf3a0144316d06d16aac7a37a42150e713113cc7edc SHA512 cf540fdac03d2868902c9d4c2f1cd5919e878e79de635b01006b61f4d95f727659033d0d05172a7bcd00287ecc395609a643cf95a6498fbc3ff2d3fb26c136b4 -EBUILD wcslib-7.11.ebuild 1690 BLAKE2B 9fec72c7edc5971448dd0cf34073c2ef17c2d53f618828065790edc3fb14130923ceb5fed6841572c556f13d9795d57caf7862ccf41bd595b9f07dd428af1067 SHA512 97ba1981a161039bf10a6b599b3058f4dbf238b859158a317365e491b72bea15a673fa1caedbbf94e5e4cf0138b65e989f0b6a9fc23b5121fd42ee4c03ab9692 -EBUILD wcslib-7.12.ebuild 1895 BLAKE2B 6de973d2049c4f3986bfc418f1a804d14a5b40175df91379ee1ae1f40991ada60ab0ba0332711d39cb5bc3c306fd29b175e6b172e664b5ea7805aa0b2655c1ec SHA512 dbe20444b4ebd2119c358b2a7673da0087500fdd467d4cc398d7aad88390f0a556740a06e20bf4b4b16efbbc01c3b751de32cada4542b38e9a24f45271c20876 -EBUILD wcslib-7.3.1.ebuild 1699 BLAKE2B 238469a47f22084a44f02f034cf4a63a107d72e6f0561f5d5245a030630328d401a8598d0a8dc8d72feb77a5c510b05d239383a6faa7da46216167fc29e4fa34 SHA512 b6e5ceb6f3b1bbd6633f8cc32591d53a827320fb8b7f6afa04a16946a8e0456fddfe5cd4e907a9c083b6a45a5405491fe4b56657d7f6d4e065f22ef2358990d1 -EBUILD wcslib-7.3.ebuild 1698 BLAKE2B 3394fccccbb0877821df87b7e8eee0e3fd7ebfca7b265e49e947d4d5dc5e5c4b12e9b262b294066dadc4c942ecc9fad52e543c9f035edc4ba5ce0211b28e2660 SHA512 6aaa3cf995d576bc699cfddfc0edf06a05774347c446b17483ab7ef7e54f3b749f0c35abb80c285667eeac916921e8519026ccd4727ed49d583faf062a4fc49f -EBUILD wcslib-8.2.2-r1.ebuild 1966 BLAKE2B f4955990fa43118ba406eb05db9cfb85e9db01fa6ae98057ce156d6fb344c9821d9c8b1f4e71c489a052b4714c472ad6d5cfa56f991f0d0928c71407fc49742b SHA512 26a4da8933746d5494e88bc847f479d512e174abd4e69020c64ce19298ffda36b962cb954617d9e4bd34073d617af8d2e20ecf6279b846ae3200396b17e14483 +DIST wcslib-8.3.tar.bz2 3245293 BLAKE2B 0f420d1c6e3b4a7e97b3227971f745d70f5c51e907f0315b7f57e79a34ef32446bbd7fa29ffd25c800e888b8aab6227b774375ed8d89d21f7315916fdd06d788 SHA512 248518489431cbcba7a5df9e34a747e2a007128639d8ab655ceee35250e609d952fe466b67cdca5defe16d3e926730d00bfc5c362c369f74851cd88973b506ba +EBUILD wcslib-8.3-r1.ebuild 1861 BLAKE2B afc3f3305544d631d2ef981ab7f6500487c36e39c6669035fc7a719c70dae247ec3072ac37108c46d4d99b1b26704fa260e2baf05ca6017d8b817c77381df502 SHA512 ab4987d7cc8275071d2d3e3dd8f3c61a65026b6165029e309fc7f9738663588a2a79257925d50c22d9a5679647f865cb90d8e86025f82646215dc59d99b6fbe9 MISC metadata.xml 1109 BLAKE2B d2076683baab3ea4aeadb1c90ed55f44abc749554d6469eb886606491277ca009b60fae15c4eafb66f8b55ce37706e0618946446aa589bee8544609303e0278e SHA512 98ce562fdee94819b992e5129d48649ab4a1389397b632eda8279c55c4d3c35c1aacd34dd6269ef1c5b8ecb63359f1c7f0f3944c2a3080608d6b8453eb3c4c0d diff --git a/sci-astronomy/wcslib/wcslib-7.11.ebuild b/sci-astronomy/wcslib/wcslib-7.11.ebuild deleted file mode 100644 index 2f5f4a45861c..000000000000 --- a/sci-astronomy/wcslib/wcslib-7.11.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -inherit flag-o-matic fortran-2 - -DESCRIPTION="Astronomical World Coordinate System transformations library" -HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/" -SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" - -SLOT="0/7" -LICENSE="LGPL-3" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fortran fits pgplot static-libs +tools" - -RDEPEND=" - fits? ( sci-libs/cfitsio:0= ) - pgplot? ( sci-libs/pgplot:0= )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig" - -src_configure() { - # workaround until upstream fix it properly - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - local myconf=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --htmldir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable fortran) - $(use_enable tools utils) - ) - # hacks because cfitsio and pgplot directories are hard-coded - if use fits; then - myconf+=( - --with-cfitsioinc="${EPREFIX}/usr/include" - --with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-cfitsio ) - fi - if use pgplot; then - myconf+=( - --with-pgplotinc="${EPREFIX}/usr/include" - --with-pgplotlib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-pgplot ) - fi - econf "${myconf[@]}" - sed -i -e 's/COPYING\*//' GNUmakefile || die -} - -src_install () { - default - # static libs share the same symbols as shared (i.e. compiled with PIC) - # so they are not compiled twice - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a - use doc || rm -r \ - "${ED}"/usr/share/doc/${PF}/html \ - "${ED}"/usr/share/doc/${PF}/*.pdf -} diff --git a/sci-astronomy/wcslib/wcslib-7.3.1.ebuild b/sci-astronomy/wcslib/wcslib-7.3.1.ebuild deleted file mode 100644 index 90795ca990bf..000000000000 --- a/sci-astronomy/wcslib/wcslib-7.3.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FORTRAN_NEEDED=fortran - -inherit fortran-2 flag-o-matic - -DESCRIPTION="Astronomical World Coordinate System transformations library" -HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/" -SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" - -SLOT="0/7" -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fortran fits pgplot static-libs +tools" - -RDEPEND=" - fits? ( sci-libs/cfitsio:0= ) - pgplot? ( sci-libs/pgplot:0= )" -DEPEND="${RDEPEND} - app-alternatives/lex - virtual/pkgconfig" - -src_configure() { - # GCC 10 workaround - # bug #764548 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - local myconf=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --htmldir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable fortran) - $(use_enable tools utils) - ) - - # hacks because cfitsio and pgplot directories are hard-coded - if use fits; then - myconf+=( - --with-cfitsioinc="${EPREFIX}/usr/include" - --with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-cfitsio ) - fi - if use pgplot; then - myconf+=( - --with-pgplotinc="${EPREFIX}/usr/include" - --with-pgplotlib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-pgplot ) - fi - econf ${myconf[@]} - sed -i -e 's/COPYING\*//' GNUmakefile || die -} - -src_test() { - emake check -} - -src_install () { - default - # static libs share the same symbols as shared (i.e. compiled with PIC) - # so they are not compiled twice - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a - use doc || rm -r \ - "${ED}"/usr/share/doc/${PF}/html \ - "${ED}"/usr/share/doc/${PF}/*.pdf -} diff --git a/sci-astronomy/wcslib/wcslib-7.3.ebuild b/sci-astronomy/wcslib/wcslib-7.3.ebuild deleted file mode 100644 index cffd03763ea2..000000000000 --- a/sci-astronomy/wcslib/wcslib-7.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FORTRAN_NEEDED=fortran - -inherit fortran-2 flag-o-matic - -DESCRIPTION="Astronomical World Coordinate System transformations library" -HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/" -SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" - -SLOT="0/7" -LICENSE="LGPL-3" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fortran fits pgplot static-libs +tools" - -RDEPEND=" - fits? ( sci-libs/cfitsio:0= ) - pgplot? ( sci-libs/pgplot:0= )" -DEPEND="${RDEPEND} - app-alternatives/lex - virtual/pkgconfig" - -src_configure() { - # GCC 10 workaround - # bug #764548 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - local myconf=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --htmldir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable fortran) - $(use_enable tools utils) - ) - - # hacks because cfitsio and pgplot directories are hard-coded - if use fits; then - myconf+=( - --with-cfitsioinc="${EPREFIX}/usr/include" - --with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-cfitsio ) - fi - if use pgplot; then - myconf+=( - --with-pgplotinc="${EPREFIX}/usr/include" - --with-pgplotlib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-pgplot ) - fi - econf ${myconf[@]} - sed -i -e 's/COPYING\*//' GNUmakefile || die -} - -src_test() { - emake check -} - -src_install () { - default - # static libs share the same symbols as shared (i.e. compiled with PIC) - # so they are not compiled twice - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a - use doc || rm -r \ - "${ED}"/usr/share/doc/${PF}/html \ - "${ED}"/usr/share/doc/${PF}/*.pdf -} diff --git a/sci-astronomy/wcslib/wcslib-8.2.2-r1.ebuild b/sci-astronomy/wcslib/wcslib-8.2.2-r1.ebuild deleted file mode 100644 index 47c7788eb7ad..000000000000 --- a/sci-astronomy/wcslib/wcslib-8.2.2-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -inherit flag-o-matic fortran-2 - -DESCRIPTION="Astronomical World Coordinate System transformations library" -HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/" -SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" - -SLOT="0/8" -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fortran fits pgplot static-libs +tools" - -RDEPEND=" - fits? ( sci-libs/cfitsio:0= ) - pgplot? ( sci-libs/pgplot:0= )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig" - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/877885 - # - # Upstream has an email contact address, so sent an email describing the issue. - filter-lto - - # workaround until upstream fix it properly - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - local myconf=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --htmldir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable fortran) - $(use_enable tools utils) - ) - # hacks because cfitsio and pgplot directories are hard-coded - if use fits; then - myconf+=( - --with-cfitsioinc="${EPREFIX}/usr/include" - --with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-cfitsio ) - fi - if use pgplot; then - myconf+=( - --with-pgplotinc="${EPREFIX}/usr/include" - --with-pgplotlib="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=( --without-pgplot ) - fi - econf "${myconf[@]}" - sed -i -e 's/COPYING\*//' GNUmakefile || die -} - -src_install () { - default - # static libs share the same symbols as shared (i.e. compiled with PIC) - # so they are not compiled twice - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/lib*.a || die - fi - - if ! use doc; then - rm -r \ - "${ED}"/usr/share/doc/${PF}/html \ - "${ED}"/usr/share/doc/${PF}/*.pdf || die - fi - # always creates this symlink - rm "${ED}"/usr/share/doc/${PN} || die -} diff --git a/sci-astronomy/wcslib/wcslib-7.12.ebuild b/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild index f78a2c657d7a..119ebaa448f4 100644 --- a/sci-astronomy/wcslib/wcslib-7.12.ebuild +++ b/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild @@ -11,26 +11,25 @@ DESCRIPTION="Astronomical World Coordinate System transformations library" HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/" SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" -SLOT="0/7" +SLOT="0/$(ver_cut 1)" LICENSE="LGPL-3" KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc fortran fits pgplot static-libs +tools" RDEPEND=" - fits? ( sci-libs/cfitsio:0= ) - pgplot? ( sci-libs/pgplot:0= )" + fits? ( + !sci-astronomy/montage + sci-libs/cfitsio:0= + ) + pgplot? ( sci-libs/pgplot:0= ) +" + DEPEND="${RDEPEND}" BDEPEND=" app-alternatives/lex virtual/pkgconfig" src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/877885 - # - # Upstream has an email contact address, so sent an email describing the issue. - filter-lto - # workaround until upstream fix it properly append-fflags $(test-flags-FC -fallow-argument-mismatch) @@ -39,6 +38,7 @@ src_configure() { --htmldir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable fortran) $(use_enable tools utils) + --with-bindc ) # hacks because cfitsio and pgplot directories are hard-coded if use fits; then @@ -74,4 +74,6 @@ src_install () { "${ED}"/usr/share/doc/${PF}/html \ "${ED}"/usr/share/doc/${PF}/*.pdf || die fi + # always creates this symlink + rm "${ED}"/usr/share/doc/${PN} || die } |