gentoo resync : 01.08.2021

4 files changed, 15 insertions, 43 deletions

diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index a4614227a371..67c0f1290ac1 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,6 +1,6 @@
 DIST plowshare-2.1.6.tar.gz 95946 BLAKE2B 1a3c420bc3370e03946f3f813ccecdec6b567245ee49cdf9f7b7788e41fed60b93931e7038e34f6edcbe8a00ed201681c28ae29ffb0aaec10112d03f653231c8 SHA512 bccc72f1add6389fd7fc41a27f9e169c622e3a4e7c9c1040c01a8a4569accc9b0b6910815a013d5e8aff7103ee26d943665ffeccc02db1879eca580b3892190d
 DIST plowshare-2.1.7.tar.gz 96282 BLAKE2B bfec7fba200d783fcba5051738f98f7cd862eede1661b4d72062bd111b394800406443e52ecf2f0b771b90a9834a87fae01a6055828e8a12446126c593daa01c SHA512 7fe91d3756c55ffc1daf9275bfd2413f2644accd8fa69f2b1064696e1435f9b8be9515907c8249ffde85436dc6966f1d42bad94ccfbde93ae584dcc0d642c215
-EBUILD plowshare-2.1.6.ebuild 1695 BLAKE2B 5fdb0b37e2fdced72fa29e47cb910bcf9a486becd10e346db67e70d4fbff6d9dc337dacd0c98a2fc45b5768de4c3f06f4616e3a79f1dce9ce297327a6744ad63 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1
-EBUILD plowshare-2.1.7.ebuild 1695 BLAKE2B 5fdb0b37e2fdced72fa29e47cb910bcf9a486becd10e346db67e70d4fbff6d9dc337dacd0c98a2fc45b5768de4c3f06f4616e3a79f1dce9ce297327a6744ad63 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1
-EBUILD plowshare-9999.ebuild 1657 BLAKE2B ad697863a68aa541a7654130856ac829a8044d4866250922ad70451ee67c4ba966d2ecb48a47499c53deefa1ca4a623c3e7df099945167d7810e49bf10952178 SHA512 b718b705c5c53bde6b09adf03cefc601fa2ab006e59daf1d943d3738ce82b5a11e7e9df1201bb7d04f0cc58cdd126bf963202a8bc3c21d101d8e0914bbdb02eb
+EBUILD plowshare-2.1.6-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570
+EBUILD plowshare-2.1.7-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570
+EBUILD plowshare-9999.ebuild 1471 BLAKE2B 9c66158debb0c162ea7e7f5cea42fa1957e4f33296ed613f334732c8984fa53df4c227a9261e740cfa82494eb807e85d14c736d498fe52c423de417fe99bbee6 SHA512 f8c773141349db717d9b649637125c8863084bd398abedb9743bfe2c8544423b4438cddc7e949cae8d885abf2f828f76d45495594f8a11a9a8eb706aaf943439
 MISC metadata.xml 408 BLAKE2B dead060e9bca4c0f9ded99161e297f85a00a992312ebb10402a6b91515c3eccab9e9dafe9c0ae813c3c64cb72d0f2e28822b6e49c9ceea8de254136d13092d5d SHA512 46c5f62d551219c2922af526b34c0b19e948c243f2afb1fe12b1b6ad85e0c5b963d1fbda60e8ad6ff26e3652d163ccad5ec12d910ac67e887f58bb538461c073
diff --git a/net-misc/plowshare/plowshare-2.1.6.ebuild b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
index 52227ef820ef..cacd5eb72e61 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
index 52227ef820ef..cacd5eb72e61 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 a0c97507680a..1c454b8d9c40 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
 }