summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-01-16 07:55:37 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-01-16 07:55:37 +0000
commit9cbf48f673b5b424d0adc29cbe3de6e7611341ab (patch)
tree763fd2cb5e9abb6fcbc4300dba265c1be346fad3 /net-analyzer
parentFix compability with libcdio-paranoia. (diff)
downloadgentoo-2-9cbf48f673b5b424d0adc29cbe3de6e7611341ab.tar.gz
gentoo-2-9cbf48f673b5b424d0adc29cbe3de6e7611341ab.tar.bz2
gentoo-2-9cbf48f673b5b424d0adc29cbe3de6e7611341ab.zip
Respect AR and RANLIB, wrt bug #445524. Thanks to Agostino Sarubbo for discovering this issue
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nmap/ChangeLog7
-rw-r--r--net-analyzer/nmap/nmap-6.01.ebuild10
-rw-r--r--net-analyzer/nmap/nmap-6.25.ebuild10
3 files changed, 22 insertions, 5 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 3c8581e1282b..50ff76978cd0 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/nmap
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.277 2013/01/15 17:03:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.278 2013/01/16 07:55:37 pinkbyte Exp $
+
+ 16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> nmap-6.01.ebuild,
+ nmap-6.25.ebuild:
+ Respect AR and RANLIB, wrt bug #445524. Thanks to Agostino Sarubbo for
+ discovering this issue
15 Jan 2013; Jeroen Roovers <jer@gentoo.org> -files/nmap-5.00-python.patch,
-files/nmap-5.20-nolua.patch, -files/nmap-5.21-openssl-1.patch,
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
index 0484a9dc18ba..e05b13341158 100644
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ b/net-analyzer/nmap/nmap-6.01.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2013 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.17 2013/01/15 17:03:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.18 2013/01/16 07:55:37 pinkbyte Exp $
EAPI="4"
PYTHON_DEPEND="2"
-inherit eutils flag-o-matic python
+inherit eutils flag-o-matic python toolchain-funcs
MY_P=${P/_beta/BETA}
@@ -72,6 +72,12 @@ src_prepare() {
-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
+
+ # respect AR and RANLIB, wrt bug #445524
+ tc-export AR RANLIB
+ sed -i -e '/^RANLIB/d' -e '/^AR/d' liblinear/{,blas}/Makefile || die
+ sed -i -e '/^RANLIB/d' -e '/^AR/d' liblua/Makefile || die
+ sed -i -e '/^AR/d' {libnetutil,libpcre,nbase,nsock/src}/Makefile.in || die
}
src_configure() {
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index effca50ced65..0f7af9b156df 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2013 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.6 2013/01/15 17:03:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.7 2013/01/16 07:55:37 pinkbyte Exp $
EAPI="4"
PYTHON_DEPEND="2"
-inherit eutils flag-o-matic python
+inherit eutils flag-o-matic python toolchain-funcs
MY_P=${P/_beta/BETA}
@@ -103,6 +103,12 @@ src_prepare() {
-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
+
+ # respect AR and RANLIB, wrt bug #445524
+ tc-export AR RANLIB
+ sed -i -e '/^RANLIB/d' -e '/^AR/d' liblinear/{,blas}/Makefile || die
+ sed -i -e '/^RANLIB/d' -e '/^AR/d' liblua/Makefile || die
+ sed -i -e '/^AR/d' {libnetutil,libpcre,nbase,nsock/src}/Makefile.in || die
}
src_configure() {