Version bump to 0.9.2. Fix bug 313895 and bug 314355

(Portage version: 15511-svn/cvs/Linux i686)

2 files changed, 37 insertions, 13 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index f3acb193b3b1..c89c42e91b87 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.8 2010/02/15 22:29:12 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.9 2010/05/15 11:35:24 volkmar Exp $
+
+*plowshare-0.9.2 (15 May 2010)
+
+  15 May 2010; Mounir Lamouri <volkmar@gentoo.org> -plowshare-0.9.ebuild,
+  +plowshare-0.9.2.ebuild:
+  Version bump to 0.9.2. Fix bug 313895 and bug 314355
 
 *plowshare-0.9.1 (15 Feb 2010)
 
diff --git a/net-misc/plowshare/plowshare-0.9.ebuild b/net-misc/plowshare/plowshare-0.9.2.ebuild
index 898a9723575a..44aed24b31c2 100644
--- a/net-misc/plowshare/plowshare-0.9.ebuild
+++ b/net-misc/plowshare/plowshare-0.9.2.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.ebuild,v 1.1 2010/02/09 18:38:45 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-0.9.2.ebuild,v 1.1 2010/05/15 11:35:24 volkmar Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+javascript +perl view-captcha"
+IUSE="examples +javascript +perl view-captcha"
 
 RDEPEND="
 	javascript? ( dev-lang/spidermonkey )
@@ -22,7 +22,7 @@ RDEPEND="
 	app-text/recode
 	app-text/tesseract[tiff]
 	|| ( app-text/tesseract[linguas_en] >=app-text/tesseract-2.04-r1 )
-	media-gfx/imagemagick[tiff]
+	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
 	net-misc/curl
 	sys-apps/util-linux"
 DEPEND=""
@@ -31,23 +31,29 @@ DEPEND=""
 # 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
+
 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"
+		sed -i -e 's:^\(MODULES=".*\)mediafire:\1:' \
+			-e 's:^\(MODULES=".*\)zshare:\1:' \
+			src/{delete,download,list,upload}.sh || die "sed failed"
 		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"
+		sed -i -e 's:^\(MODULES=\".*\)netload_in:\1:' \
+			-e 's:^\(MODULES=\".*\)loadfiles:\1:' \
+			src/{delete,download,list,upload}.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
+	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"
 }
 
@@ -62,14 +68,26 @@ src_install() {
 	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/{download,upload,delete}.sh || die "doexe failed"
+	doexe src/{delete,download,list,upload}.sh || die "doexe failed"
 
+	dosym /usr/share/${PN}/delete.sh /usr/bin/plowdel
 	dosym /usr/share/${PN}/download.sh /usr/bin/plowdown
+	dosym /usr/share/${PN}/list.sh /usr/bin/plowlist
 	dosym /usr/share/${PN}/upload.sh /usr/bin/plowup
-	dosym /usr/share/${PN}/delete.sh /usr/bin/plowdel
 
 	dodoc CHANGELOG README || die "dodoc failed"
+
+	doman docs/plow{del,down,list,up}.1 || die "doman 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() {