diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 44386 -> 44383 bytes | |||
-rw-r--r-- | sci-libs/libdap/Manifest | 8 | ||||
-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 | 55 |
9 files changed, 0 insertions, 287 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 06ae5bb15a18..c9beb5427751 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest index 2c8611b68ff6..a1ac0e5e170f 100644 --- a/sci-libs/libdap/Manifest +++ b/sci-libs/libdap/Manifest @@ -1,12 +1,4 @@ -AUX libdap-3.18.1-disable-broken-tests.patch 719 BLAKE2B de9bdfc1580f077a69272b8f104b19d3a9d168fdfbe3a21df82996feb1dc965f614694d06f0b85dd0eebce1e6552ff8560bd634a5d1f96da6d2e5b1cc3183f35 SHA512 11237422b0d129aaa52dc3559e2ffe0d4bcc0562e0acd476290af7a4026a1c7272bc1e0a0ceddcb40250746c0c71e4c6d63a780c5c1635132faf0ee609e3b88c -AUX libdap-3.18.1-disable-cache-test.patch 965 BLAKE2B 615baece5bd65d8f45c71df1f05f3918e96b6df1a144692503fbbef8e7c3f5c3a24f2677d6409ba5f2bea49889d5ecbc825ea3e55498835897f233d61c8bcf50 SHA512 087dd231f92d4117cbf469077922975029576239e507ef2cd5ae9d5b1f8f38ab3c4a3f32c8e2781a5c299c5e0a29c77cfd7d67ea8bf141058839f2bb4299b187 -AUX libdap-3.18.1-disable-dmr-tests.patch 1241 BLAKE2B fd7d07f506bb2832f78dce512e71f032338b8a8cbd22168a55450df052de735e9a802536fda2e22b7358da4a3c1b1c3f28d767a0990d4133f1e15f58e0a3f247 SHA512 5becf972bed0d27b32a67127af5ca2567757c05e04ef13aa3d514212320c552ad91a7b11b5386b73211a72017712b10875931a764f88ba9fa4fba40da453340f -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 958 BLAKE2B 02e6cf77258761fb34c7e9d10474c95dd290459c403c05c065e3d1cdbf46aaeb1ab1c605637607213d82b4f66174e8474b279e02a810494410b1063024502e4f SHA512 49de2e5d7f508033161d8c210e01f4953aaa6b151b6de830ab1cd56d1291fee0b36289533b09cb0d2a8286978a92661eea4c92acf1a76c6ae1397cfe3b3fbf1a MISC metadata.xml 773 BLAKE2B f1334411aab7288075c7683ec32c35ed82e5eafb48e87a0b1d320d3e29d514f20934ff65ab214add8f8fd9df7e2c54491f6804314f5d7abb06e855476f898662 SHA512 48fbdada76f39eaf72cf385d9f73f029ce166919e1d80a57ec98ddf257955faa6de18673b94388526a41f2f126c9a313d55f016fed63243848251fe0ead4c27c 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 deleted file mode 100644 index 09c33e6f381a..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 6ce7ae0c4f6d..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index d4691f59518f..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 7c42ec1199c4..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index f36fdceb1fd0..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 6b74fa10a240..000000000000 --- a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 deleted file mode 100644 index 07e468687be9..000000000000 --- a/sci-libs/libdap/libdap-3.18.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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-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() { - # bug 619144 - append-cxxflags -std=c++14 - - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_install() { - default - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} |