From c9a62f92fd53c520cff4ca6607e707a11e2e761e Mon Sep 17 00:00:00 2001 From: Sébastien Fabbro Date: Wed, 16 Mar 2016 22:42:55 +0000 Subject: sci-libs/hdf: Version bump Package-Manager: portage-2.2.27 --- sci-libs/hdf/Manifest | 1 + .../files/hdf-4.2.11-enable-fortran-shared.patch | 35 ++++++ .../hdf/files/hdf-4.2.11-fix-examples-dir.patch | 120 +++++++++++++++++++++ .../hdf/files/hdf-4.2.11-fix-szip-detection.patch | 27 +++++ sci-libs/hdf/hdf-4.2.11.ebuild | 66 ++++++++++++ 5 files changed, 249 insertions(+) create mode 100644 sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch create mode 100644 sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch create mode 100644 sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch create mode 100644 sci-libs/hdf/hdf-4.2.11.ebuild (limited to 'sci-libs/hdf') diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest index f1ec6cf57c40..34e6461a5694 100644 --- a/sci-libs/hdf/Manifest +++ b/sci-libs/hdf/Manifest @@ -1,2 +1,3 @@ +DIST hdf-4.2.11.tar.bz2 3173535 SHA256 bb0e900b8cc6bc89a5730abc97e654e7705e8e1fbc4e0d4477f417822428d99b SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781 WHIRLPOOL 6168284c0f4cb272cfa14f12779ca2106d86d68d38d85f58ba73c137611acde6ed3d1c32bd5620496b20578de7decae6428654eb6a3afffbf7c11fff1ccebc20 DIST hdf-4.2.8.tar.bz2 3027253 SHA256 e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e WHIRLPOOL 89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299 DIST hdf-4.2.9.tar.bz2 3126686 SHA256 942a54bff4da8c0733c5626b5e11162deda1adeb65c384b141f0681c935ca98a SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390 WHIRLPOOL 0ed161fba7f862c1d93aebbcb6184c0b256ce71be12fa49598f9c8bf727ea1ef46c612c41908a49774b7982f5dfe577bcb8ada2c26bf2488627952040bdd9934 diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch new file mode 100644 index 000000000000..7d48a8a0ca97 --- /dev/null +++ b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch @@ -0,0 +1,35 @@ +--- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 ++++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000 +@@ -224,20 +224,6 @@ + ## Build static libraries by default. Furthermore, fortran shared libraries + ## are unsupported. Disallow a user from enabling both shared libraries and + ## fortran. +-if test "X${enable_shared}" != "Xyes"; then +- enable_shared="no" +-fi +- +-if test "X${enable_shared}" = "Xyes"; then +- if test "X${BUILD_FORTRAN}" = "Xyes"; then +- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) +- fi +-fi +- +-AC_PROG_INSTALL +-AC_PROG_LN_S +- +-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) + + AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], []) + +@@ -847,11 +833,6 @@ + ## ------------------------------------------------------------------------ + ## Check to see if libtool has enabled shared libraries. Set a conditional + ## as some Makefiles will build based on availability of shared libraries. +-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then +- enable_shared=yes +-else +- enable_shared=no +-fi + + ## ------------------------------------------------------------------------ + ## Specify shared library extension the host machine should recognize. 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 new file mode 100644 index 000000000000..f6f15545d66b --- /dev/null +++ b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch @@ -0,0 +1,120 @@ +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/files/hdf-4.2.11-fix-szip-detection.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch new file mode 100644 index 000000000000..4486eb959b82 --- /dev/null +++ b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch @@ -0,0 +1,27 @@ +--- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 ++++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000 +@@ -473,12 +473,14 @@ + yes) + HAVE_SZIP="yes" + AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP]) +- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then ++ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then + AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) + fi + + if test -z "$HAVE_SZIP"; then + AC_MSG_ERROR([couldn't find szlib library]) ++ else ++ USE_COMP_SZIP="yes" + fi + ;; + no) +@@ -525,7 +527,7 @@ + AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) + fi + +- if test -z "$HAVE_SZIP"; then ++ if test "x$HAVE_SZIP" != "xyes"; then + AC_MSG_ERROR([couldn't find szlib library]) + else + USE_COMP_SZIP="yes" diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild new file mode 100644 index 000000000000..d12e40d9b695 --- /dev/null +++ b/sci-libs/hdf/hdf-4.2.11.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs autotools flag-o-matic + +MYP=${P/_p/-patch} + +DESCRIPTION="General purpose library and format for storing scientific data" +HOMEPAGE="http://www.hdfgroup.org/hdf4.html" +SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2" + +SLOT="0" +LICENSE="NCSA-HDF" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="examples fortran szip static-libs 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 +} -- cgit v1.2.3-65-gdbad