summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-07-06 17:41:20 +0000
committerMike Gilbert <floppym@gentoo.org>2014-07-06 17:41:20 +0000
commite6fd0e0abe185f4aefefb063515d86bcf22669c6 (patch)
treec1221dd7db908ec414def802ac6b4ad6501daed1 /net-analyzer/namebench
parentUse python_gen_cond_dep. (diff)
downloadhistorical-e6fd0e0abe185f4aefefb063515d86bcf22669c6.tar.gz
historical-e6fd0e0abe185f4aefefb063515d86bcf22669c6.tar.bz2
historical-e6fd0e0abe185f4aefefb063515d86bcf22669c6.zip
Cleanup python2.6.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'net-analyzer/namebench')
-rw-r--r--net-analyzer/namebench/ChangeLog7
-rw-r--r--net-analyzer/namebench/Manifest24
-rw-r--r--net-analyzer/namebench/namebench-1.3.1-r1.ebuild11
3 files changed, 15 insertions, 27 deletions
diff --git a/net-analyzer/namebench/ChangeLog b/net-analyzer/namebench/ChangeLog
index c067f1684dde..c21932d1dcde 100644
--- a/net-analyzer/namebench/ChangeLog
+++ b/net-analyzer/namebench/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/namebench
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/ChangeLog,v 1.9 2013/09/05 13:54:04 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/ChangeLog,v 1.10 2014/07/06 17:41:18 floppym Exp $
+
+ 06 Jul 2014; Mike Gilbert <floppym@gentoo.org> namebench-1.3.1-r1.ebuild:
+ Cleanup python2.6.
05 Sep 2013; Michał Górny <mgorny@gentoo.org> namebench-1.3.1-r1.ebuild:
Drop stale conditional after py2.5 removal.
diff --git a/net-analyzer/namebench/Manifest b/net-analyzer/namebench/Manifest
index 68d4576d29ab..2e945ed73927 100644
--- a/net-analyzer/namebench/Manifest
+++ b/net-analyzer/namebench/Manifest
@@ -2,25 +2,13 @@
Hash: SHA256
DIST namebench-1.3.1-source.tgz 1118505 SHA256 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b WHIRLPOOL 808977fd3e9e2f906350d104be91f0aa80b5df29953a92e00953013b33ce8473fcbc955ceb3d1dc1b71d6491816d6a7e04a0244a12fbd039fd304c7b874cf462
-EBUILD namebench-1.3.1-r1.ebuild 1240 SHA256 3a70f9c43a5a664d083e54c46e2ed2e9e140f43bc8e7b10b80fa3f887773e12e SHA512 452fc4653921bc53c38a942de9cf95468ef8e796b92b190cefa3ed8427eca190856a4860654db939873220ba9c0a5e34241600f03d6bc4d0b2dab7a65a589431 WHIRLPOOL 18c0514cb2c11cd4e3fd9506b0e47849d4a3356e228f0a8e371fc97e16355129b189881412dd3202513491354ea6f7664fad6d5898e5e5f791bac6bece842a24
-MISC ChangeLog 1529 SHA256 01591cb4b1163fd6ab252e3ec4301656c553fc91217c1d4bd55363b82eee6a5f SHA512 7453e5f389e1f5645ace56c6bfa2ebe9cae0184b3447b76036daf25bf8c28dac6e7b9218d51893652501c3c20c52bfb09872e7a34c72b9a0e146c67cc0102d09 WHIRLPOOL dc3f94ae7c00f607699431e0c689e150c8e6843c6750cda5134f3546b3ee63b565c7654fa87387cd796a75f82597a05faa7cd4f75effd2c6b2493010669060cb
+EBUILD namebench-1.3.1-r1.ebuild 1181 SHA256 a9bbab26fe608bf6196871897c804a3671e7f69b9ab206c6b1aacdeb7987bb27 SHA512 f44af2354b719d9369d6e8187b060952af4db7ad98eb5be22df4a0c3b086fef9eb304af2a0633b0ff0113be277ce59870f8a68e092a08758eee8fef10d7fa766 WHIRLPOOL a509faa78ed6d6ef973d29d9bc8b7980e06e75ebed3fa5fe6b4908b16bb1b4cff8dd82a042cf294c754fd1570b4ca286a04658cc2341acde36957f6fe7a1e727
+MISC ChangeLog 1629 SHA256 5d5f42ec9cf5a51da787589687ca2048339b5c522c8cd47bd4d37c1bef58286e SHA512 84f251eccbb5e0d51c0f00885a481b4c06fc583198b119fc4a91c34e80af808de1f582e7034c637a5111465a5624fae831e1bbb9e4e61fabdbf0f343ee0395a8 WHIRLPOOL 79cdf2c49e1e9057637043fa10ff7a6816801e23b10a687781bc36e996127d60921948eec457e945a1aab6c3d692e205c5c7f7004f819e82c627ebb1a0d09687
MISC metadata.xml 239 SHA256 3b19d9dbb502fcb22efce4fc6d3250b2c35e2ec707480ff12793774c85a02edd SHA512 3d0594c39dc82a2f45185f4e7b79becf51b1ede05b338e1b09cf073375b79281f4bb326653e0c798a788e027164b0b0202b18e4109c18eb6eccdd68f0c0e444b WHIRLPOOL bf6af6a64a708c6b8e1010fbf454905ea98e5dbee08e58de94a0fe5bb7e287d67ea113079255c528518b5bf631a4a26e911733ed0048d8d9c17579a588dd76f3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2
-iQJ8BAEBCABmBQJSKI0XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODQgP/R1L9w/54HzvsKdn2h1BcsKM
-wSbVzoXIxeU8vJnLuS7r92eTz2VbndumP7KcMNluN9amxpeleseCo0+qJ0MF9yL4
-L7BfJtgF1732Sduzn7/2Ius+DbzEBQKUSnPXtkIKWoWsE1Juxdk+tAvWA4VZMoZ2
-6b89NQPoFLg6m9m0iMZxwz6O0S15z6K2Ab5xWXsper5Wu1ODWzKyliOUSO9baliE
-JUb2ucBRjCyL+briFdBreo5BrAmr3ZxXLN+Zzkd+UiHApGJiE3PeWUcokkXrJt/m
-Wr81QKErRLRvoi0MuPnkYM7kMOfNOjubcX+vW9l8XIuOiESafCpvSmebHR/9rd2d
-LC62xrFyNWZRQHyJpGB+BG72HyMos/kgHbMBBS74/TeEEehzgi2Hq+MVBauhHBvt
-9ap+qfvpyBuof9nVDcFkgCynWZVhgJUI5TG5tvm1lvgE1p7FftSfnSlCqy1IONuX
-DA2UdegFGXRSPLo+e9g79+GdtTrXoa7BY3WvbobTPQAYeiuqneWljTcrpRprUXS7
-JVXaxzNQuNwlkWkdMYEfcmVJM3xsn6KytZ08A9AfUUQxV4Ghy03/AkMm1O1XkRY+
-Zhe7Tv7g9JxseBhKWHgwa5o5ocUR19Grs/Asc1XYIpMIeaxyIgHDSx6bzkEVbkKp
-N/FQ1gCFUfjCQ9zv2NnU
-=NDKS
+iF4EAREIAAYFAlO5ij8ACgkQC77qH+pIQ6Ts/wD/bIJJElay1pMoB6FcgjPdxqDg
+eMwbWq72yy/VGOnhYx4A/js5wJ9Ixm2W8Tm8X01ZAXSCBe/7Qi76GGlzH9r0Fkun
+=zQr8
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
index 8ae08483a30a..5b3235fae2cd 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1-r1.ebuild,v 1.2 2013/09/05 13:54:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1-r1.ebuild,v 1.3 2014/07/06 17:41:18 floppym Exp $
EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
@@ -18,10 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="X"
# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
-DEPEND="X? (
- python_targets_python2_6? ( dev-lang/python:2.6[tk] )
- python_targets_python2_7? ( dev-lang/python:2.7[tk] )
- )"
+DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
RDEPEND="${DEPEND}
>=dev-python/dnspython-1.8.0[${PYTHON_USEDEP}]
>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]