gentoo resync : 22.01.2021

3 files changed, 0 insertions, 189 deletions

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 047314d24a2f..c5f2a49289de 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,11 +1,8 @@
 AUX hdf-4.2.11-enable-fortran-shared.patch 1287 BLAKE2B 4b1b7aab9a2eb958684418a01067f37b46c38ad1f8c983caace0f01b29a26d1f0c787cfb80045f228a91cb962dd997995e6e5ada1df28e6e1d0bbc70d332265c SHA512 787260127abff6695e5cddbbd75290c2349ae150c01dd1c74e83539e78d503bbcb017ea8aba8f808d846e7e291e4cb13ef69d4186ff1e38780c75e0046ca6734
-AUX hdf-4.2.11-fix-examples-dir.patch 5966 BLAKE2B 8ff35e5db544e73e85629f555d6dd7b22ae902d16c4fa2da5e9c29694196abc9fc65c591fa5898f324ad36a73cc39b2b3785ae1936ae101da3cab4a2eb6d7f5c SHA512 f33b6e2f5de26687accba8b6ff7c1d50b96f9ad40b84771ea8a361692da88d2f376331cb8a80dc662e3213d6ddc7707ca5fcbfcaf7c1ef7224a534c0a969fabb
 AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24cf1f428d5d130f9aebfc261e6108d19cbd7846fc2d90820c993d03fab5c7943b032afb3c8d0b2053ef1665a94f6e38403c60f SHA512 44342b4e7680a002a3dd9ae2a56dcb6689ee57824476436dc5ef5ff1884174e9de6c98972fccc88296f376a354f92e049d64c493df81da2d08ace6271cd2292a
 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.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.11.ebuild 1639 BLAKE2B e665ee1ddd8ed979cc7c86712289b610fed0ae71064dacef3f1d476ea3affa81783b49fcfe9f15de35ff94b37c60687c542ba824ce2f9663aed81d0b4030d912 SHA512 ccfde9e848bf91258c40853dc2161c7c80b65dd3cb07ff3928e8a465de01a2e3ae6ae1160d24f2afd177a87c86f3f814a6abf31c2d029d4231e56788a3292e04
 EBUILD hdf-4.2.13-r1.ebuild 1825 BLAKE2B d9a3ab5d47884442462115561ab2871ee537ec1ae8cc7f1babd4fb9773218bd41dcfbac49bd3bdf958df50e4fe2bad6e562eaad049d0062d6a6f4395bcc5bf6e SHA512 8f3b3373867dc97da0a1422de930b9b6ea709a830e69bb97a1be1c7294b48501222d6518d448a4f92254ea1c77b849da7ea1d6dbae739dee78a4065f5674bf3b
 EBUILD hdf-4.2.13.ebuild 1711 BLAKE2B a35ac70c77523f3bd60aedf15d4bcdf05a2d2b7d061d0ec4553a1b761566e6388f2b9d141f53bcb5bef44fb34d0cfb189031cde7bb6baca440089a251d3da6c9 SHA512 332a2a73a35a3970c18a43b1fbe139f94c8a6f0b84a37249c1a1d7b2a8fd010454bd22e64e4284d22c8fed314e5067ede2dfe25532f691a640f31ca1d4b63af9
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
deleted file mode 100644
index f6f15545d66b..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am hdf-4.2.11/hdf/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/examples/Makefile.am	2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/examples/Makefile.am	2016-03-16 22:16:35.836304451 +0000
-@@ -46,8 +46,8 @@
- INSTALL_TOP_FILES = README
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/c
--EXAMPLETOPDIR=$(prefix)/examples
-+EXAMPLEDIR=$(docdir)/examples/c
-+EXAMPLETOPDIR=$(docdir)/examples
- 
- # How to build C programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am hdf-4.2.11/hdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am	2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/fortran/examples/Makefile.am	2016-03-16 22:17:58.775261767 +0000
-@@ -41,7 +41,7 @@
- INSTALL_SCRIPT_FILES = run-fortran-ex.sh
- 
- # Where to install Fortran example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -Nur hdf-4.2.11.orig/mfhdf/examples/Makefile.am hdf-4.2.11/mfhdf/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/examples/Makefile.am	2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/examples/Makefile.am	2016-03-16 22:18:38.304764814 +0000
-@@ -23,7 +23,7 @@
- 	SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c        \
- 	SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
- 
--EXAMPLEDIR=$(prefix)/examples/c
-+EXAMPLEDIR=$(docdir)/examples/c
- 
- # How to build programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am hdf-4.2.11/mfhdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am	2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/fortran/examples/Makefile.am	2016-03-16 22:18:15.075056851 +0000
-@@ -24,7 +24,7 @@
- 	SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
---- hdf-4.2.11/config/examples.am.destdir	2015-02-09 09:43:05.000000000 -0700
-+++ hdf-4.2.11/config/examples.am	2015-02-13 13:24:09.008230956 -0700
-@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
- CLEANFILES=$(EXAMPLE_PROG)
- 
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- 	mkdir -p $@
- 
- # Install and uninstall rules.  We install the source files, not the
-@@ -54,42 +54,42 @@ install-data-local:
- uninstall-local:
- 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
- 
--install-examples: $(EXAMPLEDIR) 
-+install-examples: $(DESTDIR)$(EXAMPLEDIR) 
- 	@for f in X $(INSTALL_FILES); do                                     \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
--	    chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);    \
-+	    chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f;                                     \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_SCRIPT_FILES); do                              \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);    \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_TOP_FILES); do                                 \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
--	    chmod a-x $(EXAMPLETOPDIR)/$$f;                                  \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+	    chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f;                                  \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                          \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- 	  fi;                                                                \
- 	done
- 
- uninstall-examples:
--	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then           \
--	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
-+	@if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then           \
-+	  set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
- 	fi
--	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then    \
--	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);       \
-+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then    \
-+	  set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);       \
- 	fi
--	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
--	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then    \
-+	  set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
- 	fi
--	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
--	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then    \
-+	  set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
- 	fi
- 
- installcheck-local:
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
deleted file mode 100644
index e898f4d07374..000000000000
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ /dev/null
@@ -1,66 +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
-	"${FILESDIR}"/${PN}-4.2.11-fix-examples-dir.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
-	use examples || rm -rf share/doc/${PF}/examples
-	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
-}