--- nmap-6.25.ebuild~	2012-12-03 13:31:21.000000000 +0000
+++ nmap-6.25.ebuild	2012-12-03 17:18:33.691202924 +0000
@@ -13,7 +13,7 @@ DESCRIPTION="A utility for network explo
 HOMEPAGE="http://nmap.org/"
 SRC_URI="
 	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
+	gtk? ( http://dev.gentoo.org/~jer/nmap-logo-64.png )
 "
 
 LICENSE="GPL-2"
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
-NMAP_LINGUAS="de fr hr it ja pt_BR ru"
+NMAP_LINGUAS="de es fr hr hu id it jp pl pt_BR pt_PT ro ru sk zh"
 for lingua in ${NMAP_LINGUAS}; do
 	IUSE+=" linguas_${lingua}"
 done
@@ -76,6 +76,12 @@ src_prepare() {
 		-e 's/-m 755 -s ncat/-m 755 ncat/' \
 		ncat/Makefile.in || die
 
+	sed -e 's|-D_FORTIFY_SOURCE=2|-U_FORTIFY_SOURCE \0|g' \
+		-i {.,libnetutil,nbase,ncat,nmap-update,nping,nsock/src}/Makefile.in || die
+
+	# linguas_id is missing
+	sed -e '/^ALL_LINGUAS =/s|$| id|g' -i Makefile.in || die
+
 	if use nls; then
 		local lingua=''
 		for lingua in ${NMAP_LINGUAS}; do