4 files changed, 31 insertions, 64 deletions
diff --git a/dev-cpp/cli11/Manifest b/dev-cpp/cli11/Manifest
index 57973662c248..a76342ad6441 100644
--- a/dev-cpp/cli11/Manifest
+++ b/dev-cpp/cli11/Manifest
@@ -1,2 +1 @@
-DIST cli11-2.3.1.tar.gz 301615 BLAKE2B f5045a50a736aa7add0e21f95b76abbabe191eaa36bf68eb1e05c90343327c6343774b5f34daa281a4ff52230679a44d280eddbc3cef0abe5bce8454d7c98ec9 SHA512 7805a3bff5ce443e93a005341680db1e618d5b0789a697daaac881f9ccac76f855ea3d43c9c5b13c33c2bf590138241df9e55d70e133562272f0859d8341af09
 DIST cli11-2.3.2.tar.gz 303507 BLAKE2B 68a1ca97fb55a4329f7d56a7d661f71f356bebcb0878421bccb18093aab171cff963f4e3e8f47b95cac4947ebbd7c7d6c853cc28e404c07091685ba1e99ac8d3 SHA512 f48b289d52034c47b90db58c035a123b464bed488cf31bcdbe10a692214a5c05e62b99d6fb7c4b065f42df862ecf3813f11dd533b3697939d761e99d2b89c2ec
diff --git a/dev-cpp/cli11/cli11-2.3.1.ebuild b/dev-cpp/cli11/cli11-2.3.1.ebuild
deleted file mode 100644
index 793ca37ab4aa..000000000000
--- a/dev-cpp/cli11/cli11-2.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="docs"
-inherit cmake docs
-
-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"
-S="${WORKDIR}/CLI11-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	<dev-cpp/catch-3:0
-	dev-libs/boost
-)"
-
-DOCS=( README.md CHANGELOG.md )
-
-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
-}
diff --git a/dev-cpp/cli11/cli11-2.3.2.ebuild b/dev-cpp/cli11/cli11-2.3.2.ebuild
index 793ca37ab4aa..3dc2b6902112 100644
--- a/dev-cpp/cli11/cli11-2.3.2.ebuild
+++ b/dev-cpp/cli11/cli11-2.3.2.ebuild
@@ -1,41 +1,50 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DOCS_BUILDER="doxygen"
-DOCS_DIR="docs"
-inherit cmake docs
+inherit cmake
 
 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"
-S="${WORKDIR}/CLI11-${PV}"
+HOMEPAGE="https://cliutils.github.io/CLI11/book/"
+SRC_URI="https://github.com/CLIUtils/CLI11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN^^}-${PV}"
 
 LICENSE="BSD"
-SLOT="0/2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? (
-	<dev-cpp/catch-3:0
-	dev-libs/boost
-)"
-
-DOCS=( README.md CHANGELOG.md )
+DEPEND="
+	test? (
+		=dev-cpp/catch-2*:0
+		dev-libs/boost
+	)"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCLI11_BUILD_DOCS=OFF  # handled by docs.eclass
+		-DCLI11_BUILD_DOCS=$(usex doc)
+		-DCLI11_BUILD_EXAMPLES=no
 		-DCLI11_BUILD_TESTS=$(usex test)
+		$(usev test -DCLI11_BOOST=yes)
 	)
 
 	cmake_src_configure
 }
 
 src_compile() {
-	cmake_src_compile
-	docs_compile
+	cmake_src_compile all $(usev doc docs)
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md book/{chapters,code,*.md} )
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
 }
diff --git a/dev-cpp/cli11/metadata.xml b/dev-cpp/cli11/metadata.xml
index ddb5b0f1787e..a3b44b016c9f 100644
--- a/dev-cpp/cli11/metadata.xml
+++ b/dev-cpp/cli11/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>ionen@gentoo.org</email>
+  <name>Ionen Wolkens</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file