diff options
author | Jeroen Roovers <jer@gentoo.org> | 2017-01-21 12:01:49 +0100 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2017-01-21 12:04:53 +0100 |
commit | d3c5298c0c05243b79396f77fa43b0e949064122 (patch) | |
tree | 5af68578eddef737b3832b40efd219eb10e51a35 /net-analyzer/nmap/nmap-9999.ebuild | |
parent | dev-python/pydns: add py3.5, pypy3, fix deps, tests (diff) | |
download | gentoo-d3c5298c0c05243b79396f77fa43b0e949064122.tar.gz gentoo-d3c5298c0c05243b79396f77fa43b0e949064122.tar.bz2 gentoo-d3c5298c0c05243b79396f77fa43b0e949064122.zip |
net-analyzer/nmap: Fix bug #529244 again.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-analyzer/nmap/nmap-9999.ebuild')
-rw-r--r-- | net-analyzer/nmap/nmap-9999.ebuild | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index b7315c680410..ff1ea85fb923 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,xml" -inherit autotools eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user +inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user MY_P=${P/_beta/BETA} @@ -52,6 +52,16 @@ DEPEND=" " S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-5.10_beta1-string.patch + "${FILESDIR}"/${PN}-5.21-python.patch + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch + "${FILESDIR}"/${PN}-6.46-uninstaller.patch + "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch + "${FILESDIR}"/${PN}-7.25-libpcre.patch + "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch + "${FILESDIR}"/${PN}-7.31-libnl.patch +) pkg_setup() { if use ndiff || use zenmap; then @@ -60,15 +70,9 @@ pkg_setup() { } src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ - "${FILESDIR}"/${PN}-5.21-python.patch \ - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ - "${FILESDIR}"/${PN}-6.46-uninstaller.patch \ - "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \ - "${FILESDIR}"/${PN}-7.25-libpcre.patch \ - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch + rm -r libpcap/ || die + + default if use nls; then local lingua='' @@ -97,8 +101,6 @@ src_prepare() { zenmap/install_scripts/unix/zenmap-root.desktop \ zenmap/install_scripts/unix/zenmap.desktop || die - epatch_user - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die eautoreconf if [[ ${CHOST} == *-darwin* ]] ; then |