From 32fb4fffc2a53da7c210d64349e053d8d0c88a47 Mon Sep 17 00:00:00 2001 From: James Broadhead Date: Sat, 5 Oct 2013 17:51:50 +0100 Subject: Inherit plowshare changes from gentoo tree --- net-misc/plowshare/Manifest | 2 +- net-misc/plowshare/plowshare-99999999.ebuild | 64 +++++++++------------------- 2 files changed, 22 insertions(+), 44 deletions(-) diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest index d852c70..970489c 100644 --- a/net-misc/plowshare/Manifest +++ b/net-misc/plowshare/Manifest @@ -1,2 +1,2 @@ -EBUILD plowshare-99999999.ebuild 2862 SHA256 fd09b1aac385e8cccd8fb8be66a20c9e355b53bcdbdc2e88d5c6617bb656de16 SHA512 bbbe5caa2f960bf6a7ead101db67245193bc72eaab320fddc9fe5880942afbf91eb5f6331ada447f286a8d863e846347fa0164e1f8fdbc323bc281a7ec06ca55 WHIRLPOOL 73f87a50b162b366249910e87ed4e6abf4aa5b996436ebf0dfaaaf1dafc14fa4a0ea63aa5f2916a0fe46ea74f3195fdffc9fd9bdef95b1d2b8730461a7731ad1 +EBUILD plowshare-99999999.ebuild 2055 SHA256 ca657c0cb8171f55ace9707c8748c522d26100a3716ed975bac376acab02a98c SHA512 cffd2ab4b33acad3d513b242191455de88c320ca53a87164ad0ef1efcb0231cde995d44bf906760fbe80de6eda286bc7e14d3c92d87e605a4536cf88a22d7bfc WHIRLPOOL f149678a79fc515a1a7e161fbc74d9fae6a4daa77eb9942af889995302c972fd881e540402aa162c7d95bb8bfd94237ee76d15be1f5960173701185c67f975d8 MISC metadata.xml 436 SHA256 570ee354fd5582f16fb1b090baeb3d85faf43f4aaa542a47219813960fa3c073 SHA512 b54e1fe96ed5dfcc9198c02784d16c5994dfc048aa898dc391afec983fce720b852d4780c583a106fe13cc02582bc58b1659cbc84848b3605a814351c4289c3b WHIRLPOOL c964575c08009e35165b542cc671e29db56c1bc295830172beb9ec141f2283e287e50fc2e584c26945b87f1a2d0d982651496ed095fe49e5ed52d276ae7ddd3e diff --git a/net-misc/plowshare/plowshare-99999999.ebuild b/net-misc/plowshare/plowshare-99999999.ebuild index 798196b..b737efd 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 @@ -13,48 +13,29 @@ 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" +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="" # NOTES: -# spidermonkey dep should be any javascript interpreter using /usr/bin/js - -# TODO: -# dev-java/rhino could probably be an alternative for spidermonkey +# javascript dep should be any javascript interpreter using /usr/bin/js src_prepare() { + # Modules using detect_javascript if ! use javascript; then - sed -i -e 's:^mediafire.*::' \ - -e 's:^badongo.*::' \ - -e 's:^dataport_cz.*::' \ - -e 's:^1fichier.*::' \ - -e 's:^turbobit.*::' \ + sed -i -e 's:^rapidgator.*::' \ + -e 's:^zalaa*::' \ + -e 's:^zippyshare*::' \ 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" + rm src/modules/{rapidgator,zalaa,zippyshare}.sh || die "rm failed" fi # Don't let 'make install' install docs. @@ -62,7 +43,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 +59,25 @@ 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" + pwd + ls contrib + 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 " rapidgator, zalaa, zippyshare" fi } -- cgit v1.2.3-65-gdbad