From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C7D813835A for ; Sun, 17 Jan 2021 11:52:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFCF8E088D; Sun, 17 Jan 2021 11:52:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B4E7E088D for ; Sun, 17 Jan 2021 11:52:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2320F340FA5 for ; Sun, 17 Jan 2021 11:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 656364A8 for ; Sun, 17 Jan 2021 11:52:06 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1610884283.1da7f8cbf1a9b8d6a36886efab8e4bb6e779e1e9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/hdf/Manifest sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch sci-libs/hdf/hdf-4.2.11.ebuild X-VCS-Directories: sci-libs/hdf/files/ sci-libs/hdf/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1da7f8cbf1a9b8d6a36886efab8e4bb6e779e1e9 X-VCS-Branch: master Date: Sun, 17 Jan 2021 11:52:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6ced6c8a-7f4b-4ec1-9b09-f6fed4d085ef X-Archives-Hash: 0bdc9f0251c33c9dd70093e1ec8c023b commit: 1da7f8cbf1a9b8d6a36886efab8e4bb6e779e1e9 Author: Jakov Smolic sartura hr> AuthorDate: Sun Jan 17 11:51:23 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 17 11:51:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7f8cb sci-libs/hdf: Remove old Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> sci-libs/hdf/Manifest | 1 - .../hdf/files/hdf-4.2.11-fix-examples-dir.patch | 120 --------------------- sci-libs/hdf/hdf-4.2.11.ebuild | 66 ------------ 3 files changed, 187 deletions(-) diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest index 5fbf047ece6..e10b0af4e45 100644 --- a/sci-libs/hdf/Manifest +++ b/sci-libs/hdf/Manifest @@ -1,2 +1 @@ -DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657 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 f6f15545d66..00000000000 --- 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 e898f4d0737..00000000000 --- 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 -}