jer 15/01/26 12:08:35 Modified: ChangeLog nmap-9999.ebuild Added: nmap-6.47-r2.ebuild Log: Fix LINGUAS checking/removal logic, die() on removal failure. Update LINGUAS. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.334 net-analyzer/nmap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.334&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.334&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.333&r2=1.334 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- ChangeLog 5 Jan 2015 07:42:36 -0000 1.333 +++ ChangeLog 26 Jan 2015 12:08:35 -0000 1.334 @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.333 2015/01/05 07:42:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.334 2015/01/26 12:08:35 jer Exp $ + +*nmap-6.47-r2 (26 Jan 2015) + + 26 Jan 2015; Jeroen Roovers <j...@gentoo.org> +nmap-6.47-r2.ebuild, + nmap-9999.ebuild: + Fix LINGUAS checking/removal logic, die() on removal failure. Update LINGUAS. *nmap-9999 (05 Jan 2015) 1.2 net-analyzer/nmap/nmap-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?r1=1.1&r2=1.2 Index: nmap-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nmap-9999.ebuild 5 Jan 2015 07:42:36 -0000 1.1 +++ nmap-9999.ebuild 26 Jan 2015 12:08:35 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.1 2015/01/05 07:42:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.2 2015/01/26 12:08:35 jer Exp $ EAPI=5 @@ -22,7 +22,7 @@ KEYWORDS="" IUSE="ipv6 +lua system-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 ) +NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh ) IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" @@ -71,17 +71,17 @@ if use nls; then local lingua='' - for lingua in ${NMAP_LINGUAS}; do + 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 + rm -r zenmap/share/zenmap/locale/${lingua} || die + rm zenmap/share/zenmap/locale/${lingua}.po || die 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 + for lingua in ${NMAP_LINGUAS[@]}; do + rm -r zenmap/share/zenmap/locale/${lingua} || die + rm zenmap/share/zenmap/locale/${lingua}.po || die done fi 1.1 net-analyzer/nmap/nmap-6.47-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild?rev=1.1&content-type=text/plain Index: nmap-6.47-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.1 2015/01/26 12:08:35 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 system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru ) IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" system-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} ) system-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 \ "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ "${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch if use nls; then local lingua='' for lingua in ${NMAP_LINGUAS[@]}; do if ! use linguas_${lingua}; then rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die fi done else # configure/make ignores --disable-nls for lingua in ${NMAP_LINGUAS[@]}; do rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die 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 system-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 }
