gentoo resync : 24.12.2018

5 files changed, 123 insertions, 15 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 267e4a684dc5..8410ad228d5a 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -2,11 +2,15 @@ AUX catch-2.2.2-python-automagic.patch 1096 BLAKE2B c1c5ae6cc0fa4f8066255581ab29
 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.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
+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-9999.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
+EBUILD catch-2.5.0.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
+EBUILD catch-9999.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
new file mode 100644
index 000000000000..f8b78e009959
--- /dev/null
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+	EGIT_BRANCH="Catch1.x"
+else
+	MY_P=${PN^}-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S="${WORKDIR}/${PN^}2-${PV}"
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!<dev-cpp/catch-1.12.2:0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc -r docs/.
+}
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index a770fcddab58..f8b78e009959 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,20 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-EGIT_BRANCH="Catch1.x"
-inherit cmake-utils git-r3
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+	EGIT_BRANCH="Catch1.x"
+else
+	MY_P=${PN^}-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S="${WORKDIR}/${PN^}2-${PV}"
+fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
 HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI=""
 
 LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS=""
+SLOT="1"
 IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!<dev-cpp/catch-1.12.2:0"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/catch/catch-2.5.0.ebuild b/dev-cpp/catch/catch-2.5.0.ebuild
new file mode 100644
index 000000000000..5318b054d396
--- /dev/null
+++ b/dev-cpp/catch/catch-2.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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 )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	use test &&
+		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index d7763c4ccaa9..5318b054d396 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -25,11 +26,19 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+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}"
 	)
+	use test &&
+		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
 	cmake-utils_src_configure
 }