Version bump, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 101 insertions, 118 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index 5129154cb595..47933b38bf0d 100644
--- a/net-misc/plowshare/ChangeLog
+++ b/net-misc/plowshare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/plowshare
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.24 2013/08/09 13:44:07 axs Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.25 2014/01/05 21:33:45 voyageur Exp $
+
+*plowshare-20131130 (05 Jan 2014)
+
+  05 Jan 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -plowshare-20120609-r2.ebuild, +plowshare-20131130.ebuild:
+  Version bump, drop old
 
   09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> plowshare-20120609-r2.ebuild,
   plowshare-20130520.ebuild:
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index abb4c80e7353..1c6fa11aca26 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST plowshare-snapshot-git20120609.tar.gz 121031 SHA256 cd23791943bfab23d7edf7272ff24615b2990d5e09d2988669d24d9161daebf9 SHA512 a0b2b8ac3cc2aade7dda0d361829ac0bfe23281beb48379a30c5fa8c4b4ad137c2afcc49fad53d47d4b54e9a7127e0e457acd297069f4430099339996aa7b2b1 WHIRLPOOL d8a525cf0f08834a2b21cffc12566f97e39e053684c7b54d3e4ed9134bd68dccaec74cccd63103afce9d7baf8d508cdcfd0f10b15d448f58981f28b310842b41
 DIST plowshare4-snapshot-git20130520.2b2d736.tar.gz 169289 SHA256 fb1cddf2e29337145b97b6c3fe58b8c2c44478330e07aca6e17a2510512c1f73 SHA512 4dfc2c931b8a5308c5f6a7025b40ecee38c05794efd2b487533c17be4047e52da64b13669704363bb3cb07f0b921421eff3abd721891457dc7f7224d70c7b57c WHIRLPOOL f168b908288885f421f47634c61bdc1265b63117296b19c00b8d4f45f676d672eeae0197669a2fa7c3388e13ead640b025bacffa1b6da5939efb592b05a1bb57
-EBUILD plowshare-20120609-r2.ebuild 3032 SHA256 dfc7aa46736f0afc9921edf95a0ab344232dfc4dbf6e9a800cf5df567dcd1d18 SHA512 2724ef6fd689c064d6784b5ff6c281e38c611230e978a5a7d16f13dd2ecaf79b9cebe0726064f36719427b5bb3397972ce61e90a86bd9016a45b988602c96cd9 WHIRLPOOL 386163164018612c09cfd45d168cbd14ba58364999ecb2947ab413acd7b0fcd999ef019c06dd0eac9971a2ad5bcd093f45505d240a05aa8565604b8c758537b4
+DIST plowshare4-snapshot-git20131130.3c63b19.tar.gz 212351 SHA256 b376d984b76dd22635d8b67be4843b91688b1a34fff25372c77e5d6340e302e0 SHA512 ed47a9147a18e2b9329cf58d27148c95fecc452be1c0d63e8b3482d8a679994df40ded606a76d86fb18c137b05621c8a0bfb303ed7e7f9461ba2894623576371 WHIRLPOOL 8b5d0db751bd22eefefe17ae3740adea7bf577a659057a70323c4736f16bbba49652a95c1d2dcc8ff8823b51c4f6604601dba08c2381bd935bce10595297ae7a
 EBUILD plowshare-20130520.ebuild 2208 SHA256 3fbe799cd48d9516eb17f0b491ee1ca6f0acee96638e99f2e6165a5f52f9e618 SHA512 ca784f3ad1a7da0e1e659e14caf6df475522531353a079afebaa3d29adeaa6ebeafd4e60a72bc0bcc912c654d0fdde7db706577c03d2e0bb2dd232ebeb6eb5db WHIRLPOOL 98e0ee1faa7003202962c48960f457408bf749eb9db0dfde1c99bbc8325d792b13800b4fddd33f73b387ea4bbac0b5cf0eb34ad0737fbcd567c00951a5cca9fe
