gentoo auto-resync : 14:09:2022 - 11:10:10

7 files changed, 101 insertions, 14 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 4274d36c768e..e7ff4b7570d5 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 678e6c385bf5..08d5ddb7f86a 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,8 +1,10 @@
-AUX siril-1.0.3-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
+AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c SHA512 ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa
 DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041 SHA512 bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
+DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
-EBUILD siril-1.0.3.ebuild 1947 BLAKE2B 6e2fe922520768a9a1d0b8531257b2fc0deecc13d68dcd224136178be6a0409cfc04d2da5d1cb6d9c5f7ad695218ed612d839e51c889e10e03fb7a5b9f07252a SHA512 54b49aaf4f6c804810f716bde3a4479bc9ca287d737c615b43df9f1c545ef972594a9dd82c9c6ba29a5b0afd11cc9cd8db658a929cd0fef28c5224fa353877b3
+EBUILD siril-1.0.3.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365
+EBUILD siril-1.0.5.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365
 EBUILD siril-9999.ebuild 1958 BLAKE2B b9c561e60100361d7686e5c7ed34e3836d540d8292b46e38f5c31820ca766e9056d4b8c7f5c51f77c8620b3d3a417e17b95b96984f7f23796c7218e95b63f7cc SHA512 0c56714a1277ec80bbd0cfe807e36f47a263837786d0992cb08b3e39e3a58561dd442639a58792e5189fd4a1a28b6aaf4b2272b84efd413658594e022ddc7432
 MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3
diff --git a/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch b/sci-astronomy/siril/files/siril-1.0-dependencies.patch
index 84595472e63f..84595472e63f 100644
--- a/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
+++ b/sci-astronomy/siril/files/siril-1.0-dependencies.patch
diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild b/sci-astronomy/siril/siril-1.0.3.ebuild
index de5d2c77535e..d354aede9fea 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
-	"${FILESDIR}/${P}-dependencies.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild b/sci-astronomy/siril/siril-1.0.5.ebuild
new file mode 100644
index 000000000000..d354aede9fea
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 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://www.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 ffmpeg heif jpeg openmp png raw tiff wcs"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
+	>=dev-libs/libconfig-1.4[cxx]
+	>=media-gfx/exiv2-0.25
+	media-libs/librtprocess:=
+	>=media-libs/opencv-4.4.0:=
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.20.0:3
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg:= )
+	heif? ( media-libs/libheif )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( >=media-libs/libpng-1.6.0 )
+	raw? ( media-libs/libraw )
+	tiff? ( media-libs/tiff )
+	wcs? ( >=sci-astronomy/wcslib-7.7 )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.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 ffmpeg)
+		$(meson_use heif libheif)
+		$(meson_use jpeg libjpeg)
+		$(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_mimeinfo_database_update
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 2b1209e0e917..72505747f881 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,9 +1,9 @@
 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-7.9.tar.bz2 2947112 BLAKE2B 797a1c51dd5b1669faf63c4a509e698f93422d6b4bfc5ace023d75e8e03b2967cc01c6764cca190f07c65b76aec76a740349349561f18f61b870af90bb66ba35 SHA512 72831ced127ad8fce934b43ddde86383273b161316ac078b03dcd8de94b0d6076b625445728695e4c8a9da46cccaa3832038f251922a759f480ef2ad33fd67a1
 EBUILD wcslib-7.11.ebuild 1693 BLAKE2B 78aeddce9d49cfd0e8d6b6dc12a1aad275f61488ceaa1868c190202c1191ec3ca66f204727f1f7fa7e5a17c4389e3e2e5e938d55096e0f0a585ae8c8a975a208 SHA512 035cdcc410645dcafc0a55d15656ccd501eba045c4d72cf8a283cbd08757bfbe160b9db9ec0c99ecb82f5070928890d623023e41e47cab4b821d8d3c42b1e680
+EBUILD wcslib-7.12.ebuild 1738 BLAKE2B df55f67cdd91b89c9220a71fde7e336df84a21c170a9105bff6c5282bc52a36cc91a2bc1384d2a8dfb62651491ab8028bffcd791233a3fb246ef5c3d772e6e07 SHA512 fe0b89badb302848862970c6d49cbc463ead8b93fab0315ad732176bbd204e74548095efa458ce557702ed941b7c25311a03996b5864b35bf5cd460db1a80805
 EBUILD wcslib-7.3.1.ebuild 1693 BLAKE2B e00e09b8e5223ef63eb2c65d626bb5f1e60d5cfa1a490ad9ceca268bec913c23f13d916520ef7b1b5c4e032f5fdc59dff3680e3448f48d0f66ccdfa7a53ed15a SHA512 e69ba5bed4b3acd3fdf871453a0a3f22faadbbaf6858f0806e260b7cb0f45fefd1a922a8f710ee1485bd33114801c03aaa1bc7baebceef0d34febb18729f2ca3
 EBUILD wcslib-7.3.ebuild 1691 BLAKE2B 98f7e1ed446fb03c86419ff096131ddc318a9b11d5d97b8fc484dcdb22e277e2908112839080aa6c9633e1101b2d56ab2d97caf2cc950e18a982ec094efa26a0 SHA512 f16ee1129c6a4c54dbdf1da67e14af94d0eeba5945c164adaa5f187f3e287a721ccb6f9a7a9c989b77f7e5d2545e0d5c2ca2cd01c93e6742e6386cf844716bb4
-EBUILD wcslib-7.9.ebuild 1765 BLAKE2B 8ffc9f07968ab04ec930f83e1139d211086190c9858a6598a25b94ce08b4628e39705c1ce55a2a1be437761d27a0dc363c6f43eb87d7c4d47044b1306c6cc95b SHA512 6dcd921ebe7782636beba4c0e9396b7a1c5b31cbdb1fe6a7f91d34165d460ea47eedcb7e3fb63caf435d6edd9470da2e5bfed5df93247847e1bdc2097a0277b1
 MISC metadata.xml 1107 BLAKE2B 82837dbdf8a7b56d330df0bdb0bf5afc90ad7efd8141c9cf63f6f9b30798a451103080393e3c2bd10e1502de50ea5bd1fc38e068119c07d1ff79fa4d61cda228 SHA512 9ab798676bf10969eb2d171598c3ecb0385322333240f002f033f36cab1060e14fbbd11462c572e2cb8ed1b7092f88824dd1fc2be6e2f93944c44d886ae9c4ef
diff --git a/sci-astronomy/wcslib/wcslib-7.9.ebuild b/sci-astronomy/wcslib/wcslib-7.12.ebuild
index 8bb41c6f9a45..758e7d330da6 100644
--- a/sci-astronomy/wcslib/wcslib-7.9.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.12.ebuild
@@ -55,17 +55,17 @@ src_configure() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
 
-src_test() {
-	# -j1 to work around a race condition
-	emake -j1 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
+	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
 }