Revert "gentoo auto-resync : 14:06:2023 - 15:13:45"

This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b.

6 files changed, 5 insertions, 192 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 6d70970a8fc6..72e54ad060cd 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 00ad24a88922..7f618d3d925e 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -3,15 +3,11 @@ AUX siril-1.0-execinfo-r2.patch 2493 BLAKE2B 5bd27710b0bc5eb942f40827a43ca1f8d70
 AUX siril-1.2-execinfo.patch 1273 BLAKE2B a70786b6cda34092d60e3651e015c6f54faa903a8c307c40d6fbec2b80ffe8bdf2b3ded3fdfbfb3a0c6a9ff4f48cefe9e5d15655c74d53b6f43fada8a5cf27d1 SHA512 9974f82dd964b5031619277a0de51d7afb0935e46b090e5ce5e54f2bbcede2c4212cdb48fe03ea06694eb7cfb367550cf76373cd72081574bc00a34794afc1be
 AUX siril-1.2-htmesh.patch 2036 BLAKE2B cc3fd4c31dcbde61976dfc9d84ce10576aeab2918bf6f7c7f24a765854f07b3a4e94cd77472d7e6f76f734aa6574b743582903de816e79e5d4808553867d4619 SHA512 eecc134f00d79e42450ec10b5ab11c2a9601a4435bd16f78d19efb93ed85e92e1e52c00a36099b8adb3c1d944a616de7155e82d3d6c9df9d0acaa349a73692a7
 AUX siril-1.2-openmp.patch 1451 BLAKE2B de7ebfd725e9d6b5eb2b9fe105224362085a3ef46f4f7e1c28522907efd2de44d2302d897a77748052ba42010b15b7053fb934befd693bf8d30c184df8f00849 SHA512 a9bec990941e0148f3b22c7e9773208c86ec04b474d3a0dba6651dab2f8e8443670a652e5235a978dbe693f08b344448a1808ffb6fcf7b0e35720df72dbf4bc0
-AUX siril-1.2-stdint.patch 696 BLAKE2B 9bc2e5f9b0a7ac00b1474372b875471f79f2fcbaa031efa7e978b47457a0bb0aac7a3f134688805259e941949ce8ed95837d164bbb5ac736f8aeebb835460948 SHA512 a9565d25bd71e1f721327dc8d68c54e52dabfcc9f1fcef92996b3373727cf8d2ded1ff6e518da4087d5e288aab970c78b381114891feea1b438f785cc9f74e56
-AUX siril-1.2-tiff.patch 2121 BLAKE2B fedc3fabcec2c77fd1a740dd4d5356190cad31cc0b33ffd34bfcc4c86e35c43f476e569c685a859f7b8cbbe8878b62ea351148fc02ee0cf2d52c615096c3093c SHA512 b47f35235988cad10234b057460af115747ab798e9d6c09e36a8668bbfefed7ee839a4dc66ec58c918eaa726ba95e6d4bc212f6c857a53295a8b070db415fca9
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 AUX siril-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
 DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
-DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1 SHA512 41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f
 EBUILD siril-1.0.6-r2.ebuild 2109 BLAKE2B 0573ff346b01b714b82e5af8070ab3349eed1ce3cc2360d64c49794d308b44676346a05ca10fa20e354aa3e705d685f5723af939d7a33c0969306937be13361b SHA512 fd92dbcdb3a454c7f0431e48b87fde98dc64f658a3f418c23bb82ad879255ec0c1be7f9410c6d74bd95b5c1e439bfedb790e0f2a13ea238f66fc1f2bd0eae56c
 EBUILD siril-1.2.0_beta1.ebuild 2234 BLAKE2B 07e826aa1c9916644cdd53e3cfb03b88175f802d18f0105c70b07e70d67444e9d369ab1d337d870afb6c2bb37ee293139769f8c9f3c558654b229cc32ec46ad0 SHA512 3244a88ab9287239e7c253ce1b345ef56c383340d0982a405d40ea4c925563c313a5103af46c6ea65a705d768e583bd735422738985960561a7ea045c1a53cec
