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

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

8 files changed, 17 insertions, 260 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/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() {