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

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 18 insertions, 146 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/Manifest b/www-apps/viewvc/Manifest
index 20ce0dbf198b..22e05cd3ad39 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST viewvc-1.1.13.tar.gz 607965 SHA256 29b946a296bf59f685d892460fa0da639884dd5911ab5bce8c2afc7b2aea47a8
 DIST viewvc-1.1.17.tar.gz 611890 SHA256 3fec2c56bdea6529870e544e3e87fe4e0e1d4eafa42a468723ef2a35eaa607a6 SHA512 f8fdc7aea638d54a9bb7b336404b20df5d83cdce866b446ec418a2557be6470584bbf4a90031a5d5521328b1f7bd17e087060edd62c849c0a886a89081b35df9 WHIRLPOOL 91df84ca4be369107f3790c0f091a1fdd96efd452a46bc4ba1bc97265db18b913af674fa507902309a8e3031be26d04ec59d4363afefc582cfa6b11936a92666
-EBUILD viewvc-1.1.13.ebuild 3070 SHA256 3896a2275c7da48d9837b971e2d24a437a01ef85c5ee1823fa194e6d231673ef SHA512 ddc5a208e992dbce4c01e414f33efa9a561eccc29a7ceecd149dc3bc96cc5397f2c651f2e00aa308818f0faa495794652cfb544533b3e3f6169dab26437016a9 WHIRLPOOL 05320c5e9c4da3e29dfd94cd6b2b4cefe270daa7a9977288a2f2ba4adf17531de4b62399f3a8b1f824b1ce6ed1d321490b18aa649082c56dfd124c88a169c202
-EBUILD viewvc-1.1.17.ebuild 3071 SHA256 0598cc8c0f8d9a20fb71f23f0903b7b3f8a9b5e652c0b0b8cae2f8eb4ffd88be SHA512 00525b6d061b6e236dd43003eb34937a61b5965de037f5838ab91011de55b346e87bc87e074824792944db89d894c0c222b27b9f215f653952b1a88a4c0f0219 WHIRLPOOL 5f09584e8cf8e9d39fdd705a679831dd1c2860f8c09e91ee920f11b5f5d3c7642285eb528ad157944abe1ed400dc3e4add6dc87dc361e08ef017099065e2c4fe
-MISC ChangeLog 11309 SHA256 f7a30421243d4c5b21f97cc27a8008d7dac48f8f087102a5a056f45e642b55c0 SHA512 c24916e6fa4f59006d9a35325b035bd09bd4a2ec5a285d31da5b2635285bd288e9a735007370eb4b30e108bb45cf565b9d36a24a3536cb5d439b969f2d5adb12 WHIRLPOOL d48f7c6e0c6785cc305edece93f7db8d64ecc0c5b47d48946e125c477ceeabab6f16b7f64d770a831ab0bf8062f20920296536a810b180aef240806244135a83
-MISC metadata.xml 548 SHA256 6a19b8afa2e811ee5e525127ef3a562e7085167e43df792ba171772516b44540 SHA512 5c85c6949a74d40d927611ce54cb59bf862e275fdf8b6df8ee110a5b7a51a9154f32197f3d37a58d32e0450cdea4baadf0c615703683612d25bd1387fcc90743 WHIRLPOOL 1ce8f03ff5fefbf77b9ab60214d71903cb9569e810d3a5d2065abe83a76a4e2dcbbc67140c6d262996826d9c48f1bdcbf02b64cd9d49a90897b43a4c1670917a
+EBUILD viewvc-1.1.17.ebuild 2685 SHA256 dbe2391da74201783811f1f2bca92bb8abc6397c86531562a6df6cdcca2409ef SHA512 abb01cb66e413d47786b836f6fc74355fe788a4ae19b152bceecf15cac2eebcfb5c596c469042eff01028a75e467149ce4a2fa431e3e393c453d8bf6c787c697 WHIRLPOOL c571035d1a71b626bc7bd391e658cdfbe771363b6b215bdcd9022456889eae612c249d68a295b594eeacede67ff0d0ad058076cfb4e21f25230f57b62ce612c3
+MISC ChangeLog 11481 SHA256 02187cbef980690c8cb4fa894c59d6bf3821cf9f90f396822b8b9b7116ca2dcf SHA512 b6b2bcb6095cc66cef56fe2fa828a9d25de4d021f9d8f9ab6d78e3ff453230e7889f08daf33a36e29f013d1087f52a8f0da061fccd7dc0d99c816a9633c4be3c WHIRLPOOL 6a77263dd7e423b1e1a61d29269899d6754f7388ee8351e3e964085ebc6f74a49832ceaaf8d271bc40928c7463c53515c436f166d1be454a955ad06b8f331d20
+MISC metadata.xml 470 SHA256 3eae9a7016c60861699f996a9f4e1ae2e68bae5d3b79594a10034a22c8b7b2d4 SHA512 745a6b1480616cb53d5ea9b6535e058e459853828376fdfdcaf16dbeab4e7ecee9ba4608f317fe628588a7be9567e0bbcc5b457d4b306a3180c9f18db0b6f04d WHIRLPOOL dc6c6fb6671d884582d1d56ab948c5970566e57f86e8d9c91bfeb25d4ec94597289abf750d54bbdf9c2b32ef33f1e856783ccdc34bb3a889c640af6ed8c117fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlChsxMACgkQakKUmsHeVLJ7rgCeJQmZzpEZkNxvqdjymDx6WEVz
-IT4An2CzyVxjDUSmDJM30nXdgndChkt5
-=nwmQ
+iEYEAREIAAYFAlDZuU0ACgkQCaWpQKGI+9SbZQCfXH6qGgdfdJeqIvmgUPeV4vCz
+B1AAni2V4CI+QhlYqmdMqNHpy4mZJyGL
+=5IQZ
 -----END PGP SIGNATURE-----
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