diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-07-06 17:41:18 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-07-06 17:41:18 +0000 |
| commit | 74cba2719503a653835fd8ee1239e59c065369bf (patch) | |
| tree | 0c6fa36b351bc0ed0485d098f12273ed8690a365 /net-analyzer/namebench | |
| parent | Use python_gen_cond_dep. (diff) | |
| download | gentoo-2-74cba2719503a653835fd8ee1239e59c065369bf.tar.gz gentoo-2-74cba2719503a653835fd8ee1239e59c065369bf.tar.bz2 gentoo-2-74cba2719503a653835fd8ee1239e59c065369bf.zip | |
Cleanup python2.6.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-analyzer/namebench')
| -rw-r--r-- | net-analyzer/namebench/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/namebench/namebench-1.3.1-r1.ebuild | 11 |
2 files changed, 9 insertions, 9 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/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}] |