Version bump, new homepage, modules are now fetched by user with plowmod command, drop some old versions

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)

6 files changed, 20 insertions, 236 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index 81b91cb4e6c1..9579e7ecaa5d 100644
--- a/net-misc/plowshare/ChangeLog
+++ b/net-misc/plowshare/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/plowshare
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.32 2015/03/10 13:30:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.33 2015/04/13 21:50:02 voyageur Exp $
+
+*plowshare-2.1.0 (13 Apr 2015)
+
+  13 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> -plowshare-1.0.0.ebuild,
+  -plowshare-1.0.2.ebuild, -plowshare-1.0.4.ebuild, -plowshare-1.0.6.ebuild,
+  +plowshare-2.1.0.ebuild, metadata.xml:
+  Version bump, new homepage, modules are now fetched by user with plowmod
+  command, drop some old versions
 
 *plowshare-2.0.1 (10 Mar 2015)
 
diff --git a/net-misc/plowshare/metadata.xml b/net-misc/plowshare/metadata.xml
index 09c9740cdc18..17fd8a33d3cd 100644
--- a/net-misc/plowshare/metadata.xml
+++ b/net-misc/plowshare/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="view-captcha">View captcha with aview</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">plowshare</remote-id>
+		<remote-id type="github">mcrapet/plowshare</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/plowshare/plowshare-1.0.0.ebuild b/net-misc/plowshare/plowshare-1.0.0.ebuild
deleted file mode 100644
index d40ea235db21..000000000000
--- a/net-misc/plowshare/plowshare-1.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-1.0.0.ebuild,v 1.2 2014/03/14 14:04:04 voyageur Exp $
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript view-captcha"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
-	net-misc/curl
-	sys-apps/util-linux
-	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
-
-# Modules using detect_javascript
-JS_MODULES="letitbit nowdownload_co rapidgator zalaa zalil_ru zippyshare"
-
-src_prepare() {
-	if ! use javascript; then
-		for module in ${JS_MODULES}; do
-			sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed"
-			rm src/modules/${module}.sh || die "${module} rm failed"
-		done
-	fi
-
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare4|${P}|" Makefile || die "sed failed"
-
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-}
-
-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" install
-}
-
-pkg_postinst() {
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use:"
-		ewarn " ${JS_MODULES}"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-1.0.2.ebuild b/net-misc/plowshare/plowshare-1.0.2.ebuild
deleted file mode 100644
index b38abadd47dd..000000000000
--- a/net-misc/plowshare/plowshare-1.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-1.0.2.ebuild,v 1.1 2014/05/14 15:41:00 voyageur Exp $
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-# Fetched from http://${PN}.googlecode.com/archive/v${PV}.tar.gz
-SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript view-captcha"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
-	net-misc/curl
-	sys-apps/util-linux
-	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
-
-# Modules using detect_javascript
-JS_MODULES="letitbit nowdownload_co oboom rapidgator zalaa zalil_ru zippyshare"
-
-src_prepare() {
-	if ! use javascript; then
-		for module in ${JS_MODULES}; do
-			sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed"
-			rm src/modules/${module}.sh || die "${module} rm failed"
-		done
-	fi
-
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare4|${P}|" Makefile || die "sed failed"
-
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-}
-
-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() {
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use:"
-		ewarn " ${JS_MODULES}"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-1.0.4.ebuild b/net-misc/plowshare/plowshare-1.0.4.ebuild
deleted file mode 100644
index ce4811e32216..000000000000
--- a/net-misc/plowshare/plowshare-1.0.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-1.0.4.ebuild,v 1.1 2014/08/05 09:30:17 voyageur Exp $
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-# Fetched from http://${PN}.googlecode.com/archive/v${PV}.tar.gz
-SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript view-captcha"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
-	net-misc/curl
-	sys-apps/util-linux
-	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
-
-# Modules using detect_javascript
-JS_MODULES="letitbit nowdownload_co oboom rapidgator zalaa zalil_ru zippyshare"
-
-src_prepare() {
-	if ! use javascript; then
-		for module in ${JS_MODULES}; do
-			sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed"
-			rm src/modules/${module}.sh || die "${module} rm failed"
-		done
-	fi
-
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare4|${P}|" Makefile || die "sed failed"
-
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-}
-
-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() {
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use:"
-		ewarn " ${JS_MODULES}"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-1.0.6.ebuild b/net-misc/plowshare/plowshare-2.1.0.ebuild
index de41eea221c2..ccdee45fe992 100644
--- a/net-misc/plowshare/plowshare-1.0.6.ebuild
+++ b/net-misc/plowshare/plowshare-2.1.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-1.0.6.ebuild,v 1.1 2014/10/27 10:26:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-2.1.0.ebuild,v 1.1 2015/04/13 21:50:02 voyageur Exp $
 
 EAPI=5
 
 inherit bash-completion-r1
 
 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-# Fetched from http://${PN}.googlecode.com/archive/v${PV}.tar.gz
-SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
 
 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"
+
 RDEPEND="
 	>=app-shells/bash-4
 	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
 	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
 	net-misc/curl
 	sys-apps/util-linux
@@ -29,17 +30,7 @@ DEPEND=""
 # NOTES:
 # javascript dep should be any javascript interpreter using /usr/bin/js
 
-# Modules using detect_javascript
-JS_MODULES="letitbit nowdownload_co oboom rapidgator zalaa zippyshare"
-
 src_prepare() {
-	if ! use javascript; then
-		for module in ${JS_MODULES}; do
-			sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed"
-			rm src/modules/${module}.sh || die "${module} rm failed"
-		done
-	fi
-
 	# Fix doc install path
 	sed -i -e "/^DOCDIR/s|plowshare4|${P}|" Makefile || die "sed failed"
 
@@ -66,8 +57,10 @@ src_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:"
-		ewarn " ${JS_MODULES}"
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
 	fi
 }