gentoo resync : 28.04.2018

4 files changed, 117 insertions, 0 deletions

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index c182acfc6acd..1cd4b1f02045 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -2,6 +2,8 @@ AUX 4.2.7_p1-autotools.patch 3908 BLAKE2B 83041007560940adbce1bc6fc3c0cdb66d9b3e
 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
 AUX hdf-4.2.9-autotools.patch 3486 BLAKE2B 75786eb25bc11bb53cded2ed6704411eec129dcc2e4fbe43f7b48340a8ff9721d3405e931498085ceeec5eba8fb36c9a7cbf2e1fb05ca89a2d0e5fff67496272 SHA512 c34fafadc39e43169d353bf6d5a01b814ae5d963da2cdf3b140e83dedae84b424dcfcd770aed3512e4ae4f3f358147cf01ec9a72be7e6db5d41c39443d6d44c7
 AUX hdf-ppc.patch 10374 BLAKE2B db28f0a201e4ade1cf126328522443acc99cc1951c9ab538ef137f42a84b6a38e08b9484337fef218a72675fd6ae5b26ddd340540fc3141e89b6be3c4848d41c SHA512 ac88c595e369709dc907b5f009429654c59ae1ac31869aace2656511687d0a7093d41af218768cc825181f623d0018991d1e49e0c48329766c01f608873d2ddb
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
@@ -9,6 +11,7 @@ DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b42
 DIST hdf-4.2.8.tar.bz2 3027253 BLAKE2B b1291fce4b2f47a4b2f1d725cfc5314c4e451d2dd4ede242ef64a11490884ff991b800b06b7aabf574659117c6abde5cd26236d23d8f38e003c7df9271248d90 SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 DIST hdf-4.2.9.tar.bz2 3126686 BLAKE2B 491fdad375bef944ed9f7040faba0e811b11019e1f51c5c3f874f29be07b945eb68af31cfce56db5e1f03f3bbd9e85320bed6e5f7f2b725676ead50dac022986 SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
 EBUILD hdf-4.2.11.ebuild 1598 BLAKE2B 6cc328bba07d7f5fd96dfc11576d8f89d17b8e4889d74210ef2ed5bfa5faf72f3200d74e8cfd8856c0658f9376139fde9261b03ffbdc51549fcc3d7113e4171d SHA512 e873ec4aec9c1890b1a658aae3e07c6acbd304b6f4e1e90aee2930222518eccc9539dd9a4c0182f4fb352ec5e693cae2f6897a0606c56ab8055f52422e73c488
+EBUILD hdf-4.2.13-r1.ebuild 1787 BLAKE2B 3b7caf81a92ff196bb1cd61295d73a972a22e5e82dc842a39ada96a25fb8ca0c7ba17c0e99138612f406bc86081ee24d5625c9da4f68b9a0a6a38b6df0d3d04f SHA512 71b32ef907661eda8d4279f579cdabe21d7da36ff2820383749c6052537097b9c0ca48ab94f0f03392fa60e8dccc6b32c88ca54d7a9eb6636e34fddbc0485357
 EBUILD hdf-4.2.13.ebuild 1670 BLAKE2B b0af1304dc0a3ea13dbac2094322e96cc0cf87dcaf2ac0e1700fa4dfb514d8e62869fd47b92c323d07736217498fd8ee74604563eef52f975d4f8858365e6d58 SHA512 1d86aa88ac7fd4f9b8037d3dc5a0c0c1f3b07bf85af3508bc6bd0d29608fe0f37a52cc99001c634ac4632f3cfe1750286ac95adfdaa6d827167ed3884d573aa7
 EBUILD hdf-4.2.8.ebuild 1333 BLAKE2B dd4a11a50035b4279c5460f8db46988a9b3786b9bd9bd24ff7aa806dcddf2a9baacc95a37f7a80a02b4e5fd0f84876d166c52aa98f6ecfb739f5a89432910b17 SHA512 87e14301b2f8ffed92013aafc9dce2ebd1ab127c7bbf1bfa2ed73de9e44a57130fe18d3db1dc2b23de03d73029aee114a521278da5d9e07853f6a2375224c74f
 EBUILD hdf-4.2.9.ebuild 1327 BLAKE2B 8d7d692ce5370dc405cbd3a81afa564b5ff59fdcdd21a6d9af44b468c72df2fd4672579ee0fd9e27521db714ecc958b28e47accee3b3c7366c56ce4bfddb12b0 SHA512 17b9ffe9ce05679f64f8bf87ad0ef69d45e6a07fee2745c9378e73d6538e00cd82e08395b272b98cf4933baa6e9ab8bf1d240b052dc991a4f5f8b2d74b3f5462
diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
new file mode 100644
index 000000000000..a4514ab267ec
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
@@ -0,0 +1,13 @@
+Index: hdf-4.2.13/configure.ac
+===================================================================
+--- hdf-4.2.13.orig/configure.ac
++++ hdf-4.2.13/configure.ac
+@@ -676,7 +676,7 @@ case "$host" in
+   *) ;;
+ esac
+ 
+-if test "X$BUILD_XDR" != "Xyes"; then
++if test "X$BUILD_XDR" = "Xyes"; then
+     AC_TRY_LINK([
+     #include <rpc/types.h>
+     #include <rpc/xdr.h>], [xdr_int],
diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
new file mode 100644
index 000000000000..963388f66982
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
@@ -0,0 +1,29 @@
+Index: hdf-4.2.13/configure.ac
+===================================================================
+--- hdf-4.2.13.orig/configure.ac
++++ hdf-4.2.13/configure.ac
+@@ -673,6 +673,9 @@ case "$host" in
+   *-pc-cygwin*)
+     LIBS="$LIBS -ltirpc"
+     CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
++  *-pc-linux*)
++    LIBS="$LIBS -ltirpc"
++    CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
+   *) ;;
+ esac
+ 
+@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then
+       HAVE_RPC="yes"
+       AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC])
+       AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
++      if test -z "$HAVE_RPC"; then
++        AC_MSG_ERROR([couldn't find tirpc library])
++      fi
++      ;;
++     *-pc-linux*)
++      HAVE_RPC="yes"
++      AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC])
++      AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
+       if test -z "$HAVE_RPC"; then
+         AC_MSG_ERROR([couldn't find tirpc library])
+       fi
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
new file mode 100644
index 000000000000..331ad8938e5a
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+
+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 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+	net-libs/libtirpc
+	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.13-fix-xdr-configure.patch
+	"${FILESDIR}"/${PN}-4.2.13-linux-tirpc.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
+}