Remove older versions, block against dev-python/configparser, bug #528752

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

9 files changed, 34 insertions, 284 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index a44814a85c40..7b4dab445f50 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.114 2014/10/23 11:19:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.115 2014/11/10 23:54:20 blueness Exp $
+
+  10 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  -webapp-config-1.50.16-r4.ebuild, -webapp-config-1.50.19-r1.ebuild,
+  -webapp-config-1.51-r1.ebuild, -webapp-config-1.52.ebuild,
+  webapp-config-1.52-r1.ebuild, webapp-config-1.53.ebuild,
+  webapp-config-9999.ebuild:
+  Remove older versions, block against dev-python/configparser, bug #528752
 
   23 Oct 2014; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Drop myself to secondary maintainer
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 549256fec707..4b6a3d61e44c 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -9,34 +9,27 @@ AUX webapp-config-1.50.16-htdocs-symlink.patch 509 SHA256 24e48a42f2b08010ad25f5
 AUX webapp-config-1.50.16-update-servers.patch 2565 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7 SHA512 d6d37ab12a7b9592a2394b89981bfd183c1d5050866eecc9277c638f87bbae9942d822e1ed2dd856b2a4f5e0319d84ff47f8b7caf480449847599be04bcf9648 WHIRLPOOL b219c1a016e37a1c7ca140d5ea4a82075f4eebf8f57900d6ed8e964ff19aa23a35641abf8be2b5f209937b3cc100bf791968b6d392337cb906e927b1fd564332
 AUX webapp-config-1.51-fix-indentation.patch 820 SHA256 ba492885bdcb0263152a727f0ab790873a29208491573c02bb432d92930d82f1 SHA512 7a07df87a8304e2154b9a03dd4eb648eaadd4be8db70adf3c9c80fb46f2652b6ed67454ccfe64bec37d576f088eac88b829e33a81879dca06b6f9ded02587e3c WHIRLPOOL fa1b0a8dc72ecd7757a2dcb0ba2cc5d56611d10914c231a98871aa3873a0a559fe30724113a298b235ea6a4f0143198c0b4367d973db1c0f03be45c69df01324
 AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c
-DIST webapp-config-1.50.16.tar.gz 103576 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f SHA512 5dee7ee47a228af42d1f417ec004057559f2afbe2ffed668c4c2ecc16a63aae4f7e2b4a56fbe701db15e18c7bd207aed4c5505dff9245b25a9868e0ceef9aeea WHIRLPOOL c605be239c8dfa7422580e8e6932c2ae6b311a972783e93cb1dcf0af2d5ad76be57d71316ad212a094a1b0139fdcb0f64304446c2eb4e56b9eeb3af379afa35d
-DIST webapp-config-1.50.19.tar.bz2 58884 SHA256 9346d2c37e06da43d083b09bb5d908692ead14b5ef7393a5d18a57f4d4b2ac58 SHA512 ce11181cedf09e8c297a11a7f72bc9c9a76b832052ad2d908f6132f4dc8f660cf234315499400b0e5499ecd2bda3d01cd1ba7ab10e874dccd704154d216b8088 WHIRLPOOL 899ec0c320bc6c8714196b829cf8850e644f3293c9525cfe999ae6406dd2d487386a08823d2be95d09048114b16434f46eafca42d7b0b8b070b1aebc155559be
-DIST webapp-config-1.51.tar.bz2 62910 SHA256 e8db10184efbe3ce23c39b67e626da8302e4d1b3db54d67e5e18bae07f4c3a1d SHA512 b1e8b3601565e2c3d2fd7d842354ed483cb59168171485a41c8feeb93abb51a009534709513682cf981396f43d180df0746c02b028e98778b9f12c9a47a4ded0 WHIRLPOOL da9a46cca165d8506462f43c4e4d98ae56836bf11330c6fa12472c7facd550fb801f85829b65974e6de3b56e5ba119e0a15de9f6dfe4f67420a564960c0bacb7
 DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee
 DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc
