Disable compilation of Python modules.

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

4 files changed, 34 insertions, 7 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 1c72c9b99c58..b18e9ed0177c 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.222 2010/04/03 15:58:59 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.223 2010/04/04 09:56:09 spock Exp $
+
+  04 Apr 2010; Michał Januszewski <spock@gentoo.org> nmap-5.00-r2.ebuild,
+  +files/nmap-5.00-python.patch:
+  Disable compilation of Python modules.
 
   03 Apr 2010; Michał Januszewski <spock@gentoo.org> nmap-5.21.ebuild:
   Add a dep on Python 2 (bug #311157).
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 84f58a96a50f..ae4f1addfe4a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,6 +3,7 @@ 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-5.00-python.patch 1205 RMD160 22120c7719c8bb4f2ef77c50f35fea15e03e5b89 SHA1 32b42042a27e5ea131aa145c9239fb9e8a070ed1 SHA256 0fe36a2e95a2f6c01967191fe68aac87b7f66f9185846f79de15728608d09f8e
 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
@@ -18,17 +19,17 @@ DIST nmap-5.21.tar.bz2 10015121 RMD160 85e912c3c6a7ed03eb1b399c812836071e4dcf9f
 EBUILD nmap-4.76.ebuild 1504 RMD160 56cc829c2b1ed394ef11f4a86a6c74841dc0362b SHA1 b88a4081226fd4a229f5839e63decb42ab7ef5a5 SHA256 0aac8809865e963873de31525cc722691383c87553ec7c1fb362b7048800b445
 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-r2.ebuild 1484 RMD160 852ef37ef74988cd3b98eb62d47086577deb7192 SHA1 aa2fbd07d78b5ef7ed1d728ce7a64a3402c188c8 SHA256 676947c82b5c9a8703e1ac35dab1394e3468b1757666eae4d1aaf873fd7201d8
+EBUILD nmap-5.00-r2.ebuild 1530 RMD160 a80dfc542a25caceb1f8d09848207e29911d7843 SHA1 d081f12151ccfba37adaaceaf3fae51972afe08f SHA256 21d6d3c2f79ba968e335a494cc9479e29d11c8f1263e65c25da692457f5b1714
 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 1632 RMD160 f71a5583f22bbf59a4731f4983f22fc671269cf6 SHA1 fee264defa95832066f5dadc36bcbaec2e14225a SHA256 207162594e57bb7c2263b33f7def4fe11f476e308f422023fa244e64c3f256e9
 EBUILD nmap-5.21.ebuild 1655 RMD160 04bd1b917e64f138eca8fecee6c0ece16a668fdb SHA1 7976d3d8e0af2dd89cba76e96f136bab5433cb39 SHA256 3fd040d494a64f86c658e9808da8cc23ca39f96f71d606e2271aa8006ed79999
-MISC ChangeLog 27011 RMD160 bf46b56305ccc6d2e300aabe294068c96bc47e69 SHA1 6ac88dbd8c997c9dcd65260b2596dc38fb4a6940 SHA256 47228ae740f35768a88545fc181709707a646c81463e10c61d58fac1589736f3
+MISC ChangeLog 27161 RMD160 d96e3af3f5e291af87b415ad6b2975c17192b060 SHA1 6dedfa0cdac10e591a285384c6f30f50bbf01bb3 SHA256 e8b609a40006ba463b53cdf88cdc32e498f2a83ded84efbddc695942f1639fb7
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku3ZckACgkQchej4aZK9/deygCfeXkf5Ror2F7cFbb3T6WtYnMZ
-SQ0An00lIGp8uDCeiRr1XEXWMglo77Xk
-=nOqT
+iEYEARECAAYFAku4Yj0ACgkQchej4aZK9/eafwCfe4ZxbFEyWR+/Mqb4kVT80ND5
+ffcAn0FMtve/MHC6Rh1sudxZtO2ljdv2
+=Cyab
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.00-python.patch b/net-analyzer/nmap/files/nmap-5.00-python.patch
new file mode 100644
index 000000000000..82726bc33f4c
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.00-python.patch
@@ -0,0 +1,21 @@
+diff -Naurp nmap-5.00-orig//Makefile.in nmap-5.00/Makefile.in
+--- nmap-5.00-orig//Makefile.in	2010-04-04 11:39:01.000000000 +0200
++++ nmap-5.00/Makefile.in	2010-04-04 11:39:29.000000000 +0200
+@@ -236,7 +236,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
+ 
+ install-zenmap: $(ZENMAPDIR)/setup.py
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+-	cd $(ZENMAPDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(ZENMAPDIR) && $(PYTHON) setup.py 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.
+@@ -250,7 +250,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.00-r2.ebuild b/net-analyzer/nmap/nmap-5.00-r2.ebuild
index 73a9c3fe1e14..a3f7e4331653 100644
--- a/net-analyzer/nmap/nmap-5.00-r2.ebuild
+++ b/net-analyzer/nmap/nmap-5.00-r2.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.00-r2.ebuild,v 1.9 2010/01/10 18:28:24 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.00-r2.ebuild,v 1.10 2010/04/04 09:56:09 spock Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.75-include.patch"
 	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
+	epatch "${FILESDIR}/${PN}-5.00-python.patch"
 	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
 }