migrate -> distutils-r1, add missing rdep and correct deps, drop some old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

7 files changed, 20 insertions, 157 deletions

diff --git a/dev-python/mozrunner/ChangeLog b/dev-python/mozrunner/ChangeLog
index 3c856a5c1aa1..d2c147696e2b 100644
--- a/dev-python/mozrunner/ChangeLog
+++ b/dev-python/mozrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/mozrunner
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/ChangeLog,v 1.25 2013/06/19 06:16:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/ChangeLog,v 1.26 2013/07/23 11:54:39 idella4 Exp $
+
+*mozrunner-5.18-r1 (23 Jul 2013)
+
+  23 Jul 2013; Ian Delaney <idella4@gentoo.org> +mozrunner-5.18-r1.ebuild,
+  -mozrunner-2.5.4.ebuild, -mozrunner-5.10.ebuild, -mozrunner-5.12.ebuild,
+  -mozrunner-5.14.ebuild, -mozrunner-5.18.ebuild, -mozrunner-5.2.ebuild:
+  migrate -> distutils-r1, add missing rdep and correct deps, drop some old
 
 *mozrunner-5.18 (19 Jun 2013)
 
diff --git a/dev-python/mozrunner/mozrunner-2.5.4.ebuild b/dev-python/mozrunner/mozrunner-2.5.4.ebuild
deleted file mode 100644
index 9c963f9ba3d6..000000000000
--- a/dev-python/mozrunner/mozrunner-2.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-2.5.4.ebuild,v 1.1 2011/04/08 22:51:19 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
-HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
diff --git a/dev-python/mozrunner/mozrunner-5.10.ebuild b/dev-python/mozrunner/mozrunner-5.10.ebuild
deleted file mode 100644
index f72b95392642..000000000000
--- a/dev-python/mozrunner/mozrunner-5.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.10.ebuild,v 1.2 2012/08/27 15:56:37 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
-HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/simplejson
-	>=dev-python/mozinfo-0.3.3
-	>=dev-python/mozprocess-0.5
-	>=dev-python/mozprofile-0.4
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
-	distutils_src_prepare
-}
diff --git a/dev-python/mozrunner/mozrunner-5.12.ebuild b/dev-python/mozrunner/mozrunner-5.12.ebuild
deleted file mode 100644
index ef7a45a2ccde..000000000000
--- a/dev-python/mozrunner/mozrunner-5.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.12.ebuild,v 1.2 2012/10/11 21:41:17 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
-HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/simplejson
-	>=dev-python/mozinfo-0.3.3
-	>=dev-python/mozprocess-0.7
-	>=dev-python/mozprofile-0.4
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
-	distutils_src_prepare
-}
diff --git a/dev-python/mozrunner/mozrunner-5.14.ebuild b/dev-python/mozrunner/mozrunner-5.14.ebuild
deleted file mode 100644
index 77940d2b04b3..000000000000
--- a/dev-python/mozrunner/mozrunner-5.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.14.ebuild,v 1.1 2012/10/30 07:13:52 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
-HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/simplejson
-	>=dev-python/mozinfo-0.3.3
-	>=dev-python/mozprocess-0.7
-	>=dev-python/mozprofile-0.4
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
-	distutils_src_prepare
-}
diff --git a/dev-python/mozrunner/mozrunner-5.18.ebuild b/dev-python/mozrunner/mozrunner-5.18-r1.ebuild
index 949a65354a7b..c9e0bae8b584 100644
--- a/dev-python/mozrunner/mozrunner-5.18.ebuild
+++ b/dev-python/mozrunner/mozrunner-5.18-r1.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.18.ebuild,v 1.1 2013/06/19 06:16:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.18-r1.ebuild,v 1.1 2013/07/23 11:54:39 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
 HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
@@ -18,14 +16,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/simplejson
-	>=dev-python/mozinfo-0.3.3
-	>=dev-python/mozprocess-0.7
-	>=dev-python/mozprofile-0.4
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/mozinfo-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/mozprofile-0.10[${PYTHON_USEDEP}]
+	>=dev-python/mozprocess-0.10[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/mozfile[${PYTHON_USEDEP}]"
 
-src_prepare() {
+python_prepare_all() {
 	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/mozrunner/mozrunner-5.2.ebuild b/dev-python/mozrunner/mozrunner-5.2.ebuild
deleted file mode 100644
index 6914406d865e..000000000000
--- a/dev-python/mozrunner/mozrunner-5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.2.ebuild,v 1.2 2012/04/22 18:33:29 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
-HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/simplejson
-	dev-python/mozinfo
-	dev-python/mozprocess
-	dev-python/mozprofile
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"