From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-846269-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 811CD1388C1
	for <garchives@archives.gentoo.org>; Sat, 14 Nov 2015 08:56:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1980121C005;
	Sat, 14 Nov 2015 08:56:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7239721C005
	for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:56:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A2981340771
	for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:56:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6951CB6E
	for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:56:18 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1447491356.af4a7972f38cc87d4786c3828fe57aa7998abf5f.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/nmap/nmap-6.49_beta6.ebuild
X-VCS-Directories: net-analyzer/nmap/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: af4a7972f38cc87d4786c3828fe57aa7998abf5f
X-VCS-Branch: master
Date: Sat, 14 Nov 2015 08:56:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5faee77c-e38f-432c-af3c-e8da68f4506e
X-Archives-Hash: 42cb4ff05e755012d947fe21c447dbca

commit:     af4a7972f38cc87d4786c3828fe57aa7998abf5f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 08:55:56 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 08:55:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4a7972

net-analyzer/nmap: Re-add liblua-ar patch.

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-6.49_beta6.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
index 7013913..26dd911 100644
--- a/net-analyzer/nmap/nmap-6.49_beta6.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -73,7 +73,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.21-python.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
 
 	if use nls; then
 		local lingua=''