Backport upstream fix for git invocation

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

4 files changed, 84 insertions, 19 deletions

diff --git a/net-misc/plowshare/ChangeLog b/net-misc/plowshare/ChangeLog
index 9579e7ecaa5d..2a1ef1f36283 100644
--- a/net-misc/plowshare/ChangeLog
+++ b/net-misc/plowshare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/plowshare
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.33 2015/04/13 21:50:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/ChangeLog,v 1.34 2015/04/14 11:55:28 voyageur Exp $
+
+*plowshare-2.1.0-r1 (14 Apr 2015)
+
+  14 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> -plowshare-2.1.0.ebuild,
+  +plowshare-2.1.0-r1.ebuild, +files/plowshare-2.1.0-fix_git_invocation.patch:
+  Backport upstream fix for git invocation
 
 *plowshare-2.1.0 (13 Apr 2015)
 
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index 64b65a45f4e6..583ce2d36c35 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX plowshare-2.1.0-fix_git_invocation.patch 2339 SHA256 1f66c0a23064da63a7727c40fc1a9c975370e5c340f472aa7cf24de98f4d8b3d SHA512 11213e8b835e7e2c5ace34ca72e1416d0320954838d8979959a739b9afdd28667cf8da9650cbdfc1efdf81dcd99e4bb110b9b4162cc973bb372afb39bd619f27 WHIRLPOOL e900b4d9f8957ebcecb8fc87146127ad2033177d7588789404d2d749754cbb223b8bf9347b1dd9f99c2b4f9f4432d81c810d72b6f77a029e7b3e9de1fa0afdf6
 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-modules-2ededde1f34e78dcbacf02e900a2ce8cad2e148d.tar.gz 186296 SHA256 4b1f109120d8e8e0642971b4d7209a0d1a4c1952c13a7fdb80c5a52646158ad5 SHA512 a80a0d53e084f03b93b7466ae401733d9538cd398f8521bf7285cd475f4dbb9495a9d9a69606122f1f3e43b175db77c7eb0aa99526bb9af1debeba2941b23e4d WHIRLPOOL 75ad9cb5378e7f71bfce06f8d7f5082c774bb378e141abddeae13803fb374c0b1ce893deea7881ad24e1a3be3e55cccc5aa183cba71636f8ed78280c9806ee68
 EBUILD plowshare-1.2.0.ebuild 2047 SHA256 f727780b635a804652fc365d5f7063c7e765817f9e204aaa4476c1433653729b SHA512 b2d3df7d603d29ae3cfff44a5aae23b381b1c6372fc9955d7dc0ebb1d826516e66814d3e51d6b185237d0b22f529474ec5d8d50afb4674178d64909c93a7272d WHIRLPOOL fc86358c385cc04d4e67752559569305c6f497a449e6b7986965059cb55ba2477ce2582c407ed74c6458f986137bb7ef22c614d51508e5526f15b905eea3544b
 EBUILD plowshare-2.0.1.ebuild 2726 SHA256 8f36966dc212f5b2246eccf45af24cb1873945ae3b4f999b742e1f69f90e6c6b SHA512 195b1494067d1d7372e85dec8200c207861a4206d3d90455d66a3fce6f9150b8e9bbcba179338d9b49f2ce4c37b74860d9f2bf22fd080d7c8e7dcbde6c0f4a93 WHIRLPOOL 1794daada53f17196181a03064e22a9a20860de4a4b7bbb6db018b514ffcab5ee660d03b469c8b04ed2965ace55679b366db75a4c370772fb301bfe9166a2272
-EBUILD plowshare-2.1.0.ebuild 1849 SHA256 47a3078559bccbdf398ef2899a703ad5ae288d55eb15250a602238ae16ad764e SHA512 d1cbc9d0b08023f72966ef1f26e2ca578063af74bf40195954223bc3a85820963f81fa643735020e8dec5d9f05ad2729f8c5fa07a500b83b17c32c2366775e2b WHIRLPOOL ced3f5deed99c737f5e47f7f3805e5d94316b82f14b6c6a9af1e21c1f0e48711926d04c2e50c8e24e952d7ccaf0e03eff9491d151dfeae0d3827810af625b700
-MISC ChangeLog 5975 SHA256 cbb4071a905cb4c8cc8ecde98712d29fc27d97dacdb061fe232210ff43694e61 SHA512 11693e9fe090daf63608e380541792efb5cb173588f6a224b787f53ed667c76d81a0467bca5c822d969cc61b61c8611398887aa90b76d07e8a78e3693991df9d WHIRLPOOL 9ce24df409ed0f4265ea2b70ce8a3b670640d78ad54b5ca0cdc4fbfe5f76d5ecd1d47bd42ea2a5c420f1619cbd4808ad948eceef0c9a00817ca987a270482574
+EBUILD plowshare-2.1.0-r1.ebuild 1912 SHA256 16146af3e930a3230a476e11b08e4248ee6a4873b3b1eb13bef36d680230e360 SHA512 43755b039c9be3194f0c14189d79be629c0dfc5a2d2c6844d6fe0adb7796ad6abe4eb31c2d9536211da0cecfe4a409569108ebd5347bc1170c1d5574d33211ee WHIRLPOOL 36e24860fc0acf8b37531a172742e2fcda1a606d2a1815b661daf88e409d4d334760f0845da571368b19174146434b7cdf0e632b442fe0c3fe1d54cbdea5db8d
+MISC ChangeLog 6213 SHA256 2cfa99e4b500dfb89352676a0924fbf66905e24b5e94eeeae5faeaf80115b93d SHA512 60437e3a9b40ed4d56fec4adb2b52f09d9dc2cdc15bad0720182de20b937c28455f58bb91e32afd1a12754443207d360d7ad952ab38018ba46c479716cdaaf9b WHIRLPOOL a4fc7608c7d0804a7932f885b6d43bc7a29a31e4d83b4c49780655d639a863a3cbd2edb0e7e5c28c4e98fbb65150bfd527444abb353867f7142184f5d360ab44
 MISC metadata.xml 461 SHA256 3417890dea00bede4bc378f63ae4b71376fbd175f596794e973c858a4a985508 SHA512 24f72ac0bc45fc34199989534a05e432b8975d25985970a2e12864767628e1a1a69a2b5aaf41b86a99e0faa9344de2f5be5e41c341130c301a2a7ef38ecf707b WHIRLPOOL e1b488c87d8ed1e59d2ea6e018f930e02f73f61b57eec1373d07af1cbbae581fd27dfaa1a5dda81de151607716b695ddf1b9bee26b4dd6d09ca2c4a88562fa63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVLDoOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVLQA2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
-MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/yt8P/1mpH9UC0Um3x1nE+BqAuD0x
-Ys7LIbCNmBajKjX9wQUcVWsuMTutjDc/VAPZXG/z4Losq6mpdx2ENEDqSwhIiCoU
-wA4weLF1XD8zJvtIRM7GtB+yalXx8S4u/FFLEyNcObLn6oa7hNg7JXWEj/iwBqdu
-zPjHqbSTd+rR7fAQyn6Ppm0NwhRclsYOHXL/CA7f44R38Jlf78sdUzsqf2H5LU41
-akHQ1QfQe327glU5zC78sqYStu8/zh5SQfVoboesfAzKLUQhvy1NiMb5yj92xasu
-R7OwFHs4xH8dghef/0SLAeYcT9u06hqUJlEFB3uXTNFSTxrYMRULJj5cYXwoMjgG
-ioUYsTaDzPbxdS3pwdhfYdOP/tq2XryQJN7QIaJ9wbR4BshOpK5pxSGjSHy+gC5h
-gmV7xH/2ysR9TgvLl+iqYuYuGoHlUwxj0xXg+mAwlDyUeBlqZ3P1evwtNJMw5sfk
-fyWOUjV5UpIMF1e3hOrRqgbRGYA0LLdawzyoH4HNltHXhXfe7D2etiHtB2cd5YrR
-yRASciOpDpyXYli+ApYkcU6QJ62lQIQds8b6wPrxbeX7xFjZoLMpMLjRrUdsdSdN
-50f7xvoaHq302zsCV9x3y+i9wPV+bhbEg2Tu5Z3hGekoug7Z4HhyMW/zfRllL97C
-cPfBEr6RBw/PKBv8PN2a
-=BJ3h
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/XoEQALknvOANA1EPjxH7NmA2byk0
+mceSBeyxqAM2bLR3Ir88D0U09Z+dTfxtMG97UYgRXefDp34FwlfsYEisHEgnLaT9
+Jq9Z+ntBsk1Oanbu5VuSDBGf7D7NijjpgGo2m8OggBxYSk0+yhUNVtnPuCkGMsBY
+TnOwpHumCi2Gk+wuAD5pQa910DvpxIY036pk/+hLgCaybQ0BmzXFpkwZbKjuRDxQ
+uQ2M531BtsAIKfB+zLIzhlLNPy88PLTJkuSBfE7uwYFbLtlQGug3lT1RJ0PWYbAp
+/wii6Kvu7LJkkaY2cT+ZFgZ3t4OC9RmG1rrdgt4n0Ea5TH9mgxHZUS1Ji/NX3ead
+zTPRrHP0ixm9glmT20Z0quatPRYvnVs3KCtAnE4twYvwODsUDvbeJM9u/EkVv/Cu
+NMFym2JYJfo2mjr4KJaJtBDGNT/++8ulzcDgq6axsAV3if7MeVkGaWk8VdJi8s0g
++pXs5RY5Tpw2K62yIxGgtxpa3XpNDbe3Hjyhq2kAbf3QADH5zlqwk4p+8dsIApPu
+dlT8AC9tNvRdxI2tsN0xXdAx0TJfU3KMOA0psujxBNb8KUogPU23YOCu1dAxhkGE
+oSGyCO1lZTR4tol1W6lhSFXVQ72+cACf+bkVgkZb9fiX60t/2jjy5EFsXi2F1W1b
+WBMMZCQn4J8SgrAmJ79a
+=LFsN
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..f73fbcd3d900
--- /dev/null
+++ b/net-misc/plowshare/files/plowshare-2.1.0-fix_git_invocation.patch
@@ -0,0 +1,56 @@
+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.1.0.ebuild b/net-misc/plowshare/plowshare-2.1.0-r1.ebuild
index ccdee45fe992..3a08cd9140c1 100644
--- a/net-misc/plowshare/plowshare-2.1.0.ebuild
+++ b/net-misc/plowshare/plowshare-2.1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-2.1.0.ebuild,v 1.1 2015/04/13 21:50:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-2.1.0-r1.ebuild,v 1.1 2015/04/14 11:55:28 voyageur Exp $
 
 EAPI=5
 
-inherit bash-completion-r1
+inherit bash-completion-r1 eutils
 
 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
 HOMEPAGE="https://github.com/mcrapet/plowshare"
@@ -31,6 +31,8 @@ DEPEND=""
 # 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|plowshare4|${P}|" Makefile || die "sed failed"