gentoo resync : 10.09.2021

3 files changed, 48 insertions, 1 deletions

diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index aee2c1cf5f81..f73f00dfd384 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,7 +1,8 @@
+AUX netcdf-cxx-4.3.1-slibtool.patch 1500 BLAKE2B 6cd24e0a48c27c4c5a474acb671f98c0e4357f7dc548b03939aec95fa1cfba997b3a933524ec75939c965bc62649f10866ac100993f86f39158a4868632135a8 SHA512 c26b4dd6bb7f4d8365fbe3f1bd0940443e2b10b13c64e70cb3960e092527662c8288f4122e268b26aee36169e8e53095b7b0bd89bf21e882006db545df13dd93
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
 DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 EBUILD netcdf-cxx-4.2-r301.ebuild 601 BLAKE2B 1f34dc4d3e47669081a647df6da7474f5e1f37d3a67287ddf9470b6b2b729588b4dcb4acd753b0a1750cf69f1283b8d774a553e029c429a36576a42280b7a6bc SHA512 16973d6fab5e25df249f6b737e10834acd1424d2c197bd0c96deb56f388d015e8545f77c3f273c9c076a74137a2b6cfad3ab0cafc0f8052213a2347ce0d15805
 EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
-EBUILD netcdf-cxx-4.3.1.ebuild 707 BLAKE2B 148dc629c11968093a5eb2c031a799a6d3fa9a1280dc876a8540559fdd3e6d6837e44e24caa1f9267662e7a2641ec36e156d3197a4b5d276b89a3176a2d4e34f SHA512 99857c323634f08beec46c551d9cda5f05f2e3bf7dec56745e1cc911c21374598e179ddb16ea2b98dbd7b277499163cd5f00cfdc10b2d3051c9b784c4cadbcbf
+EBUILD netcdf-cxx-4.3.1.ebuild 755 BLAKE2B fb497c0ffc15f795d2685819b5f6b93c1098502070e483d6de3482497ed4cd66275f7de323a8ec7a5a2e3cb81b44c24e06e327cfc4505ebe501dbecd4797bb66 SHA512 551957e18d605656d4e00cd31a7ec8437572c7041726340667d23981a60f4bce0031d9674e8dd5a848584916be0ff7ef44e15ff7d508043295943d995a235436
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
new file mode 100644
index 000000000000..72db4dbd2c76
--- /dev/null
+++ b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
@@ -0,0 +1,42 @@
+https://github.com/Unidata/netcdf-cxx4/pull/103
+https://bugs.gentoo.org/778200
+
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:24:57 -0700
+Subject: [PATCH 1/2] cxx4: Move -lnetcdf to LIBADD so its used.
+
+--- a/cxx4/Makefile.am
++++ b/cxx4/Makefile.am
+@@ -3,15 +3,13 @@
+ 
+ # This file builds the new C++-4 interface.
+ 
+-# Point pre-preprocessor to netcdf-4 directory (libsrc4).
+-LDADD = $(top_builddir)/cxx4/libnetcdf_c++4.la  -lnetcdf
+-
+ # This is our output library.
+ lib_LTLIBRARIES = libnetcdf_c++4.la
+ 
+ # For rules updating the version info, see
+ # http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html
+ libnetcdf_c__4_la_LDFLAGS = -version-info 2:0:1 -no-undefined
++libnetcdf_c__4_la_LIBADD = -lnetcdf
+ 
+ # These headers will be installed in the users header directory.
+ include_HEADERS = netcdf ncAtt.h ncCheck.h ncDim.h ncException.h	\
+
+From a6dd5eb862d9a845b8458591b957b07c527e0d20 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:25:33 -0700
+Subject: [PATCH 2/2] plugins: Add a missing -lhdf5 linker flag.
+
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -20,6 +20,7 @@ lib_LTLIBRARIES = libh5bzip2.la
+ 
+ libh5bzip2_la_SOURCES = ${HDF5PLUGINSRC}
+ libh5bzip2_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined
++libh5bzip2_la_LIBADD = -lhdf5
+ 
+ libmisc_la_SOURCES = H5Zmisc.c H5Zutil.c h5misc.h
+ libmisc_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined -rpath ${abs_builddir}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 31c7a79c7e93..11abdd911ef6 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 src_configure() {
 	econf --disable-static
 }