Add the bundled-libs USE flag, fix bug #280772 (properly specify liblua dependencies).

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 93 insertions, 3 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 8afbb43e6ec8..d73f72a78479 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.202 2009/07/16 20:19:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.203 2009/09/26 10:39:33 spock Exp $
+
+*nmap-5.00-r1 (26 Sep 2009)
+
+  26 Sep 2009; Michał Januszewski <spock@gentoo.org> +nmap-5.00-r1.ebuild,
+  metadata.xml:
+  Add the bundled-libs USE flag, fix bug #280772 (properly specify liblua
+  dependencies).
 
 *nmap-5.00 (16 Jul 2009)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index cde372b5a37a..606a28c04200 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
@@ -11,6 +14,14 @@ EBUILD nmap-4.76.ebuild 1504 RMD160 56cc829c2b1ed394ef11f4a86a6c74841dc0362b SHA
 EBUILD nmap-4.85_beta8.ebuild 1630 RMD160 781ea53789c6d37dbc9f5844c9e1c972938114e5 SHA1 8693be65a9499b6d16e0ba59c864a3f08a50cbe1 SHA256 a8ab9f080f78eb424251f25bef827c1a970205407013d50473425f78f8a498f6
 EBUILD nmap-4.85_beta9.ebuild 1595 RMD160 916bc11bcecbae59347c05baf971667c76ffa9a9 SHA1 ec2fe9806feab20e2fc1b9e40cb208a9e1408b12 SHA256 fb2ff936aaa5fa24313bb5ae8b7314dc3c19c87438c139b552bdcab16cdb619c
 EBUILD nmap-4.90_rc1.ebuild 1570 RMD160 aa966c36cc0be41dba40476f68e2c4785e088b13 SHA1 0c2d6a43bbc205cf7b13ebcdbf0720261de557fe SHA256 0c53d7adb344878cb4b5b46534beac36ad9aeddec83cfc3c55a57f8f600dbd2b
+EBUILD nmap-5.00-r1.ebuild 1574 RMD160 d949ff8dbc21c0469b39c67bf85e2d3d0eae23c7 SHA1 6cfe19692d7c4287afef95ffec296dd62c63a64d SHA256 877c3d75bc48f65e1634b643b97c052153033f3d6eaf32baad81588e82e8b434
 EBUILD nmap-5.00.ebuild 1566 RMD160 25216ab94dabeede619569e4110c19710c9116dc SHA1 88f3725e6a4472fe5e7bea493067e4281af87e40 SHA256 879897c9f604e4895f50dc21c6b6a7570652bbb551bb4702379a855b625f3212
-MISC ChangeLog 24613 RMD160 c7f3cbf98ecea94cfca18e8dd86cebb6a9118ed8 SHA1 95045f26586bb3aafa814a685e89757836f65ee5 SHA256 ff64a80ce1d5a7e4aa242df4b04c4b0f9b0e40e8efee549c188a983538928ca3
-MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
+MISC ChangeLog 24824 RMD160 4e68d4345d20ef959655e56ad471ce1060402665 SHA1 1bda4335627ed60a781b1998da3b93b7d9517268 SHA256 7cd76abdc7a188af6d602c8cd960b2f0a7c507fc83d0658380e85fbbbc96baf7
+MISC metadata.xml 544 RMD160 226b3ed159b0f6c3d6c00673a6e995ffaaff7d7b SHA1 0942f96090d475901c087ba43289b5c13cdc41bd SHA256 a105edf8864b83c1cd1fc32a8946ba25b0c05f13b92d94a426fe2319430908c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq973MACgkQchej4aZK9/dO2gCeNwXY4u+pMDmUnW1XjKSTQbFF
+8+MAn3ZZ4nQbWZpCKi7EqqW263DWcbpx
+=DFQi
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index f0607ae32cc0..03eb23051262 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -5,4 +5,12 @@
 <maintainer>
   <email>spock@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="bundled-libs">
+		Use the liblua library bundled with nmap instead of the system one.
+		This doesn't affect the other libraries because the bundled libpcre
+		and libpcap are the same as the system libraries, and the bundled
+		libdnet is incompatible with the version available in the tree.
+	</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-5.00-r1.ebuild b/net-analyzer/nmap/nmap-5.00-r1.ebuild
new file mode 100644
index 000000000000..2dcf8b60b048
--- /dev/null
+++ b/net-analyzer/nmap/nmap-5.00-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.00-r1.ebuild,v 1.1 2009/09/26 10:39:33 spock Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+MY_P=${P//_rc1/RC1}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="http://download.insecure.org/nmap/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bundled-libs gtk lua ssl"
+
+DEPEND="dev-libs/libpcre
+	net-libs/libpcap
+	gtk? ( >=x11-libs/gtk+-2.6
+		   >=dev-python/pygtk-2.6
+		   || ( >=dev-lang/python-2.5[sqlite]
+				>=dev-python/pysqlite-2 )
+		 )
+	ssl? ( dev-libs/openssl )
+	!bundled-libs? (
+		lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.75-include.patch"
+	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
+	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
+}
+
+src_configure() {
+	local myconf=""
+
+	if use lua ; then
+		if use bundled-libs ; then
+			myconf="--with-liblua=included"
+		else
+			myconf="--with-liblua"
+		fi
+	else
+		myconf="--without-liblua"
+	fi
+
+	econf ${myconf} \
+		--with-libdnet=included \
+		$(use_with gtk zenmap) \
+		$(use_with ssl openssl) || die
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir=/usr/share/nmap install || die
+	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}