| 1 |
commit: e51e1cf12d0e8212881069ff8601d8f427efa190 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 5 17:25:29 2015 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 5 17:25:29 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/dev/ulm.git/commit/?id=e51e1cf1 |
| 7 |
|
| 8 |
dev-tex/vc: Fix parsing of git status output. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.23 |
| 11 |
|
| 12 |
dev-tex/vc/ChangeLog | 6 ++++++ |
| 13 |
dev-tex/vc/files/vc-0.5-git-status.patch | 23 +++++++++++++++++++++++ |
| 14 |
dev-tex/vc/{vc-0.5.ebuild => vc-0.5-r1.ebuild} | 3 ++- |
| 15 |
3 files changed, 31 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-tex/vc/ChangeLog b/dev-tex/vc/ChangeLog |
| 18 |
index 954383a..6c25e10 100644 |
| 19 |
--- a/dev-tex/vc/ChangeLog |
| 20 |
+++ b/dev-tex/vc/ChangeLog |
| 21 |
@@ -2,6 +2,12 @@ |
| 22 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+*vc-0.5-r1 (05 Nov 2015) |
| 26 |
+ |
| 27 |
+ 05 Nov 2015; Ulrich Müller <ulm@g.o> -vc-0.5.ebuild, |
| 28 |
+ +vc-0.5-r1.ebuild, +files/vc-0.5-git-status.patch: |
| 29 |
+ Fix parsing of git status output. |
| 30 |
+ |
| 31 |
15 May 2015; Ulrich Müller <ulm@g.o> vc-0.5.ebuild, |
| 32 |
+files/vc-0.5-fix-git-date.patch: |
| 33 |
Fix date information in git. |
| 34 |
|
| 35 |
diff --git a/dev-tex/vc/files/vc-0.5-git-status.patch b/dev-tex/vc/files/vc-0.5-git-status.patch |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..e67007d |
| 38 |
--- /dev/null |
| 39 |
+++ b/dev-tex/vc/files/vc-0.5-git-status.patch |
| 40 |
@@ -0,0 +1,23 @@ |
| 41 |
+--- vc-orig/git-unix/vc |
| 42 |
++++ vc/git-unix/vc |
| 43 |
+@@ -20,5 +20,5 @@ |
| 44 |
+ git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex |
| 45 |
+ if [ "$mod" = 1 ] |
| 46 |
+ then |
| 47 |
+- git status |gawk -v script=status -f vc-git.awk >> vc.tex |
| 48 |
++ git status --porcelain |gawk -v script=status -f vc-git.awk >> vc.tex |
| 49 |
+ fi |
| 50 |
+--- vc-orig/git-unix/vc-git.awk |
| 51 |
++++ vc/git-unix/vc-git.awk |
| 52 |
+@@ -26,9 +26,9 @@ |
| 53 |
+ |
| 54 |
+ ### Process output of "git status". |
| 55 |
+ ### Changed index? |
| 56 |
+-script=="status" && /^# Changes to be committed:/ { modified = 1 } |
| 57 |
++script=="status" && /^[MADRC]/ { if (modified == 0) modified = 1 } |
| 58 |
+ ### Unstaged modifications? |
| 59 |
+-script=="status" && /^# Changed but not updated:/ { modified = 2 } |
| 60 |
++script=="status" && /^.[MD]/ { modified = 2 } |
| 61 |
+ |
| 62 |
+ |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/dev-tex/vc/vc-0.5.ebuild b/dev-tex/vc/vc-0.5-r1.ebuild |
| 66 |
similarity index 92% |
| 67 |
rename from dev-tex/vc/vc-0.5.ebuild |
| 68 |
rename to dev-tex/vc/vc-0.5-r1.ebuild |
| 69 |
index 278d9c9..88adcda 100644 |
| 70 |
--- a/dev-tex/vc/vc-0.5.ebuild |
| 71 |
+++ b/dev-tex/vc/vc-0.5-r1.ebuild |
| 72 |
@@ -1,6 +1,6 @@ |
| 73 |
# Copyright 1999-2015 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
-# $Header: $ |
| 76 |
+# $Id$ |
| 77 |
|
| 78 |
EAPI=5 |
| 79 |
|
| 80 |
@@ -20,6 +20,7 @@ S="${WORKDIR}/${PN}" |
| 81 |
|
| 82 |
src_prepare() { |
| 83 |
epatch "${FILESDIR}"/${P}-fix-git-date.patch |
| 84 |
+ epatch "${FILESDIR}"/${P}-git-status.patch |
| 85 |
} |
| 86 |
|
| 87 |
src_compile() { :; } |
Archives