diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2010-04-04 09:56:09 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2010-04-04 09:56:09 +0000 |
| commit | be6b68ab82b307b7e238b35a5398af93828ff763 (patch) | |
| tree | 68f04be9da86015a805c6116ae07ff2b5985f73b /net-analyzer | |
| parent | hppa stable, #308049 (diff) | |
| download | gentoo-2-be6b68ab82b307b7e238b35a5398af93828ff763.tar.gz gentoo-2-be6b68ab82b307b7e238b35a5398af93828ff763.tar.bz2 gentoo-2-be6b68ab82b307b7e238b35a5398af93828ff763.zip | |
Disable compilation of Python modules.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/files/nmap-5.00-python.patch | 21 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-5.00-r2.ebuild | 3 |
3 files changed, 28 insertions, 2 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/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 } |