| 1 |
commit: 05d0651d59f71f5ee7074cf97090152bc0ace178 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 21:35:21 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 21:58:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d0651d |
| 7 |
|
| 8 |
sci-libs/libdap: drop 3.18.1, EAPI-6-- |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/867529 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/libdap/Manifest | 1 - |
| 14 |
.../files/libdap-3.18.1-disable-broken-tests.patch | 18 ---- |
| 15 |
.../files/libdap-3.18.1-disable-cache-test.patch | 22 ----- |
| 16 |
.../files/libdap-3.18.1-disable-dmr-tests.patch | 31 ------- |
| 17 |
.../files/libdap-3.18.1-disable-net-tests.patch | 33 ------- |
| 18 |
.../files/libdap-3.18.1-fix-buildsystem.patch | 20 ----- |
| 19 |
.../libdap/files/libdap-3.18.1-fix-c++14.patch | 100 --------------------- |
| 20 |
sci-libs/libdap/libdap-3.18.1.ebuild | 55 ------------ |
| 21 |
8 files changed, 280 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest |
| 24 |
index 166567f036a9..eee8bdbe052b 100644 |
| 25 |
--- a/sci-libs/libdap/Manifest |
| 26 |
+++ b/sci-libs/libdap/Manifest |
| 27 |
@@ -1,2 +1 @@ |
| 28 |
-DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38 |
| 29 |
DIST libdap-3.20.9.tar.gz 2838651 BLAKE2B 84186a73455d8756d0dccaf11554861d48f55a358cc3f70d899d7f24b0b676b0bacdfff47b63c956619717c7fb7f7e3678669599724a2170221a4bc74d8388c2 SHA512 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c |
| 30 |
|
| 31 |
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 |
| 32 |
deleted file mode 100644 |
| 33 |
index 09c33e6f381a..000000000000 |
| 34 |
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,18 +0,0 @@ |
| 37 |
-Description: D4FilterClauseTest breaks on arm*, powerpc, s390x. |
| 38 |
-Author: Alastair McKinstry <mckinstry@××××××.org> |
| 39 |
-Last-Updated: 2016-08-31 |
| 40 |
-Forwarded: no |
| 41 |
- |
| 42 |
-Index: libdap-3.18.0/unit-tests/Makefile.am |
| 43 |
-=================================================================== |
| 44 |
---- libdap-3.18.0.orig/unit-tests/Makefile.am |
| 45 |
-+++ libdap-3.18.0/unit-tests/Makefile.am |
| 46 |
-@@ -74,7 +74,7 @@ UNIT_TESTS = marshT arrayT attrTableT st |
| 47 |
- if DAP4_DEFINED |
| 48 |
- UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \ |
| 49 |
- D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \ |
| 50 |
-- chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \ |
| 51 |
-+ chunked_iostream_test D4AsyncDocTest DMRTest \ |
| 52 |
- D4SequenceTest |
| 53 |
- endif |
| 54 |
- |
| 55 |
|
| 56 |
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 |
| 57 |
deleted file mode 100644 |
| 58 |
index 6ce7ae0c4f6d..000000000000 |
| 59 |
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch |
| 60 |
+++ /dev/null |
| 61 |
@@ -1,22 +0,0 @@ |
| 62 |
-Author: Alastair McKinstry <mckinstry@××××××.org> |
| 63 |
-Description: Disable test as website appears to be down |
| 64 |
-Forwarded: no |
| 65 |
-Last-Updated: 2015-10-20 |
| 66 |
- |
| 67 |
-Index: libdap-3.18.0/unit-tests/Makefile.am |
| 68 |
-=================================================================== |
| 69 |
---- libdap-3.18.0.orig/unit-tests/Makefile.am |
| 70 |
-+++ libdap-3.18.0/unit-tests/Makefile.am |
| 71 |
-@@ -67,9 +67,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml |
| 72 |
- if CPPUNIT |
| 73 |
- UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \ |
| 74 |
- RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \ |
| 75 |
-- DDSTest DDXParserTest generalUtilTest HTTPConnectTest parserUtilTest \ |
| 76 |
-- RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \ |
| 77 |
-- HTTPCacheTest ServerFunctionsListUnitTest |
| 78 |
-+ DDSTest DDXParserTest generalUtilTest parserUtilTest \ |
| 79 |
-+ SequenceTest SignalHandlerTest MarshallerTest \ |
| 80 |
-+ ServerFunctionsListUnitTest |
| 81 |
- |
| 82 |
- if DAP4_DEFINED |
| 83 |
- UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \ |
| 84 |
|
| 85 |
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 |
| 86 |
deleted file mode 100644 |
| 87 |
index d4691f59518f..000000000000 |
| 88 |
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch |
| 89 |
+++ /dev/null |
| 90 |
@@ -1,31 +0,0 @@ |
| 91 |
-Author: Alastair McKinstry <mckinstry@××××××.org> |
| 92 |
-Description: Disable DMR tests which break on big-endian archs at the moment |
| 93 |
-Last-Updated: 2015-11-08 |
| 94 |
-Forwarded: no |
| 95 |
- |
| 96 |
-Index: libdap-3.18.0/tests/Makefile.am |
| 97 |
-=================================================================== |
| 98 |
---- libdap-3.18.0.orig/tests/Makefile.am |
| 99 |
-+++ libdap-3.18.0/tests/Makefile.am |
| 100 |
-@@ -31,7 +31,7 @@ endif |
| 101 |
- # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest |
| 102 |
- |
| 103 |
- check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \ |
| 104 |
-- $(DMRTESTSUITE) $(GETDAPTESTSUITE) |
| 105 |
-+ $(GETDAPTESTSUITE) |
| 106 |
- |
| 107 |
- # Build the test drivers. The drivers all use the |
| 108 |
- # subclassed types in Test*.cc and the TestTypesFactory. |
| 109 |
-@@ -107,11 +107,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest |
| 110 |
- GETDAPTESTSUITE = $(srcdir)/getdapTest |
| 111 |
- |
| 112 |
- check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \ |
| 113 |
--$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) |
| 114 |
-+$(EXPRTESTSUITE) $(GETDAPTESTSUITE) |
| 115 |
- $(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS) |
| 116 |
- $(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS) |
| 117 |
- $(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS) |
| 118 |
-- $(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS) |
| 119 |
- $(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS) |
| 120 |
- |
| 121 |
- # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15 |
| 122 |
|
| 123 |
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 |
| 124 |
deleted file mode 100644 |
| 125 |
index 7c42ec1199c4..000000000000 |
| 126 |
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch |
| 127 |
+++ /dev/null |
| 128 |
@@ -1,33 +0,0 @@ |
| 129 |
-Author: Alastair McKinstry <mckinstry@××××××.org> |
| 130 |
-Description: Disable network tests, as network not available on |
| 131 |
- most build systems |
| 132 |
-Last-Updated: 2016-02-06 |
| 133 |
-Forwarded: not-needed |
| 134 |
- |
| 135 |
-Index: libdap-3.18.0/tests/Makefile.am |
| 136 |
-=================================================================== |
| 137 |
---- libdap-3.18.0.orig/tests/Makefile.am |
| 138 |
-+++ libdap-3.18.0/tests/Makefile.am |
| 139 |
-@@ -30,8 +30,7 @@ endif |
| 140 |
- |
| 141 |
- # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest |
| 142 |
- |
| 143 |
--check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \ |
| 144 |
-- $(GETDAPTESTSUITE) |
| 145 |
-+check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) |
| 146 |
- |
| 147 |
- # Build the test drivers. The drivers all use the |
| 148 |
- # subclassed types in Test*.cc and the TestTypesFactory. |
| 149 |
-@@ -107,11 +106,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest |
| 150 |
- GETDAPTESTSUITE = $(srcdir)/getdapTest |
| 151 |
- |
| 152 |
- check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \ |
| 153 |
--$(EXPRTESTSUITE) $(GETDAPTESTSUITE) |
| 154 |
-+$(EXPRTESTSUITE) |
| 155 |
- $(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS) |
| 156 |
- $(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS) |
| 157 |
- $(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS) |
| 158 |
-- $(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS) |
| 159 |
- |
| 160 |
- # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15 |
| 161 |
- # Delete the scripts here and not using CLEANFILES because this target is |
| 162 |
|
| 163 |
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 |
| 164 |
deleted file mode 100644 |
| 165 |
index f36fdceb1fd0..000000000000 |
| 166 |
--- a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch |
| 167 |
+++ /dev/null |
| 168 |
@@ -1,20 +0,0 @@ |
| 169 |
-Do not install headers and static library required only for test suite. |
| 170 |
- |
| 171 |
---- a/tests/Makefile.am |
| 172 |
-+++ b/tests/Makefile.am |
| 173 |
-@@ -36,13 +36,13 @@ |
| 174 |
- # Build the test drivers. The drivers all use the |
| 175 |
- # subclassed types in Test*.cc and the TestTypesFactory. |
| 176 |
- |
| 177 |
--lib_LIBRARIES = libtest-types.a |
| 178 |
-+noinst_LIBRARIES = libtest-types.a |
| 179 |
- |
| 180 |
- libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR) |
| 181 |
- libtest_types_a_CXXFLAGS = -fPIC |
| 182 |
- |
| 183 |
- testheadersdir = $(pkgincludedir)/test |
| 184 |
--testheaders_HEADERS = $(TEST_HDR) |
| 185 |
-+noinst_testheaders = $(TEST_HDR) |
| 186 |
- |
| 187 |
- das_test_SOURCES = das-test.cc |
| 188 |
- das_test_LDADD = libtest-types.a ../libdapserver.la ../libdap.la |
| 189 |
|
| 190 |
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 |
| 191 |
deleted file mode 100644 |
| 192 |
index 6b74fa10a240..000000000000 |
| 193 |
--- a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch |
| 194 |
+++ /dev/null |
| 195 |
@@ -1,100 +0,0 @@ |
| 196 |
-C++11 changed destructor semantics to be noexcept(true) |
| 197 |
-by default, leading to potentially changed semantics. |
| 198 |
- |
| 199 |
---- a/HTTPResponse.h |
| 200 |
-+++ b/HTTPResponse.h |
| 201 |
-@@ -115,6 +115,9 @@ |
| 202 |
- temp_file and headers are deleted. If the tmp file name is "", it is |
| 203 |
- not deleted. */ |
| 204 |
- virtual ~HTTPResponse() |
| 205 |
-+#if __cplusplus >= 201103L |
| 206 |
-+ noexcept(false) |
| 207 |
-+#endif |
| 208 |
- { |
| 209 |
- DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... "); |
| 210 |
- |
| 211 |
---- a/MarshallerThread.cc |
| 212 |
-+++ b/MarshallerThread.cc |
| 213 |
-@@ -106,6 +106,9 @@ |
| 214 |
- * Unlock the mutex |
| 215 |
- */ |
| 216 |
- Locker::~Locker() |
| 217 |
-+#if __cplusplus >= 201103L |
| 218 |
-+ noexcept(false) |
| 219 |
-+#endif |
| 220 |
- { |
| 221 |
- DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl); |
| 222 |
- |
| 223 |
-@@ -140,6 +143,9 @@ |
| 224 |
- } |
| 225 |
- |
| 226 |
- ChildLocker::~ChildLocker() |
| 227 |
-+#if __cplusplus >= 201103L |
| 228 |
-+ noexcept(false) |
| 229 |
-+#endif |
| 230 |
- { |
| 231 |
- DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl); |
| 232 |
- |
| 233 |
-@@ -164,6 +170,9 @@ |
| 234 |
- } |
| 235 |
- |
| 236 |
- MarshallerThread::~MarshallerThread() |
| 237 |
-+#if __cplusplus >= 201103L |
| 238 |
-+ noexcept(false) |
| 239 |
-+#endif |
| 240 |
- { |
| 241 |
- int status = pthread_mutex_lock(&d_out_mutex); |
| 242 |
- if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex"); |
| 243 |
---- a/MarshallerThread.h |
| 244 |
-+++ b/MarshallerThread.h |
| 245 |
-@@ -52,7 +52,11 @@ |
| 246 |
- class Locker { |
| 247 |
- public: |
| 248 |
- Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count); |
| 249 |
-- virtual ~Locker(); |
| 250 |
-+ virtual ~Locker() |
| 251 |
-+#if __cplusplus >= 201103L |
| 252 |
-+ noexcept(false) |
| 253 |
-+#endif |
| 254 |
-+ ; |
| 255 |
- |
| 256 |
- private: |
| 257 |
- pthread_mutex_t& m_mutex; |
| 258 |
-@@ -74,7 +78,11 @@ |
| 259 |
- class ChildLocker { |
| 260 |
- public: |
| 261 |
- ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count); |
| 262 |
-- virtual ~ChildLocker(); |
| 263 |
-+ virtual ~ChildLocker() |
| 264 |
-+#if __cplusplus >= 201103L |
| 265 |
-+ noexcept(false) |
| 266 |
-+#endif |
| 267 |
-+ ; |
| 268 |
- |
| 269 |
- private: |
| 270 |
- pthread_mutex_t& m_mutex; |
| 271 |
-@@ -144,7 +152,11 @@ |
| 272 |
- |
| 273 |
- public: |
| 274 |
- MarshallerThread(); |
| 275 |
-- virtual ~MarshallerThread(); |
| 276 |
-+ virtual ~MarshallerThread() |
| 277 |
-+#if __cplusplus >= 201103L |
| 278 |
-+ noexcept(false) |
| 279 |
-+#endif |
| 280 |
-+ ; |
| 281 |
- |
| 282 |
- pthread_mutex_t &get_mutex() { return d_out_mutex; } |
| 283 |
- pthread_cond_t &get_cond() { return d_out_cond; } |
| 284 |
---- a/Response.h |
| 285 |
-+++ b/Response.h |
| 286 |
-@@ -93,6 +93,9 @@ |
| 287 |
- |
| 288 |
- /** Close the stream. */ |
| 289 |
- virtual ~Response() |
| 290 |
-+#if __cplusplus >= 201103L |
| 291 |
-+ noexcept(false) |
| 292 |
-+#endif |
| 293 |
- { |
| 294 |
- if (d_stream) |
| 295 |
- fclose(d_stream); |
| 296 |
|
| 297 |
diff --git a/sci-libs/libdap/libdap-3.18.1.ebuild b/sci-libs/libdap/libdap-3.18.1.ebuild |
| 298 |
deleted file mode 100644 |
| 299 |
index 07e468687be9..000000000000 |
| 300 |
--- a/sci-libs/libdap/libdap-3.18.1.ebuild |
| 301 |
+++ /dev/null |
| 302 |
@@ -1,55 +0,0 @@ |
| 303 |
-# Copyright 1999-2019 Gentoo Authors |
| 304 |
-# Distributed under the terms of the GNU General Public License v2 |
| 305 |
- |
| 306 |
-EAPI=6 |
| 307 |
- |
| 308 |
-inherit autotools flag-o-matic |
| 309 |
- |
| 310 |
-DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2" |
| 311 |
-HOMEPAGE="https://www.opendap.org" |
| 312 |
-SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz" |
| 313 |
- |
| 314 |
-LICENSE="|| ( LGPL-2.1 URI )" |
| 315 |
-SLOT="0" |
| 316 |
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" |
| 317 |
-IUSE="static-libs test" |
| 318 |
-RESTRICT="!test? ( test )" |
| 319 |
- |
| 320 |
-RDEPEND=" |
| 321 |
- dev-libs/libxml2:2 |
| 322 |
- net-misc/curl |
| 323 |
- sys-libs/zlib" |
| 324 |
-DEPEND="${RDEPEND} |
| 325 |
- virtual/pkgconfig |
| 326 |
- sys-devel/flex |
| 327 |
- test? ( dev-util/cppunit )" |
| 328 |
- |
| 329 |
-PATCHES=( |
| 330 |
- "${FILESDIR}/${PN}-3.18.1-fix-buildsystem.patch" |
| 331 |
- "${FILESDIR}/${PN}-3.18.1-fix-c++14.patch" |
| 332 |
- "${FILESDIR}/${PN}-3.18.1-disable-cache-test.patch" |
| 333 |
- "${FILESDIR}/${PN}-3.18.1-disable-dmr-tests.patch" |
| 334 |
- "${FILESDIR}/${PN}-3.18.1-disable-net-tests.patch" |
| 335 |
- "${FILESDIR}/${PN}-3.18.1-disable-broken-tests.patch" |
| 336 |
-) |
| 337 |
- |
| 338 |
-src_prepare() { |
| 339 |
- default |
| 340 |
- eautoreconf |
| 341 |
-} |
| 342 |
- |
| 343 |
-src_configure() { |
| 344 |
- # bug 619144 |
| 345 |
- append-cxxflags -std=c++14 |
| 346 |
- |
| 347 |
- econf \ |
| 348 |
- --enable-shared \ |
| 349 |
- $(use_enable static-libs static) |
| 350 |
-} |
| 351 |
- |
| 352 |
-src_install() { |
| 353 |
- default |
| 354 |
- |
| 355 |
- # package provides .pc files |
| 356 |
- find "${D}" -name '*.la' -delete || die |
| 357 |
-} |
Archives