[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/weightwatcher/, sci-astronomy/weightwatcher/files/

[David Seifert]

commit:     c66f73c85e12f55cbc2ca4da527101ae3b89b27b
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Jan  2 20:16:32 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 20:16:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66f73c8

sci-astronomy/weightwatcher: Port to EAPI 7

* Fix direct AR call
* Fix build with gcc-10

Closes: https://bugs.gentoo.org/707594
Closes: https://bugs.gentoo.org/725284
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/weightwatcher-1.12-AR.patch              |  11 ++
 .../files/weightwatcher-1.12-fno-common.patch      | 160 +++++++++++++++++++++
 .../weightwatcher/weightwatcher-1.12.ebuild        |  17 ++-
 3 files changed, 184 insertions(+), 4 deletions(-)

diff --git a/sci-astronomy/weightwatcher/files/weightwatcher-1.12-AR.patch b/sci-astronomy/weightwatcher/files/weightwatcher-1.12-AR.patch
new file mode 100644
index 00000000000..6c5b72ffc74
--- /dev/null
+++ b/sci-astronomy/weightwatcher/files/weightwatcher-1.12-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/725284
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,7 @@ fi
+ 
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
++AM_PROG_AR
+ 
+ # Checks for libraries.
+ # Replace `main' with a function in -lm:

diff --git a/sci-astronomy/weightwatcher/files/weightwatcher-1.12-fno-common.patch b/sci-astronomy/weightwatcher/files/weightwatcher-1.12-fno-common.patch
new file mode 100644
index 00000000000..a9071da8120
--- /dev/null
+++ b/sci-astronomy/weightwatcher/files/weightwatcher-1.12-fno-common.patch
@@ -0,0 +1,160 @@
+--- a/src/field.c
++++ b/src/field.c
+@@ -42,6 +42,9 @@
+ #include	"prefs.h"
+ #include	"readimage.h"
+ 
++extern prefstruct prefs;
++char gstr[MAXCHAR];
++
+ /********************************* newfield **********************************/
+ /*
+ Returns a pointer to a new field, ready to go!
+--- a/src/fits/fitsbody.c
++++ b/src/fits/fitsbody.c
+@@ -43,6 +43,7 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++extern int bswapflag;
+ size_t	body_maxram = BODY_DEFRAM,
+ 	body_maxvram = BODY_DEFVRAM,
+ 	body_ramleft, body_vramleft, body_ramflag;
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@ extern  void	error(int, char *, char *),
+ 		warning(char *msg1, char *msg2);
+ 
+ 
+-int		bswapflag;
++extern int		bswapflag;
+ 
+ #endif
+--- a/src/fits/fitscheck.c
++++ b/src/fits/fitscheck.c
+@@ -42,6 +42,7 @@
+ unsigned int	exclude[13] = {0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,
+ 				0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60};
+ 
++extern int bswapflag;
+ /****** encode_checksum *****************************************************
+ PROTO	void encode_checksum(unsigned int sum, char *str)
+ PURPOSE	Encode a checksum to ASCII
+--- a/src/fits/fitskey.c
++++ b/src/fits/fitskey.c
+@@ -38,6 +38,7 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++int bswapflag;
+ /****** add_key ****************************************************************
+ PROTO	int add_key(keystruct *key, tabstruct *tab, int pos)
+ PURPOSE	Copy a key from one table to another.
+--- a/src/fits/fitsread.c
++++ b/src/fits/fitsread.c
+@@ -38,6 +38,7 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++extern int bswapflag;
+ char	padbuf[FBSIZE];
+ 
+ /****** read_cat ***************************************************************
+--- a/src/fits/fitswrite.c
++++ b/src/fits/fitswrite.c
+@@ -39,6 +39,7 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++extern int bswapflag;
+ 
+ /****** save_cat **************************************************************
+ PROTO	void save_cat(catstruct *cat, char *filename)
+--- 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/main.c
++++ b/src/main.c
+@@ -51,6 +51,8 @@ EXECUTABLE " [-c <configuration_file>] [-<keyword> <value>]\n"\
+ extern const char	notokstr[];
+ time_t		thetime, thetime2;
+ 
++extern prefstruct prefs;
++
+ /********************************** main ************************************/
+ int	main(int argc, char *argv[])
+ 
+--- a/src/makeit.c
++++ b/src/makeit.c
+@@ -45,6 +45,8 @@
+ #include "readimage.h"
+ #include "xml.h"
+ 
++extern prefstruct prefs;
++
+ /********************************** makeit ***********************************/
+ void	makeit(void)
+   {
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -51,6 +51,9 @@
+ #include 	"prefs.h"
+ #include	"preflist.h"
+ 
++extern int bswapflag;
++prefstruct prefs;
++
+ /********************************* dumpprefs ********************************/
+ /*
+ Print the default preference parameters.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -86,7 +86,7 @@ typedef struct
+   double	time_diff;			/* Execution time */
+   }	prefstruct;
+ 
+-  prefstruct	prefs;
++extern prefstruct prefs;
+ 
+ 
+ /*-------------------------------- protos -----------------------------------*/
+--- a/src/readimage.c
++++ b/src/readimage.c
+@@ -39,6 +39,7 @@
+ #include	"fits/fitscat.h"
+ #include	"readimage.h"
+ 
++extern int bswapflag;
+ /******************************** readdata **********************************/
+ /*
+ read and convert input data stream in PIXTYPE (float) format.
+--- a/src/vector.c
++++ b/src/vector.c
+@@ -46,6 +46,9 @@
+ 
+ static void	chsort(crosstruct *ra, int n);
+ 
++extern char gstr[MAXCHAR];
++extern prefstruct prefs;
++
+ /********************************** newvec **********************************/
+ /*
+ Returns a pointer to a new polygon, and initialize local context buffer:
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -45,6 +45,7 @@
+ #include "field.h"
+ #include "xml.h"
+ 
++extern  prefstruct prefs;
+ extern time_t		thetime,thetime2;	/* from makeit.c */
+ extern pkeystruct	key[];			/* from preflist.h */
+ extern char		keylist[][32];		/* from preflist.h */

diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
index c423074420a..2aa44a1044b 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
 HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
@@ -12,8 +14,15 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="doc"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
 	default