[gentoo-commits] repo/gentoo:master commit in: app-doc/cppman/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     7f629a139b3531f94e5099d9fbc8014010d01dae
Author:     neeshy <neeshy <AT> tfwno <DOT> gf>
AuthorDate: Sat Mar 28 20:06:52 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 07:17:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f629a13

app-doc/cppman: cleanup, fix DOCS location

Signed-off-by: Nima Sadeghi <neeshy <AT> tfwno.gf>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...pman-0.4.8-r1.ebuild => cppman-0.4.8-r2.ebuild} | 24 ++++++++++++++--------
 app-doc/cppman/cppman-0.4.9.ebuild                 | 20 ++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app-doc/cppman/cppman-0.4.8-r1.ebuild b/app-doc/cppman/cppman-0.4.8-r2.ebuild
similarity index 59%
rename from app-doc/cppman/cppman-0.4.8-r1.ebuild
rename to app-doc/cppman/cppman-0.4.8-r2.ebuild
index 931aff72c2b..47193572aa4 100644
--- a/app-doc/cppman/cppman-0.4.8-r1.ebuild
+++ b/app-doc/cppman/cppman-0.4.8-r2.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,threads"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,threads(+)"
 
 DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
 DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
 HOMEPAGE="https://github.com/aitjcize/cppman"
-LICENSE="GPL-3"
-
-SLOT="0"
 SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bash-completion zsh-completion"
 
 RDEPEND="
 	sys-apps/groff
@@ -27,5 +28,12 @@ RDEPEND="
 	')
 "
 
-# `./setup install` already installs docs
-DOCS=()
+DOCS=( README.rst AUTHORS COPYING ChangeLog )
+
+src_prepare() {
+	sed -i '\:share/doc/cppman:d' setup.py
+	use bash-completion || sed -i '\:share/bash-completion/completions:d' setup.py
+	use zsh-completion || sed -i '\:share/zsh-completion/completions:d' setup.py
+
+	default
+}

diff --git a/app-doc/cppman/cppman-0.4.9.ebuild b/app-doc/cppman/cppman-0.4.9.ebuild
index a124e60ffdd..47193572aa4 100644
--- a/app-doc/cppman/cppman-0.4.9.ebuild
+++ b/app-doc/cppman/cppman-0.4.9.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 
 DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
 DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
 HOMEPAGE="https://github.com/aitjcize/cppman"
-LICENSE="GPL-3"
-
-SLOT="0"
 SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bash-completion zsh-completion"
 
 RDEPEND="
 	sys-apps/groff
@@ -27,5 +28,12 @@ RDEPEND="
 	')
 "
 
-# `./setup install` already installs docs
-DOCS=()
+DOCS=( README.rst AUTHORS COPYING ChangeLog )
+
+src_prepare() {
+	sed -i '\:share/doc/cppman:d' setup.py
+	use bash-completion || sed -i '\:share/bash-completion/completions:d' setup.py
+	use zsh-completion || sed -i '\:share/zsh-completion/completions:d' setup.py
+
+	default
+}