gentoo resync : 04.01.2022

3 files changed, 81 insertions, 0 deletions

diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index 390942d546a4..baf3be9a2a63 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -4,6 +4,9 @@ AUX libdap-3.18.1-disable-dmr-tests.patch 1241 BLAKE2B fd7d07f506bb2832f78dce512
 AUX libdap-3.18.1-disable-net-tests.patch 1281 BLAKE2B fd00fb1920a8440a633aa9595ddcf423b7883be26a9c0efc3ffb3fa8bef608fb68a641f1df7b449b1d786acb2cca815bfa6132361ddff88247319e0925ce99f2 SHA512 91db2d34693eed9a4e4c6f1d138520472c86290de131adaf47b609e3cc2ee7a6806eaf47d7d11a440034c226a18cb7ee1af5efadf08b2c3ba173792b6ee64813
 AUX libdap-3.18.1-fix-buildsystem.patch 621 BLAKE2B 09ec113a8860388d9d1150b7111352316b52d8307e29c3db2d6de00d2bc912d46d7c27f2e0f3429382691ff2d3696252c019554c28d8c92ea8f74db9c7877e5b SHA512 4aeb883dd338ed3c27ab2fe217d8419c8e4130485eec11f12b75dad6979034b4cbe251b4f81d21280a05257cd7bd5e56fdbb20b08f48ac0d48822024cf00d9bb
 AUX libdap-3.18.1-fix-c++14.patch 2287 BLAKE2B 2d6c036ab9ad4d611215de48b4288aa93868f3411d5637fcde7757ada661319472827bc4eea7084f925ecd9f9561d2156a4add8f5eb04693b4eb687f02efc398 SHA512 6bd2722f16cd3491922b43040148efb09dcf66f2403bcc8caae028d3497a5c864d6539b980c32cda01f35fffc2c724b68d20042f8d341f0a3a50c8fa78670535
+AUX libdap-3.20.9-disable-net-tests.patch 1279 BLAKE2B cc9e813074d590f7fe9c15f4854ad7d721694bff6cea0376e2b8f7c701ad05a7b602b86959b7d0b260df55bd6f7e8fd5424fc221a18535c2a6b3695c86c4305f SHA512 a2c7d1b1591c41dea792a3805208d39e850ce794d02717c327203b2d0a1856c28bb7f1a830c4b8c504c619b2a3557893fcc066a0327b375ea2330f115b2fe0b1
 DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38
+DIST libdap-3.20.9.tar.gz 2838651 BLAKE2B 84186a73455d8756d0dccaf11554861d48f55a358cc3f70d899d7f24b0b676b0bacdfff47b63c956619717c7fb7f7e3678669599724a2170221a4bc74d8388c2 SHA512 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c
 EBUILD libdap-3.18.1.ebuild 1180 BLAKE2B b12babd0caa23d50003305be2afce6a99180787e0d6ef7c50d4b9b6e6aef8a2a4b036c0867c788917a2993f6f5ac03b9a028c8e14787bbef3d5f78e5bd0239bc SHA512 4cd049a6acf16274e56b2f9177dc7dcd39bfe82be1e5cbea71a39a3a6f7b8775ec53c7713a9708e3dab726517d09b6eb57c78246f34825532aa3a1b782eed4c8
+EBUILD libdap-3.20.9.ebuild 960 BLAKE2B df8501307616383d0539f16db50d1ab5f482b06def2802579fd432165523c89502e5f8f04b5cbb5547131fdd8d373a0d9a0f7c3b5ad1dae5f4442ca00dae3a2e SHA512 4c47e6f3ea4a97a2c8911c4015cffddff916d017d2e746cf928f25eb7bd330cb35a88de449cd21cd8786e73716571c0b0ab03c3a4e92a10ed69c92d0045bdd0c
 MISC metadata.xml 773 BLAKE2B f1334411aab7288075c7683ec32c35ed82e5eafb48e87a0b1d320d3e29d514f20934ff65ab214add8f8fd9df7e2c54491f6804314f5d7abb06e855476f898662 SHA512 48fbdada76f39eaf72cf385d9f73f029ce166919e1d80a57ec98ddf257955faa6de18673b94388526a41f2f126c9a313d55f016fed63243848251fe0ead4c27c
diff --git a/sci-libs/libdap/files/libdap-3.20.9-disable-net-tests.patch b/sci-libs/libdap/files/libdap-3.20.9-disable-net-tests.patch
new file mode 100644
index 000000000000..9426a287b42e
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.20.9-disable-net-tests.patch
@@ -0,0 +1,26 @@
+https://src.fedoraproject.org/rpms/libdap/raw/rawhide/f/libdap-offline.patch
+https://bugs.gentoo.org/830221
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -120,7 +120,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
+ 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
+-	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+ 
+ # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
+ # Delete the scripts here and not using CLEANFILES because this target is
+--- a/unit-tests/Makefile.am
++++ b/unit-tests/Makefile.am
+@@ -78,9 +78,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+ if CPPUNIT
+ UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
+ 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+-	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
++	DDSTest	DDXParserTest  generalUtilTest parserUtilTest \
+ 	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
+-	HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
++	ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
+ 	Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \
+ 	D4BaseTypeFactoryTest BaseTypeFactoryTest
+ 
diff --git a/sci-libs/libdap/libdap-3.20.9.ebuild b/sci-libs/libdap/libdap-3.20.9.ebuild
new file mode 100644
index 000000000000..7e2276b04adb
--- /dev/null
+++ b/sci-libs/libdap/libdap-3.20.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2"
+HOMEPAGE="https://www.opendap.org"
+SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 URI )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/flex
+	test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20.9-disable-net-tests.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug 619144
+	append-cxxflags -std=c++14
+
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}