6 files changed, 5 insertions, 202 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 2e2eb3dbfb09..4f4c41d9024a 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 35dbc8e04339..678e6c385bf5 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,9 +1,8 @@
 AUX siril-1.0.3-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
-AUX siril-9999-dependencies.patch 5217 BLAKE2B 3f9753c47b8ee337c75ea47d811c5df7e4a08fabdbd8d53546fbe94a56a298a74067ea34cfe98d8c443741fdb36a735e897534b078959f8747fbfb5b1b4114b8 SHA512 c2c695ff725a8c761c1a1f3bfc0e0952ad6faa29201aaec07ba61d1b6387f8ed847c0786299cc40f3a0fef2b7f6ea087186d1177c11a509c3a80ba7ec32dc221
 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
 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
 EBUILD siril-1.0.3.ebuild 1947 BLAKE2B 6e2fe922520768a9a1d0b8531257b2fc0deecc13d68dcd224136178be6a0409cfc04d2da5d1cb6d9c5f7ad695218ed612d839e51c889e10e03fb7a5b9f07252a SHA512 54b49aaf4f6c804810f716bde3a4479bc9ca287d737c615b43df9f1c545ef972594a9dd82c9c6ba29a5b0afd11cc9cd8db658a929cd0fef28c5224fa353877b3
-EBUILD siril-9999.ebuild 2003 BLAKE2B 9bc894d56b0e0fab2085b2c74fe28db31ea87be23bb0995af410fa58e0913db1e7d1ea0e37207a5a43d0bfe81d9a8144734f618e0f157db4919b9fde9eb5cb1c SHA512 79b02cf03ba2f712467c6e452b5a637fb50c076ceb81754bae5769873790a8da22c114b13619e68f1aa7ff628d40e8f86b3a96cdd6cf6e6790aaa84e1393de13
+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-9999-dependencies.patch b/sci-astronomy/siril/files/siril-9999-dependencies.patch
deleted file mode 100644
index b9ed88f98e8a..000000000000
--- a/sci-astronomy/siril/files/siril-9999-dependencies.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff --git a/meson.build b/meson.build
-index fdfc3745..c8823c6f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -42,7 +42,17 @@ srcInclude  = include_directories('src')
- 
- warnings = []
- 
--enable_openmp = get_option('openmp')
-+enable_openmp    = get_option('openmp')
-+enable_libraw    = get_option('libraw')
-+enable_libtiff   = get_option('libtiff')
-+enable_libjpeg   = get_option('libjpeg')
-+enable_libpng    = get_option('libpng')
-+enable_libheif   = get_option('libheif')
-+enable_ffms2     = get_option('ffms2')
-+enable_ffmpeg    = get_option('ffmpeg')
-+enable_libconfig = get_option('libconfig')
-+enable_criterion = get_option('criterion')
-+enable_wcslib    = get_option('wcslib')
- 
- # General version
- siril_version = meson.project_version()
-@@ -256,33 +266,72 @@ if enable_openmp
-     siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
-     siril_c_flag += ['-Xpreprocessor', '-fopenmp']
-   else
--  openmp_dep = dependency('openmp', required : false)
-+  openmp_dep = dependency('openmp', required : true)
-   endif
- else
-   message('OpenMP disabled')
- endif
- 
--libraw_dep = dependency('libraw', required : false)
--libtiff_dep = dependency('libtiff-4', required : false)
--libjpeg_dep = dependency('libjpeg', required : false)
--libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
--libheif_dep = dependency('libheif', required : false)
--ffms2_dep = dependency('ffms2', required : false)
--ffmpeg = [
--  dependency('libavformat', required : false),
--  dependency('libavcodec', required : false),
--  dependency('libavutil', version : '>= 55.20', required : false),
--  dependency('libswscale', required : false),
--  dependency('libswresample', required : false)
--]
-+libraw_dep = no_dep
-+if enable_libraw
-+  libraw_dep = dependency('libraw', required : true)
-+endif
-+
-+libtiff_dep = no_dep
-+if enable_libtiff
-+  libtiff_dep = dependency('libtiff-4', required : true)
-+endif
-+
-+libjpeg_dep = no_dep
-+if enable_libjpeg
-+  libjpeg_dep = dependency('libjpeg', required : true)
-+endif
-+
-+libpng_dep = no_dep
-+if enable_libpng
-+  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
-+endif
-+
-+libheif_dep = no_dep
-+if enable_libheif
-+  libheif_dep = dependency('libheif', required : true)
-+endif
-+
-+ffms2_dep = no_dep
-+if enable_ffms2
-+  ffms2_dep = dependency('ffms2', required : true)
-+endif
-+
-+ffmpeg = []
-+if enable_ffmpeg
-+  ffmpeg = [
-+    dependency('libavformat', required : true),
-+    dependency('libavcodec', required : true),
-+    dependency('libavutil', version : '>= 55.20', required : true),
-+    dependency('libswscale', required : true),
-+    dependency('libswresample', required : true)
-+  ]
-+endif
-+
- libcurl_dep = no_dep
- if enable_libcurl
--  libcurl_dep = dependency('libcurl', required : false)
-+  libcurl_dep = dependency('libcurl', required : true)
- endif
--libconfig_dep = dependency('libconfig', required : false)
--criterion_dep = dependency('criterion', required : false)
- 
--wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
-+libconfig_dep = no_dep
-+if enable_libconfig
-+  libconfig_dep = dependency('libconfig', required : true)
-+endif
-+
-+criterion_dep = no_dep
-+if enable_criterion
-+  criterion_dep = dependency('criterion', required : true)
-+endif
-+
-+wcslib_dep = no_dep
-+if enable_wcslib
-+  wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
-+endif
- 
- ################################################################################
- # Configuration
-@@ -546,6 +595,7 @@ summary(
-     'FFMPEG'    : ffmpeg_found,
-     'libcurl'   : libcurl_dep.found(),
-     'wcslib'    : wcslib_dep.found(),
-+    'libconfig' : libconfig_dep.found(),
-     'criterion' : criterion_dep.found(),
-   }, section: 'Optional dependencies'
- )
-diff --git a/meson_options.txt b/meson_options.txt
-index cd4b9cc1..07b4b904 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,9 +12,69 @@ option('openmp',
-  description: 'build with OpenMP support'
- )
- 
-+option('libraw',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with LibRaw support'
-+)
-+
-+option('libtiff',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with TIFF support'
-+)
-+
-+option('libjpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with JPEG support'
-+)
-+
-+option('libpng',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with PNG support'
-+)
-+
-+option('libheif',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with HEIF support'
-+)
-+
-+option('ffms2',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFMS2 support'
-+)
-+
-+option('ffmpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFmpeg support'
-+)
-+
- option('enable-libcurl',
-  type: 'combo', 
-  value: 'platform-default',
-  description: 'Use libcurl instead of GIO',
-  choices: [ 'yes', 'no', 'platform-default' ]
--)
-\ No newline at end of file
-+)
-+
-+option('libconfig',
-+ type : 'boolean',
-+ value : 'true',
-+ description: 'build with libconfig support'
-+)
-+
-+option('criterion',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with criterion support'
-+)
-+
-+option('wcslib',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with WCSLIB support'
-+)
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 62ed0ef4d3f6..7a9061a16811 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
-	"${FILESDIR}/${PN}-9999-dependencies.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-astronomy/skymaker/Manifest b/sci-astronomy/skymaker/Manifest
index 4c02034ea9db..d37a157781aa 100644
--- a/sci-astronomy/skymaker/Manifest
+++ b/sci-astronomy/skymaker/Manifest
@@ -1,4 +1,4 @@
 AUX skymaker-3.10.5-fno-common.patch 1719 BLAKE2B 473656de5281f6c4aaf06dd02a0d35f06e82edc329e68c6a5de0d8f8c75dff2127345b349c81fdc697268ba56f0f622faeea10ff791abf98d9b81bcbea2c4617 SHA512 21370919be5e4f1737fa2cbab0b25e889be2ed25a9152154270adcec53db18af040eb658bc7541622c57450b90b9415c16a4c8bfa7053f2221c91373f853e280
 DIST skymaker-3.10.5.tar.gz 508938 BLAKE2B 82baaf083deb941c31052c3394a601489cb9c4efea979055236eb33af1df2b5473bc43339e76de0785956f5a9a7968f48c62227c66bf1e76ef57907e16cbdac4 SHA512 98bb5a75c21475c6ecf16cb7de333db7faae95fd32c4ac311b44ddf637ffec2c80061b056b070b8d21b1a5a46c0a5a82855e417d25a9d8de02aad2167cb45b43
 EBUILD skymaker-3.10.5.ebuild 525 BLAKE2B 7cc392bfc66c99ed270f3380f69140d96daf868b01cf9b55c5f1f1cd595b3bf138fb0d32a07c0fac856a69b4b9557a1d3c04d67eecb8358deff805c6ca373556 SHA512 141e468835c705945ed246cd6f00db1839e8e396253312bfa6672572123027e5346f13a1184f2596bb25d83645a23da7defed931e86b5948d2b8d80ff61518be
