diff options
| -rw-r--r-- | net-misc/plowshare/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/plowshare/files/plowshare-2.1.0-fix_git_invocation.patch | 56 | ||||
| -rw-r--r-- | net-misc/plowshare/plowshare-2.0.1.ebuild | 92 | ||||
| -rw-r--r-- | net-misc/plowshare/plowshare-2.1.0-r1.ebuild | 68 |
4 files changed, 0 insertions, 219 deletions
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest index 7411988813f1..7e088dd7c369 100644 --- a/net-misc/plowshare/Manifest +++ b/net-misc/plowshare/Manifest @@ -1,5 +1,2 @@ DIST plowshare-1.2.0.tar.gz 253572 SHA256 0f1ff5d2986334209389857d6c6f3f63162d661b28687747ae1a8612f3e5d678 SHA512 5fd8eeef5a4d6a42d03a858b451fa2ac121e0dbdcdb2f2981cef6660b0972e44396e3b8b3d9eb5b36ca8ce0aacda7df8f193ba4e5464c1f96a4c8ff2c104ff9a WHIRLPOOL 0009dc91d9a0fc15083c781fa6a73f46f966af673d20cf8897bb786f2337a36a75a0dae55dd2109f88d4e1a57578824763b1f79ae7949d497e9a9136ad2d2632 -DIST plowshare-2.0.1.tar.gz 80167 SHA256 89a9d8af78e026a09979f11ec3c2d5ba4922977874c6e62afd28295dfb82d1b9 SHA512 4ed6ac9f1b3d7893af22dd529debfd589e564d4e24bcaaaa0e2d542edad883d5dd98c2e8cd9621e6f2c88800f58b683e1d5be4d31f6b8d9386a9c9371d9fc7cc WHIRLPOOL 683a7cfcf323bf07f3d50d146e4e37a8f26b02e5a262ed41e5e19d7e934bb57fbe5313b70bf9e3208b0595de5b82b3e58f7bc3bdf7dd51f2daef6cc056843ccc -DIST plowshare-2.1.0.tar.gz 89800 SHA256 762482dd11c1e1af08b940c613856a2f51e998b25c11ba14f6a7a734eb94de16 SHA512 7c4b9a4aae92fc9baf34133706a664c0c20547c1c83e68430bf9eb64a393d47c187d3c197c2f2a0e75a15b36d4522293ea93ff4b07cebc47f220ccf2dd1ef4a3 WHIRLPOOL e745eef81c4b2d3431d2a306915d035b94e94aa77c5c6eca521d6f2b9f90db7399f028ae37bc5df7e43e738dab28d9bd5f7cfd27d23d64e896f9b5722198f1b2 DIST plowshare-2.1.1.tar.gz 90653 SHA256 96b3acd1dba1b14f3009334520969af4c00c8f4b7f5d924a26decc4b4a817e53 SHA512 4aae7c64ce8123301b241d31a0f25ffe414295d5d8b354423530f47cbe3dd91a4bbe57a686a6c56015dab37c6b463334b4f9165b570a2c0314c25ee94bc255fc WHIRLPOOL cde48f76136901c4c009611556beda92aa3b4e5ed9fc5d94487ed69d5f11745995dca7ba7bbd2dabe516161efe9e705a7bfbdd21423d96f506aae4079b847a34 -DIST plowshare-modules-2ededde1f34e78dcbacf02e900a2ce8cad2e148d.tar.gz 186296 SHA256 4b1f109120d8e8e0642971b4d7209a0d1a4c1952c13a7fdb80c5a52646158ad5 SHA512 a80a0d53e084f03b93b7466ae401733d9538cd398f8521bf7285cd475f4dbb9495a9d9a69606122f1f3e43b175db77c7eb0aa99526bb9af1debeba2941b23e4d WHIRLPOOL 75ad9cb5378e7f71bfce06f8d7f5082c774bb378e141abddeae13803fb374c0b1ce893deea7881ad24e1a3be3e55cccc5aa183cba71636f8ed78280c9806ee68 diff --git a/net-misc/plowshare/files/plowshare-2.1.0-fix_git_invocation.patch b/net-misc/plowshare/files/plowshare-2.1.0-fix_git_invocation.patch deleted file mode 100644 index f73fbcd3d900..000000000000 --- a/net-misc/plowshare/files/plowshare-2.1.0-fix_git_invocation.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/src/core.sh b/src/core.sh -index bccdafc..0f38473 100644 ---- a/src/core.sh -+++ b/src/core.sh -@@ -2883,7 +2883,7 @@ process_configfile_module_options() { - # $1: absolute path to plowshare's libdir - log_report_info() { - local -r LIBDIR1=$1 -- local G GIT_DIR LIBDIR2 -+ local G LIBDIR2 - - if test $VERBOSE -ge 4; then - log_report '=== SYSTEM INFO BEGIN ===' -@@ -2908,10 +2908,9 @@ log_report_info() { - fi - done - -- GIT_DIR=$(git --work-tree "$LIBDIR" rev-parse --quiet --git-dir) || true -- if [ -d "$GIT_DIR" ]; then -- local -r GIT_BRANCH=$(git --git-dir=$GIT_DIR rev-parse --quiet --abbrev-ref HEAD) -- local -r GIT_REV=$(git --git-dir=$GIT_DIR describe --tags --always 2>/dev/null) -+ if git -C "$LIBDIR" rev-parse --is-inside-work-tree &>/dev/null; then -+ local -r GIT_BRANCH=$(git -C "$LIBDIR" rev-parse --quiet --abbrev-ref HEAD) -+ local -r GIT_REV=$(git -C "$LIBDIR" describe --tags --always 2>/dev/null) - log_report "[git ] $GIT_REV ($GIT_BRANCH branch)" - fi - -diff --git a/src/mod.sh b/src/mod.sh -index 42795a8..b4c6475 100755 ---- a/src/mod.sh -+++ b/src/mod.sh -@@ -98,10 +98,9 @@ mod_install() { - log_notice "- installing new directory: $L" - - if [ -d "$L" -a -n "$HAVE_GIT" ]; then -- GIT_DIR=$(git --work-tree "$L" rev-parse --quiet --git-dir) || true -- if [ -d "$GIT_DIR" ]; then -+ if git -C "$L" rev-parse --is-inside-work-tree &>/dev/null; then - log_notice 'WARNING: directory already exists! Do a git pull.' -- git pull --quiet -+ git -C "$L" pull --quiet - else - log_error 'ERROR: directory exists but it does not appear to be a git repository, abort' - RET=$ERR_FATAL -@@ -124,9 +123,8 @@ mod_update() { - - if [ -d "$L" ]; then - if [ -n "$HAVE_GIT" ]; then -- GIT_DIR=$(git --work-tree "$L" rev-parse --quiet --git-dir) || true -- if [ -d "$GIT_DIR" ]; then -- git pull --quiet -+ if git -C "$L" rev-parse --is-inside-work-tree &>/dev/null; then -+ git -C "$L" pull --quiet - else - log_error 'ERROR: directory exists but it does not appear to be a git repository, abort!' - RET=$ERR_FATAL diff --git a/net-misc/plowshare/plowshare-2.0.1.ebuild b/net-misc/plowshare/plowshare-2.0.1.ebuild deleted file mode 100644 index d6da579fe839..000000000000 --- a/net-misc/plowshare/plowshare-2.0.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 - -DESCRIPTION="Command-line downloader and uploader for file-sharing websites" -HOMEPAGE="http://code.google.com/p/plowshare/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="bash-completion +javascript +modules view-captcha" - -MOD_PV="2ededde1f34e78dcbacf02e900a2ce8cad2e148d" -SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz - modules? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-modules-${MOD_PV}.tar.gz )" - -RDEPEND=" - >=app-shells/bash-4 - || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) - || ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] ) - net-misc/curl - sys-apps/util-linux - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) - view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" -DEPEND="" - -# NOTES: -# javascript dep should be any javascript interpreter using /usr/bin/js - -# Modules using detect_javascript -JS_MODULES="flashx letitbit nowdownload_co oboom rapidgator yourvideohost zalaa zippyshare" - -src_unpack() { - default - if use modules; then - rm -r "${S}"/src/modules - mv ${PN}-modules-${MOD_PV} "${S}"/src/modules - fi -} - -src_prepare() { - if use modules && ! use javascript; then - for module in ${JS_MODULES}; do - sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed" - rm src/modules/${module}.sh || die "${module} rm failed" - done - fi - - # Fix doc install path - sed -i -e "/^DOCDIR/s|plowshare4|${P}|" Makefile || die "sed failed" - - if ! use bash-completion - then - sed -i -e \ "/^install:/s/install_bash_completion//" \ - Makefile || die "sed failed" - fi -} - -src_compile() { - # There is a Makefile but it's not compiling anything, let's not try. - : -} - -src_test() { - # Disable tests because all of them need a working Internet connection. - : -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" \ - PLOWSHARE_FORCE_VERSION="${PV}" install -} - -pkg_postinst() { - if use modules; then - elog "System-wide modules can break between releases, install per-user versions" - elog "in ~/.config/plowshare/modules if needed" - if ! use javascript; then - ewarn "Without javascript you will not be able to use:" - ewarn " ${JS_MODULES}" - fi - else - elog "plowshare is not delivered with modules by default anymore" - elog "Per-user modules should be installed as described at:" - elog "https://code.google.com/p/plowshare/wiki/Readme#Installation_of_modules" - elog "USE=modules will install a system-wide set occasionally updated" - fi -} diff --git a/net-misc/plowshare/plowshare-2.1.0-r1.ebuild b/net-misc/plowshare/plowshare-2.1.0-r1.ebuild deleted file mode 100644 index 77f66e46c634..000000000000 --- a/net-misc/plowshare/plowshare-2.1.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 eutils - -DESCRIPTION="Command-line downloader and uploader for file-sharing websites" -HOMEPAGE="https://github.com/mcrapet/plowshare" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="bash-completion +javascript view-captcha" - -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -RDEPEND=" - >=app-shells/bash-4 - || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) - dev-vcs/git - || ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] ) - net-misc/curl - sys-apps/util-linux - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) - view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" -DEPEND="" - -# NOTES: -# javascript dep should be any javascript interpreter using /usr/bin/js - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix_git_invocation.patch - - # Fix doc install path - sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - - if ! use bash-completion - then - sed -i -e \ "/^install:/s/install_bash_completion//" \ - Makefile || die "sed failed" - fi -} - -src_compile() { - # There is a Makefile but it's not compiling anything, let's not try. - : -} - -src_test() { - # Disable tests because all of them need a working Internet connection. - : -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" \ - PLOWSHARE_FORCE_VERSION="${PV}" install -} - -pkg_postinst() { - elog "plowshare is not delivered with modules by default anymore" - elog "Per-user modules can be installed/updated with the plowmod command" - if ! use javascript; then - ewarn "Without javascript you will not be able to use modules" - ewarn "requering a Javascript shell (/usr/bin/js)" - fi -} |