diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-08-30 23:35:21 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-08-30 23:58:46 +0200 |
commit | 05d0651d59f71f5ee7074cf97090152bc0ace178 (patch) | |
tree | ad893c2e3da7b34d2b7e6af271358984445aa70c /sci-libs/libdap | |
parent | dev-games/godot: add 4.0_alpha15, unkeyworded (diff) | |
download | gentoo-05d0651d59f71f5ee7074cf97090152bc0ace178.tar.gz gentoo-05d0651d59f71f5ee7074cf97090152bc0ace178.tar.bz2 gentoo-05d0651d59f71f5ee7074cf97090152bc0ace178.zip |
sci-libs/libdap: drop 3.18.1, EAPI-6--
Closes: https://bugs.gentoo.org/867529
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/libdap')
-rw-r--r-- | sci-libs/libdap/Manifest | 1 | ||||
-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 |
8 files changed, 0 insertions, 280 deletions
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest index 166567f036a9..eee8bdbe052b 100644 --- a/sci-libs/libdap/Manifest +++ b/sci-libs/libdap/Manifest @@ -1,2 +1 @@ -DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38 DIST libdap-3.20.9.tar.gz 2838651 BLAKE2B 84186a73455d8756d0dccaf11554861d48f55a358cc3f70d899d7f24b0b676b0bacdfff47b63c956619717c7fb7f7e3678669599724a2170221a4bc74d8388c2 SHA512 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c 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 -} |