commit:     f27f51ec43d91aa1bb0733f0b9bd44d735da89d4
Author:     neeshy <neeshy <AT> tfwno <DOT> gf>
AuthorDate: Thu Apr  2 22:12:31 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=f27f51ec

app-doc/cppman: simplify ebuilds

Signed-off-by: Nima Sadeghi <neeshy <AT> tfwno.gf>
Closes: https://github.com/gentoo/gentoo/pull/15074
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-doc/cppman/cppman-0.4.8-r2.ebuild | 10 +++-------
 app-doc/cppman/cppman-0.4.9.ebuild    | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app-doc/cppman/cppman-0.4.8-r2.ebuild 
b/app-doc/cppman/cppman-0.4.8-r2.ebuild
index 47193572aa4..6e35a51f7a2 100644
--- a/app-doc/cppman/cppman-0.4.8-r2.ebuild
+++ b/app-doc/cppman/cppman-0.4.8-r2.ebuild
@@ -18,7 +18,6 @@ 
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
@@ -28,12 +27,9 @@ RDEPEND="
        ')
 "
 
-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
+
+       # Don't allow setup.py to install documentation directly
+       sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
 }

diff --git a/app-doc/cppman/cppman-0.4.9.ebuild 
b/app-doc/cppman/cppman-0.4.9.ebuild
index 47193572aa4..6e35a51f7a2 100644
--- a/app-doc/cppman/cppman-0.4.9.ebuild
+++ b/app-doc/cppman/cppman-0.4.9.ebuild
@@ -18,7 +18,6 @@ 
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
@@ -28,12 +27,9 @@ RDEPEND="
        ')
 "
 
-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
+
+       # Don't allow setup.py to install documentation directly
+       sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
 }

Reply via email to