Drop mod_python support due its treecleaning (#343663), drop old.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 12 insertions, 138 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index b92ecfa0f032..311ba43d150e 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/viewvc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.88 2012/11/12 18:46:50 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.89 2012/12/25 14:33:47 pacho Exp $
+
+  25 Dec 2012; Pacho Ramos <pacho@gentoo.org> -viewvc-1.1.13.ebuild,
+  metadata.xml, viewvc-1.1.17.ebuild:
+  Drop mod_python support due its treecleaning (#343663), drop old.
 
   13 Nov 2012; Andreas Schuerch <nativemad@gentoo.org> viewvc-1.1.17.ebuild:
   x86 stable, see bug 440774
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
index e119196be6c7..15664488ccee 100644
--- a/www-apps/viewvc/metadata.xml
+++ b/www-apps/viewvc/metadata.xml
@@ -4,7 +4,6 @@
 	<herd>web-apps</herd>
 	<use>
 		<flag name="cvsgraph">Add <pkg>dev-vcs/cvsgraph</pkg> support to show graphical views of revisions and branches</flag>
-		<flag name="mod_python">Add <pkg>www-apache/mod_python</pkg> support</flag>
 		<flag name="mod_wsgi">Add <pkg>www-apache/mod_wsgi</pkg> support</flag>
 		<flag name="pygments">Add <pkg>dev-python/pygments</pkg> support for syntax highlighting</flag>
 	</use>
diff --git a/www-apps/viewvc/viewvc-1.1.13.ebuild b/www-apps/viewvc/viewvc-1.1.13.ebuild
deleted file mode 100644
index b912294dc067..000000000000
--- a/www-apps/viewvc/viewvc-1.1.13.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.13.ebuild,v 1.2 2012/05/21 21:34:16 darkside Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit confutils eutils python webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-DOWNLOAD_NUMBER="49161"
-SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cvs cvsgraph mod_python mod_wsgi mysql pygments +subversion"
-
-DEPEND=""
-RDEPEND="
-	cvs? ( dev-vcs/rcs )
-	subversion? ( >=dev-vcs/subversion-1.3.1[python] )
-
-	mod_python? ( www-apache/mod_python )
-	mod_wsgi? ( www-apache/mod_wsgi )
-	!mod_python? ( !mod_wsgi? ( virtual/httpd-cgi ) )
-
-	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
-	mysql? ( >=dev-python/mysql-python-0.9.0 )
-	pygments? (
-		dev-python/pygments
-		app-misc/mime-types
-	)
-"
-
-pkg_setup() {
-	python_pkg_setup
-	webapp_pkg_setup
-
-	confutils_require_any cvs subversion
-}
-
-src_prepare() {
-	find bin/ -type f -print0 | xargs -0 sed -i \
-		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \
-		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
-
-	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
-		lib/config.py
-
-	sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist
-	sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist
-	mv conf/viewvc.conf{.dist,}
-	mv conf/cvsgraph.conf{.dist,}
-
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	webapp_src_preinst
-
-	newbin bin/standalone.py viewvc-standalone-server || die "newbin failed"
-
-	dodoc CHANGES COMMITTERS INSTALL README || die "dodoc failed"
-
-	installation() {
-		insinto $(python_get_sitedir)/${PN}
-		doins -r lib/*
-	}
-	python_execute_function installation
-
-	insinto "${MY_APPDIR}"
-	doins -r templates/ || die "doins failed"
-	doins -r templates-contrib/ || die "doins failed"
-
-	if use mysql; then
-		exeinto "${MY_HOSTROOTDIR}/bin"
-		doexe bin/{*dbadmin,make-database,loginfo-handler} || die "doexe failed"
-	fi
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins conf/{viewvc,cvsgraph}.conf
-
-	if use mod_python; then
-		insinto "${MY_HTDOCSDIR}"
-		doins bin/mod_python/viewvc.py || die "doins failed"
-		doins bin/mod_python/handler.py || die "doins failed"
-		doins bin/mod_python/.htaccess || die "doins failed"
-		if use mysql; then
-			doins bin/mod_python/query.py || die "doins failed"
-		fi
-	else
-		exeinto "${MY_CGIBINDIR}"
-		doexe bin/cgi/viewvc.cgi || die "doexe failed"
-		if use mysql; then
-			doexe bin/cgi/query.cgi || die "doexe failed"
-		fi
-	fi
-
-	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	python_mod_optimize viewvc
-	webapp_pkg_postinst
-	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup viewvc
-}
diff --git a/www-apps/viewvc/viewvc-1.1.17.ebuild b/www-apps/viewvc/viewvc-1.1.17.ebuild
index d6dd32d2427c..d69009a7d1c4 100644
--- a/www-apps/viewvc/viewvc-1.1.17.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.17.ebuild,v 1.3 2012/11/12 18:46:50 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.17.ebuild,v 1.4 2012/12/25 14:33:47 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,16 +19,15 @@ SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.t
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="cvs cvsgraph mod_python mod_wsgi mysql pygments +subversion"
+IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
 
 DEPEND=""
 RDEPEND="
 	cvs? ( dev-vcs/rcs )
 	subversion? ( >=dev-vcs/subversion-1.3.1[python] )
 
-	mod_python? ( www-apache/mod_python )
 	mod_wsgi? ( www-apache/mod_wsgi )
-	!mod_python? ( !mod_wsgi? ( virtual/httpd-cgi ) )
+	!mod_wsgi? ( virtual/httpd-cgi )
 
 	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
 	mysql? ( >=dev-python/mysql-python-0.9.0 )
@@ -86,20 +85,10 @@ src_install() {
 	insinto "${MY_HOSTROOTDIR}/conf"
 	doins conf/{viewvc,cvsgraph}.conf
 
-	if use mod_python; then
-		insinto "${MY_HTDOCSDIR}"
-		doins bin/mod_python/viewvc.py || die "doins failed"
-		doins bin/mod_python/handler.py || die "doins failed"
-		doins bin/mod_python/.htaccess || die "doins failed"
-		if use mysql; then
-			doins bin/mod_python/query.py || die "doins failed"
-		fi
-	else
-		exeinto "${MY_CGIBINDIR}"
-		doexe bin/cgi/viewvc.cgi || die "doexe failed"
-		if use mysql; then
-			doexe bin/cgi/query.cgi || die "doexe failed"
-		fi
+	exeinto "${MY_CGIBINDIR}"
+	doexe bin/cgi/viewvc.cgi || die "doexe failed"
+	if use mysql; then
+		doexe bin/cgi/query.cgi || die "doexe failed"
 	fi
 
 	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf