Rename external-lua => system-lua.

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

4 files changed, 17 insertions, 13 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index cc4ef62ed18f..8db905e5e267 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.316 2014/11/17 23:51:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.317 2014/11/18 00:26:06 jer Exp $
+
+  18 Nov 2014; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r1.ebuild,
+  metadata.xml:
+  Rename external-lua => system-lua.
 
 *nmap-6.47-r1 (17 Nov 2014)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index f44dd16fc5d0..b527c1f5795a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -16,13 +16,13 @@ DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b
 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.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
+EBUILD nmap-6.47-r1.ebuild 3782 SHA256 db6823d8a8e7c8ef4653db7adcc77e1aa48f70d28b93981c467511b4bca660fa SHA512 2ae6f553d0dfe8de0017e30bcee599383977bc439c772763860b5226ffb5d81ffefdabff688fcd8d1ea21e9f4958c44282f7deef63ffe210578aa1a95555d449 WHIRLPOOL 298872be6af9a773f5754b0047821860ebef922eba3c9cd3a1f61ec1de8b2e33d9acdf7f5fcc5b4519460ba3869b7ff322e823b044cfb740f747ca93d2a3cdf5
+MISC ChangeLog 39556 SHA256 327391b69f0d12cb2fb0d47b3418f1cfed1b069dffb9ba7f131fed7d24f100ae SHA512 f30d7237829d2c79bf9e64bc1b5ed4f781e55afa24ad91a950954bd1e9bd4b70c8fb8b496e256f304fb680df284277228ec0b8ffe27bf4685d495f31ccf3f0c9 WHIRLPOOL faeecec9952666922a02c454d6d6a0d3f2dfbc1b53f80e0c289cc529dc87f53af86340dccae9bdf86b6c7951b0eca21a811e4fd711c6f356accee8b839878779
+MISC metadata.xml 696 SHA256 9daf0485d01dd301ebd817d5431d8f4ae482aef6ebc680b9dfc02295b7a7381e SHA512 846e5a5aa81b33305046935bda0e15cf5ee388b15801314890120e8d0027672986af311be6e60d0a9060770b752fbf4fff1ad9ca30b3d0ab9b4426ae82cc4f9e WHIRLPOOL a7c66004f3ad9494739d8436765e6bcc1fa99c3bb9108fc624ed90c362aedb5363974adef686d1fbf240cf1969744cad27f0c069258a22c547b8e47e1052db23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRqiegACgkQVWmRsqeSphPSjwCcCyiVdnugbRzDIbOY43BxdRvw
-H5QAnjXBiGjPajFedaAc1g5dGSuwMyQe
-=tct0
+iEYEAREIAAYFAlRqkiAACgkQVWmRsqeSphPncACggSkyo8O0dgf9yVqpcG6m7yR2
+1O8AnjDr+D3rLQqLcaIl/Ra0A71bObvh
+=3R1f
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 0fb887934c00..49a143e49d4c 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name="external-lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag>
+<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</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>
diff --git a/net-analyzer/nmap/nmap-6.47-r1.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
index 84ef569210c2..7d5e0dafb374 100644
--- a/net-analyzer/nmap/nmap-6.47-r1.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-r1.ebuild,v 1.1 2014/11/17 23:51:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v 1.2 2014/11/18 00:26:06 jer Exp $
 
 EAPI=5
 
@@ -21,12 +21,12 @@ LICENSE="GPL-2"
 SLOT="0"
 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 external-lua ncat ndiff nls nmap-update nping ssl zenmap"
+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 )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
-	external-lua? ( lua )
+	system-lua? ( lua )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	external-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
@@ -113,7 +113,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_with zenmap) \
-		$(usex lua --with-liblua=$(usex external-lua /usr included '' '') --without-liblua) \
+		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \