Fix LINGUAS checking/removal logic, die() on removal failure. Update LINGUAS.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 174 insertions, 14 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index de724dbb8f0a..9e77e9caee5d 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.333 2015/01/05 07:42:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.334 2015/01/26 12:08:35 jer Exp $
+
+*nmap-6.47-r2 (26 Jan 2015)
+
+  26 Jan 2015; Jeroen Roovers <jer@gentoo.org> +nmap-6.47-r2.ebuild,
+  nmap-9999.ebuild:
+  Fix LINGUAS checking/removal logic, die() on removal failure. Update LINGUAS.
 
 *nmap-9999 (05 Jan 2015)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index be22aa84caf4..998731bddac2 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,13 +12,14 @@ AUX nmap-6.47-no-libnl.patch 1903 SHA256 5f9fa774374ee1c410123b0349d501d0aa265fe
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.47-r1.ebuild 3807 SHA256 159927583d8299c0f1411672055b1fa69ef486b9dbf82ad66f2abb17cdc6479c SHA512 e99dff9a0dd34ac18ceec5160664ad1a4f9edbe47ab859ea84fea9ac2f617e2fa8b133f0d472e5a966b1bcdd158b0e8562745ab81ec25486ecfcbacb695a668c WHIRLPOOL c879d44f5ac7e2744ebe629b0b761bce964adc5e91d25bbce88c93f8f152e7e3e22548dafbc74a61c7b5b48327b52b0773736a8397c185393f2068562f756e25
-EBUILD nmap-9999.ebuild 3579 SHA256 7ea472f42f7b5397acb60593f7ca507f64d6b1a297962c9612846e6c8767a296 SHA512 470614c93553933532818c4180b5574af1fee4f2c4985e885085def66925a2aecb0fcc68429c5df1010cf1071691af00031904109461500b400aab953767e64b WHIRLPOOL 3701060b8dbfdf263e03eec9e6e9e220eb5ddf42a15f90dd5b484527ca604833cac8d13b777bd4eaa1f6c7476d8e4ab66b39671e46d6ed51be938776420f123e
-MISC ChangeLog 41486 SHA256 0c7cb8f4da975bb0ac02b9ee5bbb308db68c8547d9fc2bfe92aafcb38c90f801 SHA512 9a6efac31718fd41920c26334d8635d9626d3d8a1453e77181d8ebe6f41e75855a06984d3d256da4de71de9df03dd545fe4ab402c1fb1fbb12244a0b996db95f WHIRLPOOL f4add7256e471a63b6d76c32fa7686c5dd11f0196fba82bddc099561e36d6abb9d4814f0a2f24c4154e2e35a35a3711d1e07f1caf7e5388b2828e30c7b6ede55
+EBUILD nmap-6.47-r2.ebuild 3817 SHA256 1495265eef6c419a1dfd9be87d255d3c07933b0c0f6234cce06cdc53085122e3 SHA512 eb0c45952aaaf63952a00bd88106c7cb0474de21447f7fcdd0d38c524758cf99bca8db6866e8ae78e77cd256c766e6a83c21140405a6ed559adb432a966c08b4 WHIRLPOOL 00ebb6e44eb0d58827635287712d52662af3b43ed207579d51640c9fd11b0c04e1a97f88ceb4135bd4222a1cff856ec169cad41e712b876287dc41bcf1a69223
+EBUILD nmap-9999.ebuild 3584 SHA256 d2cc3d44e27ed2c29b395da1335e7e30dc8e3ccca6c8a4e433e164bd270cd776 SHA512 25127ec28d004d56ba199401159db0809f9242427a0467c5ad529fd1cdf8af340608b3678e57075cf6e49006f21cc9d11886f633bca64112f7097e0d1e43bb9e WHIRLPOOL 74756fd1af5ba9e34a924667357237a5864ae50e27c1124a9e9a04b7d4f54347e544503d9375df3c5242aaa161f1993249ac8c88ceb446b5360d857edde1987c
+MISC ChangeLog 41685 SHA256 fb8b8dce8d6c30c7b813eae819f9efa6cec87d5c1f2f9a1b7b3764780db32754 SHA512 a422f92416006871c3e679bb951ba8a6b1c3ef84381d8709ef97edf0d10a7d1e7d8b616a4f106f1d507414068b4cc30d223d5f4eef1e72489584077854e39776 WHIRLPOOL d2d7f4c60f9c5e9603c342ae4517fb1a272b77ba1835bacd4f434565dcc5644b66e94bde5e04afeb0d722cb012d2ec5e9189c2310695058e87ce76871d0f82ef
 MISC metadata.xml 698 SHA256 0bc8d424bc183f9dc54ed8bc8b957a3ececa0970e8f8826400bb594cdcd178d1 SHA512 929fa760d9178548397d23e90f08ed458f90e25ecc7a7e0193d696b904fff761c67f6957beeb9bfeff6832a0a8d2832ed4a8cf2e3742e3a18b869695f4b4cd09 WHIRLPOOL 7cf95e8e5aa1edadc28bcf6ad32ab22c03d48a748470738414b5b8f3f57948a4ce5a1acc4e17186a28df2c7c037f6db14f3b8a5bb7556dc10bd0035460e723fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSqQG0ACgkQVWmRsqeSphO6hwCeIO2AhCEY8AfA2HwkGdtIrGxS
-5UQAnRgexr9Ut2zaquIsvmEkY1PPuL/l
-=b/0E
+iEYEAREIAAYFAlTGLkQACgkQVWmRsqeSphNn+ACeMay8sry8350OoeljsxcQzjYy
+3S4AnAu+5+T57glKUqyS8Mu/q0FwxXiz
+=nXRz
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
new file mode 100644
index 000000000000..ac0a854c9c4e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.47-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.1 2015/01/26 12:08:35 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+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 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( lua )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 03dd1a502f50..f624fb91e2c5 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.1 2015/01/05 07:42:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.2 2015/01/26 12:08:35 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -71,17 +71,17 @@ src_prepare() {
 
 	if use nls; then
 		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
+		for lingua in ${NMAP_LINGUAS[@]}; do
 			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
 		done
 	else
 		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
 		done
 	fi