gentoo resync : 25.11.2020

4 files changed, 92 insertions, 7 deletions

diff --git a/sci-astronomy/missfits/Manifest b/sci-astronomy/missfits/Manifest
index 24124c5716cd..fb5874560379 100644
--- a/sci-astronomy/missfits/Manifest
+++ b/sci-astronomy/missfits/Manifest
@@ -1,3 +1,5 @@
+AUX missfits-2.8.0-fno-common.patch 1604 BLAKE2B bb789edeefdccfa791e2c0a7d12ff59c1b3cb842f2e93c26f393f8dc3b62bb12f421bacbfebe38e594e292a2aef0fe2dfd34406c0c8d171f7f151229463d0ff0 SHA512 e1b19cd5d7da898bf06ad557cdcb914805d1625c11c7a775d25b9bbac9a0227faaebd30cdc9dc8bc5a3e090ace6c37ce83cbb69ca5b3a25a9104c7b2f6326a75
+AUX missfits-2.8.0-run-AM_PROG_AR.patch 130 BLAKE2B 62db7291b717ff82041d0dbfc773b70a959527efbdbf386c491e823599110046a928e101a546b9d5016ebfd6a38f907d4a3bbc0d75dfcaed761a3189d47d0e4a SHA512 a5ae4397d84f5524b7f889f1c9e36b8393019ee420b48030d12bdb25ab859a87e1035c736c533b264c035e9da2a1dec552b1125db394ff1d398b982936f93c40
 DIST missfits-2.8.0.tar.gz 428404 BLAKE2B 6d4f2ce1a3b36a487c84a13ea64dd5ab07f359ff31efdaa129455aae8a76eb37973f65bca5d4abf0675865016b6ceb86e904d5cc51d4e48b4be9332d86b66036 SHA512 32727f5eb30573a1cedacb8900e2536867e4815059eee32e64e3db65be9291b8a91b9f45b2c9f3cf6fc2a8cc448012ea3d502bdd9dee516008e17d5086aee795
-EBUILD missfits-2.8.0.ebuild 475 BLAKE2B 8c571af59bf0b45ffb48fa89363b79a859315c0f028af5b57584e183829dbd3237ae3e7eefa68ecb943c8858f2aff10fbb6a94039f1b495a25d024cf55e32e35 SHA512 13c303990c6a2d309d2c53833ce4e212311984ebf11d2497798c5286047141a74c0e18a8c61f537ea61aaf3d98a0bab1e424463d76aea0ef6579bac1263e11af
+EBUILD missfits-2.8.0.ebuild 575 BLAKE2B 06b9b57d07ba5c2ea1343ebbe00511ebae6cafdcca5e58887582d78eeb71c22ba198a58ee9cdc040ac1ebde48c1d1f1706625526949e458d11eccfd7e72d3a39 SHA512 9a6b7178c74bd66361a35377f7883d220c466e05b28a3c855a62335a5b53e8285dbdd4b0c1844d0e5d53d04b6f8c794b0447f8bad8ca69eaa3c811834b9c6146
 MISC metadata.xml 644 BLAKE2B 3e4c092fca1e86ce44570d790923dde2fe35aacb41b6b35345f073a57af15ec68b9800bccba7d39fad1bb81073974dc005b6b2e8dc1402fb2cfda8aa85b82bf8 SHA512 4d436d4c45058b19a9b8954c6750d7dff8e33ed7dd3c45d8089b8b388e106a8e442054c09617602a76f649cb899cb9b692c3036591e4b61bf2adb1caa8d65b64
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch
new file mode 100644
index 000000000000..0c7e042376b7
--- /dev/null
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch
@@ -0,0 +1,65 @@
+--- a/src/file.c
++++ b/src/file.c
+@@ -45,6 +45,8 @@
+ #include "prefs.h"
+ #include "xml.h"
+ 
++char    gstr[MAXCHAR];
++
+ /****** load_fitsfiles *******************************************************
+ PROTO	catstruct **load_fitsfiles(char *name, int *ncat, int * outcat,
+                                    filenum *filetype, int *headflag)
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@
+ 		warning(char *msg1, char *msg2);
+ 
+ 
+-int		bswapflag;
++extern int		bswapflag;
+ 
+ #endif
+--- a/src/fits/fitscheck.c
++++ b/src/fits/fitscheck.c
+@@ -38,6 +38,8 @@
+ #include "fitscat_defs.h"
+ #include "fitscat.h"
+ 
++int   bswapflag;
++
+ #define	ENCODE_OFFSET	0x30
+ unsigned int	exclude[13] = {0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,
+ 				0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60};
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -30,7 +30,7 @@
+ #include	"types.h"
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+-char		gstr[MAXCHAR];
++extern char		gstr[MAXCHAR];
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern	void	makeit(void),
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -50,6 +50,8 @@
+ #include 	"prefs.h"
+ #include	"preflist.h"
+ 
++prefstruct  prefs;
++
+ /********************************* dumpprefs ********************************/
+ /*
+ Print the default preference parameters.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -84,7 +84,7 @@
+   double	time_diff;		    /* Execution time */
+   }	prefstruct;
+ 
+-prefstruct	prefs;
++extern prefstruct	prefs;
+ 
+ /*----------------------------- Internal constants --------------------------*/
+ 
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch
new file mode 100644
index 000000000000..33166519fc6d
--- /dev/null
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,7 @@
+   ACX_PROG_CC_OPTIM
+ fi
+ 
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ 
diff --git a/sci-astronomy/missfits/missfits-2.8.0.ebuild b/sci-astronomy/missfits/missfits-2.8.0.ebuild
index 970e40703b1b..c619190e23f7 100644
--- a/sci-astronomy/missfits/missfits-2.8.0.ebuild
+++ b/sci-astronomy/missfits/missfits-2.8.0.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files"
 HOMEPAGE="http://www.astromatic.net/software/missfits/"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${P}-run-AM_PROG_AR.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
 	default
-	use doc && dodoc doc/*
+	dodoc -r doc/.
 }