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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

11 files changed, 37 insertions, 286 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/Manifest b/app-admin/supervisor/Manifest
index bf98cef652c1..f0ab7a268f91 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1,30 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 3.0_alpha8-no-docs.patch 607 SHA256 ec3fa157556714133fe0c2590855d0de3a6ae8cbf1426725c95f1396c485c9b8 SHA512 714012db8d7616d688dea98e9e7669e35009102ce2a931e53a3791b7b3046742a16a0e6e76ebe9ef3d1017a83e421e453fb582a2dcaa4a1b55cc68c537844c23 WHIRLPOOL af7adcc474e10f25deb6a0b3f91fb627f8b13025c2cbb3691f930efa90181e286032d530d2b0e0d34ae67fde984782ff32a35ab7224a4ebfbb89171480072f94
 AUX conf.d 85 SHA256 312ec20f53a96a4daf6f49c2928c4d1243a527ac8e32ecd882ec1a7a3d6b72eb SHA512 73a831b1d5b30686fa8120cbb3317ca2291da72f8217e1402791eee1dee7d232b26b9146e8eee5ce75c69a4c1c7993bb29eeb5de758cf731f1c093ecb340fcc2 WHIRLPOOL dc5cc98cecd01b5b3853782263b329651520f47399f3c9eadc88e706bb724aa17af46476111e746f8362fa9603f76acf03fbd4a902a563701c6c58337ceb4aba
 AUX init.d 734 SHA256 089fab0a143af0b1d68b3edd442ec4c1267129585f30250261adfd0839f78506 SHA512 67b3f2c98bdf32a4d43f70444e7d57fb1e287f8491d2c4ecf6f5641f604d30282703811f546c98bc54ba3d7250e02ceb6917a2c5beca8081dfbd68a5de590dba WHIRLPOOL 85dc5730ccc9b0b83836dc927b99fec1e27eb11bd2051507e563841485cee18fac9c46b011cbcd91666fb91c4dd24ff1fc5d2f2c873b252ae7165e3978047695
 AUX init.d-r1 564 SHA256 9def805f02710cb5966169bfc605fce9626a1be5677e2cce468e9bca33a1d0dd SHA512 ac7ede641a9ca5d6af402f3caca1acae222897fcf76c46b44dd43a20d607789947624c664378d03b52e08d248d6caaa21679661ff0f6bd101342341df331e8ae WHIRLPOOL 7c29dcde84a0c2442e2be3dae08b512ef36152477f6c7f69b26cec1623cca7b1baf3068653e62bd1355f49242b6f34dc50439671953783ce25ac5896c5c9ef46