-MISC ChangeLog 4111 SHA256 bcbbd9d36c5b252d06452058ecbb5d8c72eb088022073476fd25fd65cccb9f05 SHA512 644f7e98a7546d0d0f1e33dd90039887bc9e4a876dafee65daf7f8992874e1f65be97b7e243c4784123a442909ac1613a26937622b19085572218a310fe685e8 WHIRLPOOL bed2ac07358551b09fd74ef2cfa7bbba981d6493542855dfdd529eab1d49b76531750d82660dad05b90c1bb552e38b9e5767880e83d35b100754470cab14df56
+EBUILD plowshare-20131130.ebuild 2235 SHA256 5640575fb8dc78467040755f20998cd5212c6341998588b5e04b86625ac5ab55 SHA512 66124eb89d72f3d9fe8098af554535920d9fdadcb7a85a12d6197274cc1e80c3bfe9f10b0d04eea9d22a234bbfc84b4b0fee8ec405fa83f595236ad094ff4885 WHIRLPOOL e2a9ded72b3dfd415143c957430c62314d1c10c2f610ec78fedf2dbebfa39fe0d2dc6cf51ad2fb8ea310dfcb0b7ec7caf51f3801d979842d337175e294838c22
+MISC ChangeLog 4293 SHA256 c8164956db664c5cd95c749e26c5d94bf6221f8cb305999073f17f4cb9cea195 SHA512 f4bdcdb718707db2eb2dbabc958fc24880e2c7fbc24af9cfed2ed8567d5ad0c2e70355c3c266429e343ebf15b18a8970834605905a0f1180cd9444cb28bc09ef WHIRLPOOL 997f058462d645081b585171986bec32b063e3979bbf49c1731e45e745a8175dc3f022cf1c8f8eafe94c7b68c2cde43c512a471a8367fc301f6fa6b6b4a8b9d5
 MISC metadata.xml 460 SHA256 f5e5bf748d8c77bf03238f8c404e0856249ae87d55df06b8413c6fee164a33ff SHA512 3183b109d57abdc2f6772f105ea76844542994bc5bdc13650cf2ab9a0dfcb7486fdbb7f4f57ce4d3022dfafa77b3b8003b77a6d9e6a3fa6cc2773c015d5705c0 WHIRLPOOL c5c80bac202df4b0e007c3349f78954c36abb929ceeed86b8ece08844bca770e52c96625a58525f6a266894fbacd03d8613127f4bb387087643fe0613ad0132e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIE8jkACgkQ2ugaI38ACPAZWQD9GrEI2Gld84wk/YNjBbRYme+X