-EBUILD siril-1.2.0_rc1.ebuild 2184 BLAKE2B 66e49a52e6a695c214ffdf9062978fa72acd4743b135155d1e692d19f3687a19ecd4976a553c31ed9bee373067c4d2bf9b56bbee01cce4adc283d86c6470bd39 SHA512 cd42a98cce99d82be3fe52666110cf57908e7537dd3ee24a46dfbdad6987d197ecb30e99ff1c37299aa1fac0b5c15d2f343f0dbb96a0d654d5d3d8bd950f47d7
-EBUILD siril-9999.ebuild 2088 BLAKE2B 1fb16f167539029c7dd7bf1e62861a3b49aaf423b1ae111dcbf8c192c966a6b62d67bf69f0c6ce19206be1c274b9c3815e42534c70bf4af67568786f967eeb62 SHA512 e55283e02105593b1965db255bf5b861e66071517d9f54d6cb0dbd45e5aabe9c2084680ece7757c504054e5a6f34283abc3e2b6ef1fce71c9ab1e7eff3915d5d
+EBUILD siril-9999.ebuild 2026 BLAKE2B b48b513249493b5293063fb86c9f8f526e82d4f7f461b43671b31520a8ee1a31ab21ea2b1859b4b37c666e9ff09bf568db43c93a18c0e9e24bc6cd241e7cd77e SHA512 ed0b053f0f20d061b5562fae58afea32fb11304e8f1079c15595f43d53cce9c0db293a4d212b387f91c5faff3eb2e4ef5d783bbbd572b023abff27f7ff6c9a28
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/files/siril-1.2-stdint.patch b/sci-astronomy/siril/files/siril-1.2-stdint.patch
deleted file mode 100644
index a8fb39c2bd5d..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-stdint.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/525
---- a/src/core/exif.h
-+++ b/src/core/exif.h
-@@ -20,6 +20,8 @@
- #ifndef SRC_CORE_EXIF_H_
- #define SRC_CORE_EXIF_H_
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- a/src/io/avi_pipp/pipp_avi_write_dib.h
-+++ b/src/io/avi_pipp/pipp_avi_write_dib.h
-@@ -1,6 +1,8 @@
- #ifndef PIPP_AVI_WRITE_DIB_H
- #define PIPP_AVI_WRITE_DIB_H
- 
-+#include <cstdint>
-+
- #include "pipp_video_write.h"
- #include "pipp_avi_write.h"
- 
---- a/src/io/avi_pipp/pipp_buffer.h
-+++ b/src/io/avi_pipp/pipp_buffer.h
-@@ -19,7 +19,6 @@
- #ifndef PIPP_BUFFER_H
- #define PIPP_BUFFER_H
- 
--#include <cstdint>
- #include <cstdint>
- #include <cstddef>
- 
diff --git a/sci-astronomy/siril/files/siril-1.2-tiff.patch b/sci-astronomy/siril/files/siril-1.2-tiff.patch
deleted file mode 100644
index 9e84f12c645b..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-tiff.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://gitlab.com/free-astro/siril/-/commit/de5030991caa9490c510651868783faae2530089
-From: Cyril Richard <cyril.richard42@gmail.com>
-Date: Sun, 11 Jun 2023 23:40:10 +0200
-Subject: [PATCH] Fixing compiler error with no libtiff
-Upstream: https://gitlab.com/free-astro/siril/-/issues/1129
-
---- a/src/gui/preferences.c
-+++ b/src/gui/preferences.c
-@@ -299,6 +299,7 @@ void initialize_path_directory(const gchar *path) {
- }
- 
- void initialize_starnet_executable(const gchar *path) {
-+#ifdef HAVE_LIBTIFF
- 	GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(lookup_widget("filechooser_starnet"));
- 	GtkWidget *starnet_weights_reset = GTK_WIDGET(lookup_widget("starnet_weights_clear"));
- 	GtkWidget *starnet_weights = GTK_WIDGET(lookup_widget("filechooser_starnet_weights"));
-@@ -315,6 +316,7 @@ void initialize_starnet_executable(const gchar *path) {
- 		gtk_widget_set_sensitive(starnet_weights, FALSE);
- 		gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
- 	}
-+#endif
- }
- 
- void initialize_starnet_weights(const gchar *path) {
-@@ -404,6 +406,7 @@ void on_filechooser_swap_file_set(GtkFileChooserButton *fileChooser, gpointer us
- }
- 
- void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer user_data) {
-+#ifdef HAVE_LIBTIFF
- 	GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(fileChooser);
- 	gchar *path;
- 
-@@ -429,7 +432,7 @@ void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer
- 		gtk_widget_set_sensitive(starnet_weights, FALSE);
- 		gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
- 	}
--
-+#endif
- }
- 
- void on_starnet_weights_clear_clicked(GtkButton *button, gpointer user_data) {
---- a/src/io/sequence_export.c
-+++ b/src/io/sequence_export.c
-@@ -650,7 +650,9 @@ void on_buttonExportSeq_clicked(GtkButton *button, gpointer user_data) {
- 		// add a trailing '_' for multiple-files sequences
- 		args->basename = format_basename(args->basename, TRUE);
- 		if (args->output == EXPORT_TIFF) {
-+#ifdef HAVE_LIBTIFF
- 			args->tiff_compression = get_tiff_compression();
-+#endif
- 		}
- 	}
- 	// Display a useful warning because I always forget to remove selection
--- 
-GitLab
-
diff --git a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1.ebuild
deleted file mode 100644
index 93988e8161cb..000000000000
--- a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 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 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
-	dev-libs/sleef:=
-	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 )
-	exif? ( >=media-gfx/exiv2-0.25 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	heif? ( media-libs/libheif )
-	libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
-	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}
-"
-BDEPEND="dev-util/cmake
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-docfiles.patch"
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch"
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.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/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index ae08398c3c70..eeffd9b1d7ed 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -13,18 +13,19 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="~amd64"
 	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"
+IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/json-glib-1.2.6
 	dev-libs/sleef:=
+	>=media-gfx/exiv2-0.25
 	media-libs/librtprocess:=
 	>=media-libs/opencv-4.4.0:=
 	sci-libs/cfitsio
@@ -33,7 +34,6 @@ DEPEND="
 	x11-libs/cairo
 	>=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 )
 	libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
@@ -46,8 +46,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-BDEPEND="dev-util/cmake
-	x11-base/xorg-proto"
+BDEPEND="x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
@@ -67,7 +66,6 @@ src_configure() {
 	local emesonargs=(
 		-Dffms2=false
 		-Dcriterion=false
-		$(meson_use exif exiv2)
 		$(meson_use ffmpeg)
 		$(meson_use heif libheif)
 		$(meson_use jpeg libjpeg)