-DIST supervisor-3.0.tar.gz 459820 SHA256 82aac54c5760b6a4f4c28dda203714e362a68b4a9ba8549fa65955998e3a2212 SHA512 6a6398ef89bb7e44b4482170e10bd95c27bd1f56efc78c6d7093020190149523b7364277af9c3d065366bfe8673c13c13747bc58326d49be3496129cc5340056 WHIRLPOOL 8932e808ad9fdf0cd1dee7ea48842472be6c090c32884f81cefba4c0f1b6cb1a9a54f24663f722932bd25c93e3a789a35040aa99b453145cc3a5ca7f0dd9940d
-DIST supervisor-3.0a10.tar.gz 438362 SHA256 63620d0431bafff6f346fb4df5d9a7745588b5dee1ca5fec2ddff2298107d69f SHA512 57239e23ff6bd0896f97591b4e80f57e36fc1858b15c43161d4205753cd346c2d7d343179ef0fd435001f14bfcff5881bf68f299cd5537d80a49126e8a116607 WHIRLPOOL 37c91a0184c3f7e4130f14ad0fa14787452a78789719637b5419473ef7ab4658600c55cb08e397356d38676fe120e1cc4c86c81c2ce9083f3ab3d493d3908cb3
-DIST supervisor-3.0a12.tar.gz 438901 SHA256 de60eee3c460b379aa8493083b59d31b29f2c4267730db29b6f9dea22642b3b4 SHA512 e60efdf26361940402c8d1b5fafe9f04fa2354c5bde29a404bd1d167557b14492297d011c5d73d8a58e6c6fe7c6cb3d70876383a58bfdcd9fc1c1d7eda04c3a7 WHIRLPOOL 8e56d50d24b912cc92c18fb3ad9643a6e1c973430d64ce7518b081eac948e7ccc8dc202da4a8a579b82a8b879a9d17abd35b2f7807146c0f9c9c8c5370e4a8ff
-DIST supervisor-3.0b1.tar.gz 452676 SHA256 7361e224871257534cac3bc035e90571c35b9fa9245ec46207de9d89191a7d0c SHA512 3e2e2eed32abb6b443321aff8b973a4d25d6cbd2107c02b91ea4713b950483fb24c730be839c22d920671a808c63676af061fbd368706d6331cad6f8f924bf09 WHIRLPOOL 03eaa49d3809edfce47fdd50c75392dd76ce1d8323f13bc83f1a21b195ca2fbe37d827bd369153da0f8c20f05ce869d68e840ccbb0daa4e7c90e11e0c6e77ebd
-DIST supervisor-3.0b2.tar.gz 458264 SHA256 3cb0e1d8ce4e4feb8c27923ca996ad7ba725f9d6300b8f8dfd2dbac4998575ed SHA512 162032b737b1ac8d8904f71e1e7a31539a2701da57183ada4144730de86c803fc8dafdac6c81f634d989e38dd25ee28a3502b38a5b18dbdb2cf3b5520b938181 WHIRLPOOL 77102b537230c5e2f06bab4fcb331bdd59547eeb8d3a319772d6cf3d09e12e17b7136b832b5f832ed762fdbddcd345fe23ba8eda1724b53c9e2f51a94b3a7c2b
-DIST supervisor-3.1.0.tar.gz 408995 SHA256 f0add8a9096cb662c1e233947b954125e38db26d40c8148fb76a7c83564518cc SHA512 8b64885ade496d69a80faee21bc7aba879d3696079ec7e49f8270666e45e749dbf0042a582829415be429bb93048ce1a365983d486cbc753e27f9e8cf8f876f1 WHIRLPOOL 804ab4f1b9b0b1a5f125bad1a5e0ec171869b7f3a0a2e2ddfb9cd0c5ab6e6f932efbd2f153fd890fce7afa75d6e78ec4ced4eccf7b3003f706420d5d91f1bac8
 DIST supervisor-3.1.1.tar.gz 416845 SHA256 e3c3b35804c24b6325b5ba462553ebee80d5f4d1766274737b5c532cd4a11d59 SHA512 bcd4841185b3eb51c59e0252ec2b825fe2799fec4f81eb4c27ac28103cae6b54819938c57d2c2dfb0d90291a3938b8bd6e033aa7dd75af501224ed94b9a92c13 WHIRLPOOL babd603034fb2ed406d5073da0b17e7e0739898199b4ed8a18ac7a85fa74e8172d182fb4501c43bd190ea58da4fff93d93ee8fd28b6eb014791130c8c7a77594
