gentoo resync : 03.03.2021

3 files changed, 7 insertions, 74 deletions

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index c5f2a49289de..f81b97622a32 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -3,6 +3,5 @@ AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24c
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.13-r1.ebuild 1825 BLAKE2B d9a3ab5d47884442462115561ab2871ee537ec1ae8cc7f1babd4fb9773218bd41dcfbac49bd3bdf958df50e4fe2bad6e562eaad049d0062d6a6f4395bcc5bf6e SHA512 8f3b3373867dc97da0a1422de930b9b6ea709a830e69bb97a1be1c7294b48501222d6518d448a4f92254ea1c77b849da7ea1d6dbae739dee78a4065f5674bf3b
-EBUILD hdf-4.2.13.ebuild 1711 BLAKE2B a35ac70c77523f3bd60aedf15d4bcdf05a2d2b7d061d0ec4553a1b761566e6388f2b9d141f53bcb5bef44fb34d0cfb189031cde7bb6baca440089a251d3da6c9 SHA512 332a2a73a35a3970c18a43b1fbe139f94c8a6f0b84a37249c1a1d7b2a8fd010454bd22e64e4284d22c8fed314e5067ede2dfe25532f691a640f31ca1d4b63af9
+EBUILD hdf-4.2.13-r1.ebuild 1920 BLAKE2B 5122f7010fd75a545ef87057b72ca67911f01c67ead8911b643c76808bebc1051c96fe781eb37cc40fb31d066d0eda767c77d39ec5aee25aecb3653b155de300 SHA512 f809f598f273fded8a747d9d9da4955cb5221e6132f3666a8ad86b461fa69f3b7b9d25f11a6413c127156a7b478604abaf2c2d3e92fbbaf750f7c9804c1dfc58
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index ae60cc865d33..7937f8032bdf 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.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
@@ -41,10 +41,14 @@ src_prepare() {
 	default
 	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
 	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
 }
 
 src_configure() {
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+	# GCC 10 workaround
+	# bug #723014
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	econf \
 		--enable-shared \
 		--enable-production=gentoo \
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
deleted file mode 100644
index feefb99d01aa..000000000000
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0
-	szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
-	test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
-	"${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-production=gentoo \
-		--disable-netcdf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_with szip szlib) \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files --all
-	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-	cd "${ED}"usr
-	if use examples; then
-		mv  share/hdf4_examples share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r share/hdf4_examples || die
-	fi
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
-}