Version Bump; fix licenses

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 86 insertions, 35 deletions

diff --git a/dev-python/tox/ChangeLog b/dev-python/tox/ChangeLog
index 94c9574249a3..ec0d57959a98 100644
--- a/dev-python/tox/ChangeLog
+++ b/dev-python/tox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/tox
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/ChangeLog,v 1.14 2013/11/26 06:55:05 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/ChangeLog,v 1.15 2014/02/03 10:18:40 jlec Exp $
+
+*tox-1.7.0 (03 Feb 2014)
+
+  03 Feb 2014; Justin Lecher <jlec@gentoo.org> +tox-1.7.0.ebuild,
+  tox-1.4.3-r1.ebuild, tox-1.4.3.ebuild, tox-1.6.1.ebuild:
+  Version Bump; fix licenses
 
 *tox-1.6.1 (26 Nov 2013)
 
diff --git a/dev-python/tox/tox-1.4.3-r1.ebuild b/dev-python/tox/tox-1.4.3-r1.ebuild
index 5fc814880f55..926021363728 100644
--- a/dev-python/tox/tox-1.4.3-r1.ebuild
+++ b/dev-python/tox/tox-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/tox/tox-1.4.3-r1.ebuild,v 1.1 2013/06/17 09:04:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.4.3-r1.ebuild,v 1.2 2014/02/03 10:18:40 jlec Exp $
 
 EAPI=4
 
@@ -13,19 +13,20 @@ DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools
-		>=dev-python/virtualenv-1.8.4
-		dev-python/pip
-		dev-python/pytest
-		>=dev-python/py-1.4.9
-		virtual/python-argparse
-		doc? ( dev-python/sphinx )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-python/setuptools
+	>=dev-python/virtualenv-1.8.4
+	dev-python/pip
+	dev-python/pytest
+	>=dev-python/py-1.4.9
+	virtual/python-argparse"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-rm_version_test.patch
diff --git a/dev-python/tox/tox-1.4.3.ebuild b/dev-python/tox/tox-1.4.3.ebuild
index 2175b88215b9..9d458d67a147 100644
--- a/dev-python/tox/tox-1.4.3.ebuild
+++ b/dev-python/tox/tox-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/tox/tox-1.4.3.ebuild,v 1.3 2013/05/20 08:26:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.4.3.ebuild,v 1.4 2014/02/03 10:18:40 jlec Exp $
 
 EAPI=4
 
@@ -13,19 +13,20 @@ DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools
-		>=dev-python/virtualenv-1.7
-		dev-python/pip
-		dev-python/pytest
-		>=dev-python/py-1.4.9
-		virtual/python-argparse
-		doc? ( dev-python/sphinx )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-python/setuptools
+	>=dev-python/virtualenv-1.7
+	dev-python/pip
+	dev-python/pytest
+	>=dev-python/py-1.4.9
+	virtual/python-argparse"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-rm_version_test.patch
diff --git a/dev-python/tox/tox-1.6.1.ebuild b/dev-python/tox/tox-1.6.1.ebuild
index e009b43cfdac..e95c894ecf13 100644
--- a/dev-python/tox/tox-1.6.1.ebuild
+++ b/dev-python/tox/tox-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/tox/tox-1.6.1.ebuild,v 1.1 2013/11/26 06:55:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.6.1.ebuild,v 1.2 2014/02/03 10:18:40 jlec Exp $
 
 EAPI=4
 
@@ -13,19 +13,20 @@ DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools
-		>=dev-python/virtualenv-1.8.4
-		dev-python/pip
-		dev-python/pytest
-		>=dev-python/py-1.4.9
-		virtual/python-argparse
-		doc? ( dev-python/sphinx )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-python/setuptools
+	>=dev-python/virtualenv-1.8.4
+	dev-python/pip
+	dev-python/pytest
+	>=dev-python/py-1.4.9
+	virtual/python-argparse"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
 
 src_compile() {
 	distutils_src_compile
diff --git a/dev-python/tox/tox-1.7.0.ebuild b/dev-python/tox/tox-1.7.0.ebuild
new file mode 100644
index 000000000000..be2ff30cc3cc
--- /dev/null
+++ b/dev-python/tox/tox-1.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.7.0.ebuild,v 1.1 2014/02/03 10:18:40 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -x || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/doc/_build/html/. )
+	distutils-r1_python_install_all
+}