Add USE=external-lua (bug #253269).

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

5 files changed, 21 insertions, 158 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index f54e450ff27b..cc4ef62ed18f 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.315 2014/11/12 16:28:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.316 2014/11/17 23:51:03 jer Exp $
+
+*nmap-6.47-r1 (17 Nov 2014)
+
+  17 Nov 2014; Jeroen Roovers <jer@gentoo.org> -nmap-6.46.ebuild,
+  -nmap-6.47.ebuild, +nmap-6.47-r1.ebuild, metadata.xml:
+  Add USE=external-lua (bug #253269).
 
   12 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.25-r1.ebuild:
   Drop unconditional dep on dev-libs/apr.
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8e16dc9963ed..f44dd16fc5d0 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -11,20 +11,18 @@ AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0e
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
 DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
-DIST nmap-6.46.tar.bz2 7911353 SHA256 3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137 SHA512 eec55267009d1e539df06187ed1522b86e3fa36282159fc872ed5537d93d361201d2d944bcde6af86f22816c0038db7832b011d4ece204ea7c470b716a2dc4c7 WHIRLPOOL 172eb6da55cea1cb559ddd979458e4a7b8f179675b4d1261153f85eb010ba9e64aec61f6c5566a874319e06aa5e4df21881384dc699cac98be09e59b0dafe086
 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.01.ebuild 2644 SHA256 a2e907c693677dcc8a477898731770103682529c93594fd2df7723420ab6a58b SHA512 541cdb4c5c62b5dd20f35f216d703e31f2f9a8d354f4532fb95f429aad527fa9ca3ba86d2d8a72968c3ea4229254325cd85cc55d70a067bcff6752b1dc54ad31 WHIRLPOOL d6a183fca1074ff2c905e17145317524d82dd6028ae843602ec7bd81abbff1e973533e36a278d50ab063a21804da1c019dd59af032054f884a013d5f058f4394
 EBUILD nmap-6.25-r1.ebuild 3609 SHA256 d9478ec7ed6758121432cf11b3fe1ba5643fa71ffb8aa883c98c80cb7f73368a SHA512 9a426d8c1d875819cb332254a27fc3a2be317aedeb4c7f9f3680001a7a36f119119f6dcdf96f5b9f133bd31d06b3cfb6ff9b8dddc58aea607241d4630847099c WHIRLPOOL 5167df00f1f79b4c01c896a11269c3b361e42338159839bc6b24dd69f361c50c98d059118d36f051b579601b3fb9f3366042aa4e00f09615e0e20020ea79a0ef
 EBUILD nmap-6.25.ebuild 3479 SHA256 3fc8097d4dcac997838289fd0df88ccb21f084b7b276dfe28f7392ec60cb583c SHA512 d4ee4d0b830ce2667e87c9ffda50a23bc59f6fe7ffe623453555f76b29ac21ae001bdb00dd04ec25e485002c37f953a5f14af11c932675d89f2b49a3f0aa7897 WHIRLPOOL f4faf39d4a2922c776be592971c4f421aada9c93e54f64923397ce29363f14ba458f57dc2662720caed7d63ad796b64a74d5b46545ad4af6191d1c5580a9b151
-EBUILD nmap-6.46.ebuild 3553 SHA256 217182cb769e9ff4290d02e0f65ef5f8bb5585c6022a4880f4c5af71937174a2 SHA512 59f158904468786e4087e35c95df4268d109639c19486e8130abf485a412559371852c2104951594f55a2a62ae345633005124ac9b089ab328bc55adf65b3be7 WHIRLPOOL da3c146c64a632d045e5c62a6cc3a47eac590d3b809c875de20f61a2b03ff1b8c56a2716de6f35fa9d3bf96dd57dbc78d7d97abaaa3034e6509f5ab2402d297c
-EBUILD nmap-6.47.ebuild 3722 SHA256 cbf6234767a39f1266c35c6224885d1f917bacff68c2cc0121bc962d24a7aefc SHA512 96e64967e458b7a19b1638fd34e5e10998bcd00a1b442f706fe2b0b3d0c0d228800b3bc7f5a14ead96c1251978186ba73699dc6c8d5dbe67b23ee542487405ae WHIRLPOOL 880af3b528f92d84efc693e057a371c8d9201fcebc1772c72373ab93b92524071f9265c72ec389dc49385a8a18bd8b001f6dfc4ab889fbd9f87307fe10ec345d
-MISC ChangeLog 39247 SHA256 c248422bad94c183c75f4beac26a7a0d92e649924177297b8872cd3c5a373e6b SHA512 1ede9d96e6a16b5d5359371c4afcac4250fa06e94dd6715db116d5edb1cfa57c04c56d57493f4cbd383b35b37b320bae93ab44f8154cddd9ddcdb3356688757d WHIRLPOOL 40dd8ac8158996fc2d3cba5dc970f855d6b9a22f10d2d4bc42a3b5ffc21e317def3ac78d522bf78e7527dc3f1d9b134178c46f1827fd8895ae339034c309bba4
-MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd
+EBUILD nmap-6.47-r1.ebuild 3790 SHA256 026fa95082b0aa7ba1b98fc775477d5c4dfd10ecc3d9b4f52fa00165371052a0 SHA512 64e2ffa0adaa6e7b060c745efe419d130a8c0d4deb1c8db134a48bcfa32ff818f558ad547349c013efd6e4b5af8260b41ccd726e45f07b98c140f14c273e4e12 WHIRLPOOL 6a63617a59d432db52e797f18327743b5e119d64164f7f292b3ec627db1e6c00c4934a00d288ce74c51ab4820fec91692109a9f3b2223d9ef3de1e77ef889cc6
+MISC ChangeLog 39434 SHA256 47e38612a6d0e8f2c2dc763ce78a32177c6c82cce229635fe71679afa89081c9 SHA512 db513b591267b846093f12442c9102da6d4d57126d7441abfe6b8e5d32328d0164170548a5a4e286c2c0fb4bc9bad792779bbfe73d9881864980b6ad2ef7e995 WHIRLPOOL 4e500a5bbbf4add10d625e0332b170883bd24186c0fa58a1a49c68a4154df17e45b5de119feed39c8eb173f71987834896e36a838c6395a686eb6e28090a82bd
+MISC metadata.xml 724 SHA256 f1b1e83e5959b3ef616937ead4a46b5ab0dc5ed59ce4cc538769422806b71b6f SHA512 9b7ce66f39014d49b3d868cff40b2a3ecb0e3bcc3b728e0dedf3579691c9acd9825701a615ebb7879a1fe81dd08408d34c0bfb50c117f1ff4cf3778e96b5db70 WHIRLPOOL ab0e184475ca337f24d950e17f45ae20ed533eda21b14ccca78305eeeb72e65454ebefdbf28b2d6bef6b567f2a6d4a5f7e7a9311b970a02a81d1a869ebe7709f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRjiqkACgkQC77qH+pIQ6TWsAD8CEWS1nVBSbPzoKCWZ04xxHCY
-owsoEHQeWsObs78ganIA/jO1Saak6anBl6Vq8WWJQVJOhH3b8Lsyz4EoG/uySf6I
-=H0gO
+iEYEAREIAAYFAlRqiegACgkQVWmRsqeSphPSjwCcCyiVdnugbRzDIbOY43BxdRvw
+H5QAnjXBiGjPajFedaAc1g5dGSuwMyQe
+=tct0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 3d0dd7c50725..0fb887934c00 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name="lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag>
+<flag name="external-lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag>
+<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
 <flag name="ncat">Install the ncat utility</flag>
 <flag name="ndiff">Install the ndiff utility</flag>
 <flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
diff --git a/net-analyzer/nmap/nmap-6.46.ebuild b/net-analyzer/nmap/nmap-6.46.ebuild
deleted file mode 100644
index ca90c0fa6f85..000000000000
--- a/net-analyzer/nmap/nmap-6.46.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.3 2014/08/28 10:07:45 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-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 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 )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-NMAP_PYTHON_DEPEND="
-	|| ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	dev-libs/liblinear
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2
-		${NMAP_PYTHON_DEPEND}
-	)
-	lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	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}"
-
-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
-
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || die
-
-	if use nls; then
-		local lingua=''
-		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
-			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
-		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=/usr --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
-
-	use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.47.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
index 54aa2eb5fd7b..84ef569210c2 100644
--- a/net-analyzer/nmap/nmap-6.47.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.5 2014/11/12 16:20:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v 1.1 2014/11/17 23:51:03 jer Exp $
 
 EAPI=5
 
@@ -19,13 +19,14 @@ SRC_URI="
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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 ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 +lua external-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 )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
+	external-lua? ( lua )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -38,7 +39,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	lua? ( >=dev-lang/lua-5.2[deprecated] )
+	external-lua? ( >=dev-lang/lua-5.2[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
@@ -112,7 +113,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_with zenmap) \
-		$(usex lua --with-liblua=/usr --without-liblua) \
+		$(usex lua --with-liblua=$(usex external-lua /usr included '' '') --without-liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \