jer 14/08/28 10:07:45
Modified: nmap-6.25.ebuild nmap-6.01.ebuild nmap-6.46.ebuild
ChangeLog
Added: nmap-6.47.ebuild
Log:
Version bump. Remove <python2.7 dependencies.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.30 net-analyzer/nmap/nmap-6.25.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.30&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.30&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?r1=1.29&r2=1.30
Index: nmap-6.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nmap-6.25.ebuild 1 Dec 2013 20:36:20 -0000 1.29
+++ nmap-6.25.ebuild 28 Aug 2014 10:07:45 -0000 1.30
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.29
2013/12/01 20:36:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.30
2014/08/28 10:07:45 jer Exp $
EAPI="4"
@@ -28,8 +28,6 @@
NMAP_PYTHON_DEPEND="
|| (
dev-lang/python:2.7[sqlite]
- dev-lang/python:2.6[sqlite]
- dev-lang/python:2.5[sqlite]
)
"
RDEPEND="
1.26 net-analyzer/nmap/nmap-6.01.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.26&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.26&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?r1=1.25&r2=1.26
Index: nmap-6.01.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nmap-6.01.ebuild 2 Aug 2013 13:52:45 -0000 1.25
+++ nmap-6.01.ebuild 28 Aug 2014 10:07:45 -0000 1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.25
2013/08/02 13:52:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.26
2014/08/28 10:07:45 jer Exp $
EAPI="4"
@@ -23,8 +23,6 @@
NMAP_PYTHON_DEPEND="
|| (
dev-lang/python:2.7[sqlite]
- dev-lang/python:2.6[sqlite]
- dev-lang/python:2.5[sqlite]
)
"
DEPEND="
1.3 net-analyzer/nmap/nmap-6.46.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?r1=1.2&r2=1.3
Index: nmap-6.46.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nmap-6.46.ebuild 6 Jun 2014 00:19:47 -0000 1.2
+++ nmap-6.46.ebuild 28 Aug 2014 10:07:45 -0000 1.3
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.2
2014/06/06 00:19:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.3
2014/08/28 10:07:45 jer Exp $
EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
1.310 net-analyzer/nmap/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.310&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.310&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.309&r2=1.310
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- ChangeLog 6 Jun 2014 00:25:23 -0000 1.309
+++ ChangeLog 28 Aug 2014 10:07:45 -0000 1.310
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/nmap
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.309
2014/06/06 00:25:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.310
2014/08/28 10:07:45 jer Exp $
+
+*nmap-6.47 (28 Aug 2014)
+
+ 28 Aug 2014; Jeroen Roovers <[email protected]> nmap-6.01.ebuild,
+ nmap-6.25.ebuild, nmap-6.46.ebuild, +nmap-6.47.ebuild:
+ Version bump. Remove <python2.7 dependencies.
06 Jun 2014; Jeroen Roovers <[email protected]> -nmap-6.40.ebuild,
-nmap-6.40-r1.ebuild, -files/nmap-6.40-uninstaller.patch:
1.1 net-analyzer/nmap/nmap-6.47.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.1&content-type=text/plain
Index: nmap-6.47.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.1
2014/08/28 10:07:45 jer Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
MY_P=${P/_beta/BETA}
DESCRIPTION="A utility for network exploration or security auditing"
HOMEPAGE="http://nmap.org/";
SRC_URI="
http://nmap.org/dist/${MY_P}.tar.bz2
http://dev.gentoo.org/~jer/nmap-logo-64.png
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
NMAP_PYTHON_DEPEND="
|| ( ${PYTHON_DEPS} )
"
RDEPEND="
dev-libs/liblinear
dev-libs/libpcre
net-libs/libpcap[ipv6?]
zenmap? (
dev-python/pygtk:2
${NMAP_PYTHON_DEPEND}
)
lua? ( >=dev-lang/lua-5.2[deprecated] )
ndiff? ( ${NMAP_PYTHON_DEPEND} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
ssl? ( dev-libs/openssl )
"
DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
"
S="${WORKDIR}/${MY_P}"
src_unpack() {
# prevent unpacking the logo
unpack ${MY_P}.tar.bz2
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.75-nolua.patch \
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
"${FILESDIR}"/${PN}-5.21-python.patch \
"${FILESDIR}"/${PN}-6.01-make.patch \
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${PN}-6.46-uninstaller.patch
sed -i \
-e 's/-m 755 -s ncat/-m 755 ncat/' \
ncat/Makefile.in || die
if use nls; then
local lingua=''
for lingua in ${NMAP_LINGUAS}; do
if ! use linguas_${lingua}; then
rm -rf zenmap/share/zenmap/locale/${lingua}
rm -f zenmap/share/zenmap/locale/${lingua}.po
fi
done
else
# configure/make ignores --disable-nls
for lingua in ${NMAP_LINGUAS}; do
rm -rf zenmap/share/zenmap/locale/${lingua}
rm -f zenmap/share/zenmap/locale/${lingua}.po
done
fi
sed -i \
-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
Makefile.in || die
# Fix desktop files wrt bug #432714
sed -i \
-e '/^Encoding/d' \
-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
}
src_configure() {
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_with zenmap) \
$(usex lua --with-liblua=/usr --without-liblua) \
$(use_with ncat) \
$(use_with ndiff) \
$(use_with nmap-update) \
$(use_with nping) \
$(use_with ssl openssl) \
--with-libdnet=included \
--with-pcre=/usr
# --with-liblinear=/usr \
# Commented because configure does weird things, while
autodetection works
}
src_compile() {
emake \
AR=$(tc-getAR) \
RANLIB=$(tc-getRANLIB )
}
src_install() {
LC_ALL=C emake -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
install
if use nmap-update;then
LC_ALL=C emake -j1 \
-C nmap-update \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
install
fi
dodoc CHANGELOG HACKING docs/README docs/*.txt
use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
}
