summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-12-03 12:45:46 +0000
committerJeroen Roovers <jer@gentoo.org>2012-12-03 12:45:46 +0000
commit0935c4e5a8f4e6001b4bf3d4eee5eb576f337efc (patch)
tree9a978610c2bfc9591b53e7dd061deb9cf13d0cd8 /net-analyzer
parentAdd IUSE=ipv6 (bug #445734 by LeeL). (diff)
downloadhistorical-0935c4e5a8f4e6001b4bf3d4eee5eb576f337efc.tar.gz
historical-0935c4e5a8f4e6001b4bf3d4eee5eb576f337efc.tar.bz2
historical-0935c4e5a8f4e6001b4bf3d4eee5eb576f337efc.zip
Add IUSE=ipv6, IUSE=nls and LINGUAS (bug #445752 by Alex Turbov).
Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nmap/ChangeLog5
-rw-r--r--net-analyzer/nmap/Manifest10
-rw-r--r--net-analyzer/nmap/nmap-6.25.ebuild28
3 files changed, 32 insertions, 11 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 860584c01892..0d0fcd632865 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.264 2012/12/03 12:29:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.265 2012/12/03 12:45:45 jer Exp $
+
+ 03 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.25.ebuild:
+ Add IUSE=ipv6, IUSE=nls and LINGUAS (bug #445752 by Alex Turbov).
03 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild:
Add IUSE=ipv6 (bug #445734 by LeeL).
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 10fc061cffd1..399c83c0f0db 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -23,13 +23,13 @@ EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4
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 2687 SHA256 0f1ff3d84de80203251b931a08a51914331b178c03965c55c792943ba06ae001 SHA512 79571b7454f74dd8d1241b1f43ff14bb556fe2fb3a5de01ea4fffd2de6e77ccb0686a6a50b921e9c0b8dc2ea6a2a9bd6e6e060d35330b586515438e6baabd951 WHIRLPOOL 19232e74d7d2e07b28fccff2496dae843c0c4d94a454da2f4620bc1fd890a6139c1585f346d09776e2db03ac348af77c3ad26f4eabd0c96e8e5f0fe091e26f0a
-EBUILD nmap-6.25.ebuild 2658 SHA256 7d91e3e152d0bb25096d7732564dd13370b58935872691fbaee83f708aac4c03 SHA512 864a5f88f041504ed8c9af7fbdf1db48ebe769cedfa2ddee468542ea84e11d35abb72385ec4bf51b98669fe9f8ceb8e45d705aff88f26b9399511c9cd26bab1b WHIRLPOOL 315f69a459c10169dcd8b18b930c835da035e4c9833b9dcc48489b33132e34bd00abb63357f221ddca71518d5dcbe15190c893846bfc21d521a315d0bce76ebb
-MISC ChangeLog 32567 SHA256 5cf12d9c1c9c7fdda5a5e8fbadcb435ac0977cef08ebae66623a007c986dc8eb SHA512 427dece9b2b6b1ac49c6971533a184da78772eaecf37facef4e2457701f03fce050367ff444705445aebe8af69f7c0e559fd3db67bd8ad00ddd721b638f5ded3 WHIRLPOOL eca27311c40ab58b5348b0d6cf213c15d97bfc02a471ca5c3729c1b630f8c2483b22f253e31614eaf22bf36b6389f6e2be93849da0bf363dc42a4478e31bdd0a
+EBUILD nmap-6.25.ebuild 3049 SHA256 5409f054a70b7a82fdb9d3f4b75d78049c86a4264c7f7fa2cee2da4d3db86162 SHA512 683eed2e7492cd120db975d8501437efbbc177052f0fc97b5bfc3b05f99e6552efcac138990576362ee85f9ecffb0d0bc02ee75186084fdf81fb532ef914c1b8 WHIRLPOOL 34753dd5ebacd0e6224a667a680d21c09a28256406b6532904542fee8e7c877039d7f98c46696f8a1b3af8d93953968ca0939b3f9d4948c07a03b3210b3f8ac4
+MISC ChangeLog 32701 SHA256 cfc4e60a79956c10fcb01f8fc3bb08a1009a4cf70a703bc9892ce5766b550848 SHA512 a977ff30601a636b1d406e2c2c37eb2ba87f5ab15b6cd08058236f0c1e76bbe4c7329e39237f14fb1e259b2844102adee14495340d0dfe2e12abb95f58933c99 WHIRLPOOL dbe173be45b5920e846fdae6da2aefeaea28759692ef417b5cc76ad25f9e7bf2e0ddc0711dc9e3825a3c8ef2f1627d3df0cc51956984a1c00b4796b6e96c0884
MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlC8m0AACgkQVWmRsqeSphN8BQCfYSp6NLj2IdM7UX3Z76u05zBS
-vbcAnAkZW05MxwmwyEZkueK/7otdRG/n
-=jOBC
+iEYEAREIAAYFAlC8nvoACgkQVWmRsqeSphMhlwCcCM5neRKGddCigaEgYDTekkBd
+Ey4Anjly6ifo/ws0E2ELz62fPnAtkWcW
+=A2TA
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index 78dbeba83384..01b3cefcb370 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.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.25.ebuild,v 1.2 2012/12/02 15:57:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.3 2012/12/03 12:45:45 jer Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -19,7 +19,12 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk lua ncat ndiff nmap-update nping ssl"
+
+IUSE="gtk ipv6 lua ncat ndiff nls nmap-update nping ssl"
+NMAP_LINGUAS="de fr hr it ja pt_BR ru"
+for lingua in ${NMAP_LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
NMAP_PYTHON_DEPEND="
|| (
@@ -29,10 +34,10 @@ NMAP_PYTHON_DEPEND="
dev-python/pysqlite:2
)
"
-DEPEND="
+RDEPEND="
dev-libs/apr
dev-libs/libpcre
- net-libs/libpcap[ipv6]
+ net-libs/libpcap[ipv6?]
gtk? (
>=x11-libs/gtk+-2.6:2
>=dev-python/pygtk-2.6
@@ -40,10 +45,14 @@ DEPEND="
)
lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
ndiff? ( ${NMAP_PYTHON_DEPEND} )
+ nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
ssl? ( dev-libs/openssl )
"
-RDEPEND="${DEPEND}"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
S="${WORKDIR}/${MY_P}"
@@ -67,6 +76,14 @@ src_prepare() {
-e 's/-m 755 -s ncat/-m 755 ncat/' \
ncat/Makefile.in || die
+ local lingua=''
+ for lingua in ${NMAP_LINGUAS}; do
+ rm -rf zenmap/share/zenmap/locale/${lingua}
+ if ! use linguas_${lingua}; then
+ rm -f zenmap/share/zenmap/locale/${lingua}.po
+ fi
+ done
+
# Fix desktop files wrt bug #432714
sed -i \
-e '/^Encoding/d' \
@@ -83,6 +100,7 @@ src_configure() {
$(use_with lua liblua) \
$(use_with ncat) \
$(use_with ndiff) \
+ $(use_enable nls) \
$(use_with nmap-update) \
$(use_with nping) \
$(use_with ssl openssl) \