-XHl2+HhteC0vAktxQhUA/AmQ6wncirp3OZrStfwqc+mReE8rBIBP3dlJ9ATCGoQy
-=7kk5
+iF4EAREIAAYFAlLJz8cACgkQFYEBGcdFJfJAmgD/Tgicj8pyS8bFttz2we8eZjy2
+Gqf8yKyNeT/wT5v+Ns8BAKL2ooLDqwowP2uG4QkNOjEuZ2AunSBSNXS0sS8+JycF
+=vYCw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/plowshare/plowshare-20120609-r2.ebuild b/net-misc/plowshare/plowshare-20120609-r2.ebuild
deleted file mode 100644
index 15bf1498bdc2..000000000000
--- a/net-misc/plowshare/plowshare-20120609-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-20120609-r2.ebuild,v 1.2 2013/08/09 13:44:07 axs Exp $
-
-EAPI="2"
-
-inherit bash-completion-r1
-
-MY_P="${PN}-snapshot-git${PV}"
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript +perl scripts view-captcha"
-
-RDEPEND="
-	javascript? ( dev-lang/spidermonkey:0 )
-	perl? ( dev-lang/perl
-		media-gfx/imagemagick[perl] )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
-	app-shells/bash
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	app-text/tesseract[tiff]
-	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
-	net-misc/curl
-	sys-apps/util-linux"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# NOTES:
-# spidermonkey dep should be any javascript interpreter using /usr/bin/js
-
-# TODO:
-# dev-java/rhino could probably be an alternative for spidermonkey
-
-src_prepare() {
-	if ! use javascript; then
-		sed -i -e 's:^mediafire.*::' \
-			-e 's:^badongo.*::' \
-			-e 's:^dataport_cz.*::' \
-			-e 's:^1fichier.*::' \
-			-e 's:^turbobit.*::' \
-			src/modules/config || die "sed failed"
-		rm src/modules/{mediafire,badongo,dataport_cz,1fichier,turbobit}.sh || die "rm failed"
-	fi
-	if ! use perl; then
-		sed -i -e 's:^netload_in.*::' \
-			-e 's:^badongo.*::' \
-			src/modules/config || die "sed failed"
-		rm src/modules/netload_in.sh || die "rm failed"
-		if use javascript; then
-			rm src/modules/badongo.sh || die "rm failed"
-		fi
-
-		# Don't install perl file helpers.
-		sed -i -e 's:\(.*src/core.sh\).*:\1:' Makefile || die "sed failed"
-	fi
-
-	# Don't let 'make install' install docs.
-	sed -i -e "/INSTALL.*DOCDIR/d" Makefile || die "sed failed"
-
-	if use bash-completion; then
-		sed -i -e \
-			's:CDIR=/usr/local/share/plowshare/modules/config:CDIR=/usr/share/plowshare/modules/config:' \
-			etc/plowshare.completion || 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() {
-	DESTDIR="${D}" PREFIX="/usr" emake install || die "emake install failed"
-
-	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
-
-	if use scripts; then
-		exeinto /usr/bin/
-		doexe contrib/{caturl,plowdown_{add_remote_loop,loop,parallel}}.sh \
-			|| die "doins failed"
-	fi
-
-	if use bash-completion; then
-		newbashcomp etc/${PN}.completion ${PN} || die "newbashcomp failed"
-	fi
-}
-
-pkg_postinst() {
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use:"
-		ewarn " mediafire, badongo, dataport_cz, 1fichier and turbobit."
-	fi
-	if ! use perl; then
-		ewarn "Without perl you will not be able to use:"
-		ewarn " netload.in and badongo."
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-20131130.ebuild b/net-misc/plowshare/plowshare-20131130.ebuild
new file mode 100644
index 000000000000..e7338cba6596
--- /dev/null
+++ b/net-misc/plowshare/plowshare-20131130.ebuild
@@ -0,0 +1,86 @@
+# 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-20131130.ebuild,v 1.1 2014/01/05 21:33:45 voyageur Exp $
+
+EAPI=5
+
+inherit bash-completion-r1
+
+MY_P="${PN}4-snapshot-git${PV}.3c63b19"
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="http://code.google.com/p/plowshare/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="bash-completion +javascript scripts 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=""
+
+S=${WORKDIR}/${MY_P}
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+# Modules using detect_javascript
+JS_MODULES="letitbit 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
+
+	# Don't let 'make install' install docs.
+	sed -i -e "/INSTALL.*DOCDIR/d" Makefile || die "sed failed"
+
+	if use bash-completion; then
+		sed -i -e \
+			"s,/usr/local\(/share/plowshare4/modules/config\),${EPREFIX}/usr\1," \
+			etc/plowshare.completion || 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
+
+	dodoc AUTHORS README
+
+	if use scripts; then
+		exeinto /usr/bin/
+		doexe contrib/{plowdown_{add_remote_loop,loop,parallel}}.sh
+	fi
+
+	if use bash-completion; then
+		newbashcomp etc/${PN}.completion ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use:"
+		ewarn " ${JS_MODULES}"
+	fi
+}