gentoo auto-resync : 10:11:2022 - 21:28:32

2 files changed, 25 insertions, 7 deletions

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index eb8b76c6b747..3c35629d7656 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,11 +1,11 @@
 AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
 AUX siril-1.0-execinfo.patch 567 BLAKE2B 852e3491139a6ab38d0490c57b5c90f553fba76319048cf2c3dd395bc403c10bff15ebc302904b4275b5956e38eb10dbc598dfba24bea656777540db12755d51 SHA512 2e2cc76a2a95f5d3e9bad8c710900344cd10534b70f9c36a5c1232b69adda937efac2eb7f8e0c3f86314ca11a95196e734ae114c18c47d8aaae7707968f412f8
 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
+DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
 EBUILD siril-1.0.3.ebuild 1961 BLAKE2B 2f429c1727eaea3ba1eba8814dd2a045c330a0a580bf58f21c33c7ba5c304dd192f772aafde5b1362e58203455037c080dcda18b4d7ab7250084d0cd593c7f82 SHA512 c49426627209598178ec372508228b786dd7171d17a9680f412ff34118686daece978cbbef4a59718fbfe6c9093aaa4d3e882e7f55a9a5ea74bad2cbd2408521
 EBUILD siril-1.0.5.ebuild 2012 BLAKE2B b9aa1da605d260c602409829aa254ae87be9669bf6db0508d2ca561817c9c3e09a6d4879cb68dcee31780cbd562c8f4eb8a05ab7ffa81a3278622ce7a81f6d7b SHA512 75c86cf60f9b278bbec77dd80c5169b8d884e462431d61801300e5af92b7761ea0e73687babee1c36a20285ea2e2b7136b8c19756fdbcfdf53abae9461178bc0
+EBUILD siril-1.0.6.ebuild 2067 BLAKE2B ccbe0d22bdd3e25ca4ed62127e44493a16f33a78314367167efe6b969e75690d963dcdba62fa0b2a083119b7c8e39f9b3dc97180ac4a8d176c7d1dae5e9e7b27 SHA512 48068cb397170a65e3e726e8e2af2ed046f701e4037bbe9e623a7635fa63012d00a936e7e67b00a1272e85c94f86f23c9281f1751134c7faf534ca7845ec00e5
 EBUILD siril-9999.ebuild 1958 BLAKE2B b9c561e60100361d7686e5c7ed34e3836d540d8292b46e38f5c31820ca766e9056d4b8c7f5c51f77c8620b3d3a417e17b95b96984f7f23796c7218e95b63f7cc SHA512 0c56714a1277ec80bbd0cfe807e36f47a263837786d0992cb08b3e39e3a58561dd442639a58792e5189fd4a1a28b6aaf4b2272b84efd413658594e022ddc7432
 MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3
diff --git a/sci-astronomy/siril/siril-1.0.1.ebuild b/sci-astronomy/siril/siril-1.0.6.ebuild
index 9f673bad189f..91eec72237c2 100644
--- a/sci-astronomy/siril/siril-1.0.1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson toolchain-funcs xdg
+inherit meson optfeature toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
 HOMEPAGE="https://www.siril.org/"
@@ -17,9 +17,9 @@ else
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ Boost-1.0"
 SLOT="0"
-IUSE="curl ffmpeg gnuplot heif jpeg openmp png raw tiff wcs"
+IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
@@ -44,14 +44,16 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	gnuplot? ( sci-visualization/gnuplot )
 "
+BDEPEND="x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
 )
 
-DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+DOCS=( README.md NEWS ChangeLog AUTHORS )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -63,8 +65,24 @@ pkg_setup() {
 
 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_icon_cache_update
+	xdg_mimeinfo_database_update
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}