-EBUILD webapp-config-1.50.16-r4.ebuild 2108 SHA256 e251d057903b0bd0ded6def7497641e3af5c4610898a2c73deee32ddb315a1f2 SHA512 5e1573f27267f4d6c98b60cf7c8efcd2e033bd682889fa1f53164fd80a120ce9c9465c4c29f830439844bd17be2763f081fdc9c45403052f30885ff8ea92bc49 WHIRLPOOL e18a2300257a4eac8f1cc1842c53ea1f6fa62cbd51d55d514bf84ba6bf2bcc3256bd03732525e48761bc6d8660cc79705d893f1683b39e83c8cd3fe50a5bbaa7
-EBUILD webapp-config-1.50.19-r1.ebuild 1698 SHA256 411b16196fdf209a1418d15386654ba7c2921eaa96935ff27561b8d67f803a5a SHA512 43fac53bb14fe1f6dae84a2922a0afb95db0522af36fc924742cc5c125b95ac177ba3ff1850e2a4b579181da7ec68a2a18d7bce65f7c5be85cbe2464fb9731eb WHIRLPOOL 2dac692ff8ae785c8c81334fcb31ba60eda7560ed5703fad2dbc4170f136905ab8d585ae88736da40238ec78e70fee4e51083ec5b513235abd42bec9439430c5
-EBUILD webapp-config-1.51-r1.ebuild 1709 SHA256 5ec43c1f2e8ec2a1d8b73a0ce8151026e24106bfbdc847d8abbda490eef38b60 SHA512 f59aa9f0954738aa443b6307fc40e8b9996ff0f4e27bc9f0794ff31ed1996c054f876f0bcd1ba79aca8111416b41d09690c4f77e4d37ab61bbdf89362be660a8 WHIRLPOOL b61bd8cf82bf2f6f4a014e569608d3004e070caf4f5744cadef54c15caa473d096971cd01f457173b4f771a1a19398d38df51b1cbe1e9da7b61833102000dffd
-EBUILD webapp-config-1.52-r1.ebuild 1719 SHA256 f7908517843da949afb9778b5bf3beffe5a07f10340b23eaa55676981d57b2c3 SHA512 c5f1729a2be9544986dc04653d9f18fdbcde760f974ed464d41532b0e9e3dfef19d64c8854df26e3e8cce8f79f30d1ba47ee3ffc568779986f5938dd95412699 WHIRLPOOL 96a808500d4312f041730dc1bfb6e936c5ecb0585ccca4aceba9e6bc4f6766014cdc868a5216df0ea05e339c618930f1213210b2f6b2397e39c7de5bd3aaa966
-EBUILD webapp-config-1.52.ebuild 1650 SHA256 545a0e2ecb45b9c58d2a7cfb6d78a63470fb7437279f2a0f175b9fc18659d361 SHA512 8f48e52faa09492919e878611f43471553469102de605dd91023cd67cdbf0cd41bc23428ff8fe977fe6832ebffd6959a51a6de41e63ff6571f1ca4d085ce4ee9 WHIRLPOOL 26fd4896ab0fbc801139719a7847a922fdd051630468be38d20df553eadbe39f428c9494fb5962dff4e007460d71884a6d5ad5543212921b09f621ecb1fb46d0
-EBUILD webapp-config-1.53.ebuild 1664 SHA256 c9e79255019b6673896bb06a3508b393f4814a7156cd04dc0d1a525ea7ab2168 SHA512 01148b18d412150fd7c8fd4bb92dcb75ae95f19a2d887137eb9b90b538e98f3f512af42139542664ac9e03b2a6d2e6030b848ea35d5b43eacd1e5613cb12cbc6 WHIRLPOOL 860b7062fe93f318e90c64f238ac9148e16f5f5042c2d75022484af0cfca35884ebc39d1e4dd8c2b6854e380f727939f7f1ad9b41875dfc10f4a46ecd6b7d2d5
-EBUILD webapp-config-9999.ebuild 1791 SHA256 93bf85afdd19baa60289ad9c1ff3a86c03db6877de83771638283d76a740da7c SHA512 4c6f557c3f95009d754d3f08104bd3d171ebe4b1a7c4192871a063e584c792012e954fb0491a34b03fe80511337666993f3f7396e1ada5e324349567b0177d06 WHIRLPOOL 287640e93345aa77cd154648fabbe30d4779176df75cd7059263a901e27760d3af137caaf360f70142cd0970a5f0a791689aa8ed584c88788976ff7df79d78b8
-MISC ChangeLog 30337 SHA256 d28fee296ecddaec99ab2e7a48c463fa0eea6b053c9ec14acdcbf18d691c8ae4 SHA512 977d156126b603c92d1595dd24af0c81086f7ed47233fda0350f07f7a9f4370b85b433854e03afe5ab05e75caa7dd51f41fc4f3377f4c19479dcd5ff1e81f11b WHIRLPOOL f9fde1f7b84d0c1801f494070cc78652643e5c2cb822e32d6821af05e14074076a7526e3f71d8feaea47c13adb45c0cf7c0902ce93bbab0cdd0d6d134384beda
+EBUILD webapp-config-1.52-r1.ebuild 1746 SHA256 a840cc430e2b3cf9102118c994f30e6d947663ece2ba5c337e7fb45ab8c74bbf SHA512 164e59e0c27236b093e3c346a3289c37ea0e958ae50c3fe7142e8e48be733179b85ece4166884f3d679612c048bcc96ba3c5692916ac2d48a53d923e7fa266f6 WHIRLPOOL 09fb2cfb75813de9bab227c4ab1a6ef2343f134ae071620e4b36ffcb07d235a061f837a75857333f47bbd2a91199db9f789357b8181d96c988bd970e6caf19c3
+EBUILD webapp-config-1.53.ebuild 1691 SHA256 cc9f043e9e50c4a90c99704576e641e72a2f3a4618bb90d5e89adaa5138df218 SHA512 9dfc9a8854c0660166d11494fd76b858e83f1a1bc4469d13840e0a6a7ef3e4ddbbf371071649c9cbc219505cb1eac98ed7acc66a2e8492bf126ee5011b75b88e WHIRLPOOL 1e22259bec019b2f2e5a70b1927e2a02e236b2e786363c2c1f0fcfb209f9e3dcca928311d2c98de31744085d2bd37b1b5d1ea8ce7ff7cf5fed0068655673118c
+EBUILD webapp-config-9999.ebuild 1818 SHA256 0dd52b62b5f0b3a0f495434317c65e4a7a15a4e669b79a6e79f55f6fb7a67860 SHA512 b2b0a5ec1826fe7cb24f2041f58f9118b2f6e0dab15f3b092446319e91ebd6770029d14a06adb30d2669b44afd3778c5a44f5c092c4a63072994b0f1603582e2 WHIRLPOOL 15d70a19e84285bf89e22ce9bf52b6f70639e79526c7aebba01b0267ac1331594b7a919fba4d11c3a4377d3cf8be6efa2b287e7a6fa19efe9fc752f52c9f5c3c
+MISC ChangeLog 30688 SHA256 af1a8f0f2bddec394cbfa1d043fc193845bc0670f50a3234e055ffd51f68c087 SHA512 1b500184b213d020d7d2f769e575592cf33120c0bb5df4d7a216fe40fe846c2b28bc5c672011dff4c27351903a5a418742a01a80bec41bd8035be2b659c7b0cc WHIRLPOOL 84a603ad3647149a9ed7dc69ef2e17b095f6baa4c8c85b2ad0c544efc749e67fe0360cf1c798e17c0c1620564a14b342a84c4d9165231e18606efdfd832f6e23
 MISC metadata.xml 462 SHA256 c8bfbdf08140c41fd24a684e7e9642298dde3060c52054768f77a53ec78e125e SHA512 82fa9c21e551dab1bf71ee7ef2cf7ddf3bad6b3478a3701c2e90eaf06175f13d6b0965f163a2f30993ee6be582d9044cf947777c25b077f8424bcc09a96cb117 WHIRLPOOL 2e3efe5f154cbc0b68ad51da216b0bca2e2ce06d92c10166d8ec04b71ec63b532f8237c4d35cf1532e6a15fa41d3731147c05c46e036a14aceff58e3b5da85b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUSOSxAAoJEJOE+m71LUu6fvAP/3eZE98vnO4qbYzXwIq2cCLd
