gentoo resync : 03.03.2021

11 files changed, 13 insertions, 153 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 18c7bccc7de5..2893033fc2e7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 7ed92156335a..98f4e7927eb4 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,9 +1,4 @@
-AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e
-AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1
-AUX gwyddion-2.55-xml.patch 603 BLAKE2B e50a97f2c39dbf83aa6dd6cdd9b3a3a1f3a4aa7101b41f57a79d09b2474a8ed9fbd7e1817fdfddc22b27ed11282397b0c118d7f7d610e89f599cc4022ce1065a SHA512 6f8943247493518f85159ce259305bf2e822ee16d5d334c342955b1fb183a491202c8db879b8cfd8f5d95a4ee2fb709ee1e0221c8fe10d2f11b6f7457051b6b5
 AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45b8adbc962c63b9664d02bdc2a3fca405b9d58fed7a18a53da89eb6577cba93e17dd713598897629a10eba0e2c2f4bd9 SHA512 4e3a4761d1858803a6b35bd66c0516fd4ac733be7337298bd56454bde9253685b3622ea47a8759a3f512fb6c13a95ae3efb834cc9d9160608f85c3c26fd1e7d0
-DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
-EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a
-EBUILD gwyddion-2.56.ebuild 1648 BLAKE2B 60ecf19f3ec568a6f0d5e7dc41f3e29f4f36fd02190f3d32ef898ddeb283b699d8a864cb67268fe5ab1b9b76f29d1f8e148a63c6b5e57a76fb94a0a3659bb85e SHA512 4557739fb1a01e6b7ffbcc194f422167dc2bb6b792a27b0c827209e313acf0cc61e5b985ff54dc2dcf11235578f8b5c29361266ba7da9ee6af2373713e341edf
+EBUILD gwyddion-2.56.ebuild 1646 BLAKE2B 56173da9c59cff136b908ae5a1eac7767199a73a3fa09c2b1a5480cc9d5d191ba7604e731a1b0c43b2f65f19a0580481efe91742cdb0581645c43215daf8768c SHA512 1205b0dc85fd5c418089555b3a31ab555576ff91fcddfe925595e29a2f31de2d529269aa7092eb80e9a0995e4a0627dc19edbc6de88e58b35ab1e209c1b8e6da
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
deleted file mode 100644
index 405a2552f08b..000000000000
--- a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac
---- gwyddion-2.55.orig/configure.ac	2019-11-04 10:25:16.000000000 +0100
-+++ gwyddion-2.55/configure.ac	2020-01-24 05:22:15.264763441 +0100
-@@ -634,21 +634,25 @@
- #############################################################################
- # OpenEXR
- # Optional.  Used for HDR greyscale OpenEXR pixmap import/export.
--enable_exr=$have_cxx
--PKG_CHECK_MODULES(EXR, [OpenEXR],
-+GWY_WITH([exr],,[build with OpenEXR support])
-+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then
-+  PKG_CHECK_MODULES(EXR, [OpenEXR],
-                   [AC_DEFINE(HAVE_EXR,1,
-                             [Define if we have the OpenEXR package.])],
-                   [enable_exr=no])
-+fi
- AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
- 
- #############################################################################
- # CFITSIO
- # Optional.  Used for FITS image import.
--enable_cfitsio=yes
--PKG_CHECK_MODULES(CFITSIO, [cfitsio],
-+GWY_WITH([cfitsio],,[build with cfitsio support])
-+if test "x$enable_cfitsio" != "xno"; then
-+  PKG_CHECK_MODULES(CFITSIO, [cfitsio],
-                   [AC_DEFINE(HAVE_CFITSIO,1,
-                             [Define if we have the cfitsio package.])],
-                   [enable_cfitsio=no])
-+fi
- AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
- 
- #############################################################################
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
deleted file mode 100644
index 536790c1ac46..000000000000
--- a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gwyddion/modules/file/ambprofile.c
-===================================================================
---- gwyddion/modules/file/ambprofile.c	(revision 22650)
-+++ gwyddion/modules/file/ambprofile.c	(revision 22651)
-@@ -32,8 +32,8 @@
-  *   <comment>Ambios XML profile data</comment>
-  *   <magic priority="80">
-  *     <match type="string" offset="0" value="&lt;?xml">
-- *       <match type="string" offset="40:120" value="<ProfilometerData>">
-- *          <match type="string" offset="60:140" value="<Header>"/>
-+ *       <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
-+ *          <match type="string" offset="60:140" value="&lt;Header&gt;"/>
-  *       </match>
-  *     </match>
-  *   </magic>
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
deleted file mode 100644
index 3cebcc684b50..000000000000
--- a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/data/gwyddion.xml b/data/gwyddion.xml
-index d26089f..acb7b90 100644
---- a/data/gwyddion.xml
-+++ b/data/gwyddion.xml
-@@ -55,8 +55,8 @@
-   <comment>Ambios XML profile data</comment>
-   <magic priority="80">
-     <match type="string" offset="0" value="&lt;?xml">
--      <match type="string" offset="40:120" value="<ProfilometerData>">
--         <match type="string" offset="60:140" value="<Header>"/>
-+      <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
-+         <match type="string" offset="60:140" value="&lt;Header&gt;"/>
-       </match>
-     </match>
-   </magic>
diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
deleted file mode 100644
index 335e80a5c600..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fits gnome nls openexr perl ruby sourceview xml X"
-
-RDEPEND="
-	>=dev-libs/glib-2.32
-	dev-libs/libzip
-	media-libs/libpng:0=
-	>=sci-libs/fftw-3.1:3.0=
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fits? ( sci-libs/cfitsio )
-	gnome? ( gnome-base/gconf:2 )
-	openexr? ( media-libs/openexr:= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.55-automagic.patch"
-	"${FILESDIR}/${PN}-2.55-mime.patch"
-	"${FILESDIR}/${PN}-2.55-xml.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--without-kde4-thumbnailer \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) \
-		--disable-pygwy \
-		$(use_with fits cfitsio) \
-		$(use_with perl) \
-		--without-python \
-		$(use_with ruby) \
-		--without-gl \
-		$(use_with openexr exr) \
-		$(use_with sourceview gtksourceview) \
-		$(use_with xml libxml2) \
-		$(use_with X x) \
-		--with-zip=libzip
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	xdg_pkg_postinst
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
index 85f881ab3d16..2a71870ce0e1 100644
--- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.56.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fits gnome hdf5 nls openexr perl ruby sourceview xml X"
 
 RDEPEND="
diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest
index 6ad8b75061bc..bd2cdf1e2090 100644
--- a/sci-visualization/xd3d/Manifest
+++ b/sci-visualization/xd3d/Manifest
@@ -3,5 +3,5 @@ AUX xd3d-8.3.1-gentoo.diff 1768 BLAKE2B a223a496ef534650094ff368e4d327b4a896a1c0
 AUX xd3d-8.3.1-parallel.patch 2194 BLAKE2B b4706b43ab85cd312a2ec6399eac155ac23a53f0f7863117df14101ab59cc6001a0e218ffbc0b1fc3a36f5701ddfae6515e1e5266c2d8ba5609fce30de8bc7ab SHA512 d7516dd4fad56d35a0a24c5efb08e67d7c68642b72b6a48355a7c2b595f00e4b0b398c8759552eabf64a1d69072c5062f657b463dc4a2c788cae08d5813e790e
 AUX xd3d-8.3.1-rotated.patch 241 BLAKE2B dbf15070238a3cd35c068ca2bc46a59ecc1cb3b60183a698992f72ad3b45dc2e044395238674a5caf249d9d9fe6755a743b7640f65e3bfe4fad753be86fcc2e7 SHA512 e5a1f0bc718543e577b1a4faea290f1dbb9e01f7341b1b81f8e90646156babdcd3a600fac9f195a29f97ad3052d432f2ea65d527a33f3e1685e914dc913630ec
 DIST xd3d-8.3.1.tar.gz 2188216 BLAKE2B 80db2b65e54dd0f0e7b0e1e6eec86d9d3756c60e0983e14b65d145876e3c6c5c06f050b2082d072a23fa7a4d250a2abc5f1c7564275ee14303719bb4f6cc8f36 SHA512 a02e1b53b1d393c8184866b0693394f596bb3c1eb5f49d00a41dd7bb972f08ba8d1621e7a1f197b015551d9483c9c76c07dac5e199961de775b9ff63c898c89e
-EBUILD xd3d-8.3.1-r1.ebuild 1131 BLAKE2B f59db10430da4c3d354f066a0b92d259326514a26fa45daa86da8b4549ac5e487e34faed9fdfcf3fdf8e9cc68ec7f108175731164b38f6703120ba64ef721d75 SHA512 c53c418bdfb07d9451b29cb1a337710eb871fdf3693d1a6979349c8e200078e86bae20c1d49f82f9518864f67c346d20263cab40b0714ca6104120bdef20d46c
+EBUILD xd3d-8.3.1-r1.ebuild 1236 BLAKE2B a2ca466cb3bebf7af6ae45eb03729077ddb9140cb9516d5d1ee436772ff2a594b44932871b0379590c49e26b81a0d7efb98134804b2ace36db97b5b13bf3cbdd SHA512 c19d1efe6e211bd8cc1fece0ea841bca7c9dbe17255c266e2faa2534f3f0222a90211d775b213b9bab51ab51cb16a1edfbbce62934993efbfeebef7e35ebebdd
 MISC metadata.xml 719 BLAKE2B 0f5d7942635c1b14e24e32da154d7b296edc12ed131ff5bc3f80b470aa89e1894ea1b2a658e65797f29639fffe5b838dff68afd9facd54cb13893d281a5ae062 SHA512 7c6d78a4d913f41c63885461bd1beba884e1911bc77ab957ce6eb08ad377efdf5434c6301d8bfd47c0f68d07d311fa9cff85b288b7513a652ea4600b57b4c642
diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
index b79e8599c1d3..d46bcf3fdc4d 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fortran-2 toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scientific visualization tool"
 HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
@@ -40,6 +40,10 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
+	# GCC 10 workaround
+	# bug #722426
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	./configure -arch=gentoo || die "configure failed."
 }
 
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index 2edae5f1e247..ac2c6bb571b7 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -1,4 +1,4 @@
 DIST xgraph-12.1.tar.gz 145278 BLAKE2B c7c35b8e6b729c0ee977b86a00ff3e27bab3dc51cd75a514cd3efa37c8d625106498428146b7e274bf06a1bf8ce1fd2a50a5bf8608cf0459eb3e3bd51ea39aa3 SHA512 67c1faea0f423717cf97c4613e7c288ad17e952f7f0c7cc555d3d3cffaaef890b3b8d77f9421ab5842f8c65dea3393820e296b38d7a3eae2a0b80eb0b8fc948c
 DIST xgraph_12.1-16.debian.tar.gz 23154 BLAKE2B 02e88cca274c3af0c98873f742b82e9e9dbce6622a37115eb2020800c85473011cb24adbd3bc507a14eaaa4a79ad3664a9ffd0f7fb5ea419f1941ee6da44fdc0 SHA512 6942d85d453a63191b11f6f52bee592c765023068d022e62b94b6fc6b0ed46ce57c9cc00bfcb53cd5f943997cef23724513c1433cdfbf11c7debac5760de1d26
-EBUILD xgraph-12.1-r4.ebuild 988 BLAKE2B 2e9c8640ce09441e20e2aa72f46bccca572cc9eeb659499f69302f38a556fc28ab34404e4c3edf360acf75b013c9b8d43e54518ec3e8671839a739670474be3c SHA512 ac7b07f87f689eacc452ddc9b3045b4ab01cae0bb58043274404a8b876f4232f384415d0a1b13ab0f19a883f2a0851cf61f036c22466219a86f01de08c246bf5
+EBUILD xgraph-12.1-r4.ebuild 992 BLAKE2B 1d24d7f7b9a23057275d64cc2e9488ffd8f48416faded6269e22cd17f0104687e2b660f0cfd3bf2bb9d0a6107ff43df34c2842565c5f5512ceead50e995b6968 SHA512 0369ad0f092168c29ae8f28923b31d60d237e012441f5c76f8d2ea276f069c646a833f82c7d02dabafee3bd59b584484212f38c25007a94951716491fd1f7bf7
 MISC metadata.xml 773 BLAKE2B fa1f9d1b5d08ba5e4967bcd25a45a0c3416da99f584b89a55af6681a671f2315818c8da793d3f0678adbeb84e02cdb045031db80cc943da6e28969cb69e328f0 SHA512 4ab2e3db785543deb8f2f541cb64055dab9caa058424e46987896b6100d03cd55a48bda31cfc261225f76374c618e16f19bbfa5526f195f4c0c9ca583830ab04
diff --git a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
index 61f36811879b..71f4647a38e7 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz
 
 LICENSE="xgraph"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
 RDEPEND="x11-libs/libSM
 	x11-libs/libX11"