summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/Manifest.gzbin9904 -> 9894 bytes
-rw-r--r--dev-cpp/catch/Manifest4
-rw-r--r--dev-cpp/catch/catch-1.11.0.ebuild34
-rw-r--r--dev-cpp/catch/catch-2.2.2.ebuild49
-rw-r--r--dev-cpp/htmlcxx/Manifest6
-rw-r--r--dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch56
-rw-r--r--dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch67
-rw-r--r--dev-cpp/htmlcxx/htmlcxx-0.87.ebuild (renamed from dev-cpp/htmlcxx/htmlcxx-0.86.ebuild)18
-rw-r--r--dev-cpp/libjson-rpc-cpp/Manifest8
-rw-r--r--dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild4
-rw-r--r--dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild4
-rw-r--r--dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild4
-rw-r--r--dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild4
-rw-r--r--dev-cpp/ms-gsl/Manifest6
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild4
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild4
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-9999.ebuild6
17 files changed, 29 insertions, 249 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 2bde9c945930..7ac7998774ac 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
Binary files differ
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 8410ad228d5a..9e550ae4dc2c 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,15 +1,11 @@
AUX catch-2.2.2-python-automagic.patch 1096 BLAKE2B c1c5ae6cc0fa4f8066255581ab29bed966f4051eea79941c0a0f3e51f3639894b216dcc229de2ca932f0e41b8c3277f687d5d4dd2d226a2872f58ea486b9315f SHA512 d6b7198f60e45a52a40496eeecc1b34f5394af5dcccbaa7b2afa3af674d83f05a258311f151147ee8fcacae7764c4d742a92591c910a7beedfba5c71f547dfdc
AUX catch-2.2.2-test-python3.patch 1521 BLAKE2B 6329f5d4995216e685c3404ef99fea1deed0be3e5f4849e7b24448b7a6c3d2aab47442a29dadbf0684888360c4a5a2e09667d765182a8a5f9245e64c7723cb34 SHA512 ca4ba7bfd87edcd06775d4d3fc7f19eb7188f95c73f4f26a08ddddd63a86249e2f4e3380b6a7cf449f1d6a32a6181557d5f82af6f79ca0c315b72fa9f7198166
AUX catch-2.3.0-python-automagic.patch 1007 BLAKE2B 33a5c7fb715e5b312c28216ded81c2384abd4849d550f6be44604175f3645e2570d3cf17f863ad6e3b2b8d966a2427baf69fbf26440780c5ea458b9e5eea350b SHA512 dc0fd7ed133bbbca14f06ec05e867a7de41e5ef92e7644118daa96d283dac4b4f77c4d1367ab3af990643cbc38f7107eca204730d67851bf9264bc4010f04b28
-DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
-DIST Catch2-2.2.2.tar.gz 497244 BLAKE2B d5073d56b9399bd7f50bafc7758e60e31ba4434e229f92ca92cd04257f4a54cec925ad3180cc964c4f69edbaa7fc14f8af8e828421e2bb2b4f6c59eaea5cc06d SHA512 ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38
DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b3980a686ea495101165d612c848b642ad1e7233bce5bb164c80958c9cbfbc229e72a1ae6947aa4dffdf27556 SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
-EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
EBUILD catch-1.12.2.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
-EBUILD catch-2.2.2.ebuild 1078 BLAKE2B 5c33d53d303e552418f2957e8c1c9f640fb03b356bb3e4f6d2988c2fc98225d1bc6a50621a1285d5ab0d255cd1a00b5916788de16527c3f7f436bdf9d4ba3f28 SHA512 3912a227443c1eff86b65831ea3f5c2703811c0978c8750e5b69c75cca0079d1ecc31d2c643aad6a02a2b210da061f111097db390e9be00fab807d4e54eb5534
EBUILD catch-2.3.0.ebuild 1029 BLAKE2B 472cd9eb3b96e8c7bf766b42477f881ff3421dcd81617905fda7e6c530a457150f2dc4d543bfb73aa352a49713960d1db3a9758a55714b1dc100b697fc039ddd SHA512 7523558c0b75881959da3aec3d529c8bffb33f5d3bd9bbe409726845cde139b9a166d348a36e0e6742e045677f2142580925b950b605b7b4e318b1aaf5f8d276
EBUILD catch-2.5.0.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
EBUILD catch-9999.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
diff --git a/dev-cpp/catch/catch-1.11.0.ebuild b/dev-cpp/catch/catch-1.11.0.ebuild
deleted file mode 100644
index afc65f924e9f..000000000000
--- a/dev-cpp/catch/catch-1.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${P^}
-
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
- cmake-utils_src_configure
- cmake-utils_src_compile
- cmake-utils_src_test
-}
-
-src_install() {
- # same location as used in fedora
- insinto /usr/include/catch
- doins -r include/.
- dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.2.2.ebuild b/dev-cpp/catch/catch-2.2.2.ebuild
deleted file mode 100644
index 2cce0298b3a4..000000000000
--- a/dev-cpp/catch/catch-2.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-else
- MY_P=${PN^}2-${PV}
- SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-
- S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.2-test-python3.patch
- "${FILESDIR}"/${PN}-2.2.2-python-automagic.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCATCH_ENABLE_WERROR=OFF
- -DBUILD_TESTING=$(usex test)
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake-utils_src_configure
-}
diff --git a/dev-cpp/htmlcxx/Manifest b/dev-cpp/htmlcxx/Manifest
index b4c87079135c..01cab033e390 100644
--- a/dev-cpp/htmlcxx/Manifest
+++ b/dev-cpp/htmlcxx/Manifest
@@ -1,5 +1,3 @@
-AUX 0001-strstream-is-deprecated-use-sstream-instead.patch 1442 BLAKE2B 93f0f2ec5606650bc0aac209ee80e988bb0fbbb158d9f367b39ef5f87bba9bf7dbe71fde2977d39529bae5cbe4a7da012511bdd89f105311f39459db82f2d093 SHA512 75cbb49425edc4c77c9bafd0f0fcc1d0bb8364db542229bc9a838003dd4d16e785346760e433c3cebc6aff44018d104f72c66b40257b7f82690f5c1dea8eb542
-AUX 0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch 1265 BLAKE2B aacadc58a374a644eb2207d26e67e948e1cb4a3cbf9cf51474ab4a1c4740cf2bba18417b5d584ac096906d4271e34a5454f741527b28e1dd258fb99b5a1e2bea SHA512 c311c1d4e6cc463ec31fc13b77f1d38f68c81edda072c2486db1bdae3f19aa74db64a03056d941960c08dd193a4910930844ec6781c7c44d3ab4559eb40d4ce5
-DIST htmlcxx-0.86.tar.gz 469416 BLAKE2B 6edd4b7755db6d8911bc4ee6b1b61792b08d6a381971162a77cd3a6c7cb6cdb06e5a4a77b0a815589edab26aec04490a6b6c9edd80199f01304a506c707688b6 SHA512 dcff9c9946e1c3429af2230997c965b89a28a8ee219d8d594800106ff578bb21154e4680c38a09fb5f96cd4051c89cbf16f2151d30be93d4e3d291ff421aafcb
-EBUILD htmlcxx-0.86.ebuild 779 BLAKE2B 3079d926bebee3bccb81d11be3433ee2e2e0c83ccc2ee89675f1b7922967b3dc6f45cb4b01ac3ef14cca15c4f9af83c48bb56b8afd239ca4d623caace4a088c9 SHA512 05e1f4d67c94a604e1f933aa381d3b94aeb122cfcdbac4635682a06ff70f50db31d9cac393bb9fa334920f6a7f3cfdffbe068e02b50a89425767df6701682093
+DIST htmlcxx-0.87.tar.gz 477083 BLAKE2B 94977e758b4f2643f39a464094e315c11b78bc957a3eb054e6a7608828345704a82c3ca36c5ac2855054e7570daebb80d8a63639f3a7197344d25f2d16830702 SHA512 391b94c7ea2d17a04d46ac80f8146e6c2b14b289379c40f3d432ed9c0f36222ced6384d725cdecfc352e28c30f11976249b6a3f7133bbee3161a7883d197fca7
+EBUILD htmlcxx-0.87.ebuild 613 BLAKE2B 536f4256c4c0bcf4311ac5c8ce220907aafdb4c04c776f7d8018875b7e6f2c21a59115445c3695db73fde207c8fa77f52b7d9075030a8ead30f4f8ceb6876f97 SHA512 1b8bba8b6d5c2837617ea90b9aefab2ec8bc4aea29f39d6b1b3a1ec440965e73b961316a8cde85a21e5ad6f1c8caf9b54511a4fd6d1f7d527942fe69356250bf
MISC metadata.xml 324 BLAKE2B 41ae2c30cadd90db72f85f0b1a8829cccb8aa250bbd57dc10414f856dc3eadee95e94c6261901da3d7555ea30960d06b4110fd3b426e3faa72df809abded6ec3 SHA512 09d19b383ae7c72a26e069063cb28bd4b96d61e4c27505234131ef635dd2643bba26fbde2d972029969fd209eb9b0370c2a95b582b1f1516dbef31c5e7d9ac43
diff --git a/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch b/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch
deleted file mode 100644
index 822c1c8e41a2..000000000000
--- a/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 04fbe8cb7d933699f2a8ac06d89b205d933070c1 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 14 Sep 2016 22:56:14 +0100
-Subject: [PATCH 1/3] strstream is deprecated, use sstream instead
-
----
- html/Uri.cc | 2 +-
- html/utils.cc | 5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/html/Uri.cc b/html/Uri.cc
-index 4ddb3dd..034d29a 100644
---- a/html/Uri.cc
-+++ b/html/Uri.cc
-@@ -1,7 +1,7 @@
- #include "Uri.h"
-
- #include "wincstring.h"
--#include <strstream>
-+#include <sstream>
- #include <cstdlib>
- #include <cassert>
- #include "tld.h"
-diff --git a/html/utils.cc b/html/utils.cc
-index 37ee889..e56cbaf 100644
---- a/html/utils.cc
-+++ b/html/utils.cc
-@@ -1,7 +1,7 @@
- #include <algorithm>
- #include <cctype>
- #include <cstring>
--#include <strstream>
-+#include <sstream>
- #include "Uri.h"
-
- #include "utils.h"
-@@ -509,7 +509,7 @@ namespace htmlcxx {
- string __serialize_gml(const tree<HTML::Node> &tr, tree<HTML::Node>::iterator it, tree<HTML::Node>::iterator end, unsigned int parent_id, unsigned int& label) {
-
- using namespace std;
-- ostrstream ret;
-+ ostringstream ret;
- tree<HTML::Node>::sibling_iterator sib = tr.begin(it);
- while(sib != tr.end(it)) {
- ret << "node [ id " << ++label << "\n label \"" << label << "\"\n]\n";
-@@ -519,7 +519,6 @@ namespace htmlcxx {
- }
- ret << ends;
- string str = ret.str();
-- ret.freeze(0);
- return str;
- }
-
---
-2.8.2
-
diff --git a/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch b/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch
deleted file mode 100644
index c387deeca7f1..000000000000
--- a/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 807081583ea58b07a5ff2e0659f4173492befb8a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 14 Sep 2016 22:56:35 +0100
-Subject: [PATCH 2/3] Update css_syntax.y for use with less ancient Bison
-
-New pregenerated css_syntax.c to follow.
----
- css/css_syntax.y | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/css/css_syntax.y b/css/css_syntax.y
-index e75720d..0d9b177 100644
---- a/css/css_syntax.y
-+++ b/css/css_syntax.y
-@@ -4,13 +4,13 @@
- #include "css_lex.h"
- #include "parser.h"
-
--#define YYPARSE_PARAM yyparam
- #define YYERROR_VERBOSE 1
- //#define YYDEBUG 1
-
- %}
-
--%pure_parser
-+%parse-param {void *yyparam}
-+%pure-parser
-
- %union {
- char *lexeme;
-@@ -22,6 +22,19 @@
- int pseudo_element;
- }
-
-+%{
-+
-+int yylex(YYSTYPE *lvalp);
-+
-+int yyerror(void *yyparam, const char *s) {
-+#if YYDEBUG
-+ fprintf(stderr, "Error: %s\n", s);
-+#endif
-+ return 0;
-+}
-+
-+%}
-+
- %token IMPORT_SYM
- %token IMPORTANT_SYM
- %token IDENT
-@@ -571,13 +584,6 @@ hexcolor
-
- %%
-
--int yyerror(char *s) {
--#if YYDEBUG
-- fprintf(stderr, "Error: %s\n", s);
--#endif
-- return 0;
--}
--
- struct selector_list_t* css_parse(const char *buffer, int buf_len) {
- struct selector_list_t *ret = NULL;
- //yydebug = 1;
---
-2.8.2
-
diff --git a/dev-cpp/htmlcxx/htmlcxx-0.86.ebuild b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
index 88d48de33736..fdcb01bc5cf2 100644
--- a/dev-cpp/htmlcxx/htmlcxx-0.86.ebuild
+++ b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils multilib-minimal
+inherit multilib-minimal
DESCRIPTION="A simple non-validating CSS 1 and HTML parser for C++"
HOMEPAGE="http://htmlcxx.sourceforge.net/"
@@ -13,14 +13,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
-DEPEND="sys-devel/flex[${MULTILIB_USEDEP}]
- virtual/yacc"
-
-PATCHES=(
- "${FILESDIR}"/0001-strstream-is-deprecated-use-sstream-instead.patch
- "${FILESDIR}"/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch
-)
-
ECONF_SOURCE="${S}"
multilib_src_configure() {
@@ -30,6 +22,8 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- prune_libtool_files
+ # libtool archives covered by pkg-config.
+ find "${D}" -name "*.la" -delete || die
+
einstalldocs
}
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 9e033a932ea1..75a362599911 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,7 +1,7 @@
DIST libjson-rpc-cpp-1.1.0.tar.gz 179442 BLAKE2B cfbfe703d1a3d4ccaf6d4d475a7c1686c8f7afc28b025d6fd3bfebdc41cff2b944e6600e68073c1b7e7c0a2463cbf6e9724cf618c5d481bf7a4600019b529922 SHA512 bf34eedb196b1e214292976036a00e933f8a9b4325441ea2e4ae049a7c818014a68dd9d2f22d01588f5e6d1e9f465c73a133b0fd8282f8cf78a05a493f4c461b
DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433
-EBUILD libjson-rpc-cpp-1.1.0-r1.ebuild 1581 BLAKE2B 1014949d138562647f2ab770acc5e55f9747e30541ded868def799b0019a98f2a03a770196cce2fd43c58da7bf5057c620d810df1b55d1b4aa08661b1205614f SHA512 d9fdbb75f52eb2b0f87c850249594e33d5497173bbf440866576d67e836db7cd953c1a970c01c7baa8e55b16d1292ad04d9eb68b81b045d7167c3b059240337d
-EBUILD libjson-rpc-cpp-1.1.1-r1.ebuild 1583 BLAKE2B ac73aac2d7b86a610eb04a2df35da91d07b709327ecea87207d79013e87f23912d9a8af4c17d9376d8cdcf049ea391f1803a58546af23e2dd8823ce49493f83c SHA512 61c15fc197f12452d617f41bcbb8ea97463746270ba7d217d7e87a7273aeaefb0c988a701deea5ecd8e2cc63476f0e0ebd13e378995c604af40d12bffb048fb7
-EBUILD libjson-rpc-cpp-1.1.1.ebuild 1581 BLAKE2B 1014949d138562647f2ab770acc5e55f9747e30541ded868def799b0019a98f2a03a770196cce2fd43c58da7bf5057c620d810df1b55d1b4aa08661b1205614f SHA512 d9fdbb75f52eb2b0f87c850249594e33d5497173bbf440866576d67e836db7cd953c1a970c01c7baa8e55b16d1292ad04d9eb68b81b045d7167c3b059240337d
-EBUILD libjson-rpc-cpp-9999.ebuild 1583 BLAKE2B 67319729d6a83052ff993f33c0edab45ddb1b896c973901918c7b0fcb48f90b4788060f3e42d22148637b5e2b794d3a2a1a7c7e0c4859ca44d2036d12b3c9d35 SHA512 3e2d73ed97df33c7617f7eaca476e88776260a408ce868f3fffa41cd135affe28365a94497db04b652841f73c566a46e899822cf2b36da1018dd63b48cc939a0
+EBUILD libjson-rpc-cpp-1.1.0-r1.ebuild 1577 BLAKE2B 6126b21e1c7af4a81d8a01be1c5773c6a2aa3c7be05738672b92a886d5f76579390139084b179be2c44812a68af4cc9b67580d5bfc6c257218f30964f8222533 SHA512 0ba7e7f7138cee4cd15b38e32676f41278a50cd83432c559b2a0672ed01486c31d2e5be9d128aec0a5a057173388840cb50ee260355901f972cfbd94264de5c5
+EBUILD libjson-rpc-cpp-1.1.1-r1.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
+EBUILD libjson-rpc-cpp-1.1.1.ebuild 1577 BLAKE2B 6126b21e1c7af4a81d8a01be1c5773c6a2aa3c7be05738672b92a886d5f76579390139084b179be2c44812a68af4cc9b67580d5bfc6c257218f30964f8222533 SHA512 0ba7e7f7138cee4cd15b38e32676f41278a50cd83432c559b2a0672ed01486c31d2e5be9d128aec0a5a057173388840cb50ee260355901f972cfbd94264de5c5
+EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B 94d3a0d77ee6c007928c0f90b503a7b0ac041c783fdcd87766ae2ba09c4d419906dd06ac0ecdd9b23a86e78295961e3f5f1ca8ba14ed1514ee4d61074885c095 SHA512 c0dab0ba3eff39b3c8af50c562d3bc3e7ee714cd8cc4daaed3df1f78ef4ac373987b3b8c57c363697d0fd11f04add0e4bd810297919ad7eb11c84caa8e19f0b0
MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
index d04f0daefd39..614694270fd9 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
stubgen? ( dev-libs/argtable:= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- test? ( <dev-cpp/catch-2 )"
+ test? ( dev-cpp/catch:1 )"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
index fbf180d4cf2d..2ab94282c0a9 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
stubgen? ( dev-libs/argtable:= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- test? ( >=dev-cpp/catch-2 )"
+ test? ( dev-cpp/catch:0 )"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
index d04f0daefd39..614694270fd9 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
stubgen? ( dev-libs/argtable:= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- test? ( <dev-cpp/catch-2 )"
+ test? ( dev-cpp/catch:1 )"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
index 1daad1e754b0..b5214663cb01 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
stubgen? ( dev-libs/argtable:= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- test? ( >=dev-cpp/catch-2 )"
+ test? ( dev-cpp/catch:0 )"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 9754105339c4..69a964c59862 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -2,7 +2,7 @@ AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb84899
AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
-EBUILD ms-gsl-1.0.0.ebuild 740 BLAKE2B 064e283ba501e9fb3ad9dd3fd28576c4138ebab6d5c532cecbe6b416d3a468a96b9fcc94bddc6987562b3c9897c7623f874c2bd791568d59bf7fe2cb463756d7 SHA512 0f4ba6a3e412749c33ea001645cc3b43b4cc509ed9190e56201a9b2ad8f055431df55d7a2e77e85c2180fe542e4b60042e58618cb4840fd5187fdd2eda9201cd
-EBUILD ms-gsl-2.0.0.ebuild 763 BLAKE2B ea4084bab54323b98d7481a8681593bcd604e0ced3009c9bae6505ceaaca786c42c85446e82db6cabf2868c36dfd7a6505b9f2c461ebc75a77f3a1371ab28f65 SHA512 8e1c5817b892378487686862ebbcf23d8e66e8477abef5374dbc388c99b627d1533374bd6e030c9256a505ac41eb596ffcae2d4a1afa2a00b354a0b98728dd53
-EBUILD ms-gsl-9999.ebuild 743 BLAKE2B d680d641bbbf771789823bc7cf5996b34c0e9f2135427b466f6166c613a068e05ef6c79a21d4f6aed334f01e3c8c128e6ae14b516164c4b2ef22ac7667dd9395 SHA512 fcd37e590c9bb6397032fd3d10d968d42db22cd4e8d063df3aac6fd972bbedbbe9fed5055b61d841ccf758fb274ae813e4fbd5b6d784022afd3f4950cface488
+EBUILD ms-gsl-1.0.0.ebuild 730 BLAKE2B 5aaeb7b07a5f949614256d7cdbc4aa2eade4a5f9ad5ebb729bc13b1df3a43ce5fb13a7d8cc6ba9fb23891f6d70eaeee391ebe7bec2d1c14eacb77aa9b6329004 SHA512 9d5e8ca174656262b9968371a4d0966091c88c95549224b7f35240ae180e3df02f1a1177c8c88fbfeaf05d1ed8e781db3819a4b70ef776762e69582b6b191c55
+EBUILD ms-gsl-2.0.0.ebuild 757 BLAKE2B 5632fb8de56133b6022345f3e90281dcf03f35d8c0e419e69efa8aa8432d5238bd58f03ead6ef910adbec94d2e356caba198751ed55d4ca219a94830666578fc SHA512 ceb5ddac161baf541076a5dd6f58561919ebc55ea247d8d271ece00e17f628a7c92dee763aec400ea2dc2d0c4f4bb59456abf71e421d9b33c8971bb8853db4de
+EBUILD ms-gsl-9999.ebuild 711 BLAKE2B ff612a5f984d24926a7dbc401db50c817031d470c5bf994f9b5085c77851bc15d16439014931024c42daf75df3f9a3edf3b7e206b7d9197317211409692b8c32 SHA512 3bafae58327c7fe393e49a4cf2b29b8c717fa144df47613d9171d1175187e7c75642a1eb98f9a91087573024157963366facba1c7fd0b0b1924fbf98647e3f0a
MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
index cde182b5ba10..c2294e55587b 100644
--- a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ IUSE="test"
# header only library
RDEPEND=""
-DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+DEPEND="test? ( dev-cpp/catch:1 )"
PATCHES=(
"${FILESDIR}/${P}-use_system_catch-636828.patch"
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
index c3af23471bc5..8b5cb2b6670b 100644
--- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ IUSE="test"
# header only library
RDEPEND=""
-DEPEND="test? ( ~dev-cpp/catch-1.11.0 )"
+DEPEND="test? ( dev-cpp/catch:1 )"
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
index d7c789086547..3568adaea6b7 100644
--- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,8 +10,6 @@ HOMEPAGE="https://github.com/Microsoft/GSL"
SRC_URI=""
EGIT_REPO_URI="https://github.com/Microsoft/GSL.git"
-S="${WORKDIR}/GSL-${PV}"
-
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
@@ -19,7 +17,7 @@ IUSE="test"
# header only library
RDEPEND=""
-DEPEND="test? ( ~dev-cpp/catch-1.11.0 )"
+DEPEND="test? ( dev-cpp/catch:1 )"
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"