Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/plowshare/
Date: Sat, 31 Jul 2021 00:18:42
Message-Id: 1627690638.f17fc82cfd256723006c5afa229185d5a81c7e01.sam@gentoo
1 commit: f17fc82cfd256723006c5afa229185d5a81c7e01
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 03:04:13 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 31 00:17:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17fc82c
7
8 net-misc/plowshare: [QA] unconditionally install completion files
9
10 QA policy [0] says that we don't conditionalise installation of
11 small files. It's a wasteful rebuild and inconsistent across packages
12 for when users desire completions to be available.
13
14 [0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 ...lowshare-2.1.6.ebuild => plowshare-2.1.6-r1.ebuild} | 18 ++++--------------
18 ...lowshare-2.1.7.ebuild => plowshare-2.1.7-r1.ebuild} | 18 ++++--------------
19 net-misc/plowshare/plowshare-9999.ebuild | 16 ++++------------
20 3 files changed, 12 insertions(+), 40 deletions(-)
21
22 diff --git a/net-misc/plowshare/plowshare-2.1.6.ebuild b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
23 similarity index 84%
24 rename from net-misc/plowshare/plowshare-2.1.6.ebuild
25 rename to net-misc/plowshare/plowshare-2.1.6-r1.ebuild
26 index 52227ef820e..cacd5eb72e6 100644
27 --- a/net-misc/plowshare/plowshare-2.1.6.ebuild
28 +++ b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
29 @@ -1,19 +1,16 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 +# Copyright 1999-2021 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33
34 -EAPI=6
35 -
36 -inherit bash-completion-r1
37 +EAPI=7
38
39 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
40 HOMEPAGE="https://github.com/mcrapet/plowshare"
41 +SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
42
43 LICENSE="GPL-3"
44 SLOT="0"
45 KEYWORDS="~amd64 ~arm ~ppc ~x86"
46 -IUSE="bash-completion +javascript view-captcha"
47 -
48 -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
49 +IUSE="+javascript view-captcha"
50
51 RDEPEND="
52 >=app-shells/bash-4
53 @@ -24,7 +21,6 @@ RDEPEND="
54 virtual/imagemagick-tools[tiff]
55 javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
56 view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
57 -DEPEND=""
58
59 # NOTES:
60 # javascript dep should be any javascript interpreter using /usr/bin/js
61 @@ -33,12 +29,6 @@ src_prepare() {
62 # Fix doc install path
63 sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
64
65 - if ! use bash-completion
66 - then
67 - sed -i -e \ "/^install:/s/install_bash_completion//" \
68 - Makefile || die "sed failed"
69 - fi
70 -
71 default
72 }
73
74
75 diff --git a/net-misc/plowshare/plowshare-2.1.7.ebuild b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
76 similarity index 84%
77 rename from net-misc/plowshare/plowshare-2.1.7.ebuild
78 rename to net-misc/plowshare/plowshare-2.1.7-r1.ebuild
79 index 52227ef820e..cacd5eb72e6 100644
80 --- a/net-misc/plowshare/plowshare-2.1.7.ebuild
81 +++ b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
82 @@ -1,19 +1,16 @@
83 -# Copyright 1999-2017 Gentoo Foundation
84 +# Copyright 1999-2021 Gentoo Authors
85 # Distributed under the terms of the GNU General Public License v2
86
87 -EAPI=6
88 -
89 -inherit bash-completion-r1
90 +EAPI=7
91
92 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
93 HOMEPAGE="https://github.com/mcrapet/plowshare"
94 +SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
95
96 LICENSE="GPL-3"
97 SLOT="0"
98 KEYWORDS="~amd64 ~arm ~ppc ~x86"
99 -IUSE="bash-completion +javascript view-captcha"
100 -
101 -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
102 +IUSE="+javascript view-captcha"
103
104 RDEPEND="
105 >=app-shells/bash-4
106 @@ -24,7 +21,6 @@ RDEPEND="
107 virtual/imagemagick-tools[tiff]
108 javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
109 view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
110 -DEPEND=""
111
112 # NOTES:
113 # javascript dep should be any javascript interpreter using /usr/bin/js
114 @@ -33,12 +29,6 @@ src_prepare() {
115 # Fix doc install path
116 sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
117
118 - if ! use bash-completion
119 - then
120 - sed -i -e \ "/^install:/s/install_bash_completion//" \
121 - Makefile || die "sed failed"
122 - fi
123 -
124 default
125 }
126
127
128 diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild
129 index a0c97507680..1c454b8d9c4 100644
130 --- a/net-misc/plowshare/plowshare-9999.ebuild
131 +++ b/net-misc/plowshare/plowshare-9999.ebuild
132 @@ -1,9 +1,9 @@
133 -# Copyright 1999-2017 Gentoo Foundation
134 +# Copyright 1999-2021 Gentoo Authors
135 # Distributed under the terms of the GNU General Public License v2
136
137 -EAPI=6
138 +EAPI=7
139
140 -inherit bash-completion-r1 git-r3
141 +inherit git-r3
142
143 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
144 HOMEPAGE="https://github.com/mcrapet/plowshare"
145 @@ -11,8 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git"
146
147 LICENSE="GPL-3"
148 SLOT="0"
149 -KEYWORDS=""
150 -IUSE="bash-completion +javascript view-captcha"
151 +IUSE="+javascript view-captcha"
152
153 RDEPEND="
154 >=app-shells/bash-4
155 @@ -23,7 +22,6 @@ RDEPEND="
156 virtual/imagemagick-tools[tiff]
157 javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
158 view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
159 -DEPEND=""
160
161 # NOTES:
162 # javascript dep should be any javascript interpreter using /usr/bin/js
163 @@ -32,12 +30,6 @@ src_prepare() {
164 # Fix doc install path
165 sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
166
167 - if ! use bash-completion
168 - then
169 - sed -i -e \ "/^install:/s/install_bash_completion//" \
170 - Makefile || die "sed failed"
171 - fi
172 -
173 default
174 }