[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/, dev-vcs/git/files/

[Justin Lecher]

commit:     74c1a2dd55137294624d5164f7f6cbf7e3bde32a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 11:15:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 11:16:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c1a2dd

dev-vcs/git: Fix @ -> <at> conversion

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch | 8 ++++----
 dev-vcs/git/{git-2.6.1-r1.ebuild => git-2.6.1-r2.ebuild}      | 0
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
index bc60708..b5e3af1 100644
--- a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
+++ b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
@@ -1,4 +1,4 @@
-From: Renee Margaret McConahy <nepella <at> gmail.com>
+From: Renee Margaret McConahy <nepella@×××××.com>
 Subject: [PATCH v2] am: configure gpg at startup
 Newsgroups: gmane.comp.version-control.git
 Date: 2015-09-30 17:49:44 GMT (5 days, 14 hours and 45 minutes ago)
@@ -11,7 +11,7 @@ Perhaps git_gpg_config's functionality ought to be merged into
 git_default_config, but this is simpler and in keeping with the current
 practice.
 
-Signed-off-by: Renee Margaret McConahy <nepella <at> gmail.com>
+Signed-off-by: Renee Margaret McConahy <nepella@×××××.com>
 ---
 
  builtin/am.c | 13 ++++++++++++-
@@ -21,7 +21,7 @@ diff --git a/builtin/am.c b/builtin/am.c
 index 4f77e07..3bd4fd7 100644
 --- a/builtin/am.c
 +++ b/builtin/am.c
- <at>  <at>  -2208,6 +2208,17  <at>  <at>  enum resume_mode {
+@@ -2208,6 +2208,17 @@ enum resume_mode {
  	RESUME_ABORT
  };
 
@@ -39,7 +39,7 @@ index 4f77e07..3bd4fd7 100644
  int cmd_am(int argc, const char **argv, const char *prefix)
  {
  	struct am_state state;
- <at>  <at>  -2308,7 +2319,7  <at>  <at>  int cmd_am(int argc, const char **argv, const char *prefix)
+@@ -2308,7 +2319,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
  		OPT_END()
  	};
 

diff --git a/dev-vcs/git/git-2.6.1-r1.ebuild b/dev-vcs/git/git-2.6.1-r2.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.6.1-r1.ebuild
rename to dev-vcs/git/git-2.6.1-r2.ebuild