6 files changed, 96 insertions, 63 deletions
diff --git a/sci-astronomy/open-phd-guiding/metadata.xml b/sci-astronomy/open-phd-guiding/metadata.xml
index cf5e369..c736923 100644
--- a/sci-astronomy/open-phd-guiding/metadata.xml
+++ b/sci-astronomy/open-phd-guiding/metadata.xml
@@ -1,30 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ctibor@brancik.cz</email>
-    <name>Ctibor Brančík</name>
-  </maintainer>	
-  <longdescription>
-    PHD2 is the next generation of Stark Labs PHD Guiding. PHD2 provides a number of new features and enhancements over the original PHD1, such as
-    A more responsive user interface, with a new multi-threaded design
-    Improved visualization tools for observing guiding performance in units of arc-seconds or pixels
-    Declination-compensated guiding, eliminating the need for recalibrating when switching targets
-    Support for guiding with Adaptive Optics units
-    Equipment profiles for managing multiple guiding configurations
-    Internationalization improvements, with French, German, Japanese, Polish, Russian, and Simplified Chinese translations available
-    A new server interface for controlling and monitoring PHD2 by other imaging applications
-    New tools, such as a polar drift alignment tool and a calibration step size calculator, a Comet tracking mode, and more
-    Dark-frame libraries and Bad-pixel maps
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>andy.galasso@gmail.com</email>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<longdescription>
+	PHD2 is the next generation of Stark Labs PHD Guiding. PHD2 provides a number of new features and enhancements over the original PHD1.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+		<email>andy.galasso@gmail.com</email>
 		<name>Andy Gallasso</name>
-        </maintainer>
-        <changelog>http://openphdguiding.org/</changelog>
-        <doc lang="en">https://sites.google.com/site/openphdguiding/phd2-drift-alignment</doc>
-        <bugs-to>https://code.google.com/p/open-phd-guiding/issues/list</bugs-to>
-        <remote-id type="google-code">open-phd-guiding</remote-id>
-  </upstream>
+		</maintainer>
+		<changelog>http://openphdguiding.org/</changelog>
+		<doc lang="en">https://sites.google.com/site/openphdguiding/phd2-drift-alignment</doc>
+		<bugs-to>https://code.google.com/p/open-phd-guiding/issues/list</bugs-to>
+		<remote-id type="google-code">open-phd-guiding</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild b/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
index 88354ff..d85d2cb 100644
--- a/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
+++ b/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
 
-inherit git-r3 cmake-utils wxwidgets
+inherit git-r3 cmake wxwidgets
 
 DESCRIPTION="Astrophoto guiding software"
 HOMEPAGE="http://code.google.com/p/open-phd-guiding/"
@@ -15,19 +15,12 @@ KEYWORDS=""
 
 SLOT="2"
 
-DEPEND="x11-libs/wxGTK:3.0[X]
+DEPEND="x11-libs/wxGTK:3.0-gtk3[X]
 	virtual/libusb:1
 	sci-libs/cfitsio
 	media-libs/opencv"
 
 RDEPEND="${DEPEND}"
 
-#PATCHES=( "${FILESDIR}/open-phd-guiding-2.9999-remove_compiler_strict_warnings.patch" "${FILESDIR}/open-phd-guiding-2.9999-build_helper_script.patch" )
-
-src_install() {
-	/bin/sh "${S}"/build/build_help.sh
-	dohtml -r "${S}"/help
-	rm "${S}"/locale/fr_FR/PHD2GuideHelp.zip
-	dodoc PHD_2.0_Architecture.docx
-	cmake-utils_src_install
-}
+DOCS=( PHD_2.0_Architecture.docx )
+HTML_DOCS=( help )
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index eeb98c3..6bfc02f 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1 +1 @@
-DIST siril-0.9.12.tar.gz 2844599 SHA256 dc24b8ea344c0d1d6a35fae8c80becb2f2493991107bcc928eda9159761af590 SHA512 dafcaaead50b936233d361ca25ed9f64228b8a65ef01f3a808075c49932a9f14a664f79f8de555af2996c6d860ee58df69fa0a983c68eb3daaeb09cd9cb99a50 WHIRLPOOL 4a985a80c6aae6c77ebb86a9b43e51c65da95b6734d578fe4e8be942f1f4f6205dc94cc034f7efd781e2788346534d1e9f1706d65758c2379a9ca7fa899f87a4
+DIST siril-1.0.1.tar.bz2 3486586 SHA256 88bd69dfef04a61a38a9a5a1b0d7e69e2f45321ce6d9ef61a617d8a1a52671cc SHA512 34bd6219726f5f4d51b9f0e5bc851b708e4a587d60ddce07b2106c80b1e74c6fafa3b52d0a9dda77d213272b4bdee881b4c8b4e014da9af986e1af69838afe15 WHIRLPOOL 8aef6dc56b5dc5f9a0f2e6a0506105520977b4c38ceea11f9ecdf9962d47a41d00fef8af99b8cf9dffd7d1baacd4f1b938b7957d5f77c5f69563f77d66134559
diff --git a/sci-astronomy/siril/metadata.xml b/sci-astronomy/siril/metadata.xml
index 4cb10f0..a1d8934 100644
--- a/sci-astronomy/siril/metadata.xml
+++ b/sci-astronomy/siril/metadata.xml
@@ -5,6 +5,11 @@
 		<email>ctibor@brancik.cz</email>
 	</maintainer>
 	<longdescription>
