dev-cpp/cli11: add 2.1.0, drop 1.9.1

- add subslot
- enable normal tests

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>

dev-cpp/cli11/Manifest

@@ -1,2 +1,3 @@
-DIST cli11-1.9.1.tar.gz 262925 BLAKE2B 30c0c35827992ca8f1527ace9dda076a89666f1598be423bead85fff2006ca82f59937348b914a9b058878a7e68467501226c704b4ecaeefe09508657f346a14 SHA512 bcccfe88695ceddd73d87738e1d5ed4372f5cf43e3866e88053dd486ea8973804022029775de781e1dbdd2e1566b77e072de00202033983217276954a07c5718
+DIST catch-2.13.6.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40
 DIST cli11-2.0.0.tar.gz 280797 BLAKE2B 5ce65d6c23f98d4128d1e7d4711f9dcd258b1705317b7e94b094d172c090c27a26b43580df16fee8d0a1a1cb993b763d7d43cc8fda7dad231f0ca018c816b9e7 SHA512 5ac06623383c003286b915e585e85ad419449735770e9a164665395f33d9e03ec6340445ab782200e2cfe5f40123b5843a7401211b6ece5b16342321e3e7a10a
+DIST cli11-2.1.0.tar.gz 286192 BLAKE2B c88a57effedaa19a119a28f5ad6d63f3b1a43055359e6d7d74258a839e0846817593974460e3f51d44218bca2b6b227c9d893a919155b38b63cd6b0b37711073 SHA512 22c75e6b55d5320656ca2f65bf7c1dc82546fa65458f66a3d6401d002e83f12a0ee93a572637f5daa8daed9e0ce11fbf4aabf864caadc851f75bced63814ba10

dev-cpp/cli11/cli11-1.9.1.ebuild

@@ -1,36 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_CONFIG_NAME="docs/Doxyfile"
-inherit cmake docs
-
-MY_PN="CLI11"
-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/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLI11_BUILD_DOCS=OFF
-		-DCLI11_BUILD_TESTS=OFF
-		-DCLI11_BUILD_EXAMPLES=$(usex test)
-		-DCLI11_BUILD_EXAMPLES_JSON=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}

dev-cpp/cli11/cli11-2.1.0.ebuild

@@ -0,0 +1,51 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs"
+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 )
+"
+S="${WORKDIR}/CLI11-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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
+		-DCLI11_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}

dev-cpp/cli11/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
 		<remote-id type="github">CLIUtils/CLI11</remote-id>