bump; add IUSE flag iterparse (term used by upstream) for optional extra and the related dep, tidy dep mock, remove old

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

10 files changed, 29 insertions, 267 deletions

diff --git a/app-admin/supervisor/ChangeLog b/app-admin/supervisor/ChangeLog
index 43274e7006a5..1c5d5ca29941 100644
--- a/app-admin/supervisor/ChangeLog
+++ b/app-admin/supervisor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/supervisor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.16 2014/08/25 06:19:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.17 2014/09/16 07:06:46 idella4 Exp $
+
+*supervisor-3.1.2 (16 Sep 2014)
+
+  16 Sep 2014; Ian Delaney <idella4@gentoo.org> +supervisor-3.1.2.ebuild,
+  -files/3.0_alpha8-no-docs.patch, -supervisor-3.0.ebuild,
+  -supervisor-3.0_alpha10.ebuild, -supervisor-3.0_alpha12.ebuild,
+  -supervisor-3.0_beta1.ebuild, -supervisor-3.0_beta2-r1.ebuild,
+  -supervisor-3.1.0.ebuild, metadata.xml, supervisor-3.1.1.ebuild:
+  bump; add IUSE flag iterparse (term used by upstream) for optional extra and
+  the related dep, tidy dep mock, remove old
 
 *supervisor-3.1.1 (25 Aug 2014)
 
diff --git a/app-admin/supervisor/files/3.0_alpha8-no-docs.patch b/app-admin/supervisor/files/3.0_alpha8-no-docs.patch
deleted file mode 100644
index c4e947065100..000000000000
--- a/app-admin/supervisor/files/3.0_alpha8-no-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup.py.old	2010-06-07 11:48:30.000000000 +0200
-+++ setup.py	2010-06-07 11:48:40.000000000 +0200
-@@ -73,15 +73,6 @@
-     maintainer_email = "chrism@plope.com",
-     package_dir = {'':'src'},
-     packages = find_packages(os.path.join(here, 'src')),
--    # put data files in egg 'doc' dir
--    data_files=[ ('doc', [
--        'README.txt',
--        'CHANGES.txt',
--        'TODO.txt',
--        'LICENSES.txt',
--        'COPYRIGHT.txt'
--        ]
--    )],
-     install_requires = requires,
-     extras_require = {'iterparse':['cElementTree >= 1.0.2']},
-     tests_require = requires + ['mock >= 0.5.0'],
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
index 0d8452b949e9..2493ffa9f45e 100644
--- a/app-admin/supervisor/metadata.xml
+++ b/app-admin/supervisor/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<use>
+                <flag name='iterparse'>Enable support for the specific element properties</flag>
+        </use>
 	<upstream>
 		<remote-id type="pypi">supervisor</remote-id>
 	</upstream>
