Version bump to 0.9.3 and removing old ebuilds.

Fix bug 322997.
(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 19 insertions, 103 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index ce9cf63b1def..91553a0993a5 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.10 2010/06/03 23:26:03 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.11 2010/07/25 12:13:49 volkmar Exp $
+
+*plowshare-0.9.3 (25 Jul 2010)
+
+  25 Jul 2010; <volkmar@gentoo.org> -plowshare-0.9.1.ebuild,
+  -plowshare-0.9.2.ebuild, +plowshare-0.9.3.ebuild:
+  Version bump to 0.9.3 and removing old ebuilds. Fix bug 322997.
 
   03 Jun 2010; Mounir Lamouri <volkmar@gentoo.org> plowshare-0.9.2.ebuild:
   Fix bug 320533. Thanks to Fabiano Francesconi.
diff --git a/net-misc/plowshare/plowshare-0.9.1.ebuild b/net-misc/plowshare/plowshare-0.9.1.ebuild
deleted file mode 100644
index 54affb42469d..000000000000
--- a/net-misc/plowshare/plowshare-0.9.1.ebuild
+++ /dev/null
@@ -1,94 +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.9.1.ebuild,v 1.1 2010/02/15 22:29:12 volkmar 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="examples +javascript +perl 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-text/recode
-	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:
-# spidermonkey dep should be any javascript interpreter using /usr/bin/js
-# linguas_en is a workaround for bug 287373 and bug 297991
-
-src_prepare() {
-	if ! use javascript; then
-		sed -i -e 's:^\(MODULES=".*\)mediafire:\1:' \
-			-e 's:^\(MODULES=".*\)zshare:\1:' \
-			src/{delete,download,upload}.sh || die "sed failed"
-		rm src/modules/{mediafire,zshare}.sh || die "rm failed"
-	fi
-	if ! use perl; then
-		sed -i -e 's:^\(MODULES=\".*\)netload_in:\1:' \
-			-e 's:^\(MODULES=\".*\)loadfiles:\1:' \
-			src/{delete,download,upload}.sh || die "sed failed"
-		rm src/modules/{loadfiles,netload_in}.sh || die "rm failed"
-	fi
-}
-
-src_test() {
-	# don't use test_modules.sh because it needs a working internet connection
-	if ! use perl; then
-		sed -i -e "s:\(.*\.pl\):#\1:" test/test_lib.sh || die "sed failed"
-	fi
-	./test/test_lib.sh || die "test failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins src/lib.sh || die "doins failed"
-
-	if use perl; then
-		doins src/strip_{single_color,grey}.pl || die "doins failed"
-	fi
-
-	insinto /usr/share/${PN}/modules
-	doins -r src/modules/* || die "doins failed"
-
-	insinto /usr/share/${PN}/tesseract
-	doins -r src/tesseract/* || die "doins failed"
-
-	exeinto /usr/share/${PN}
-	doexe src/{delete,download,upload}.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"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/plowdown_{add_remote_loop,loop,parallel}.sh \
-		|| die "doins failed"
-	fi
-}
-
-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 and loadfiles.in"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-0.9.2.ebuild b/net-misc/plowshare/plowshare-0.9.3.ebuild
index 1a6970ef410b..adee749b75eb 100644
--- a/net-misc/plowshare/plowshare-0.9.2.ebuild
+++ b/net-misc/plowshare/plowshare-0.9.3.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.9.2.ebuild,v 1.2 2010/06/03 23:26:03 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-0.9.3.ebuild,v 1.1 2010/07/25 12:13:49 volkmar Exp $
 
 EAPI="2"
 
@@ -21,7 +21,6 @@ RDEPEND="
 	app-shells/bash
 	app-text/recode
 	app-text/tesseract[tiff]
-	|| ( app-text/tesseract[linguas_en] >=app-text/tesseract-2.04-r1 )
 	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
 	net-misc/curl
 	sys-apps/util-linux"
@@ -29,7 +28,6 @@ DEPEND=""
 
 # NOTES:
 # spidermonkey dep should be any javascript interpreter using /usr/bin/js
-# linguas_en is a workaround for bug 287373 and bug 297991
 
 # TODO:
 # dev-java/rhino could probably be an alternative for spidermonkey
@@ -38,14 +36,18 @@ src_prepare() {
 	if ! use javascript; then
 		sed -i -e 's:^\(MODULES=".*\)mediafire:\1:' \
 			-e 's:^\(MODULES=".*\)zshare:\1:' \
+			-e 's:^\(MODULES=\".*\)badongo:\1:' \
+			-e 's:^\(MODULES=\".*\)filefactory:\1:' \
 			src/{delete,download,list,upload}.sh || die "sed failed"
-		rm src/modules/{mediafire,zshare}.sh || die "rm failed"
+		rm src/modules/{mediafire,zshare,badongo,filefactory}.sh || die "rm failed"
 	fi
 	if ! use perl; then
 		sed -i -e 's:^\(MODULES=\".*\)netload_in:\1:' \
-			-e 's:^\(MODULES=\".*\)loadfiles:\1:' \
+			-e 's:^\(MODULES=\".*\)badongo:\1:' \
 			src/{delete,download,list,upload}.sh || die "sed failed"
 		rm src/modules/netload_in.sh || die "rm failed"
+		# Forcing remove of badongo.sh because it may have been removed before.
+		rm -f src/modules/badongo.sh || die "rm failed"
 	fi
 }
 
@@ -62,7 +64,7 @@ src_install() {
 	doins src/lib.sh || die "doins failed"
 
 	if use perl; then
-		doins src/strip_single_color.pl || die "doins failed"
+		doins src/strip_{single_color,threshold}.pl || die "doins failed"
 	fi
 
 	insinto /usr/share/${PN}/modules
@@ -92,9 +94,11 @@ src_install() {
 
 pkg_postinst() {
 	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use zshare and mediafire"
+		ewarn "Without javascript you will not be able to use:"
+		ewarn " zshare, mediafire, badongo and filefactory"
 	fi
 	if ! use perl; then
-		ewarn "Without perl you will not be able to use netload.in"
+		ewarn "Without perl you will not be able to use:"
+		ewarn " netload.in and badongo"
 	fi
 }