-MISC metadata.xml 644 BLAKE2B 1f27b2f12e1f839c9c6c6de1b620654632296293be18a6a2066a5c37e47a87a19d6461fb0f87d17b58b2685bb562564d6d85d175aa1095c51804c791b9e1e059 SHA512 19591d6ae858832ff40543e91c2fffef6940704fe778be544960a8f03376da85122370e27721b57950fe2543449ca09e5b2706b305c2471dca7db8d085ae86d6
+MISC metadata.xml 728 BLAKE2B db761baba9112a01cd50ab8bc7d4ba5987e0f565cce745744c6b8f6d7d807bb8ebd2b103ebccd90bba5c05275a845dc160fa757270976028a417b7ebe874a94a SHA512 846db5614a1fb09e01fab9ee7607cfcd68dee84bb369ff8f3377ac9d820094ffb4bdacc4ad3e25aca372fafa2003647a8010a4233c46b686066235031accacf1
diff --git a/sci-astronomy/skymaker/metadata.xml b/sci-astronomy/skymaker/metadata.xml
index 0789a77189b3..ca8254972502 100644
--- a/sci-astronomy/skymaker/metadata.xml
+++ b/sci-astronomy/skymaker/metadata.xml
@@ -12,4 +12,7 @@
 		build a realistic Point Spread Function, generate a list of stars and
 		galaxies. Galaxies are modeled analytically.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">astromatic/skymaker</remote-id>
+	</upstream>
 </pkgmetadata>