Version bump to 0.9.

Fix bug 297991 and bug 302759.
(Portage version: 15321-svn/cvs/Linux ppc)

3 files changed, 29 insertions, 72 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index 546f385aaa19..2ca5f726e6a9 100644
--- a/net-misc/plowshare/ChangeLog
+++ b/net-misc/plowshare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/plowshare
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.6 2010/01/10 15:27:39 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.7 2010/02/09 18:38:45 volkmar Exp $
+
+*plowshare-0.9 (09 Feb 2010)
+
+  09 Feb 2010; Mounir Lamouri <volkmar@gentoo.org> -plowshare-0.8.1.ebuild,
+  -plowshare-0.8.1-r1.ebuild, +plowshare-0.9.ebuild:
+  Version bump to 0.9. Fix bug 297991 and bug 302759
 
 *plowshare-0.8.1-r1 (10 Jan 2010)
 
diff --git a/net-misc/plowshare/plowshare-0.8.1.ebuild b/net-misc/plowshare/plowshare-0.8.1.ebuild
deleted file mode 100644
index 679f6441173e..000000000000
--- a/net-misc/plowshare/plowshare-0.8.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-0.8.1.ebuild,v 1.2 2010/01/01 12:07:25 hwoarang Exp $
-
-EAPI="2"
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="http://code.google.com/p/plowshare/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+javascript view-captcha"
-
-RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
-	view-captcha? ( media-gfx/aview )
-	app-shells/bash
-	app-text/recode
-	app-text/tesseract
-	media-gfx/imagemagick[tiff]
-	net-misc/curl
-	sys-apps/util-linux"
-DEPEND=""
-
-# NOTES:
-# dev-lang/spidermonkey is actually any javascript interpreter using /usr/bin/js
-
-src_prepare() {
-	if ! use javascript; then
-		sed -i -e "s: mediafire::" src/upload.sh src/download.sh \
-			|| die "sed failed"
-		sed -i -e "s: zshare::" src/upload.sh src/download.sh \
-			|| die "sed failed"
-		rm src/modules/{mediafire,zshare}.sh
-	fi
-}
-
-src_test() {
-	./test/test_lib.sh || die "test failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins src/lib.sh || die "doins failed"
-
-	insinto /usr/share/${PN}/modules
-	doins -r src/modules/* || die "doins failed"
-
-	exeinto /usr/share/${PN}
-	doexe src/{download,upload,delete}.sh || die "doexe failed"
-
-	dosym /usr/share/${PN}/download.sh /usr/bin/plowdown
-	dosym /usr/share/${PN}/upload.sh /usr/bin/plowup
-	dosym /usr/share/${PN}/delete.sh /usr/bin/plowdel
-
-	dodoc CHANGELOG README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use zshare and mediafire"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-0.8.1-r1.ebuild b/net-misc/plowshare/plowshare-0.9.ebuild
index 07900773056a..898a9723575a 100644
--- a/net-misc/plowshare/plowshare-0.8.1-r1.ebuild
+++ b/net-misc/plowshare/plowshare-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-0.8.1-r1.ebuild,v 1.1 2010/01/10 15:27:39 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-0.9.ebuild,v 1.1 2010/02/09 18:38:45 volkmar Exp $
 
 EAPI="2"
 
@@ -11,21 +11,24 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+javascript view-captcha"
+IUSE="+javascript +perl view-captcha"
 
 RDEPEND="
 	javascript? ( dev-lang/spidermonkey )
-	view-captcha? ( media-gfx/aview )
+	perl? ( dev-lang/perl
+		media-gfx/imagemagick[perl] )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 	app-shells/bash
 	app-text/recode
-	app-text/tesseract[linguas_en]
+	app-text/tesseract[tiff]
+	|| ( app-text/tesseract[linguas_en] >=app-text/tesseract-2.04-r1 )
 	media-gfx/imagemagick[tiff]
 	net-misc/curl
 	sys-apps/util-linux"
 DEPEND=""
 
 # NOTES:
-# dev-lang/spidermonkey is actually any javascript interpreter using /usr/bin/js
+# spidermonkey dep should be any javascript interpreter using /usr/bin/js
 # linguas_en is a workaround for bug 287373 and bug 297991
 
 src_prepare() {
@@ -34,11 +37,17 @@ src_prepare() {
 			|| die "sed failed"
 		sed -i -e "s: zshare::" src/upload.sh src/download.sh \
 			|| die "sed failed"
-		rm src/modules/{mediafire,zshare}.sh
+		rm src/modules/{mediafire,zshare}.sh || die "rm failed"
+	fi
+	if ! use perl; then
+		sed -i -e "s: netload_in::" src/upload.sh src/download.sh \
+			|| die "sed failed"
+		rm src/modules/netload_in.sh || die "rm failed"
 	fi
 }
 
 src_test() {
+	# don't use test_modules.sh because it needs a working internet connection
 	./test/test_lib.sh || die "test failed"
 }
 
@@ -46,6 +55,10 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins src/lib.sh || die "doins failed"
 
+	if use perl; then
+		doins src/strip_single_color.pl || die "doins failed"
+	fi
+
 	insinto /usr/share/${PN}/modules
 	doins -r src/modules/* || die "doins failed"
 
@@ -63,4 +76,7 @@ pkg_postinst() {
 	if ! use javascript; then
 		ewarn "Without javascript you will not be able to use zshare and mediafire"
 	fi
+	if ! use perl; then
+		ewarn "Without perl you will not be able to use netload.in"
+	fi
 }