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 ADE60139000 for ; Sat, 31 Jul 2021 00:18:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67BB0E08F6; Sat, 31 Jul 2021 00:18:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3D436E08F0 for ; Sat, 31 Jul 2021 00:18:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8DD543438FE for ; Sat, 31 Jul 2021 00:18:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C7F1858 for ; Sat, 31 Jul 2021 00:18:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1627690638.f17fc82cfd256723006c5afa229185d5a81c7e01.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/plowshare/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/plowshare/plowshare-2.1.6-r1.ebuild net-misc/plowshare/plowshare-2.1.6.ebuild net-misc/plowshare/plowshare-2.1.7-r1.ebuild net-misc/plowshare/plowshare-2.1.7.ebuild net-misc/plowshare/plowshare-9999.ebuild X-VCS-Directories: net-misc/plowshare/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f17fc82cfd256723006c5afa229185d5a81c7e01 X-VCS-Branch: master Date: Sat, 31 Jul 2021 00:18:35 +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: b3c2953b-52b4-4c44-83f6-138c1c06cc35 X-Archives-Hash: 4ca3da744fd925c8c46df720f245f4df commit: f17fc82cfd256723006c5afa229185d5a81c7e01 Author: Sam James gentoo org> AuthorDate: Sun Jul 25 03:04:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 31 00:17:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17fc82c net-misc/plowshare: [QA] unconditionally install completion files QA policy [0] says that we don't conditionalise installation of small files. It's a wasteful rebuild and inconsistent across packages for when users desire completions to be available. [0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301 Signed-off-by: Sam James gentoo.org> ...lowshare-2.1.6.ebuild => plowshare-2.1.6-r1.ebuild} | 18 ++++-------------- ...lowshare-2.1.7.ebuild => plowshare-2.1.7-r1.ebuild} | 18 ++++-------------- net-misc/plowshare/plowshare-9999.ebuild | 16 ++++------------ 3 files changed, 12 insertions(+), 40 deletions(-) diff --git a/net-misc/plowshare/plowshare-2.1.6.ebuild b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild similarity index 84% rename from net-misc/plowshare/plowshare-2.1.6.ebuild rename to net-misc/plowshare/plowshare-2.1.6-r1.ebuild index 52227ef820e..cacd5eb72e6 100644 --- a/net-misc/plowshare/plowshare-2.1.6.ebuild +++ b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild @@ -1,19 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit bash-completion-r1 +EAPI=7 DESCRIPTION="Command-line downloader and uploader for file-sharing websites" HOMEPAGE="https://github.com/mcrapet/plowshare" +SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="bash-completion +javascript view-captcha" - -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +IUSE="+javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -24,7 +21,6 @@ RDEPEND=" virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" -DEPEND="" # NOTES: # javascript dep should be any javascript interpreter using /usr/bin/js @@ -33,12 +29,6 @@ src_prepare() { # Fix doc install path sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - if ! use bash-completion - then - sed -i -e \ "/^install:/s/install_bash_completion//" \ - Makefile || die "sed failed" - fi - default } diff --git a/net-misc/plowshare/plowshare-2.1.7.ebuild b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild similarity index 84% rename from net-misc/plowshare/plowshare-2.1.7.ebuild rename to net-misc/plowshare/plowshare-2.1.7-r1.ebuild index 52227ef820e..cacd5eb72e6 100644 --- a/net-misc/plowshare/plowshare-2.1.7.ebuild +++ b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild @@ -1,19 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit bash-completion-r1 +EAPI=7 DESCRIPTION="Command-line downloader and uploader for file-sharing websites" HOMEPAGE="https://github.com/mcrapet/plowshare" +SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="bash-completion +javascript view-captcha" - -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +IUSE="+javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -24,7 +21,6 @@ RDEPEND=" virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" -DEPEND="" # NOTES: # javascript dep should be any javascript interpreter using /usr/bin/js @@ -33,12 +29,6 @@ src_prepare() { # Fix doc install path sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - if ! use bash-completion - then - sed -i -e \ "/^install:/s/install_bash_completion//" \ - Makefile || die "sed failed" - fi - default } diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild index a0c97507680..1c454b8d9c4 100644 --- a/net-misc/plowshare/plowshare-9999.ebuild +++ b/net-misc/plowshare/plowshare-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit bash-completion-r1 git-r3 +inherit git-r3 DESCRIPTION="Command-line downloader and uploader for file-sharing websites" HOMEPAGE="https://github.com/mcrapet/plowshare" @@ -11,8 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="bash-completion +javascript view-captcha" +IUSE="+javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -23,7 +22,6 @@ RDEPEND=" virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" -DEPEND="" # NOTES: # javascript dep should be any javascript interpreter using /usr/bin/js @@ -32,12 +30,6 @@ src_prepare() { # Fix doc install path sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - if ! use bash-completion - then - sed -i -e \ "/^install:/s/install_bash_completion//" \ - Makefile || die "sed failed" - fi - default }