-        SIRIL can align automatically or manually, stack and enhance pictures from various file formats, even image sequence files (films and SER files).
+		SIRIL can align automatically or manually, stack and enhance pictures from various file formats, even image sequence files (films and SER files).
 	</longdescription>
+	<use>
+		<flag name="ffms2">Enable support for films import usign <pkg>media-libs/ffmpegsource</pkg></flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
+		<flag name="wcs">Enable support for World Coordinate System library using <pkg>sci-astronomy/wcslib</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-astronomy/siril/siril-0.9.12.ebuild b/sci-astronomy/siril/siril-1.0.1.ebuild
index 852278d..1f85b23 100644
--- a/sci-astronomy/siril/siril-0.9.12.ebuild
+++ b/sci-astronomy/siril/siril-1.0.1.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools xdg-utils
+inherit meson xdg-utils
 
 DESCRIPTION="An astronomical image processing tool"
 HOMEPAGE="https://www.siril.org/"
-SRC_URI="https://gitlab.com/free-astro/${PN}/-/archive/${PV}/${PN}-${PV}.tar.gz"
-
+SRC_URI="https://free-astro.org/download/${PN}-${PV}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="curl ffmpeg gnuplot heif jpeg png raw tiff"
-WORKDIR=
+IUSE="curl ffmpeg ffms2 gnuplot heif jpeg png raw tiff wcs"
 
 RDEPEND="
-	curl? ( net-libs/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	gnuplot? ( sci-visualisation/gnuplot )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	ffms2? ( media-libs/ffmpegsource )
+	gnuplot? ( sci-visualization/gnuplot )
 	heif? ( media-libs/libheif )
 	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )
 	raw? ( media-libs/libraw )
 	tiff? ( media-libs/tiff )
-"
+	wcs? ( sci-astronomy/wcslib )"
+
 DEPEND="
 	${RDEPEND}
 	x11-libs/gtk+:3=
@@ -32,24 +32,18 @@ DEPEND="
 	sci-libs/fftw:3.0=
 	sci-libs/gsl
 	dev-libs/libconfig
+	dev-libs/json-glib
 	media-libs/opencv
-	media-gfx/exiv2
-"
+	media-gfx/exiv2"
 
 DOCS=( README.md NEWS ChangeLog )
 
-src_prepare() {
-    eautoreconf
-    default
-    }
-
 pkg_postinst() {
-    xdg_desktop_database_update
-    xdg_mimeinfo_database_update 
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-    xdg_desktop_database_update
-    xdg_mimeinfo_database_update 
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
-    
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
new file mode 100644
index 0000000..2c1ec5e
--- /dev/null
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson git-r3 xdg-utils
+
+DESCRIPTION="An astronomical image processing tool"
+HOMEPAGE="https://www.siril.org/"
+EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg ffms2 gnuplot jpeg png raw tiff wcs"
+
+RDEPEND="
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	gnuplot? ( sci-visualization/gnuplot )
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng )
+	raw? ( media-libs/libraw )
+	tiff? ( media-libs/tiff )
+	wcs? ( sci-astronomy/wcslib )
+"
+DEPEND="
+	${RDEPEND}
+	x11-libs/gtk+:3=
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0=
+	sci-libs/gsl
+	dev-libs/libconfig
+	media-libs/opencv
+	media-gfx/exiv2
+	media-libs/libheif
+	media-libs/ffmpegsource
+"
+
+DOCS=( README.md NEWS ChangeLog )
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}