gentoo auto-resync : 03:11:2022 - 15:11:57

4 files changed, 2 insertions, 123 deletions

diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index c5ef610fc5e5..c1aa64b84070 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,6 +1,3 @@
-AUX stellarsolver-2.2-fix-implicit-vasprintf-decl.patch 3269 BLAKE2B b20b91d09de085aa6473b9bce472054fc4aba1516d782694e4351beda79b763347ec8012312b1384fbf1894747071dc20b4a25ca7bb2894382281fba528bc30e SHA512 026fc39584b73d2b90a26a1ad9028f94a6e63095f793da8f3fd185d48a7d055369d8e257f4032271d9a4729a499ccb051c8df1e2c559ff77f21f2ec1767518de
-DIST stellarsolver-2.2.tar.gz 10971732 BLAKE2B 019b822d9a84401dfe2d01053da14c3f0eafb8a8b67e60c4f664ad64c0ffefe72f9dc086edef6dac5950f7fd99e655a641ecf781609b8b54e50cf3c0f8a516b5 SHA512 0b200437130ea8131ade9219e1055ea4265925168cbfb5a7bdcf3836e267a1b670df43f20d4657ef64dea2c1ef2314cfc0bcb8503eb4ead3f0cc3fae3267f7bc
 DIST stellarsolver-2.4.tar.gz 23402982 BLAKE2B 6eb9dafdf2a209afba10c09f7e7c0f6832a4399cd67c6ed3e4eb87ba98f2163ee8cbb342490314246c77d13581d1c0547817b6ab3c292685f3c496fa305f320d SHA512 f397ddafd3bb4774ac89e95673f67c4fef40ea0be842555608d95978ee26949b21b16cc984e00e936eda2ceca316f604b784b44844cf37ad1e44a5ef8d7e75f8
-EBUILD stellarsolver-2.2.ebuild 726 BLAKE2B 69c0c81e5ae55303b250a9a2623cf03438336f569273e3e720e4a020af0417d49ec06f0939fd597268099bdc5aa824883fd5993791d86143897bbb8141360894 SHA512 64d19d43a0cd417083868cf47decc48c3efcbd50cbf209998d480ab096e54f51de20d8fc036a36e0cbe88b17e1f66edc226e79926faedd62ba8e5619d414f59f
-EBUILD stellarsolver-2.4.ebuild 605 BLAKE2B e56f22bda2e49ae96efb2158f8ef0b03dfb6fe77f50214a39c4b727b792df71ce877887b18f9a99c934a8ba9ed51dd75b235428d25ea7d0bca286719107d8ffb SHA512 406af4ccfaf471d7e9dd629546fc0fd93986513d0b6fd054496944a02b060f920a583776d158297e9266f634b74907adbacdc49e2aa8db897f6af5a7a8593abc
+EBUILD stellarsolver-2.4.ebuild 604 BLAKE2B c0fbc8549a28b289eba9965f3c968c0517861d2f4868342112cf7168eb1a971da50d060f54e5e64323eae041e71ba63b49e0e709ae305d13710c07d08390fa80 SHA512 53064dad8130d864372c5c73fc5c9995090313c3e9b08ba3cd87c4efd4c0539fc06c24ba54b1d1c5a593e5dd9a2c75297d30f9f8242075538d519371ea24a37c
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch b/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch
deleted file mode 100644
index b2625fe4429e..000000000000
--- a/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From acb58bd78388adec25eb6e09ce6434546de008b8 Mon Sep 17 00:00:00 2001
-From: Robert Lancaster <rlancaste@gmail.com>
-Date: Wed, 16 Mar 2022 18:15:21 -0400
-Subject: [PATCH] Trying to eliminate vasprintf implicit declaration warning on
- Linux
-
----
- stellarsolver/astrometry/util/bl.c          | 4 +++-
- stellarsolver/astrometry/util/errors.c      | 4 +++-
- stellarsolver/astrometry/util/fitsioutils.c | 3 +++
- stellarsolver/astrometry/util/ioutils.c     | 4 +++-
- stellarsolver/astrometry/util/log.c         | 4 +++-
- 5 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/stellarsolver/astrometry/util/bl.c b/stellarsolver/astrometry/util/bl.c
-index 1a0fee9..e84d74a 100644
---- a/stellarsolver/astrometry/util/bl.c
-+++ b/stellarsolver/astrometry/util/bl.c
-@@ -2,7 +2,9 @@
-  # This file is part of the Astrometry.net suite.
-  # Licensed under a 3-clause BSD style license - see LICENSE
-  */
--
-+#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library
-+#define __STDC_WANT_LIB_EXT2__ 1
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/stellarsolver/astrometry/util/errors.c b/stellarsolver/astrometry/util/errors.c
-index 94f5f9c..b7c4e9f 100644
---- a/stellarsolver/astrometry/util/errors.c
-+++ b/stellarsolver/astrometry/util/errors.c
-@@ -2,7 +2,9 @@
-  # This file is part of the Astrometry.net suite.
-  # Licensed under a 3-clause BSD style license - see LICENSE
-  */
--
-+#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library
-+#define __STDC_WANT_LIB_EXT2__ 1
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-diff --git a/stellarsolver/astrometry/util/fitsioutils.c b/stellarsolver/astrometry/util/fitsioutils.c
-index 7451c36..f2b20bc 100644
---- a/stellarsolver/astrometry/util/fitsioutils.c
-+++ b/stellarsolver/astrometry/util/fitsioutils.c
-@@ -2,6 +2,9 @@
-  # This file is part of the Astrometry.net suite.
-  # Licensed under a 3-clause BSD style license - see LICENSE
-  */
-+#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library
-+#define __STDC_WANT_LIB_EXT2__ 1
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <stdint.h>
-diff --git a/stellarsolver/astrometry/util/ioutils.c b/stellarsolver/astrometry/util/ioutils.c
-index ee17011..c490fb8 100644
---- a/stellarsolver/astrometry/util/ioutils.c
-+++ b/stellarsolver/astrometry/util/ioutils.c
-@@ -2,7 +2,9 @@
-  # This file is part of the Astrometry.net suite.
-  # Licensed under a 3-clause BSD style license - see LICENSE
-  */
--
-+#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library
-+#define __STDC_WANT_LIB_EXT2__ 1
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/stellarsolver/astrometry/util/log.c b/stellarsolver/astrometry/util/log.c
-index 256d5a1..1a2b8db 100644
---- a/stellarsolver/astrometry/util/log.c
-+++ b/stellarsolver/astrometry/util/log.c
-@@ -2,7 +2,9 @@
-  # This file is part of the Astrometry.net suite.
-  # Licensed under a 3-clause BSD style license - see LICENSE
-  */
--
-+#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library
-+#define __STDC_WANT_LIB_EXT2__ 1
-+#endif
- #include <stdio.h>
- #include <stdarg.h>
- #include <stdlib.h>
diff --git a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
deleted file mode 100644
index e33679de6897..000000000000
--- a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
-HOMEPAGE="https://github.com/rlancaste/stellarsolver"
-SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sci-libs/cfitsio:=
-	sci-libs/gsl:=
-	sci-astronomy/wcslib:=
-"
-DEPEND="${RDEPEND}"
-
-# https://github.com/rlancaste/stellarsolver/issues/108
-PATCHES=( "${FILESDIR}/${P}-fix-implicit-vasprintf-decl.patch" )
diff --git a/sci-libs/stellarsolver/stellarsolver-2.4.ebuild b/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
index 9d256308a02c..745064e47d62 100644
--- a/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
+++ b/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="