From 42b38e2dbcf12b6ec5553ee152c228144fe4d2ce Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 31 Mar 2022 07:58:45 +0500
Subject: [PATCH] dev-cpp/cli11: add 2.2.0, drop 2.1.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-cpp/cli11/Manifest                        |  3 +--
 ...{cli11-2.1.0.ebuild => cli11-2.2.0.ebuild} | 23 ++++++-------------
 2 files changed, 8 insertions(+), 18 deletions(-)
 rename dev-cpp/cli11/{cli11-2.1.0.ebuild => cli11-2.2.0.ebuild} (58%)

diff --git a/dev-cpp/cli11/Manifest b/dev-cpp/cli11/Manifest
index 98091fdea9..a7e1e99e53 100644
--- a/dev-cpp/cli11/Manifest
+++ b/dev-cpp/cli11/Manifest
@@ -1,3 +1,2 @@
-DIST catch-2.13.6.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40
-DIST cli11-2.1.0.tar.gz 286192 BLAKE2B c88a57effedaa19a119a28f5ad6d63f3b1a43055359e6d7d74258a839e0846817593974460e3f51d44218bca2b6b227c9d893a919155b38b63cd6b0b37711073 SHA512 22c75e6b55d5320656ca2f65bf7c1dc82546fa65458f66a3d6401d002e83f12a0ee93a572637f5daa8daed9e0ce11fbf4aabf864caadc851f75bced63814ba10
 DIST cli11-2.1.2.tar.gz 285131 BLAKE2B 7967491bb252bcbf38194440ede4d1276ee5224e122cd9a5381de95a2d9f3d6cd6527d9c787b846c9d8009a824754bbf9f73d70dd26392c0d0945158edac8b84 SHA512 3b21d015e046666d2e3df2b7cf1a6247c2daa26bf583e714dc1f0a94518785bf90993cd8530f88078b4daac02530dc517db0d5ad452d2a91521b3007f270ea55
+DIST cli11-2.2.0.tar.gz 291482 BLAKE2B 4c419ef40d0fa3cb9fefe9bbb5fbc92db4d49f4032cc963d1434b4009a7d7e31cc74662bf391c57be9832be557e825e7fa17d375f9552396ce49d6035f89fe45 SHA512 ee8994c99dd8119e612be0339252b863d6db9d85a10c15a6e60e56c6f387bbefaf479679bc85aed2cb6539aeb82b3e7543673a5b97eb04b61793b6946582241d
diff --git a/dev-cpp/cli11/cli11-2.1.0.ebuild b/dev-cpp/cli11/cli11-2.2.0.ebuild
similarity index 58%
rename from dev-cpp/cli11/cli11-2.1.0.ebuild
rename to dev-cpp/cli11/cli11-2.2.0.ebuild
index 4f578edbf2..a758cbac26 100644
--- a/dev-cpp/cli11/cli11-2.1.0.ebuild
+++ b/dev-cpp/cli11/cli11-2.2.0.ebuild
@@ -10,32 +10,23 @@ inherit cmake docs
 CATCH_PV=2.13.6
 DESCRIPTION="Command line parser for C++11"
 HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book"
-SRC_URI="
-	https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/philsquared/Catch/releases/download/v${CATCH_PV}/catch.hpp -> catch-${CATCH_PV}.hpp )
-"
+SRC_URI="https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/CLI11-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+DEPEND="test? (
+	dev-cpp/catch:0
+	dev-libs/boost
+)"
+
 DOCS=( README.md CHANGELOG.md )
 
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# work around cmake's file(DOWNLOAD ...)
-	cd "${S}" || die
-	if use test; then
-		_cmake_check_build_dir
-		mkdir "${BUILD_DIR}"/tests || die
-		cp "${DISTDIR}"/catch-${CATCH_PV}.hpp "${BUILD_DIR}"/tests/catch.hpp || die
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCLI11_BUILD_DOCS=OFF  # handled by docs.eclass