diff options
Diffstat (limited to 'sci-libs/libdap')
-rw-r--r-- | sci-libs/libdap/Manifest | 11 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch | 18 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch | 22 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch | 31 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch | 33 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch | 20 | ||||
-rw-r--r-- | sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch | 100 | ||||
-rw-r--r-- | sci-libs/libdap/libdap-3.18.1.ebuild | 51 | ||||
-rw-r--r-- | sci-libs/libdap/metadata.xml | 17 |
9 files changed, 303 insertions, 0 deletions
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest new file mode 100644 index 000000000000..60c54651513e --- /dev/null +++ b/sci-libs/libdap/Manifest @@ -0,0 +1,11 @@ +AUX libdap-3.18.1-disable-broken-tests.patch 719 SHA256 2348872654cb04c2fc551dc7ef04b4611dfd8c5c14e857f92db1cca2f26e66a5 SHA512 11237422b0d129aaa52dc3559e2ffe0d4bcc0562e0acd476290af7a4026a1c7272bc1e0a0ceddcb40250746c0c71e4c6d63a780c5c1635132faf0ee609e3b88c WHIRLPOOL aecd9d89d5a09eb773b930ae9bd5764c4815ab49dfc4cb30ead71e97542449a0fb309bd0bff2781850e4c69184b669ae836236126044f337bfd31982abeee155 +AUX libdap-3.18.1-disable-cache-test.patch 965 SHA256 84d49c91d366d1890fcb82d05e01c9a63a7a26177174944de270cbe11ad47dab SHA512 087dd231f92d4117cbf469077922975029576239e507ef2cd5ae9d5b1f8f38ab3c4a3f32c8e2781a5c299c5e0a29c77cfd7d67ea8bf141058839f2bb4299b187 WHIRLPOOL d89c0ca4c0ee27733eee5ca6241e0110b31cf2ce1223e4ccf20f7b2d3827398ee5ed5d6999c8106c14a4eadf523d4c1035b1fc6e6f9370aaca7713172368ebc1 +AUX libdap-3.18.1-disable-dmr-tests.patch 1241 SHA256 0f7d4f06ed70759fd0dd896b0ab9f5d7f07a100bf8ec75b0ad7aab4cc9064d11 SHA512 5becf972bed0d27b32a67127af5ca2567757c05e04ef13aa3d514212320c552ad91a7b11b5386b73211a72017712b10875931a764f88ba9fa4fba40da453340f WHIRLPOOL 3fb6ef17558f18295f9f9456d06480b32720ecda4b6862b31016a6aafbef5178a7c1c1601353d2b73cc8615c11df08fbe890c096e054e131c1b0510d40b467ee +AUX libdap-3.18.1-disable-net-tests.patch 1281 SHA256 0bcea9e0e9be748410fb1c124dc81748312335fabff5a83e1d0663f5b06ad636 SHA512 91db2d34693eed9a4e4c6f1d138520472c86290de131adaf47b609e3cc2ee7a6806eaf47d7d11a440034c226a18cb7ee1af5efadf08b2c3ba173792b6ee64813 WHIRLPOOL 42444e225361706305cbbf1f2ed0b2ddec4ab0dade49c4af278a3785c5c8da089864999607320f840a90e5cdac7c131f44fe1c805090149ad0e4735b3403b7a0 +AUX libdap-3.18.1-fix-buildsystem.patch 621 SHA256 cc6863ca60680cec4be0b5cf3cae496e457338e03897b5423d6c0bfb4695e80e SHA512 4aeb883dd338ed3c27ab2fe217d8419c8e4130485eec11f12b75dad6979034b4cbe251b4f81d21280a05257cd7bd5e56fdbb20b08f48ac0d48822024cf00d9bb WHIRLPOOL 03a5a5615794cdb7876d3fb62789cd29a96d256a9794fbfadcfffd177e28fdde15baefd1b37a8cb1d78bd84f9ad1fabe9c2fca7aa2994ab51fb2d5190e4d7c53 +AUX libdap-3.18.1-fix-c++14.patch 2287 SHA256 f3d16e7d0e9779078dee2291529ca4dfe6a04b6e6089cbfae2d8b3942079a885 SHA512 6bd2722f16cd3491922b43040148efb09dcf66f2403bcc8caae028d3497a5c864d6539b980c32cda01f35fffc2c724b68d20042f8d341f0a3a50c8fa78670535 WHIRLPOOL 95ae600f5c75cc1e1e7ae98d2cbdf08d856f5a093bd6221045f55d0204813abddf74aed4699d9b7432fb2a9b341ea9628557a21d61057a24e888b2e3afd2c60d +DIST libdap-3.18.1.tar.gz 2209343 SHA256 a755c472d7c9e54bc3aa6c92a847a69466fbc6cdc56ee912f411802a725d57a4 SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38 WHIRLPOOL 74eb65be375bd81e5d6db9fb93bdd219add79c12fea35eed98445df38f6dc212fc33cc51900ac93657166794b0700ff1be17fd7f41379733de19ad7480f889f0 +EBUILD libdap-3.18.1.ebuild 1095 SHA256 2011c46ff14644b92b1ae83a330edb729381646727593fafba361e0911954ae7 SHA512 10f6e2e7070b7bae860043a15cbb4d570f68a9f0c265eef4416aa4400a8748878773b3d30b3a59f4fdd6bfa9d0cced7064974173d383bdab62334ec01e5216b8 WHIRLPOOL f272edeb731e68907ffa70afd00942428a86fbb65c9f9c321983b4788ee707491ded5c4fc7048c19503d853657e3d91a9acf1815ee2f7f68ba395f06b2fb28c0 +MISC ChangeLog 3424 SHA256 121ea7dff804d7b3553b55751b4284f5f524855b6d540364bd6df39a6fb80f29 SHA512 6abff7d825ddd0098b0932a2ea6c02a046f2581a91c5032f26154950456dcb80e2a7566056f9b0b5415797c84bc50de40836ccbb18a75d318ace1db76c579855 WHIRLPOOL 268dd4e717694faacce15daad13cb36e8d6e17ef37544e6c6be82c0766dce9f4becf9287fbe86ae771b2eeed1cf6c55c239391def9df9d3f5106eb1527d8a71b +MISC ChangeLog-2015 2774 SHA256 de82d0d06b99c45fb57b56241920bceab958d3f77a6e9e748163d299789f440e SHA512 5f02cbef20c09997ef2f75cb18b9211865b6e5b57b0502cea34a4842f07f369c8b92fb2415adcdaaca8eef354abb679e297d05a53215eb2570e9aa1bd3b5fb90 WHIRLPOOL 5ada4d1662bb5b32ee3bd623037d8c955ee8e45c29d6c0b07e06e655e793d1be1c9a26ec7ecda9f419553bdbd5633f77a844d8efd96277c6cab66aacd63e6133 +MISC metadata.xml 772 SHA256 0a3dacae503eb2014129d764aaa41bd1a0f6f4192d9081c478a0824ecfb25fb6 SHA512 277e96ec4eef7a080303e3b3b054d51c017ef2227644ed2d78a35d5c873f085f4524aa14b4f0f523a3d501c96a1f078032941d62005721e8264e2c5d625182eb WHIRLPOOL efb0aabe6a5cf51c3dee45f1e3d3477fc1918b926bceb2de22d32d25136428feeca9beab5864972c5d78e3cba1f73fdeba0bea90b4138a22929ab04820b580c7 diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch new file mode 100644 index 000000000000..09c33e6f381a --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch @@ -0,0 +1,18 @@ +Description: D4FilterClauseTest breaks on arm*, powerpc, s390x. +Author: Alastair McKinstry <mckinstry@debian.org> +Last-Updated: 2016-08-31 +Forwarded: no + +Index: libdap-3.18.0/unit-tests/Makefile.am +=================================================================== +--- libdap-3.18.0.orig/unit-tests/Makefile.am ++++ libdap-3.18.0/unit-tests/Makefile.am +@@ -74,7 +74,7 @@ UNIT_TESTS = marshT arrayT attrTableT st + if DAP4_DEFINED + UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \ + D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \ +- chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \ ++ chunked_iostream_test D4AsyncDocTest DMRTest \ + D4SequenceTest + endif + diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch new file mode 100644 index 000000000000..6ce7ae0c4f6d --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch @@ -0,0 +1,22 @@ +Author: Alastair McKinstry <mckinstry@debian.org> +Description: Disable test as website appears to be down +Forwarded: no +Last-Updated: 2015-10-20 + +Index: libdap-3.18.0/unit-tests/Makefile.am +=================================================================== +--- libdap-3.18.0.orig/unit-tests/Makefile.am ++++ libdap-3.18.0/unit-tests/Makefile.am +@@ -67,9 +67,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 \ +- RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \ +- HTTPCacheTest ServerFunctionsListUnitTest ++ DDSTest DDXParserTest generalUtilTest parserUtilTest \ ++ SequenceTest SignalHandlerTest MarshallerTest \ ++ ServerFunctionsListUnitTest + + if DAP4_DEFINED + UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \ diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch new file mode 100644 index 000000000000..d4691f59518f --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch @@ -0,0 +1,31 @@ +Author: Alastair McKinstry <mckinstry@debian.org> +Description: Disable DMR tests which break on big-endian archs at the moment +Last-Updated: 2015-11-08 +Forwarded: no + +Index: libdap-3.18.0/tests/Makefile.am +=================================================================== +--- libdap-3.18.0.orig/tests/Makefile.am ++++ libdap-3.18.0/tests/Makefile.am +@@ -31,7 +31,7 @@ endif + # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest + + check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \ +- $(DMRTESTSUITE) $(GETDAPTESTSUITE) ++ $(GETDAPTESTSUITE) + + # Build the test drivers. The drivers all use the + # subclassed types in Test*.cc and the TestTypesFactory. +@@ -107,11 +107,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest + GETDAPTESTSUITE = $(srcdir)/getdapTest + + check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \ +-$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) ++$(EXPRTESTSUITE) $(GETDAPTESTSUITE) + $(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS) + $(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 diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch new file mode 100644 index 000000000000..7c42ec1199c4 --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch @@ -0,0 +1,33 @@ +Author: Alastair McKinstry <mckinstry@debian.org> +Description: Disable network tests, as network not available on + most build systems +Last-Updated: 2016-02-06 +Forwarded: not-needed + +Index: libdap-3.18.0/tests/Makefile.am +=================================================================== +--- libdap-3.18.0.orig/tests/Makefile.am ++++ libdap-3.18.0/tests/Makefile.am +@@ -30,8 +30,7 @@ endif + + # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest + +-check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \ +- $(GETDAPTESTSUITE) ++check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) + + # Build the test drivers. The drivers all use the + # subclassed types in Test*.cc and the TestTypesFactory. +@@ -107,11 +106,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest + GETDAPTESTSUITE = $(srcdir)/getdapTest + + check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \ +-$(EXPRTESTSUITE) $(GETDAPTESTSUITE) ++$(EXPRTESTSUITE) + $(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS) + $(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS) + $(SHELL) '$(EXPRTESTSUITE)' $(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 diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch new file mode 100644 index 000000000000..f36fdceb1fd0 --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch @@ -0,0 +1,20 @@ +Do not install headers and static library required only for test suite. + +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -36,13 +36,13 @@ + # Build the test drivers. The drivers all use the + # subclassed types in Test*.cc and the TestTypesFactory. + +-lib_LIBRARIES = libtest-types.a ++noinst_LIBRARIES = libtest-types.a + + libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR) + libtest_types_a_CXXFLAGS = -fPIC + + testheadersdir = $(pkgincludedir)/test +-testheaders_HEADERS = $(TEST_HDR) ++noinst_testheaders = $(TEST_HDR) + + das_test_SOURCES = das-test.cc + das_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch new file mode 100644 index 000000000000..6b74fa10a240 --- /dev/null +++ b/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch @@ -0,0 +1,100 @@ +C++11 changed destructor semantics to be noexcept(true) +by default, leading to potentially changed semantics. + +--- a/HTTPResponse.h ++++ b/HTTPResponse.h +@@ -115,6 +115,9 @@ + temp_file and headers are deleted. If the tmp file name is "", it is + not deleted. */ + virtual ~HTTPResponse() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... "); + +--- a/MarshallerThread.cc ++++ b/MarshallerThread.cc +@@ -106,6 +106,9 @@ + * Unlock the mutex + */ + Locker::~Locker() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl); + +@@ -140,6 +143,9 @@ + } + + ChildLocker::~ChildLocker() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl); + +@@ -164,6 +170,9 @@ + } + + MarshallerThread::~MarshallerThread() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + int status = pthread_mutex_lock(&d_out_mutex); + if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex"); +--- a/MarshallerThread.h ++++ b/MarshallerThread.h +@@ -52,7 +52,11 @@ + class Locker { + public: + Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count); +- virtual ~Locker(); ++ virtual ~Locker() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + private: + pthread_mutex_t& m_mutex; +@@ -74,7 +78,11 @@ + class ChildLocker { + public: + ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count); +- virtual ~ChildLocker(); ++ virtual ~ChildLocker() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + private: + pthread_mutex_t& m_mutex; +@@ -144,7 +152,11 @@ + + public: + MarshallerThread(); +- virtual ~MarshallerThread(); ++ virtual ~MarshallerThread() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + pthread_mutex_t &get_mutex() { return d_out_mutex; } + pthread_cond_t &get_cond() { return d_out_cond; } +--- a/Response.h ++++ b/Response.h +@@ -93,6 +93,9 @@ + + /** Close the stream. */ + virtual ~Response() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + if (d_stream) + fclose(d_stream); diff --git a/sci-libs/libdap/libdap-3.18.1.ebuild b/sci-libs/libdap/libdap-3.18.1.ebuild new file mode 100644 index 000000000000..b0a4bfc02ba2 --- /dev/null +++ b/sci-libs/libdap/libdap-3.18.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2" +HOMEPAGE="http://opendap.org/" +SRC_URI="http://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" + +RDEPEND=" + dev-libs/libxml2:2 + net-misc/curl + sys-libs/zlib" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex + test? ( dev-util/cppunit )" + +PATCHES=( + "${FILESDIR}/${PN}-3.18.1-fix-buildsystem.patch" + "${FILESDIR}/${PN}-3.18.1-fix-c++14.patch" + "${FILESDIR}/${PN}-3.18.1-disable-cache-test.patch" + "${FILESDIR}/${PN}-3.18.1-disable-dmr-tests.patch" + "${FILESDIR}/${PN}-3.18.1-disable-net-tests.patch" + "${FILESDIR}/${PN}-3.18.1-disable-broken-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_install() { + default + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/sci-libs/libdap/metadata.xml b/sci-libs/libdap/metadata.xml new file mode 100644 index 000000000000..c1f3d9787739 --- /dev/null +++ b/sci-libs/libdap/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> +</maintainer> +<longdescription> + libdap is a C++ implementation of OPeNDAP which allows access to + data over the internet, from programs that weren't originally + designed for that purpose, as well as some that were. While OPeNDAP + s the original developer of the Data Access Protocol (DAP) which + it's software uses, many other groups have adopted DAP and provide + compatible clients, servers and software development kits. DAP is a + NASA community standard: http://www.esdswg.org/spg/rfc/ese-rfc-004 +</longdescription> +</pkgmetadata> |