[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

[Julian Ospald]

commit:     eb8057024eb5d1150df901cdfdcb246b788349cd
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 08:51:49 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 08:51:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb805702

net-analyzer/nmap: add libressl support

 ...{nmap-9999.ebuild => nmap-6.49_beta2-r1.ebuild} | 28 +++++++++++++++-------
 net-analyzer/nmap/nmap-9999.ebuild                 |  7 ++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild 
b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
similarity index 81%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
index 1185730..a3d9dc0 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
@@ -6,21 +6,23 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+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/";
-
-EGIT_REPO_URI="https://github.com/nmap/nmap";
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png";
+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 zh )
+IUSE="ipv6 libressl +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="
@@ -41,7 +43,10 @@ RDEPEND="
        ndiff? ( ${PYTHON_DEPS} )
        nls? ( virtual/libintl )
        nmap-update? ( dev-libs/apr dev-vcs/subversion )
-       ssl? ( dev-libs/openssl:0= )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:= )
+       )
 "
 DEPEND="
        ${RDEPEND}
@@ -56,6 +61,11 @@ pkg_setup() {
        fi
 }
 
+src_unpack() {
+       # prevent unpacking the logo
+       unpack ${MY_P}.tar.bz2
+}
+
 src_prepare() {
        epatch \
                "${FILESDIR}"/${PN}-4.75-nolua.patch \
@@ -65,8 +75,8 @@ src_prepare() {
                "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
                "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
                "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-               "${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
-               "${FILESDIR}"/${PN}-6.47-ncat-lua.patch
+               "${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
+               "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
 
        if use nls; then
                local lingua=''

diff --git a/net-analyzer/nmap/nmap-9999.ebuild 
b/net-analyzer/nmap/nmap-9999.ebuild
index 1185730..1e02fc0 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png";
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl 
zenmap"
 NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
@@ -41,7 +41,10 @@ RDEPEND="
        ndiff? ( ${PYTHON_DEPS} )
        nls? ( virtual/libintl )
        nmap-update? ( dev-libs/apr dev-vcs/subversion )
-       ssl? ( dev-libs/openssl:0= )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:= )
+       )
 "
 DEPEND="
        ${RDEPEND}