Fix bug #302636.

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

4 files changed, 34 insertions, 7 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index d2a1271a2f3b..010dbd5d8a98 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.216 2010/01/29 23:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.217 2010/01/31 09:08:52 spock Exp $
+
+  31 Jan 2010; Michał Januszewski <spock@gentoo.org> nmap-5.21.ebuild,
+  +files/nmap-5.21-python.patch:
+  Fix bug #302636.
 
 *nmap-5.21 (29 Jan 2010)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index e4e45388053d..3464fb9a86bc 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -5,6 +5,7 @@ AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-5.10_beta1-string.patch 252 RMD160 58dc7f4dfb660519a51af2f5619eca144cfd6480 SHA1 b080ef5618b3666bf85f011ce6edc969d8a2132d SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506
 AUX nmap-5.20-nolua.patch 1237 RMD160 b670ecd0630d0f13f8f5a46cc8ffb84b86374c3d SHA1 e64d645b6b4e3a73482945632eba7aa7f6730d4a SHA256 ce215ce6666e4518121d6a5996c7e7a29037fc77b2d43d0ffbf77d9d7c00e985
+AUX nmap-5.21-python.patch 1219 RMD160 87b07436f42950341403ee0f92edf02abfe88614 SHA1 6e82966a50b150ce3cb2b36d0ad57595f98dc2c8 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-4.76.tar.bz2 6061317 RMD160 ec93522e05e7233e8950b28ab12b45355e63c0c7 SHA1 a71141738b4512b6d5b35ef94258e525df30a586 SHA256 4e24328ca6ec97afb2a8caf312b1f111a15cf41763a5ac41e7a633fdb217d66d
@@ -21,13 +22,13 @@ EBUILD nmap-5.00-r2.ebuild 1484 RMD160 852ef37ef74988cd3b98eb62d47086577deb7192
 EBUILD nmap-5.00.ebuild 1566 RMD160 25216ab94dabeede619569e4110c19710c9116dc SHA1 88f3725e6a4472fe5e7bea493067e4281af87e40 SHA256 879897c9f604e4895f50dc21c6b6a7570652bbb551bb4702379a855b625f3212
 EBUILD nmap-5.10_beta1.ebuild 1533 RMD160 131d53ea0981f81b084d5cde72a4cec3a5f33952 SHA1 c3a01d832411288b50bbfbb88c0ca58b7b55c7d7 SHA256 ab9281463b95d9fcef8eec13ef582089f0d65bdcf020b1bde54a6643634242ad
 EBUILD nmap-5.20.ebuild 1586 RMD160 5c0492cb7bd191996b601ac390191808321d3d4b SHA1 e3aac52d185d5b73208eb1fe3d71f62a4625f7b9 SHA256 66c10c084cadad29605d2b7a85a2f2ec9baf04c20bdaf525e7c4f889f913e8c2
-EBUILD nmap-5.21.ebuild 1541 RMD160 c1b9c74f0d9abc46470ed743859d9542c503ea62 SHA1 66f66b517adef7f4661e16a88bf56a89df493b0c SHA256 87cc2347b68f4335c97cdc248b85214c4d5bff66e378908721e77b919f0dd8b3
-MISC ChangeLog 26391 RMD160 2b631034bfb0e639da13d2b0181ad5e9803f0b3e SHA1 5c24c912edf0cc02c276810cce72b3bce0fea504 SHA256 c83c99c54ced393c76aed2a2657a6ce467253fe43586cc632997517539dc5316
+EBUILD nmap-5.21.ebuild 1587 RMD160 c684918abdf4437bff44e694b356aabf3ccd2f82 SHA1 a73b73cfeab18ca66efe4362e951dda06238dd79 SHA256 783bf92cdd534e57e65391cf1e1cec481026244d30b81529719e0328b1bc0de5
+MISC ChangeLog 26516 RMD160 d6d07af90b322a00d9a041171516b4c9362cd82c SHA1 3a293a4b1a77670f66d59f4c7c38639faec6343f SHA256 48f06593d32fdbe7e7ac0f998a7ca9cf3e97a2ba3156fe625824cbd50cad2dbc
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktjbWAACgkQchej4aZK9/dfTQCfZ3bz8rq3F2s0ZsRTZddN6q/5
-+ygAoICaN27r0Bj/ecvefHuaro7DSuTR
-=j0b2
+iEYEARECAAYFAktlSJsACgkQchej4aZK9/c9mACdFisYOlvEZClPpEFgB4LvboD4
+Dr0An3ohSPX8BjGdQc3K2p3/8Fp45/Lf
+=KYwe
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch b/net-analyzer/nmap/files/nmap-5.21-python.patch
new file mode 100644
index 000000000000..aa0d4f9db953
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.21-python.patch
@@ -0,0 +1,21 @@
+diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
+--- nmap-5.21-orig/Makefile.in	2010-01-31 09:53:53.000000000 +0100
++++ nmap-5.21/Makefile.in	2010-01-31 09:54:48.000000000 +0100
+@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
+ 
+ install-zenmap: $(ZENMAPDIR)/setup.py
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+-	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
+ # already a link.
+@@ -267,7 +267,7 @@ build-ndiff:
+ 	cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
+ 
+ install-ndiff:
+-	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 
+ NSE_FILES = scripts/script.db scripts/*.nse
+ NSE_LIB_LUA_FILES = nselib/*.lua
diff --git a/net-analyzer/nmap/nmap-5.21.ebuild b/net-analyzer/nmap/nmap-5.21.ebuild
index 142dc54eaba3..96715b3a3a78 100644
--- a/net-analyzer/nmap/nmap-5.21.ebuild
+++ b/net-analyzer/nmap/nmap-5.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21.ebuild,v 1.1 2010/01/29 23:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21.ebuild,v 1.2 2010/01/31 09:08:52 spock Exp $
 
 EAPI="2"
 
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.75-include.patch"
 	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
 	epatch "${FILESDIR}/${PN}-5.10_beta1-string.patch"
+	epatch "${FILESDIR}/${PN}-5.21-python.patch"
 	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
 }