gentoo resync : 05.03.2021

7 files changed, 26 insertions, 18 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 913c25e0e047..d1152ba3a96d 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
index fc9de48c89ca..100683129f78 100644
--- a/sci-astronomy/predict/Manifest
+++ b/sci-astronomy/predict/Manifest
@@ -2,5 +2,5 @@ AUX predict-2.2.3-earthtrack.patch 1175 BLAKE2B 17e1327695b12321abce6cb01e821141
 AUX predict-update 4039 BLAKE2B 856aea796dcd612d17cdcc8d9aa7015e59faaa42a66caf42bd01c3e51c4193119208eb2c9015d215a014e2c08511c6ebbd13b78d4a4a0f86b7b133e4363d0ed2 SHA512 8bcc89babe25f44ca985776b994265a12be8e3d6390e4301594f7a8d1402d7d42aa66f6ae1ab6f51c2d8d910d9f012920382928c0238fce4e1707cb8843a739a
 DIST predict_2.2.3-3.1.diff.gz 78624 BLAKE2B c80ffcf2b624a36e919d0f659c4cb46dbb4d00c83dd7c0e900d052a7258be92a4435a8de7ff319d16169373eab1061bed61a2311c5344eb5fc2f43183c0b8b46 SHA512 9fe2e3ffd931be7ab85f10db4cd35a2091a459c3fd0c48e9ecf8a4482c20400c267b38d31f72d28270d50b7305bc49418fefe35ff013ac9be1627d853205bd5f
 DIST predict_2.2.3.orig.tar.gz 1444530 BLAKE2B 0bcca42aa0b7294d5276d5f9db2e321b1d47afdcb5194eeeb90d6912bd6f38c02a21036638febc45a72e304b9ae4737840f6ee3f4550eccf557e830272ef3956 SHA512 260f7f4dbc72cca4b0b5f7bc9dcf612b8a7e3ef12ab6f34afa3c06b1ac24427435af1c4bae9d39e7cbcdff6cccad72e3235dd191605464642f014207651d8c11
-EBUILD predict-2.2.3-r2.ebuild 5683 BLAKE2B 8bcff5670e63eff9873df322793a6dd2ac47d9b4ffd50c4670ba296eda5124b68adc538e9bb8abeda3fd65306228edafaa390fa3885a35c363bff174481495d0 SHA512 e065d462ab30032f694861906726007f50fc1ed40a602c493aacbac1c35b5f7b0920a572cc99352a0db31831403743b4b430b4a4cbfc71d05d520f12605fbf39
+EBUILD predict-2.2.3-r2.ebuild 5722 BLAKE2B 6f36c4c25a2f5ec74c4e667a170430faa2c994fd30c3662135ed1a7f38978caaac858fc1718ff13d98aedf074ec8650544adb47d549ef7201a8589d2262c45c6 SHA512 40150061ddae17c0d08f0ee61ed18489574fad5dd16dc1fbb224e5a31466b5d81596390a87643c8921eb67cfa0786345f2052420aa8394813e88395dcb3d642e
 MISC metadata.xml 836 BLAKE2B 2e0a9b729afaa130e43c2f0375c7bef313cf061b454a1d8f8a1acb3662b9ed364f0af9ff81b0f96400c77ec21042af1e7d745385f0317355f3dd1ac4894fe033 SHA512 7e67a924a0b385cb051848bd1dd73d6a93ae60d13a10db785e96ead08df289137f06c67f17d519055b85aa228c1eca79db6da97494a532759c7c06c95e9c51d8
diff --git a/sci-astronomy/predict/predict-2.2.3-r2.ebuild b/sci-astronomy/predict/predict-2.2.3-r2.ebuild
index df1044cfeb9e..a56e5e83ba46 100644
--- a/sci-astronomy/predict/predict-2.2.3-r2.ebuild
+++ b/sci-astronomy/predict/predict-2.2.3-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-DEB_P=${PN}_${PV}
+DEB_P="${PN}_${PV}"
 DEB_PR=3.1
 
 DESCRIPTION="Satellite tracking and orbital prediction"
