Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
Date: Mon, 11 Mar 2019 04:48:14
Message-Id: 1552279568.031b939d0b29fba6390863cad39fa3aefad3c05a.bman@gentoo
1 commit: 031b939d0b29fba6390863cad39fa3aefad3c05a
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 5 16:47:40 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 11 04:46:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031b939d
7
8 dev-vcs/git: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11269
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 --------------
15 1 file changed, 14 deletions(-)
16
17 diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
18 deleted file mode 100644
19 index a874236dc65..00000000000
20 --- a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
21 +++ /dev/null
22 @@ -1,14 +0,0 @@
23 -diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
24 ---- git-2.5.1.orig/config.mak.uname 2015-08-28 15:37:13.000000000 -0400
25 -+++ git-2.5.1/config.mak.uname 2015-09-06 18:54:28.538437000 -0400
26 -@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
27 - SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
28 - endif
29 - ifeq ($(uname_S),FreeBSD)
30 -- NEEDS_LIBICONV = YesPlease
31 -+ ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
32 -+ NEEDS_LIBICONV = YesPlease
33 -+ endif
34 - OLD_ICONV = YesPlease
35 - NO_MEMMEM = YesPlease
36 - BASIC_CFLAGS += -I/usr/local/include