summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir Lamouri <volkmar@gentoo.org>2010-05-15 11:35:24 +0000
committerMounir Lamouri <volkmar@gentoo.org>2010-05-15 11:35:24 +0000
commit334e74cde4406fcc2f54bd478ce3c4a17a83e8e7 (patch)
tree6cf172c4f82a0041eb4265c6d059d679d40e89f6 /net-misc
parentVersion bump wrt #319761 (with patch reverting upstream commit to restore res... (diff)
downloadhistorical-334e74cde4406fcc2f54bd478ce3c4a17a83e8e7.tar.gz
historical-334e74cde4406fcc2f54bd478ce3c4a17a83e8e7.tar.bz2
historical-334e74cde4406fcc2f54bd478ce3c4a17a83e8e7.zip
Version bump to 0.9.2. Fix bug 313895 and bug 314355
Package-Manager: portage-15511-svn/cvs/Linux i686
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/plowshare/ChangeLog8
-rw-r--r--net-misc/plowshare/Manifest6
-rw-r--r--net-misc/plowshare/plowshare-0.9.2.ebuild (renamed from net-misc/plowshare/plowshare-0.9.ebuild)42
3 files changed, 40 insertions, 16 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/Manifest b/net-misc/plowshare/Manifest
index c007d53b3481..cc50f7c2fba0 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,6 +1,6 @@
DIST plowshare-0.9.1.tgz 55723 RMD160 5430ac93e4c59a455e568d5ea9e3b17b15be6e95 SHA1 74c32354a4a54e2d711648fe6bed89d44f14d1b9 SHA256 28065b39c4ec8ca718b5cbb140d9a0bb6643d4239631f6b2eb02c293234656d9
-DIST plowshare-0.9.tgz 45793 RMD160 ed243ccd9c9ccaed7239e11613af48a40a9c6328 SHA1 9bb5a5fda420ed3f85f53c4f6c1c3e6b0267ea63 SHA256 afd5b711692d6188509a5bdf04d39ade249280bdffd09e876bd255ec2b6b47d1
+DIST plowshare-0.9.2.tgz 63489 RMD160 71090a8363a491286d8e00070047167b1b599d5c SHA1 11c3c0903df992fee39a72b0aa67937a6c38a58a SHA256 f8abddd4d885d007a662902beff8c36466e4a4b3f94a420fdda18b20cb58e2db
EBUILD plowshare-0.9.1.ebuild 2755 RMD160 ff339e31e40b92af8e65d11717ff3fa90cabbba8 SHA1 3538a7391dc8697d1d20510fa070a5b103c5b55c SHA256 7839042543a0e58b5be67ba32a485eea087c06f0c092621a654b6140706c50f9
-EBUILD plowshare-0.9.ebuild 2334 RMD160 2b5e70216de88ceaa2f4ae6fc70cd04f96628678 SHA1 04890336f924a3c5d21ad6e02b4b7f7227f184d6 SHA256 899404295ab1eae790556f3ec3f359c59e1e051d31a4524e259a02f494e2e2a1
-MISC ChangeLog 1543 RMD160 26bc8013f093ef1baf12d061de126aa5b9045c43 SHA1 0807d1336ec82494009f32105d1d2add43c5377a SHA256 dde05043c09ac5a3fb3e78a7091636e64f7e430e92ed9d4cfe044b0ba9caac1a
+EBUILD plowshare-0.9.2.ebuild 2972 RMD160 38d4093fc4e0f581d6858bacb68399834fad58d9 SHA1 7ece5b562fdba3cb30bd33ff4553ee307383b9d0 SHA256 6265cad0945c7050911834e415ae15080343689b427dadfa1055856fe6c9e682
+MISC ChangeLog 1732 RMD160 a7177f02109bedbec08c50b71904d84f1ded81ff SHA1 82469d8ba47f7b98998f77e127acb67dfd058c02 SHA256 a475396c8236be03567480dd3645fffff9802724aec6151fb2c39a83055e79a5
MISC metadata.xml 331 RMD160 92ad07c059e3471b47ab1ffc1fbafd7c5dbdd506 SHA1 2da77f69f8270b43240291387c75798f839fb7b3 SHA256 8a31eb75ee0cac69ada8f6892668e6bde21c48eed717289f32236ec1c2f6cad5
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() {