gentoo resync : 20.03.2022

4 files changed, 10 insertions, 69 deletions

diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index 7e45eb5e2fc8..41c4e2d3fc4c 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,6 +1,4 @@
-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-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
+EBUILD plowshare-2.1.7-r2.ebuild 1479 BLAKE2B e849b36b633c55a5b697005f0ff1a8cef97d1f473692aec12244f791c5eb61bf46774e11f23ee32058c556a998dea0c5e934304a5e23efa63fe97a69d694272f SHA512 3419cdbf13152f0f0f587d50b3401bc0317a414e6e98d46571c237e10586b747f8325e433ed09a9e0daa91a27ec4cef3cb65a5400f9d39910f00835054136e46
+EBUILD plowshare-9999.ebuild 1439 BLAKE2B 5f89ae2f4b0cc208b59f45547fbb074099c06d5e416addc5d9049d2d39da2b76e02538a75836586eaff0e98dbd1510d67e4be6dbea2f855ffa5037073bf6e002 SHA512 f4ad2f51c1d4c06d23ff8849d5cf200b6e27f747c3925de946a3fe8591e07049a551a5706406f22eec28a08c47add4dccc34d9d07c14b1d3ee2a95b0cf98d80b
 MISC metadata.xml 409 BLAKE2B c6b76622caa384b675acdc6bf9f2fea2beac48a58b26862f4dd779eb496c176e1666371be069aad03164bd8a89924f19c628563a971402e0a3fa1ef54e3eda41 SHA512 a656cd950798c01c6f1df5414eb79bdadbe73c004e705498ba21dfb125c105a15e5d0670d5f1a1cf4ee62fe755cfa5fdd9fdfb7c12dce1d01ccbdfc86ad5da35
diff --git a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
deleted file mode 100644
index cacd5eb72e61..000000000000
--- a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="+javascript view-captcha"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	dev-vcs/git
-	net-misc/curl
-	sys-apps/util-linux
-	virtual/imagemagick-tools[tiff]
-	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
-
-# NOTES:
-# javascript dep should be any javascript interpreter using /usr/bin/js
-
-src_prepare() {
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	# There is a Makefile but it's not compiling anything, let's not try.
-	:
-}
-
-src_test() {
-	# Disable tests because all of them need a working Internet connection.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" \
-		PLOWSHARE_FORCE_VERSION="${PV}" install
-}
-
-pkg_postinst() {
-	elog "plowshare is not delivered with modules by default anymore"
-	elog "Per-user modules can be installed/updated with the plowmod command"
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use modules"
-		ewarn "requering a Javascript shell (/usr/bin/js)"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild
index cacd5eb72e61..f2207e36da41 100644
--- a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
+++ b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
 HOMEPAGE="https://github.com/mcrapet/plowshare"
@@ -10,7 +10,7 @@ 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="+javascript view-captcha"
+IUSE="javascript view-captcha"
 
 RDEPEND="
 	>=app-shells/bash-4
@@ -19,7 +19,7 @@ RDEPEND="
 	net-misc/curl
 	sys-apps/util-linux
 	virtual/imagemagick-tools[tiff]
-	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	javascript? ( dev-java/rhino )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
 
 # NOTES:
diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild
index 1c454b8d9c40..314455ade5a5 100644
--- a/net-misc/plowshare/plowshare-9999.ebuild
+++ b/net-misc/plowshare/plowshare-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+javascript view-captcha"
+IUSE="javascript view-captcha"
 
 RDEPEND="
 	>=app-shells/bash-4
@@ -20,7 +20,7 @@ RDEPEND="
 	net-misc/curl
 	sys-apps/util-linux
 	virtual/imagemagick-tools[tiff]
-	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	javascript? ( dev-java/rhino )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
 
 # NOTES: