diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-12-01 17:15:56 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-12-01 17:15:56 +0000 |
| commit | 7d240ef83e16a286534df9c8b1559a7debc0bd29 (patch) | |
| tree | 903be6ed57fcee1d0081d52cc69474df18c2499c /net-analyzer/nmap | |
| parent | revbump, apply patch from #436148 (diff) | |
| download | historical-7d240ef83e16a286534df9c8b1559a7debc0bd29.tar.gz historical-7d240ef83e16a286534df9c8b1559a7debc0bd29.tar.bz2 historical-7d240ef83e16a286534df9c8b1559a7debc0bd29.zip | |
Break up long lines. Clean up.
Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer/nmap')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/Manifest | 10 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.01.ebuild | 33 |
3 files changed, 32 insertions, 16 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 21ca157c4494..58814391a720 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.258 2012/12/01 16:47:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.259 2012/12/01 17:15:54 jer Exp $ + + 01 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild: + Break up long lines. Clean up. 01 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild: Fix python dependencies (bug #435462 by Alexander Zubkov). diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 053410623a31..6c1aee37310d 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -23,13 +23,13 @@ EBUILD nmap-5.35.ebuild 1878 SHA256 52569140a07b39c67f4a8163391d304b3a859ab1fd43 EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4c048c4ae18883c696eca84 SHA512 b4d52d28ad6739512b693c527618f6ee0bc0ee6cbce2883ae2ce08239ceb09bb7cd6317dfc9a0c6a222f305c3de4e3b6ce15c611f3a39292515badbae3758a01 WHIRLPOOL 374dae1d0398415bd37cc1506b7a9a84a951f0ec10bf948427f494c7b0fdaeabbc23cc970633726a0a8ab3344d68066e04b101896dde3f4b8fdccc6024d9ce20 EBUILD nmap-5.51.ebuild 2312 SHA256 8ed9723767076f6e5cc5a8290fdcb3d4ffe68361ddbf9b3c60dd94b4d2df204b SHA512 286c6f5367e34107d5273a8aa0bbad62666a43e97ff3a76a8227b539df8fe0ed9f6ac8de2b8422ce9f2291ec31c242bb0d7927dde462070464be02a7eedc794f WHIRLPOOL 2eedff89970dbe4ff9da4b8ec04be84b4a2961e246ac87bba22669977f3226755d5cd77a0961219a11ffd1bbba94819295c3a6d9b012458cc44b09f9831a794f EBUILD nmap-6.00.ebuild 1926 SHA256 67de5181a2d6f2176c0072c5ff8c35b2848555d69ee81438c1fd730978269b43 SHA512 751ad3017869c1425e7d5e85ac2ceaff81ff62fd88f5b0ca1c907b839181ffed640645e4418e6c5a5cac0ae811961a73de2989c04f2e0eb7e6a386190f6c471c WHIRLPOOL 64712da501a31edfa826aba60afc1b6336153b1ff3756c053e837f48d2ec7b4536f29d49ef12fa0668dea94f7d5e9097fdbc023375200f7082f2b163cb81bd20 -EBUILD nmap-6.01.ebuild 2768 SHA256 1062b516de5f6d95a2d69fece8c56409486079b68866f14761e9723904349458 SHA512 748c8250cf78fa9e664e9757866574e061f9c5221e2b5a5a0b844c5b10cf8a531c4422548de29f171c348b156eac34d034d3350ab2f51e9cd5adfceb0a3c1a77 WHIRLPOOL 239108a1c125ef3acaa67ab184d440c3cc749a2ec3dd41a295910c09e0ef2d88af48ba6e73e4a11b85995364a1235725de2d95df5d2c0c4ac798101c08964ca4 -MISC ChangeLog 31768 SHA256 ba2d3f289b70aa0d79265ed0e89a75cdd1439001b9151428fc2585e2edf82cff SHA512 545db89714cc9f362a8bb5442f6d7df82c909d73471e3c100b413d17d7b06273b224110cfe23ce97ec626d2fdc477cef3ac72207f309f43646d047e74331b4e2 WHIRLPOOL 56ff07da285d10032afe995ddbfceec888346d26bd9c697025dba95a2ec6a28c81b1348b28c596ed8de0814dbf84584fb020de916386fb01cc6ee92aef8cf5b0 +EBUILD nmap-6.01.ebuild 2602 SHA256 f3e8fccc416d809f91f82658b4d76642ba9b494ed7abda9c8d799137d7884b51 SHA512 a2adaca95f533dc79ff736d40cd1e879d063d13f402bc8a584235e5bf2539b17251eb39d3a61fd4c2902f649a91e49fb0c0d6cc19e966df83f24dc7628aa6068 WHIRLPOOL d168ac4185b96bf84223f2570aa8d584e8b895858b44015757a0f4d23168ebb1b352f802747b2afb3dd419aaa0aad31c8a99f1febbd535cca4bc2f4f6309e6f5 +MISC ChangeLog 31867 SHA256 cb9226afa3e020e86a7aca2c10c121dc51fe486fa28eaf608a86a9e33a39d43a SHA512 027d1a91864cabadd8422e35e822e6f306714a9f540adf3bbb605269a583a6a64e0e3d5d46ba3f6a0c1407315749ae09ae1c38929e78c7e050428a8befcccd94 WHIRLPOOL 87c747ad8215e7a4042e6566de0f6f41b4665fc63ab393a530f9d358de1d41fc71805709e56fd9308702a924c6c2a49a62fd6e76267c2515db19b33773c8759e MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlC6NJEACgkQVWmRsqeSphNgoQCeNdQAq3BGgISYWdVfY7vvxX1h -NU4An0FHJCtC1iTZ7lW85teMaZzK/wGa -=35Pi +iEYEAREIAAYFAlC6O0wACgkQVWmRsqeSphOJCwCfSb32Kr6lZm9GbIcNHg2Pi7LL +RA8An1MgOVL008VmV82soHxiCGqdAU6J +=utK1 -----END PGP SIGNATURE----- diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild index 5615905825f5..a40432f4abd6 100644 --- a/net-analyzer/nmap/nmap-6.01.ebuild +++ b/net-analyzer/nmap/nmap-6.01.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.4 2012/12/01 16:47:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.5 2012/12/01 17:15:54 jer Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -60,31 +60,44 @@ src_prepare() { epatch "${FILESDIR}"/${P}-make.patch # Fix desktop files wrt bug #432714 - sed -i -e '/^Encoding/d' zenmap/install_scripts/unix/zenmap.desktop - sed -i -e '/^Encoding/d' zenmap/install_scripts/unix/zenmap-root.desktop - sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap.desktop - sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap-root.desktop + 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 } src_configure() { # The bundled libdnet is incompatible with the version available in the # tree, so we cannot use the system library here. - econf --with-libdnet=included \ + econf \ $(use_with gtk zenmap) \ $(use_with lua liblua) \ $(use_with ncat) \ $(use_with ndiff) \ $(use_with nmap-update) \ $(use_with nping) \ - $(use_with ssl openssl) + $(use_with ssl openssl) \ + --with-libdnet=included } src_install() { - LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install if use nmap-update;then - LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap -C nmap-update install + LC_ALL=C emake \ + -C nmap-update \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install fi + dodoc CHANGELOG HACKING docs/README docs/*.txt use gtk && doicon "${FILESDIR}/nmap-logo-64.png" |