-XNbO9DVvb2vfq3aTkMlERmyPSGq3+nQqkNQhI7J+Kf2kp0w4Z1wH7lPvsTGsDSR3
-K/QxpZkiRD2DMtJP//CJRQDNNqCzBXNlf5Y3q1tq26WRMqqZWpnGvfPDV6lr5f3H
-OCocBwL6XgR/faEscqg9jqDLOw83l7R+0ST3gEAvtODDsTgghB8GcEs5KqbaBUbg
-mKip1GplBGDaulHQgZ2tp0L24w0HXwJqPMPBGYE5EVG3ms0AhXjSx/f8ZdWMA0jj
-AfBJCzCCGNFM9ULft4Mee4MFZPR/cG6ut9AzLy2QgNfObjbz7/xwO3ZBBF/DJA0g
-IaGyyTQTn5/QAi/xvZh266Aa/v5jTaVawoRwfRStQhaAc7dq/yELhs1XMJ0B5gR5
-vq4s+uBr5D2motrXOe2oQCtGooeJ8k892LDvKKznXDMjaMNoHhv2CIcbV3tIpVGa
-yMRyThhDK8cAYQPNIfgGEieEAyhHxlBB4xOmoUUX/TPgqXOM360B7Exetzk1wQLa
-Cs5ZpA5OfCX47rGwKqdsBP3QDVr9rISkW1hhV1jHTct0Vtd+6qyDq3CLPPOgMBZb
-Bq9zcESCb2dLYYLJp4/dkMm+k++ctNGi5gvdI0bmi8qYi7nquVRRzP7eTTFblUOl
-CUBLf7g6Rdl/6V6EqpAU
-=t0hD
+iQIcBAEBCAAGBQJUYVCzAAoJEJOE+m71LUu6wq8P/3kx+QQdolCArO2vptWa6sOK
+FeCMEQDKrBF5+rqEac2Gylua8GhnDGF0cPBJkXPOeeuNX0PB3VAQt20HGeSwtliI
+jU2bpSl8TGtzWpuNVIcbE5fh8Pgzc52ci8ocjTGkeVRffvUhkYhl/jQG/BRWBKii
+Z6lTmbjx6ks+cXqdKc4LloTi1q8JpLu4UHcJD8JC0Rx1iYxabDIyuX3s9mA/1LJV
+m7+l/Zjq55qzIStiHDq79Q3ciSGcqBNHEvMjHYVjPj/ZSpeblnK84V3+Ial7JD3m
+Ezw6x76uWBaaUkng0k7n0uk27NIcDeLsQvdXTwPSyMqZH5U+Ye6Vs5fpY1kMgtlB
+BMCAgzg3/15g40wDBFzM/GZnVBYcRgJrmmz16SCFigRCOU3p0CsEeRXQbRG+jzk7
+dfAUwMf39EOLS5e3eVlZKR7j2XniYRsYkwB6IAgzG0BbvgwhQju5U1TayQ/+dm8N
+Tvp5Zhz4TOtFdRd5taoW5CWAhg0P3edfTQQ73YYX4vsCx1/7UmgjFHo899xGsHJY
+cXxn5YcJy74tKCeCwIScWc98V8W65I8wqvNISkCabjUCplRus997/38x1lldemlm
+OTqayDGlosXN8ccDQGEBB2/JTDGC4P85cs5SX5taoWJu9Bk5AtPgMcePW8SAoi0P
+2nXAAf7uEVpMjOo0ZmtS
+=T8WW
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
deleted file mode 100644
index 994d58e1e67c..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
+++ /dev/null
@@ -1,72 +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/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.10 2012/07/15 17:17:09 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="WebappConfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-apache-move.patch"
-	epatch "${FILESDIR}/${P}-baselayout2.patch"
-	epatch "${FILESDIR}/${P}-htdocs-symlink.patch"
-	epatch "${FILESDIR}/${P}-absolute-paths.patch"
-	epatch "${FILESDIR}/${P}-update-servers.patch"
-	epatch "${FILESDIR}/${P}-fix-unicode-tests.patch"
-	# Do not build nor install eclass manual, bug 322759
-	rm -f doc/webapp.eclass.5*
-	sed -e '/MAN_PAGES/s/webapp.eclass.5//' \
-		-e '/HTML_PAGES/s/webapp.eclass.5.html//' \
-		-i doc/Makefile || die
-}
-
-src_install() {
-	# According to this discussion:
-	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
-	# distutils does not provide for specifying two different script install
-	# locations. Since we only install one script here the following should
-	# be ok
-	distutils_src_install --install-scripts="/usr/sbin"
-
-	insinto /etc/vhosts
-	doins config/webapp-config
-
-	keepdir /usr/share/webapps
-	keepdir /var/db/webapps
-
-	dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt CHANGES.txt examples/postinstall-en.txt
-	doman doc/*.[58]
-	dohtml doc/*.[58].html
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "Now that you have upgraded webapp-config, you **must** update your"
-	elog "config files in /etc/vhosts/webapp-config before you emerge any"
-	elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild b/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild
deleted file mode 100644
index 7d5095bdacde..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild
+++ /dev/null
@@ -1,60 +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/webapp-config/webapp-config-1.50.19-r1.ebuild,v 1.3 2013/09/05 18:15:49 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	#parallel build fixed in next release
-	emake -j1 -C doc/
-}
-
-python_install() {
-	# According to this discussion:
-	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
-	# distutils does not provide for specifying two different script install
-	# locations. Since we only install one script here the following should
-	# be ok
-	distutils-r1_python_install --install-scripts="/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/vhosts
-	doins config/webapp-config
-
-	keepdir /usr/share/webapps
-	keepdir /var/db/webapps
-
-	dodoc AUTHORS TODO
-	doman doc/*.[58]
-	dohtml doc/*.[58].html
-}
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Now that you have upgraded webapp-config, you **must** update your"
-	elog "config files in /etc/vhosts/webapp-config before you emerge any"
-	elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.51-r1.ebuild b/app-admin/webapp-config/webapp-config-1.51-r1.ebuild
deleted file mode 100644
index ea3166982c3c..000000000000
--- a/app-admin/webapp-config/webapp-config-1.51-r1.ebuild
+++ /dev/null
@@ -1,61 +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/webapp-config/webapp-config-1.51-r1.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-indentation.patch )
-
-python_compile_all() {
-	emake -C doc/
-}
-
-python_install() {
-	# According to this discussion:
-	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
-	# distutils does not provide for specifying two different script install
-	# locations. Since we only install one script here the following should
-	# be ok
-	distutils-r1_python_install --install-scripts="/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/vhosts
-	doins config/webapp-config
-
-	keepdir /usr/share/webapps
-	keepdir /var/db/webapps
-
-	dodoc AUTHORS
-	doman doc/*.[58]
-	dohtml doc/*.[58].html
-}
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Now that you have upgraded webapp-config, you **must** update your"
-	elog "config files in /etc/vhosts/webapp-config before you emerge any"
-	elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
index 42f8a162f01e..7dde6d709ed5 100644
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.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/webapp-config/webapp-config-1.52-r1.ebuild,v 1.9 2014/08/05 21:21:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.52-r1.ebuild,v 1.10 2014/11/10 23:54:20 blueness Exp $
 
 EAPI="5"
 
@@ -18,7 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+portage"
 
-DEPEND="app-text/xmlto"
+DEPEND="app-text/xmlto
+	!dev-python/configparser"
 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 python_prepare() {
diff --git a/app-admin/webapp-config/webapp-config-1.52.ebuild b/app-admin/webapp-config/webapp-config-1.52.ebuild
deleted file mode 100644
index b324cfa10ba2..000000000000
--- a/app-admin/webapp-config/webapp-config-1.52.ebuild
+++ /dev/null
@@ -1,60 +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/webapp-config/webapp-config-1.52.ebuild,v 1.2 2013/11/30 16:27:54 jer Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-inherit distutils-r1
-
-SRC_URI="http://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	emake -C doc/
-}
-
-python_install() {
-	# According to this discussion:
-	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
-	# distutils does not provide for specifying two different script install
-	# locations. Since we only install one script here the following should
-	# be ok
-	distutils-r1_python_install --install-scripts="/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/vhosts
-	doins config/webapp-config
-
-	keepdir /usr/share/webapps
-	keepdir /var/db/webapps
-
-	dodoc AUTHORS
-	doman doc/*.[58]
-	dohtml doc/*.[58].html
-}
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Now that you have upgraded webapp-config, you **must** update your"
-	elog "config files in /etc/vhosts/webapp-config before you emerge any"
-	elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.53.ebuild b/app-admin/webapp-config/webapp-config-1.53.ebuild
index c5353a77b675..c3d3b282b986 100644
--- a/app-admin/webapp-config/webapp-config-1.53.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53.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/webapp-config/webapp-config-1.53.ebuild,v 1.3 2014/05/03 20:57:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53.ebuild,v 1.4 2014/11/10 23:54:20 blueness Exp $
 
 EAPI="5"
 
@@ -18,7 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+portage"
 
-DEPEND="app-text/xmlto"
+DEPEND="app-text/xmlto
+	!dev-python/configparser"
 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 python_compile_all() {
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 4f188fef67ee..55041ef53534 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.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/webapp-config/webapp-config-9999.ebuild,v 1.8 2014/05/03 20:57:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.9 2014/11/10 23:54:20 blueness Exp $
 
 EAPI="5"
 
@@ -25,7 +25,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+portage"
 
-DEPEND="app-text/xmlto"
+DEPEND="app-text/xmlto
+	!dev-python/configparser"
 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 python_compile_all() {