1 files changed, 23 insertions, 44 deletions

diff --git a/net-misc/plowshare/plowshare-99999999.ebuild b/net-misc/plowshare/plowshare-99999999.ebuild
index 798196b..928510e 100644
--- a/net-misc/plowshare/plowshare-99999999.ebuild
+++ b/net-misc/plowshare/plowshare-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
 inherit bash-completion-r1 git-2
 
@@ -12,49 +12,33 @@ EGIT_REPO_URI="https://code.google.com/p/${PN}/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript +perl scripts view-captcha"
+KEYWORDS=""
+IUSE="bash-completion +javascript scripts view-captcha"
 
 RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
-	perl? ( dev-lang/perl
-		media-gfx/imagemagick[perl] )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
-	app-shells/bash
+	>=app-shells/bash-4
 	|| ( 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"
+	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:
-# spidermonkey dep should be any javascript interpreter using /usr/bin/js
+# javascript dep should be any javascript interpreter using /usr/bin/js
 
-# TODO:
-# dev-java/rhino could probably be an alternative for spidermonkey
+# Modules using detect_javascript
+JS_MODULES="letitbit rapidgator zalaa zippyshare"
 
 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"
+		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.
@@ -62,7 +46,7 @@ src_prepare() {
 
 	if use bash-completion; then
 		sed -i -e \
-			's:CDIR=/usr/local/share/plowshare/modules/config:CDIR=/usr/share/plowshare/modules/config:' \
+			"s,/usr/local\(/share/plowshare4/modules/config\),${EPREFIX}/usr\1," \
 			etc/plowshare.completion || die "sed failed"
 	fi
 }
@@ -78,28 +62,23 @@ src_test() {
 }
 
 src_install() {
-	DESTDIR="${D}" PREFIX="/usr" emake install || die "emake install failed"
+	emake DESTDIR="${D}" PREFIX="/usr" install
 
-	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+	dodoc AUTHORS README
 
 	if use scripts; then
 		exeinto /usr/bin/
-		doexe ${S}/contrib/plowdown_{add_remote_loop,loop,parallel}.sh \
-			|| die "doins failed"
+		doexe contrib/{plowdown_{add_remote_loop,loop,parallel}}.sh
 	fi
 
 	if use bash-completion; then
-		newbashcomp etc/${PN}.completion ${PN} || die "newbashcomp failed"
+		newbashcomp etc/${PN}.completion ${PN}
 	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."
+		ewarn " ${JS_MODULES}"
 	fi
 }