summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-11-11 21:58:33 +0000
committerMike Gilbert <floppym@gentoo.org>2014-11-11 21:58:33 +0000
commitc2bbf41e9510058095a3b171067416f6c2115478 (patch)
tree57467ce32ea4885223e381befc346c0f3ceb56d8 /net-analyzer/nmap
parentbumped minimum version of emul-linux-x86-soundlibs for pulseaudio so that the... (diff)
downloadhistorical-c2bbf41e9510058095a3b171067416f6c2115478.tar.gz
historical-c2bbf41e9510058095a3b171067416f6c2115478.tar.bz2
historical-c2bbf41e9510058095a3b171067416f6c2115478.zip
Don't call python-single-r1_pkg_setup if python is not used.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r--net-analyzer/nmap/ChangeLog5
-rw-r--r--net-analyzer/nmap/Manifest10
-rw-r--r--net-analyzer/nmap/nmap-6.47.ebuild8
3 files changed, 16 insertions, 7 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 3b5097f7aa2f..58ff023a47f2 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
# 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.311 2014/11/11 21:56:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.312 2014/11/11 21:58:32 floppym Exp $
+
+ 11 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.47.ebuild:
+ Don't call python-single-r1_pkg_setup if python is not used.
11 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.47.ebuild:
Fix python deps.
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 7921afda2fcd..0a17b9aa08dd 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -17,13 +17,13 @@ DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b
EBUILD nmap-6.01.ebuild 2644 SHA256 a2e907c693677dcc8a477898731770103682529c93594fd2df7723420ab6a58b SHA512 541cdb4c5c62b5dd20f35f216d703e31f2f9a8d354f4532fb95f429aad527fa9ca3ba86d2d8a72968c3ea4229254325cd85cc55d70a067bcff6752b1dc54ad31 WHIRLPOOL d6a183fca1074ff2c905e17145317524d82dd6028ae843602ec7bd81abbff1e973533e36a278d50ab063a21804da1c019dd59af032054f884a013d5f058f4394
EBUILD nmap-6.25.ebuild 3479 SHA256 3fc8097d4dcac997838289fd0df88ccb21f084b7b276dfe28f7392ec60cb583c SHA512 d4ee4d0b830ce2667e87c9ffda50a23bc59f6fe7ffe623453555f76b29ac21ae001bdb00dd04ec25e485002c37f953a5f14af11c932675d89f2b49a3f0aa7897 WHIRLPOOL f4faf39d4a2922c776be592971c4f421aada9c93e54f64923397ce29363f14ba458f57dc2662720caed7d63ad796b64a74d5b46545ad4af6191d1c5580a9b151
EBUILD nmap-6.46.ebuild 3553 SHA256 217182cb769e9ff4290d02e0f65ef5f8bb5585c6022a4880f4c5af71937174a2 SHA512 59f158904468786e4087e35c95df4268d109639c19486e8130abf485a412559371852c2104951594f55a2a62ae345633005124ac9b089ab328bc55adf65b3be7 WHIRLPOOL da3c146c64a632d045e5c62a6cc3a47eac590d3b809c875de20f61a2b03ff1b8c56a2716de6f35fa9d3bf96dd57dbc78d7d97abaaa3034e6509f5ab2402d297c
-EBUILD nmap-6.47.ebuild 3589 SHA256 0510343520cff9ce7de3fe12a604900a13136a419a4934840cf1a83fe866195c SHA512 d7313e8b17122e7069948967198e86d471231493c8db24e87ab1f7d9d6aae909729aaaec103c9cb301b17eb9ad47826c51122815f68c8aded9dee629cce83b11 WHIRLPOOL 09c61337833301f3625161b85709466f25b3f398f417ceb78a3be83d5b3ae98c41da053abac266ea2b17300bd0636ef05463eed88ebdfb55883ae9a50c0c05c1
-MISC ChangeLog 38633 SHA256 06fb80a3fb2614adc991c0ae46c4978b89c3a711fb992af366fbfc6f628dfb25 SHA512 706253c1a154d6cd51f556b215ed0ddb796f9a9cced27a24ba67fe29f8543848322e043200aa9c3ad58cee8f770dbf37e04a1d32c1f3565ad2ed0f4f3a1ffca7 WHIRLPOOL 11e8fe103600a9e632eedbc3dfcf189128be6384d40e4f54c135c9ceae1281f18b779eee01b2e0e447db51f811f38396792ed7991bec932a7d9d5002b0a322d9
+EBUILD nmap-6.47.ebuild 3673 SHA256 365333fa2d3f27a153cf0c46aae3db42e5ef948568ac0943c85ac13bae07eebe SHA512 0d693789c2a0fa38e8ae6adf4a16e64b909a409726ed43d5175663b970624b629a9f576d664ef3a3b69f275141bbd9911cda87997c304636132d69f46a04278d WHIRLPOOL d90c4731137fa8d96fd51b10bccabf461cd76b3c93a803c5bc50f601d8b5636679d3facc509b99a0a9a4a4264d18604b6c9a917ce9b5e2b692b2bafb1c252f4b
+MISC ChangeLog 38764 SHA256 be8d61210ee49b8ce682237a3a529da9d34458e2d2e025c362257241012bc561 SHA512 18109d56219eb5a56f2ee675cad8d5448431319b375b0dd4d295d51a7ffafbeb10bc65a9957e2432909d1109fb160ff118872448546ae0b53b90faf29f7f2156 WHIRLPOOL e1c732ab05066f9e83443804833ac8994af167eaed9357468df9e12b4ee74b6e7702d46ddbe385b6fd3500cb7bec3560fdd481e1cd3e758bd51d5027f931c3c7
MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlRihgIACgkQC77qH+pIQ6R4+QEAhmTJgo1uBh4Oxe390F17fxQj
-us9wccDKv1W/Uj4edB4A/3U2xnkEcAowSi6flDu7a4vbuwPsyjaxDGviSiw684cT
-=bBsE
+iF4EAREIAAYFAlRihokACgkQC77qH+pIQ6Q7yQEAjMtp2wu35La7auoVTzNP1wH2
+Vo1eN8pcURoi519DubAA/25Au/MJb/ARspr6Jv0dRPg7MogE/atqaAKnX5w7qO1v
+=wzvA
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.47.ebuild b/net-analyzer/nmap/nmap-6.47.ebuild
index 2d4fbef2e16a..ef905e09e839 100644
--- a/net-analyzer/nmap/nmap-6.47.ebuild
+++ b/net-analyzer/nmap/nmap-6.47.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.2 2014/11/11 21:56:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.3 2014/11/11 21:58:32 floppym Exp $
EAPI=5
@@ -51,6 +51,12 @@ DEPEND="
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