diff --git a/app-admin/supervisor/supervisor-3.0.ebuild b/app-admin/supervisor/supervisor-3.0.ebuild
deleted file mode 100644
index 60e6e6ed64c4..000000000000
--- a/app-admin/supervisor/supervisor-3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 eutils
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/meld3-0.6.10-r1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-# package uses namespaces which makes tests use installed packages
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( CHANGES.txt TODO.txt )
-
-python_prepare_all() {
-	# write missing MANIFEST.in file, otherwise required files get lost due to
-	# egg_info being passed to setup.py
-	cat > MANIFEST.in << EOF
-include supervisor/*.txt
-recursive-include supervisor/skel *.conf
-recursive-include supervisor/ui *.html *.css *.gif *.png
-recursive-include supervisor/tests *.conf *.txt
-EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-}
diff --git a/app-admin/supervisor/supervisor-3.0_alpha10.ebuild b/app-admin/supervisor/supervisor-3.0_alpha10.ebuild
deleted file mode 100644
index c00f0ad04cef..000000000000
--- a/app-admin/supervisor/supervisor-3.0_alpha10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha10.ebuild,v 1.3 2012/12/07 19:10:36 ulm Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml(+)"
-SUPPORT_PYTHON_ABIS="1"
-# xml.etree.ElementTree module required.
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/meld3
-	dev-python/setuptools"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS="CHANGES.txt README.txt TODO.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/3.0_alpha8-no-docs.patch"
-}
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}/init.d" supervisord || die "newinitd failed"
-	newconfd "${FILESDIR}/conf.d" supervisord || die "newconfd failed"
-}
diff --git a/app-admin/supervisor/supervisor-3.0_alpha12.ebuild b/app-admin/supervisor/supervisor-3.0_alpha12.ebuild
deleted file mode 100644
index 80eb63e91526..000000000000
--- a/app-admin/supervisor/supervisor-3.0_alpha12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha12.ebuild,v 1.3 2012/12/07 19:10:36 ulm Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml(+)"
-SUPPORT_PYTHON_ABIS="1"
-# xml.etree.ElementTree module required.
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/meld3
-	dev-python/setuptools"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS="CHANGES.txt TODO.txt"
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}/init.d" supervisord || die "newinitd failed"
-	newconfd "${FILESDIR}/conf.d" supervisord || die "newconfd failed"
-}
diff --git a/app-admin/supervisor/supervisor-3.0_beta1.ebuild b/app-admin/supervisor/supervisor-3.0_beta1.ebuild
deleted file mode 100644
index 11827aa7630a..000000000000
--- a/app-admin/supervisor/supervisor-3.0_beta1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_beta1.ebuild,v 1.2 2012/12/07 19:10:36 ulm Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml(+)"
-SUPPORT_PYTHON_ABIS="1"
-# xml.etree.ElementTree module required.
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/meld3
-	dev-python/setuptools"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS="CHANGES.txt TODO.txt"
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}/init.d" supervisord || die "newinitd failed"
-	newconfd "${FILESDIR}/conf.d" supervisord || die "newconfd failed"
-}
diff --git a/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild b/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild
deleted file mode 100644
index 4ede66caa881..000000000000
--- a/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 eutils
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/meld3-0.6.10-r1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-# package uses namespaces which makes tests use installed packages
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( CHANGES.txt TODO.txt )
-
-python_prepare_all() {
-	# write missing MANIFEST.in file, otherwise required files get lost due to
-	# egg_info being passed to setup.py
-	cat > MANIFEST.in << EOF
-include supervisor/*.txt
-recursive-include supervisor/skel *.conf
-recursive-include supervisor/ui *.html *.css *.gif *.png
-recursive-include supervisor/tests *.conf *.txt
-EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-}
diff --git a/app-admin/supervisor/supervisor-3.1.1.ebuild b/app-admin/supervisor/supervisor-3.1.1.ebuild
index e90f03229fcc..1f0324e33f49 100644
--- a/app-admin/supervisor/supervisor-3.1.1.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.1.ebuild,v 1.1 2014/08/25 06:19:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.1.ebuild,v 1.2 2014/09/16 07:06:46 idella4 Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ IUSE="doc test"
 RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-admin/supervisor/supervisor-3.1.0.ebuild b/app-admin/supervisor/supervisor-3.1.2.ebuild
index cd833e24b526..234e106aa4aa 100644
--- a/app-admin/supervisor/supervisor-3.1.0.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.0.ebuild,v 1.2 2014/08/02 01:38:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.2.ebuild,v 1.1 2014/09/16 07:06:46 idella4 Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 )	# py2 only
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml"
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 MY_PV="${PV/_beta/b}"
 
@@ -19,25 +19,21 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="doc iterparse test"
 
-RDEPEND=">=dev-python/meld3-0.6.10-r1[${PYTHON_USEDEP}]
+# ALL versions of meld3 match to >=meld3-0.6.5 
+RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	iterparse? ( >=dev-python/celementtree-1.0.2[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-python_prepare_all() {
-	# write missing MANIFEST.in file, otherwise required files get lost due to
-	# egg_info being passed to setup.py
-	cat > MANIFEST.in << EOF
-include supervisor/*.txt
-recursive-include supervisor/skel *.conf
-recursive-include supervisor/ui *.html *.css *.gif *.png
-recursive-include supervisor/tests *.conf *.txt
-EOF
-	distutils-r1_python_prepare_all
+python_compile_all() {
+	# Somehow the test phase is called and run on invoking a doc build; harmless
+	use doc && emake -C docs html
 }
 
 python_test() {
@@ -47,5 +43,6 @@ python_test() {
 python_install_all() {
 	newinitd "${FILESDIR}/init.d-r1" supervisord
 	newconfd "${FILESDIR}/conf.d" supervisord
+	use doc && local HTML_DOCS=( docs/.build/html/. )
 	distutils-r1_python_install_all
 }