Version Bump; fix licenses

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 112 insertions, 39 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/Manifest b/dev-python/tox/Manifest
index a237fb647a64..fba6e13ef0eb 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX tox-1.4.2-rm_version_test.patch 1696 SHA256 5a60114cba42d9faadc827885133f5fc6745743ca8e8cdc3fa2f04facc35b79c SHA512 50a9672bb93aaa05576f5df8aa85326e14b83c7351443acf84af28c62781deb92e4665b409e13b7cb17073b7d26dd47afdee27a86295333cfd545576b58b1d70 WHIRLPOOL 68524a13b8e5638a661ca9304c78035d53558c120d298b8f89ef904549b85fba3898fd3ac719535a6aa533e5d5acf4d6f8286b7a3e512a16cddaf9b21ac7cdc3
 DIST tox-1.4.3.tar.gz 71661 SHA256 b998d809d954fd9c30476a56bbbbf20a1a5adaa3e4cc5eb052c7051a682b2021 SHA512 4d7359c8f3d9d6f7c71dbd7d486221eed24b60ccf5de561c558e877ebef69186ed1d4829ef50e5d1d50ae20907aae350ef85748b2ecf4187247fe9623baa54f6 WHIRLPOOL 0a0e715a3dd6f846d0737d29e8a17f1cadc83c6eff72efaa31fd61fe96800b910a8d833b2fc8526643137ef60ffc5bd8833f0fdee59fc2785ac2de38fff118b9
 DIST tox-1.6.1.tar.gz 131654 SHA256 05c72b3b7481b47f48f63436c7355783dc8be77ffd7c2bc948b0b7aa2dd4d0de SHA512 af5e26e1b1a1f62b528063e540424087f99ef467e3b9aae27e6658170218f010cba9af544b42776025d5058ebbaec81cab81eed0a0d67129237635a3905abd10 WHIRLPOOL 219174233cd9a22ba971d85d76b8395b090055fe9f105c92a946add03b0e2dbc43a5c249d669911ac7ec018cea58c3f8d76501ecee6962dd5a9a6cda57033447