-EBUILD supervisor-3.0.ebuild 1464 SHA256 7fa3529b8a34e8b432a52c2266fbbd5f114998d1f82fb60aa6542efed37a0192 SHA512 eb4d4767917091ff147f8a4853be2a875d3ad21861de942aa97aebc0a52a54b22f39e06a7e746b38b5d9e8442ef82313b0f9d24038aa4188f24a6fe3741956f3 WHIRLPOOL 773ed5d793a7e2496d4805286c4481af5e21ca54d4335ce8c6e1b7869008bb5d5c3d14007e7eb801aff7735a77aed972320854a3b6e292dc38c1f478971924c4
-EBUILD supervisor-3.0_alpha10.ebuild 1179 SHA256 1b19ee056b64b8f7662815e0cadd4a1b91456c975c81cefd021fdc2382a23dd1 SHA512 a34f01d5d0dd15ed96bb6ee51b6a3d6c8f98ad5bfb877c91d823d5066afad7e75c3950da1c335d9fd8a31ca411c94ff1b39ab2b20a8a85de1cbfb08d0351433f WHIRLPOOL 1180d52fc9cf3388a767ea6de7d74f7c417c814ad16a305adf3052d2a6a0a704f907d4995b6b45f81c2ea920e627dc8d2c4e90e7f1db123c7d364d4ebc22fe56
-EBUILD supervisor-3.0_alpha12.ebuild 1079 SHA256 2b6db4adfa3f3c16144aa65a833c62917945348a52ab7a68c1e18b56a1b49e3b SHA512 0d3ab07e022859b915630cb375a7e6703beb51c3743e150f8035b68bb0416b4ce67ab30a4260249cd16f80ae4b82b7f8322c597d81fac6cf1c9da9db5d85aa12 WHIRLPOOL 359a367baa77bb3af975b0e2f6c03dbd4e2c5d3f6599bf2d179fcfbac60ea4567f00a3cdf1574d59673472851c33172bbb8901af16c353c5546136e854999aaa
-EBUILD supervisor-3.0_beta1.ebuild 1076 SHA256 509fb9c7c3042bdd03f6e113ad49db382ab3b4ace59938467763c0c34bcc8658 SHA512 47c6267fd4b3aef09ca623611209d4e06c4d0d6fdcad2df096a51c154e0158b03f059d33ccddcf00736f6046efbecd9201f31b1f58cdf54d3422eb07d8240601 WHIRLPOOL f8ca069c914bbdfdfb4c316d6f4ae342dc2dceb3ad59586e9f6a2128319e2fa83b9471b012ba43bb74f69eeb0dbcc5e1d4318d5cf397d2ad36854b2ed4b9a04c
-EBUILD supervisor-3.0_beta2-r1.ebuild 1473 SHA256 d0cd8a8725eccb22d15c57256e739ca98ceddcb507907e6427822530f44972b6 SHA512 e988a7091e27073d49ffd32fbc964f2cda21079e6bd878012d7a86e662c8a088cf0d32de2a26006779382976f5b57ad97a61e6a6adbd6b13cd7d425a25a2b58f WHIRLPOOL 6bc823334c385a3f1984696abaa4e5e42188c2398d452bff7b16d6a792c19532d2a72e55d97bd67ec8b7d105cf9487a8476314be6f3507d9c32529daceccc201
-EBUILD supervisor-3.1.0.ebuild 1412 SHA256 a9d7ec2a8a83226db880567faf45876ebea6937d122d86b3d409cdd221604ece SHA512 3bf750b074aa0157b5da961d600d7e6d9e65f9aef7d78a4f27501451c1a78c18906e05983c9939f6da4e601cc8eb8b54477ca2c5ca95814732a9d66f8e2b288d WHIRLPOOL e13ffd9d576429c91d76b9d6252a939dfa444141498fd46b88818c862828cc8727ca6b18c68261889f69b6c5c882a00c4cf4d17454722442d973a0750cc0c80b
-EBUILD supervisor-3.1.1.ebuild 1315 SHA256 16297adf99ed8d8c2375f402150764292d803c915510c58287ff23d8535b2c5f SHA512 394b91d8065ddc03d5bebec44b480855fd651753f05323180122f906c70a64d036d9598d115b0a39bf8d889ed08b7e44f9a229261569bc3d0695aa0381c09bdb WHIRLPOOL 967f39512a3bbd0f033e583e707b4922f300825cb8d09bef16e46ba12a97eb15b7abd499f31465c44ab6b09facee11c0e4f6947a7720cf509eff2d18cd6160bf
-MISC ChangeLog 2735 SHA256 0970551b97bdee6e789a65d61b35ab8ccf27b0c6a68d9dfa7d03e9e5c00d4257 SHA512 411077ac135668e395476971ba1e3c8003ab5cb11336e36e9bf76b19dea6bca7a6b66d31bcd4c8334518cd7165c4e52ce14b870e62d9921cbb2acdcaa963d7ea WHIRLPOOL 49c4119bfe92034431980b77f09f8b5fb04914b72892319707984ca0b62eadf347497edd2b4223b228bb44a4bc1f942eee4b8a7d3ec078415b0af62087a3b9df
-MISC metadata.xml 233 SHA256 4648fd89895b550207e07472060dad480e2207e1730cc6e22631a2f261548057 SHA512 b7609ca1ebeaf92718eeacab6b6a35a2464c8e247f007fe3bc2d30af9c6452086f994f1b5b04e0beac0d1f6674082d4445e161d447e2536e2827d59a90fb17ab WHIRLPOOL 96cefd214077304e1841c82d72d6281744099c22917d0fd23b58d92eb9ff98b5bd6aa2924ac11f61ebe237ad7536246d8df054b35e36556ba60adb072cb37634
+DIST supervisor-3.1.2.tar.gz 390925 SHA256 cb608b4735522ccd370254bb3b2bea683dc0f6ce723dd8c5b60c600b00b03961 SHA512 e0eeedc325bf1bcbb838844a801557b9cd650aa26f491931a9eb8b64de678f5e7864bac858e3e4ba12f6ec986ab7979164a11e2583752ca188b0a7d54a7b4884 WHIRLPOOL c1cf5f305fd88472308fdbc13925ada0f50af6a94d9e83925264a58f90eaace1a6f391201dad64ad66faf71104e378f7a16a1f3ce5af2b8d92219cadb811b496
+EBUILD supervisor-3.1.1.ebuild 1350 SHA256 2a56665adc223e3c9f1f50d724b1e1366202ec2e9b2604f283e48e8369c59f76 SHA512 fdb84f589811db77c237e2e1b4c7ff51bb13f97c0036a9bfeb7c0d743c1eedbf753a11ac6ff24181da9bb7e39ed6d28530d3205eba0c7a90b3d7e0e2ecdbc520 WHIRLPOOL de748daf1ac7adf0945502b003cf5f2985f21ec0bea3ea50b0ccd61ffcf874dc2a4f7f51bbd276be691df51ef34136e153cc4faa5c6dcfbbb1ac0e0a0694bebf
+EBUILD supervisor-3.1.2.ebuild 1426 SHA256 126914822ca338cf31f09a43cfa09648ebfd62862b0be77b636f98232f7dbefb SHA512 08d0422fe73dbee41dcaa18c3f58f75f43b24fb737722d01dd58e60e7ed7bc1bf9d0d621f33ac5dfcaaa0bb5878125f08b78d302174b43506bc911f04a2de796 WHIRLPOOL f7d82c85a4b237ef1cee03dde26f3040dae43b5129a55c91680850f411a67aea55629e21cdc093c4df92566f8048ef2913fafd89608b3aeb3e814516a3e859e9
+MISC ChangeLog 3224 SHA256 f2f31cbaa19dc7d6627df67c312fd05e2cd7c151a0f23fbb1b4b2477f8ff2663 SHA512 9466fbfa9b80d2347ba84a46cc14a05e6ae6914264e58338569866061dd5fedd040728214be4b6c322a640beda29f2adc14a7cd61a7ab760c680980c647e2226 WHIRLPOOL 4ce78da1c1d9d83919f3dc4fe872b42e287bfc12f726623a03a12578d63ef17709d5fe5c9e86c9531623d4a6eff277972798fc50af4d78883779e4351e1d82f7
+MISC metadata.xml 352 SHA256 44caa553e828060accc24d74b790740381df195406f456278946287bef379b7b SHA512 fd63687db144fb5e525082559975f50311e7230f4ba410ea15c1fa313f2f9a2956c1ba6ca0a1294eda7ed8e8919c318bb7f673392613c4b5fb043d283de95c1c WHIRLPOOL 827a252fecbdf345f4ae01837bc35b652a22e3921831fc816f0da5997b1f4cbe0810d4c2e29fc432f64507c3bf7977f2a75e1656fec86367197527a5cc1bdfb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlP60zYACgkQso7CE7gHKw3+dgCgyYqN5/PiYpGhyRyZK9veab9S
-BNkAoNTIIy6zkBfwRtt6EIZgpI3S003O
-=aInr
+iEYEAREIAAYFAlQYT9QACgkQso7CE7gHKw1X2QCeOaDL8HGHMX/kwCYdhmJVxcWS
+kkEAoIIdfNdK9QDzlnm2cNBXERum4ad1
+=HG3S
 -----END PGP SIGNATURE-----
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
 }