gentoo resync : 08.01.2021

10 files changed, 390 insertions, 8 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 059d77109764..369cc7ffe90e 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 4d9a3360c275..9ed20135a2ee 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,7 @@
 DIST kstars-3.4.3.tar.xz 77697704 BLAKE2B a64901f74952268fb05ab9ef90d4161f48ada210a0c3099218488bb0c327d29855c58f7226ac399e522abe9846fe7109dcbecbdb789d9c3afc1180448ba1fe69 SHA512 47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4
+DIST kstars-3.5.0.tar.xz 78825952 BLAKE2B 2654fdca7bdf7714c0b0c024babb08d13458cc984774e2f9dee31002b9c6af5c29e23ad99968c31b5a33f7fc1e506eb39c34a710b27d5d0c2a0b6830d3e2c6a1 SHA512 83cda36b66e0f14448b013fcd12c140f6e21d4b9a1595cf11cd1d56655d8afec9a6e130fedd477e5474ca0e6568199114f30e862881fd5fd24c84e3c2811326b
+DIST kstars-3.5.1.tar.xz 78872552 BLAKE2B 8962d60a7e6224a7d6724a9883136599ca7acf874131b46ad30ca5fba6d222242d60f3eff3bee8df3e7db8807e6d6a3d363d2f63dd1540d7b80d9f76be3ee31f SHA512 a0684272967a314ca9ce5d835337d6c6f52f2b5cfb877f50b41a5fa8df51497fbb10445e14e0d04804f3ad3dfdba4379710dd82547b617f4ee9d78cec8feb0dc
 EBUILD kstars-3.4.3.ebuild 2544 BLAKE2B 688438c1b26c13c29ef7e019681ebb8d82324389892eb6929f876693f567554e38ef32d778ce46e3fdf3105783aecbc869d7dcf354700c247b101c658400eb68 SHA512 fc7995084aac0d85f73b313cca927d2ca1a1003679892beda460d0dff95ad4f76ece9904d6b6e69c21f04d51e749bfbdabc57a3eb9999c2b8296bbb3f8d1aa93
+EBUILD kstars-3.5.0.ebuild 2554 BLAKE2B 05574a72815c899cc3262f2b8eda4630e20eaf5837b6c69abb1387fbf837218f7ec8edbaccd5a8599920ec613e4ae13c9d410e97a7e2b545fc5720d346ede535 SHA512 5ae12f7dfab4668badf66d02fce26808263aa0de95a867551ed1968d1a40c8bd473a61d1da3412970a31a69b96c35825c4f9adf78790367780af2d2ecb4c6ed0
+EBUILD kstars-3.5.1.ebuild 2554 BLAKE2B 05574a72815c899cc3262f2b8eda4630e20eaf5837b6c69abb1387fbf837218f7ec8edbaccd5a8599920ec613e4ae13c9d410e97a7e2b545fc5720d346ede535 SHA512 5ae12f7dfab4668badf66d02fce26808263aa0de95a867551ed1968d1a40c8bd473a61d1da3412970a31a69b96c35825c4f9adf78790367780af2d2ecb4c6ed0
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.5.0.ebuild b/sci-astronomy/kstars/kstars-3.5.0.ebuild
new file mode 100644
index 000000000000..2d2668552f20
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://apps.kde.org/en/kstars https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio:= )
+	indi? (
+		sci-libs/gsl:=
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova:=
+		sci-libs/stellarsolver
+	)
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib:= )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package indi Nova)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
+	fi
+	ecm_pkg_postinst
+}
diff --git a/sci-astronomy/kstars/kstars-3.5.1.ebuild b/sci-astronomy/kstars/kstars-3.5.1.ebuild
new file mode 100644
index 000000000000..2d2668552f20
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.5.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://apps.kde.org/en/kstars https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio:= )
+	indi? (
+		sci-libs/gsl:=
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova:=
+		sci-libs/stellarsolver
+	)
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib:= )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package indi Nova)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
+	fi
+	ecm_pkg_postinst
+}
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 92afd63c56d8..87fd07dd2d4a 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,5 +1,5 @@
 DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
 DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
 EBUILD wcslib-5.16.ebuild 1628 BLAKE2B a782f5f8bfcca41cc1e841debfad393473873cb8b450443d0013d2ed74ae5761b8b9a16a7c30e9d578730d5689b2f15233dc13dea8217312c5e09fbba8bef953 SHA512 d4eaad7b56a6982fcc7dc6e33da27b1a6f2216a4b0c7a85bd328951c95c464000d5464625c74dbdeb356802957741010834a992a8dc7d710c398fcc4b11e6dc5