-EBUILD tox-1.4.3-r1.ebuild 1286 SHA256 c62c39a21c3394fa1795b96e4b00c52f5aab4c522c018a9b92c49fee3477675f SHA512 6b9955148413717bd1a82b59bd42d112d20dd7c0bac496ded429bea19c299c5981f1656296ad82d0999a9f97cce82dea7eac04daff0b89b7b328041f7a6f160e WHIRLPOOL 3ab92243bbacb21cad3e2448d209cedfb6eeb2d25981588e9656812c3f60de926d5cd73ffbd3dec305e4b0cba3680a41810a22381209b58b9a61b2c4e9e93221
-EBUILD tox-1.4.3.ebuild 1275 SHA256 d08300068b2a8c8caf0ef9c1d1ff39267135c69edde8e75ca0b6bdb6ebc06c1e SHA512 71699c11ee02f7f6851c6a23dbe4331e478da4001fa915ff6c38d7fb1c06b7826e5241360a5a4b73bd88065e61f8c5aa67a8756f5cc97d73029288aadf5cec3c WHIRLPOOL fe46024c86e947e071f234bdfd9069c11c1033f8c5fd00283577b97aeffb9ae01d5bf4b7fa2ac2d85d2d7c8ae8c976819a8472e3bd25eaef5284e292db2fc847
-EBUILD tox-1.6.1.ebuild 1208 SHA256 9107fae1f07275dbe3f379548476e204c59a5cf2da250101275c98725a891896 SHA512 dca06881b2c6266267c6fb64300633a801318d9a156eee848230696e02392560ff589e16d395dedf362c88bb2fa2a7c4cf01c7d0f6a40986c1024d8b8e131e22 WHIRLPOOL 62f26f2d6b4ee1eed7c79ba51cb37e64364914ef7e4f86261ab8bc1a3f318627d50dbc3f834c12c9e7af44ba7d03d03731fbbef9ba66a9d80fee35ffb75241d7
-MISC ChangeLog 1890 SHA256 4d6d8e1bfe1fdd4f984de28254d59a1362fbc29223d1ba716a0040e37ef92268 SHA512 37920d6f2b5f39e8f3ad2e89e6cbb3890ab01283ca8dcf1b2a418d7cce6ae50f56c0e57bc61a3f6e2307f65076e93e0052fb678a6350539f3639ddbe6fd0bbf5 WHIRLPOOL 8786e0d9b62102d5f950aea6916ffc2d88a2f203e70bfa2039b841a7db042d3043f2ca5f0b6977c965e27524093d196f2bc191e9c56d6ae7e128468522cf9bec
+DIST tox-1.7.0.tar.gz 84492 SHA256 4cac3410af8b62f50a6496962af3884bdb1f99d30439511489e8a807e89379f8 SHA512 f7fc0f1028cfd2c4bc6cdf07b2e64cd6ed213676368bb3a6dba4334bbae00ac7afe0576e9fc2e299b1b251342fa7080ab15c1f52e961da7462e904b427932370 WHIRLPOOL 67f8d7e0c3bb1f4aef4db8a9785aa99d1433c7e2f62a95892bcfb48b813904d5c2422a5ff2ca79a1d91a509420ebd17a443b393555bec57ace20d534867e61f4
+EBUILD tox-1.4.3-r1.ebuild 1283 SHA256 9ba77ac87f1b520b11e59593da7ca944c27669080cd3ccac84447a1a1f504e75 SHA512 9d4755788988767979796d21b504f2246c02b6b15b1318641c2f36d141ea83dcd3290c7475d63b5c411d5020bf68418c1950de0caac15c8a6b4e37546e155b21 WHIRLPOOL ab92e8b53973fc0d6a10977d8244712dbae0bca97f5a037c4267efb251c3e329fd4bb9fb5633e3573865d22144654ed389fd70c16655ed7f08e1adb9c030ba74
+EBUILD tox-1.4.3.ebuild 1276 SHA256 5bda5324afd950982cd6bc9c9c791b1d6a5d0e05908c16ef66182aef7877691c SHA512 077679da97ea02ade57ecb56e6066558a9b09c207a0c631760376bd3760abd6d837c2de3f299a2cb47fc3a791edcf99175dd21d9e9c1125ecb258bbab04f40da WHIRLPOOL 6e2d4e3da526b40908caf73d5a7657cae2bbbc40f4fd40cd136cd72f13a44cb7931e4efc4f270e0a6dc921820a90608788037176b8dd724225762a2d02f70207
+EBUILD tox-1.6.1.ebuild 1202 SHA256 61e6d84082abdc39a8a35e97bd318dc3aa9543b36fd12f7fc10defa7097ae22c SHA512 d238eca4422230148857501651f50771dc0b4b389ce5e0b3f3fa540b93f582a271b4fdf00c266eb2839d9a08a01e577d7703c7f2cae8ed0658022b42a1abf059 WHIRLPOOL 5160ac60d8e5073651b945ca3381a5aee5e7e6ee7c52d2faa4bd475a02ba6c2a87058eb0b04da7e80eeb0da31e4503ae57bb2e0be485bf56e2497c1ec43c4e8c
+EBUILD tox-1.7.0.ebuild 1080 SHA256 1903aa8d7b5daec845f8784a64438ba3b609688127d776bed70d6a23d1173069 SHA512 d6d1073170bf4300a6ecde7061ec16350601edec4aa620afb6593c5c8e57588824afa1b855e4935753e36dd3c9d9e5d98405f9c745570ae2af700132ed463f84 WHIRLPOOL 2c9cd1848a27226fa508aaded078bc73de181ced8d7130015bd154c7ed5d6690215cc849012a0ce2245cec30cc689e20cf3252005ec359ee3928895a0570f930
+MISC ChangeLog 2068 SHA256 a4df458cc779758d2763c1017daccb6e768bb66a61bd54574c1416f636236d69 SHA512 b9400daf8b0e3bad1b4a27835df6be06283765dbe7864d9d54ac7975b4907b8a8abf708671b5988661e2fa0028c34f68a5308e23e337653e6f8aaefd423b2290 WHIRLPOOL 54282a8018e6829b70c9d49542d8defa3ef196c71623f9416b5971ffdd9399bb653eebe04a86c9ac8fb751baf5997cb40a88750bab42228b05b7c85d014bc61c
 MISC metadata.xml 226 SHA256 3029b22cf087196faf7576c61b9306577f5efc4559a71503cbbc4783386ea7a2 SHA512 9364739578d1096524e404aee304bad30578ca2dcb4ee691a9344387aa38514a3b0154f6c3c0bb63699f2c235b0b6b7cb0b0e57da6fbddf2ae04c9a1afd0ea97 WHIRLPOOL ecbb7999cc314bb7b1eca85c8d791c5808f34b9cd8b48f00b017b9d895bc4e10e02d5df93c9e917e3c41eb6ce91e30b7dfa4885aafbf555e6ef73907206f4656
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCgAGBQJS720CAAoJELnU8jG9FVirxq0P/jp92oB5Ggy8oX15pH4vxaBk
+rWCZTKIOwscgHv33Zbd61vJxLyXDZiJJlCbR25m401bjiBiwfxnT7v4+hk+hbd9z
+bkYLwrzrY88voI5tZ90yRPOB2FpDRCvgXlB4eo88GfBF17naMg7xtvHDaGLpKyJ/
+tPfntfmSarA1/C8BptAJh3wEeLnWD6PEMvLBE3X/uFjS3Nf1NoQAXMSVCq0f8ZKh
+mR9ltGcAcKbTQsIAx+LfwHOsoxoFYFscHLLwpHlKxBAOgYRSE28vSlKzHh0NkQOv
+pA39+V2YhxNZOZ23OfXx4WETR3jlYjriduwr7wk4aEzitZc4FhqrCcd4lVMFQ9V9
++3Q/DnxlxWL9mCn92IerczG8t0w8/YqLMxsqRE2U3Qga1bjcFcjh/QCtvdO8G01/
+hodP5Z5FVeLLriPzC5J/nhE7034Q1DAzLhhvzHgW11UvGnQUhUErpYhJAlIE0Zad
+NMfwlxprAiyzZE0+CrcgVdt0APMCf/RRvgpL9zBKeFeFaJlfhcj6MQT4ZkH2DDQ8
+O4lJ9tnG+YQqbx+fyJEYCOFb1sGmR3wShy7YuRIlZ3XXwg4xNObBOYRvmSuwQva8
+GZvedeWn2Whma1/tzENwBVzlJO+wZ71EgzafjOXxgajPOj16H6y/2NaYeTB3rMe1
+3TaZ17PeMLEAjay4Tjel
+=5Ceu
+-----END PGP SIGNATURE-----
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
+}