diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild | 62 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 4 |
5 files changed, 69 insertions, 4 deletions
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild index e9ebf804474d..dbcdc3dcd83e 100644 --- a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild +++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/" LICENSE="LGPL-2.1" SLOT="2.6" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc" RDEPEND=" diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild index 06c753d80b95..2c3656a4295e 100644 --- a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild +++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/" LICENSE="LGPL-2.1" SLOT="3.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc" RDEPEND=" diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest index 93680873270c..25ae070a9891 100644 --- a/dev-cpp/nlohmann_json/Manifest +++ b/dev-cpp/nlohmann_json/Manifest @@ -1,2 +1,3 @@ -DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891 +DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642 +DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891 diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild new file mode 100644 index 000000000000..26cbb2ced430 --- /dev/null +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version +TEST_VERSION="3.0.0" +DESCRIPTION="JSON for Modern C++" +HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" +SRC_URI=" + https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )" +S="${WORKDIR}/json-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc test" +#RESTRICT="!test? ( test )" +# Need to report failing tests upstream +# Tests only just added, large test suite, majority pass +RESTRICT="test" + +BDEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog.md README.md ) + +src_configure() { + # Tests are built by default so we can't group the test logic below + local mycmakeargs=( + -DJSON_MultipleHeaders=ON + -DJSON_BuildTests=$(usex test) + ) + + # Define test data directory here to avoid unused var QA warning, bug #747826 + use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + emake -C doc + HTML_DOCS=( doc/html/. ) + fi +} + +src_test() { + cd "${BUILD_DIR}/test" || die + + # Skip certain tests needing git per upstream + # https://github.com/nlohmann/json/issues/2189 + local myctestargs=( + "-LE git_required" + ) + + cmake_src_test +} diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild index ded1b4622890..727db8df498c 100644 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild @@ -5,11 +5,13 @@ EAPI=7 inherit cmake +# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version +TEST_VERSION="3.0.0" DESCRIPTION="JSON for Modern C++" HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" SRC_URI=" https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> ${P}-testdata.tar.gz )" + test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )" S="${WORKDIR}/json-${PV}" LICENSE="MIT" |