-EBUILD wcslib-7.3.ebuild 1584 BLAKE2B f870dcdcd480abd7ee2bf47a2f04fd1cf9c848a01cce69bf52356b1239b35b3c9eb08b971bb9aff7290a40e075fc1cb8fc84b07b26fee1ea47beee34f4d87e94 SHA512 b1477e023fa28849633669a26de76586ca87c20f2bb60e62236d24a67497eeef09d98ebc80608d55ec23e98835ff3286612dc6748fd463b0634dfe1397a2ef21
+EBUILD wcslib-7.3.ebuild 1582 BLAKE2B 4a3cbfc272c544b90ef075596cf1b275e95e7a807aa746d1936a25cc70a8c79561fb274bf60192e3c4690f5bf1824afd9897795d132b45ad7a05e8e3ca761ad6 SHA512 d5f9b2f67b6c22b092f1096646489f873d86f016406eacab3af31a5ea010670687a49a9c95a00099b11bfe2e31aa04a69ee734404a27dc78d6f045fdbade681c
 MISC metadata.xml 1092 BLAKE2B 117c7758257296d911cadb26e55fc50ad6439c4ac69e82e31b4f41e36a3f862270bb88f87533e25dd5f33c9c07a3ce8164715ba460f91c025c12c7cb31a6b509 SHA512 1c6a19945464451f87c365743d4c2a7271feab32bbafe4147abeafc5948bbf207716f3c46a2dd59c9e9fa5fce5d2b4ab8bebc8a1181915f8f81a2b3a353022e3
diff --git a/sci-astronomy/wcslib/wcslib-7.3.ebuild b/sci-astronomy/wcslib/wcslib-7.3.ebuild
index 1a490f77abdc..9333d9e13c38 100644
--- a/sci-astronomy/wcslib/wcslib-7.3.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/7"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
diff --git a/sci-astronomy/weightwatcher/Manifest b/sci-astronomy/weightwatcher/Manifest
index c08b38123efa..df3d63c670d6 100644
--- a/sci-astronomy/weightwatcher/Manifest
+++ b/sci-astronomy/weightwatcher/Manifest
@@ -1,3 +1,5 @@
+AUX weightwatcher-1.12-AR.patch 206 BLAKE2B a2d02a51fa20765ec60b85a1c56533ac4cdb5d90afed30f8bb4a621aa044118ce082ae6d1a16166526ea8601ad36509f891bb8ae53bc0de7f6ff4917d03ac2c3 SHA512 ab78a5c3ae4cdbe3659dcf06c6c2f0615817eac44f08f5f01c54aa585cac629c3bef1c94ac49159df706bd5e8370f855a33c6b16724f2183d367623767e389a8
+AUX weightwatcher-1.12-fno-common.patch 4263 BLAKE2B f545cbe225b0b96b1a706b29342eeece1ffcb3e99371587e94734f44a9fbb310d97b10916f996d8787bdcf51d00f5da42efcdebbc8cdf973115dff60afb939fe SHA512 018f2d646585982cdd7c2f65d9a7142e592d92090e807ec503c4715437340dbb01c42f61e12b66c4d4444a514325243f056236cd061ee12a60a9a741f5eea87e
 DIST weightwatcher-1.12.tar.gz 460583 BLAKE2B 6ea09dcb8ba527cdf40dc94a7ed7b11357ec438611cd0d30d99e209bd4d976454d064be77c98ec97d1c8946bfd987fdd2b34211e9b944c3ed293dd2e5c1a0fbf SHA512 392ca6442de96e6c35447b7b34c67b22e7793831337aaf0f06e45d40e63f8c5e9605649fe39a67a5baf9eadcb79fa9f5d998fcb9504f85606f75071d672b0ada
-EBUILD weightwatcher-1.12.ebuild 485 BLAKE2B 8d9f04061e97c08bc2171ad39ca51217d7a376e314c355049938e67cd94f3e100dbc4cca30914c51b7fb71867de750c3110751e5be45f15bfce2e7f23a91d4d6 SHA512 66844ff18af475cb91a152a701b43a445c9d31c7f921a23cbb50fb5476a4409337cb31509e814bb581eb49968fc7804426915af5579765f704b23f6a9553d6cf
+EBUILD weightwatcher-1.12.ebuild 592 BLAKE2B 2d59c39979cb4ac0cffb4864e86885ddd31e3c6eca0c41e34cd0824bc070a386c60626057cbb47afdf75525f0f5acead517764031d7ae7d2c1e5b6b09f08d2d4 SHA512 1e00a4cb90c30a7839f2bd5dfaf670e31d555035a77b7621236ad352c05b72e9de62148031ddb3132099c5df41726c6989f394418c0a6d2d57250239a0ae673f
 MISC metadata.xml 586 BLAKE2B dd2a604c0b5315f0bf0efaec55818d19838ef9038b7e31d426db376877f884c799f110af45707c0e8f757990ce992418685c62d09ba6fea39277fb51f2a8dbc2 SHA512 68079ef915af3e2a28aeedac587ec907a2bc73568c16ecb914553ad82bd0f54466c6989296686799cf06017d1c1d9b8567e5bfede275339ee663913d7aa8688a
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 000000000000..6c5b72ffc74c
--- /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 000000000000..a9071da81207
--- /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 c423074420aa..2aa44a1044b1 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