[gentoo-commits] repo/gentoo:master commit in: sci-libs/libdap/, sci-libs/libdap/files/
commit: 05d0651d59f71f5ee7074cf97090152bc0ace178 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 30 21:35:21 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 30 21:58:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d0651d sci-libs/libdap: drop 3.18.1, EAPI-6-- Closes: https://bugs.gentoo.org/867529 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/libdap/Manifest | 1 - .../files/libdap-3.18.1-disable-broken-tests.patch | 18 .../files/libdap-3.18.1-disable-cache-test.patch | 22 - .../files/libdap-3.18.1-disable-dmr-tests.patch| 31 --- .../files/libdap-3.18.1-disable-net-tests.patch| 33 --- .../files/libdap-3.18.1-fix-buildsystem.patch | 20 - .../libdap/files/libdap-3.18.1-fix-c++14.patch | 100 - sci-libs/libdap/libdap-3.18.1.ebuild | 55 8 files changed, 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.. --- 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 -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.. --- a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: Alastair McKinstry -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.. --- a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -Author: Alastair McKinstry -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) -
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libdap/, sci-libs/libdap/files/
commit: 5ac778139dcffdf9853020a8938b75e973995896
Author: Sam James gentoo org>
AuthorDate: Wed Dec 29 09:03:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 29 09:03:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac77813
sci-libs/libdap: add 3.20.9
We were a bit behind in Gentoo so hopefully the linked bug
is fixed too. Seems fine for me.
Closes: https://bugs.gentoo.org/638494
Signed-off-by: Sam James gentoo.org>
sci-libs/libdap/Manifest | 1 +
.../files/libdap-3.20.9-disable-net-tests.patch| 34 ++
sci-libs/libdap/libdap-3.20.9.ebuild | 52 ++
3 files changed, 87 insertions(+)
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index c134d3de5301..166567f036a9 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -1 +1,2 @@
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.20.9-disable-net-tests.patch
b/sci-libs/libdap/files/libdap-3.20.9-disable-net-tests.patch
new file mode 100644
index ..e4fb53eee3d8
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.20.9-disable-net-tests.patch
@@ -0,0 +1,34 @@
+Avoid network test failure:
+```
+## - ##
+## libdap 3.20.9 test suite: getdap. ##
+## - ##
+ 1: getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc
getdap-testsuite/fnoc1.nc.dds (pass) FAILED (getdapTest.at:34)
+
+## - ##
+```
+--- a/tests/Makefile.am
b/tests/Makefile.am
+@@ -43,7 +43,7 @@ endif
+ # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
+
+ check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
+- $(DMRTESTSUITE) $(GETDAPTESTSUITE)
++ $(DMRTESTSUITE)
+
+ # Build the test drivers. The drivers all use the
+ # subclassed types in Test*.cc and the TestTypesFactory.
+@@ -117,12 +117,11 @@ DMRTESTSUITE = $(srcdir)/DMRTest
+ GETDAPTESTSUITE = $(srcdir)/getdapTest
+
+ check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
+-$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE)
++$(EXPRTESTSUITE) $(DMRTESTSUITE)
+ $(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
+ # Delete the scripts here and not using CLEANFILES because this target is
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 ..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
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libdap/, sci-libs/libdap/files/
commit: b58c9c4f89093874e7d7f21f2a962aca7ecf63af
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Sep 30 05:49:19 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 30 05:49:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58c9c4f
sci-libs/libdap: remove 3.11.3/3.17.0
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-libs/libdap/Manifest | 2 -
sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch | 15 ---
sci-libs/libdap/libdap-3.11.3.ebuild | 51 ---
sci-libs/libdap/libdap-3.17.0.ebuild | 29 -
4 files changed, 97 deletions(-)
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index 87b3775cbf7..23808eb1066 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -1,3 +1 @@
-DIST libdap-3.11.3.tar.gz 1514429 SHA256
1fe14594960c1c24842ea9c3a4032cfce70b7082bbab17369b43c9a134ddac97 SHA512
acdb54e135a153107460cad2310176b9d4a3f9b7c142eca3456ba9331f551d1855f7e6d4b7fdce6586dd266e54e23b795f903499f349d26481ca1d9abb5f52a0
WHIRLPOOL
f67a56c64937610047de2cf2ea362193506fbd474aa0f1aa38a88e3c49e3e6fb3a5d8969feddc34c7560afa0b5c9e1304b5ced46ce3d37e9333094a2da289db0
-DIST libdap-3.17.0.tar.gz 2269838 SHA256
7c5c65535f8a6aa20f3cdbe2d552140b8f20de007a8e005db437d7361739fb6d SHA512
ec8101f8b3e5b734ae487928d62845ae46e4770af92b95b3503b0da57a6bb1f796fd7617fe33da047f92b1045d2f2db4a21c7cf022b480be8aafd7bba451854e
WHIRLPOOL
24fc31306eb99af2e79d55e792fe447fc99fdd26652f3456a6ec19b00cde102b6300905f128cae93dcc35aa037b7070ce1242757e373079911dd0f3cb9b883f4
DIST libdap-3.18.1.tar.gz 2209343 SHA256
a755c472d7c9e54bc3aa6c92a847a69466fbc6cdc56ee912f411802a725d57a4 SHA512
a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38
WHIRLPOOL
74eb65be375bd81e5d6db9fb93bdd219add79c12fea35eed98445df38f6dc212fc33cc51900ac93657166794b0700ff1be17fd7f41379733de19ad7480f889f0
diff --git a/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
b/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
deleted file mode 100644
index a0d411b03dc..000
--- a/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- ResponseBuilder.cc |1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/ResponseBuilder.cc b/ResponseBuilder.cc
-index 1135678..0356172 100644
a/ResponseBuilder.cc
-+++ b/ResponseBuilder.cc
-@@ -41,6 +41,7 @@ static char rcsid[] not_used = { "$Id
- #include
- #include
- #include
-+#include
-
- #include // used to build CID header value for data ddx
- #include "DAS.h"
diff --git a/sci-libs/libdap/libdap-3.11.3.ebuild
b/sci-libs/libdap/libdap-3.11.3.ebuild
deleted file mode 100644
index a1d137845c7..000
--- a/sci-libs/libdap/libdap-3.11.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-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="doc static-libs test"
-
-RDEPEND="
- dev-util/cppunit
- dev-libs/libxml2:2
- net-misc/curl
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-DOCS=( README NEWS README.dodsrc )
-
-RESTRICT="test"
-# needs http connection
-# FAIL: MIMEUtilTest
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-4.7.patch )
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile docs
-}
-
-src_test() {
- emake check
- cd "${S}"/unit-tests
- emake check
-}
-
-src_install() {
- use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
- autotools-utils_src_install
-}
diff --git a/sci-libs/libdap/libdap-3.17.0.ebuild
b/sci-libs/libdap/libdap-3.17.0.ebuild
deleted file mode 100644
index df92add0b7e..000
--- a/sci-libs/libdap/libdap-3.17.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-# needs network connection
-# FAIL: getdapTest
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libxml2:2
- net-misc/curl
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )
-"
-
-DOCS=( README NEWS README.dodsrc )
