From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE4B8138335 for ; Mon, 11 Mar 2019 04:48:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE847E0BEB; Mon, 11 Mar 2019 04:48:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4B96E0BEB for ; Mon, 11 Mar 2019 04:48:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 890C9335C67 for ; Mon, 11 Mar 2019 04:48:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1057503 for ; Mon, 11 Mar 2019 04:48:09 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1552279568.031b939d0b29fba6390863cad39fa3aefad3c05a.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch X-VCS-Directories: dev-vcs/git/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 031b939d0b29fba6390863cad39fa3aefad3c05a X-VCS-Branch: master Date: Mon, 11 Mar 2019 04:48:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4cb64baa-5a58-45c8-b616-02644450ae3e X-Archives-Hash: 09c76cfebb0380301b136392162b79ca commit: 031b939d0b29fba6390863cad39fa3aefad3c05a Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Mar 5 16:47:40 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 11 04:46:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031b939d dev-vcs/git: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11269 Signed-off-by: Aaron Bauman gentoo.org> dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 -------------- 1 file changed, 14 deletions(-) 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 deleted file mode 100644 index a874236dc65..00000000000 --- a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname ---- git-2.5.1.orig/config.mak.uname 2015-08-28 15:37:13.000000000 -0400 -+++ git-2.5.1/config.mak.uname 2015-09-06 18:54:28.538437000 -0400 -@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin) - SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield - endif - ifeq ($(uname_S),FreeBSD) -- NEEDS_LIBICONV = YesPlease -+ ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2) -+ NEEDS_LIBICONV = YesPlease -+ endif - OLD_ICONV = YesPlease - NO_MEMMEM = YesPlease - BASIC_CFLAGS += -I/usr/local/include