From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-846264-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 646E71384B4 for <garchives@archives.gentoo.org>; Sat, 14 Nov 2015 08:07:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47FF3E0826; Sat, 14 Nov 2015 08:07:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2704E0826 for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:07:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AECB9340676 for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:07:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D475B6E for <gentoo-commits@lists.gentoo.org>; Sat, 14 Nov 2015 08:07:10 +0000 (UTC) From: "Jeroen Roovers" <jer@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org> Message-ID: <1447487415.bf9f1614964b9ea3c20d94eab7cb975e275126e7.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/nmap-6.47-r2.ebuild net-analyzer/nmap/nmap-6.49_beta2.ebuild X-VCS-Directories: net-analyzer/nmap/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: bf9f1614964b9ea3c20d94eab7cb975e275126e7 X-VCS-Branch: master Date: Sat, 14 Nov 2015 08:07:10 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 76e20af2-3cc6-402c-bb7d-bec0eda71d04 X-Archives-Hash: ff25437d4ca153c30a93853f312ba73a commit: bf9f1614964b9ea3c20d94eab7cb975e275126e7 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Nov 14 07:50:15 2015 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Nov 14 07:50:15 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9f1614 net-analyzer/nmap: Old. Package-Manager: portage-2.2.24 net-analyzer/nmap/nmap-6.47-r2.ebuild | 153 ------------------------------ net-analyzer/nmap/nmap-6.49_beta2.ebuild | 154 ------------------------------- 2 files changed, 307 deletions(-) diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild deleted file mode 100644 index 9109549..0000000 --- a/net-analyzer/nmap/nmap-6.47-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 discovery and security auditing" -HOMEPAGE="http://nmap.org/" -SRC_URI=" - http://nmap.org/dist/${MY_P}.tar.bz2 - https://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:0= ) -" -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 -} diff --git a/net-analyzer/nmap/nmap-6.49_beta2.ebuild b/net-analyzer/nmap/nmap-6.49_beta2.ebuild deleted file mode 100644 index 4c6d397..0000000 --- a/net-analyzer/nmap/nmap-6.49_beta2.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 discovery and security auditing" -HOMEPAGE="http://nmap.org/" -SRC_URI=" - http://nmap.org/dist/${MY_P}.tar.bz2 - https://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 +nse 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? ( nse ) - 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:0= ) -" -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-ncat-lua.patch \ - "${FILESDIR}"/${PN}-6.49-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 nse --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 -}