@@ -18,14 +18,15 @@ SLOT="0"
 IUSE="doc gtk nls xforms xplanet"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="
+	sys-libs/ncurses:0=
 	gtk? ( x11-libs/gtk+:2 )
 	xforms? ( x11-libs/xforms )
 	xplanet? ( x11-misc/xplanet[truetype] )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/"${P}"-earthtrack.patch
+	"${FILESDIR}"/${P}-earthtrack.patch
 	"${WORKDIR}"/${DEB_P}-${DEB_PR}.diff
 )
 
@@ -74,6 +75,7 @@ AC_SEARCH_LIBS([dlclose], [dl])' \
 }
 
 src_configure() {
+	append-cflags -fcommon
 	if use gtk; then
 		cd "${S}"/clients/gsat-* || die
 		econf $(use_enable nls)
diff --git a/sci-astronomy/psfex/Manifest b/sci-astronomy/psfex/Manifest
index 7a9d0e2d6950..ce834f7ef91f 100644
--- a/sci-astronomy/psfex/Manifest
+++ b/sci-astronomy/psfex/Manifest
@@ -2,5 +2,5 @@ AUX psfex-3.17.1-have-mmap.patch 1406 BLAKE2B 496751b652b4d9c4224465a46011026199
 AUX psfex-3.17.1-plplot510.patch 5697 BLAKE2B 4d83b476230f88ee03f6635032fda031ae4daa64df368c0876d48f224c8a44c82e977b3026b16189eb327a0471b64660f95f0ac93e37bc5b8b1b1b4355a7b8b6 SHA512 269457b0592c6458f36c459ca3721df529d8f9ff06e0ed651d4151224bba537e4663a0eb2afb3c55e6e921c56c643fa77f9cb0b39528ae3c09894cc944446328
 AUX psfex-3.17.1-sigbus.patch 736 BLAKE2B 4c9dd4e42dce495c7edd9f774d9d9868735f71d8947d998ea7815363f661f428fb9725b56a333aae644c69d451c50dc8dce1c1ce421725cf819e97e7cd6a174d SHA512 bca9ad7a758294812761b9f860cc40cd931a5753f248a4682858e9fd1b917a485d5e0b891e17b90c96b54d0e7f05d1aa2e2e7e6143fdc52ec57d4a609c9f4df6
 DIST psfex-3.17.1.tar.gz 2366370 BLAKE2B e73ddb526b93b60baceb9edf0e1a88dc335e55490f43d3e148cf6f0eb25ae192b54abd207fab96534cf4d596c340f824d8d8afdbc7530c7037132383f1f3093e SHA512 eb562372dd75593a111c23698b0c00ce050547051803a741ac771ca346d13a0de1e478b055581619a9fa2bf6fa374915ca685cfcf1c4162271b6aa44303e6e58
-EBUILD psfex-3.17.1.ebuild 1612 BLAKE2B 5d362f782c52fc93b78c01044043d19e2688c0340be0b49305e92fa13a85746f9b4a57b2605cee22016098c618bda72be558e5ec1e23d46fc274bdfca7532926 SHA512 5bc8d5c1f86fa77af30688300d622109e9585c0d1b87f6b896cc472f766f5b7e8c2065f38b261a7c1447739d0196b1fbdae342d7c9c5bfa675c4899b1a8c711c
+EBUILD psfex-3.17.1.ebuild 1682 BLAKE2B 5ebf587bf0a350597861d5679cae2fad51af8cc659f56c8b66b5a6e232271f912a2479e70567866657f66421078ebf6b2e766647ef165f6c39fd08944d015844 SHA512 008846bb111ea2af7ec570d3956d5d627f10380333d53f6d88ef3c053fa7b2ae1e8a38f7d397171a0e4cbf1d2e6083289dc9d71e4af3c0ca58c8b6d2925fd6c3
 MISC metadata.xml 720 BLAKE2B 1e96f271388a8189f8a6bbfb9e3a2d847eafc95cb2abc456e9dd429f6294545995c692c391b60cceee9bdbdd74a64f654028f523b39504c0381b2f5925954340 SHA512 7cc57534487d05bed6729a0c2462fb9ff14402145de76071af155b9451ead40cd276cb5b682fa542085066b35eed6dfefa0e73f9a20a788a5f636f38581efa9b
diff --git a/sci-astronomy/psfex/psfex-3.17.1.ebuild b/sci-astronomy/psfex/psfex-3.17.1.ebuild
index a6635393b98b..d5dbf1306d4d 100644
--- a/sci-astronomy/psfex/psfex-3.17.1.ebuild
+++ b/sci-astronomy/psfex/psfex-3.17.1.ebuild
@@ -1,9 +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
+inherit autotools flag-o-matic
 
 DESCRIPTION="Extracts models of the Point Spread Function from FITS images"
 HOMEPAGE="http://www.astromatic.net/software/psfex"
@@ -14,12 +14,12 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="doc threads plplot"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	sci-libs/atlas:0[lapack,threads=]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-have-mmap.patch"
@@ -29,13 +29,16 @@ PATCHES=(
 
 src_prepare() {
 	default
-	local mycblas=atlcblas  myclapack=atlclapack
+
+	local mycblas=atlcblas myclapack=atlclapack
+
 	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
+		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
 			mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] &&
+		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] &&
 		myclapack=ptclapack
 	fi
+
 	# fix the configure and not the acx_atlas.m4. the eautoreconf will
 	# produce a configure giving  a wrong install Makefile target (to fix)
 	sed -e "s/-lcblas/-l${mycblas}/g" \
@@ -51,6 +54,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #724588
+	append-cflags "-fcommon"
+
 	econf \
 		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
 		$(use_enable plplot) \
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index f06faa10d383..42f511058a5f 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -16,6 +16,6 @@ DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e16
 DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
 DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
-EBUILD stellarium-0.20.3.ebuild 3943 BLAKE2B 855f8af94b2ebd1f79a9cfd430c2e52ac92d24157006f1efccd62d48b5c5bf235a8f76f69c8f97454d2c642f6bc2c9bb5fd50509e2ad831dbb64798b97b470ad SHA512 559fda758e0af0abbdf015b2a7ed1aa2e8b260723da6fa7d2ba76f92e30d784dd815140ea9654255c1be2f15bc03a9330c28b3daac3e112372a3880beff65b15
+EBUILD stellarium-0.20.3.ebuild 3942 BLAKE2B a6da18f11a16ce85240c42823127b582323db29ab9b0edd748d776a4d3c6e67e99ee3fef684072d869fad849de50446ebb1fceff9f553f83afba6913ffca7c98 SHA512 f2fd312927023ec1ed750d8f422f3d3ea3a8461d3e404fd8d2a3d0e9c35a54572bc7249f3cf8c25a745bb80f76e27670e89a43ea444a5cefead970d7d170f633
 EBUILD stellarium-0.20.4.ebuild 3984 BLAKE2B ed4cb472ad2cadc3fb2e0827d80637f4b62f7bd5b43e58cb3a1ce32cee253f7678fea4abb5c35a229071fc04682bc86f0418e154b6c9a0447552b3ed9e31f619 SHA512 4a70bb2d0653bd9f57a3db840ce8128d6382994acd79f6050707f5ca991c4f11fb516887b9199ffe5b1ea25c51940ec7316d7ea0e37a5ad77d556156f1a9fe3b
 MISC metadata.xml 1166 BLAKE2B ae9afc6a617426c07b8746859f4e1ed0e7ab61256cb82f754f8fb0f7d9e24709b2f9edf9a4f4fef1f8d0d6b46eaee2ef8af3641b81abacd8391cf41fa0624e79 SHA512 dc95989f85aaaf8c08a86b0dbaa2a57d69226dfae7e4317f8c7cc5a3dd8d4a0303a9e3111d29b6a18242f3a96e17d4e4f01fd85c7e4d7a0587495d775d537781
diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
index d3e711a5a4b2..1bb7f736fea2 100644
--- a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.20.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
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="debug deep-sky doc gps media nls stars telescope test"
 
 # Python interpreter is used while building RemoteControl plugin