From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E506A138350 for ; Sun, 5 Apr 2020 07:18:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2447E08CD; Sun, 5 Apr 2020 07:18:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBAC1E08CD for ; Sun, 5 Apr 2020 07:18:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4CC834EFFF for ; Sun, 5 Apr 2020 07:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 553BD1BF for ; Sun, 5 Apr 2020 07:18:26 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1586071074.f27f51ec43d91aa1bb0733f0b9bd44d735da89d4.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/cppman/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/cppman/cppman-0.4.8-r2.ebuild app-doc/cppman/cppman-0.4.9.ebuild X-VCS-Directories: app-doc/cppman/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f27f51ec43d91aa1bb0733f0b9bd44d735da89d4 X-VCS-Branch: master Date: Sun, 5 Apr 2020 07:18:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95b2ea45-0cda-441d-b864-e5600ff1a79b X-Archives-Hash: e251fe64f3996349daaa6e241a803c1f commit: f27f51ec43d91aa1bb0733f0b9bd44d735da89d4 Author: neeshy tfwno gf> AuthorDate: Thu Apr 2 22:12:31 2020 +0000 Commit: Joonas Niilola gentoo 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 tfwno.gf> Closes: https://github.com/gentoo/gentoo/pull/15074 Signed-off-by: Joonas Niilola 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" }