jer 14/11/17 23:51:03 Modified: ChangeLog metadata.xml Added: nmap-6.47-r1.ebuild Removed: nmap-6.47.ebuild nmap-6.46.ebuild Log: Add USE=external-lua (bug #253269). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.316 net-analyzer/nmap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.316&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.316&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.315&r2=1.316 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- ChangeLog 12 Nov 2014 16:28:24 -0000 1.315 +++ ChangeLog 17 Nov 2014 23:51:03 -0000 1.316 @@ -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.315 2014/11/12 16:28:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.316 2014/11/17 23:51:03 jer Exp $ + +*nmap-6.47-r1 (17 Nov 2014) + + 17 Nov 2014; Jeroen Roovers <[email protected]> -nmap-6.46.ebuild, + -nmap-6.47.ebuild, +nmap-6.47-r1.ebuild, metadata.xml: + Add USE=external-lua (bug #253269). 12 Nov 2014; Mike Gilbert <[email protected]> nmap-6.25-r1.ebuild: Drop unconditional dep on dev-libs/apr. 1.10 net-analyzer/nmap/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?r1=1.9&r2=1.10 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/metadata.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- metadata.xml 2 Aug 2013 13:52:45 -0000 1.9 +++ metadata.xml 17 Nov 2014 23:51:03 -0000 1.10 @@ -3,7 +3,8 @@ <pkgmetadata> <herd>netmon</herd> <use> -<flag name="lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag> +<flag name="external-lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag> +<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag> <flag name="ncat">Install the ncat utility</flag> <flag name="ndiff">Install the ndiff utility</flag> <flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag> 1.1 net-analyzer/nmap/nmap-6.47-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild?rev=1.1&content-type=text/plain Index: nmap-6.47-r1.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-r1.ebuild,v 1.1 2014/11/17 23:51:03 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 ~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 external-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_}" REQUIRED_USE=" external-lua? ( lua ) ndiff? ( ${PYTHON_REQUIRED_USE} ) zenmap? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" dev-libs/liblinear dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) external-lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( ${PYTHON_DEPS} ) 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}" pkg_setup() { if use ndiff || use zenmap; then python-single-r1_pkg_setup fi } 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=$(usex external-lua /usr included '' '') --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 if use zenmap; then doicon "${DISTDIR}/nmap-logo-64.png" python_optimize fi }
