3 files changed, 20 insertions, 232 deletions
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index ca17171ad583..385a783a5a74 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,12 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST viewvc-1.1.10.tar.gz 602017 RMD160 952af185260d17ff10c5e38b2d29d0ed59d7c8b7 SHA1 e3f2653144580200e697a7772ae75e29d501fdf3 SHA256 cca496abd2115630cae4a0d1973836c15e0cbc5683e45cd1d4e32b3cb850a1dd
-DIST viewvc-1.1.6.tar.gz 595029 RMD160 791c0f6220fb4c3c34fc309f3130967508be4189 SHA1 1aaae735bca316833d041473236baf680b39d864 SHA256 857a2685740ba2793753cccd1ce96ddeb7249692c0d0843d0f59e32423fbfd0c
-DIST viewvc-1.1.7.tar.gz 598771 RMD160 547a11ae1296d714bc10731c51166585df1af6c5 SHA1 f49b6e3de990b97877d7da379a0aa6b4e05aa8eb SHA256 b5a8a7716a30f0a658db95358633c24a123ee95261191db7448541686ba9cb51
 DIST viewvc-1.1.8.tar.gz 599340 RMD160 9737e689dc87e43153e7442e5eef303163dc83dc SHA1 f9ffb4b84752368e9065d1e7dfb7bcd3d56d950a SHA256 645ab1a17b1427683bf8c76cdc624bfad7a93cf718cfdcba679874d49838b983
 DIST viewvc-1.1.9.tar.gz 601216 RMD160 3ee385b72fb8c865776c239d116b7fdf72c74541 SHA1 c0e9f22c97c47aef548daa152f269b74f6e8e9ed SHA256 886e55852d8ddeeeb92cbd8feffde7c5abc8bd70d82aff9ab2398d30f9afea34
 EBUILD viewvc-1.1.10.ebuild 3000 RMD160 e1d22b006f98250100ab1de4f13e954a62a8c8ea SHA1 e7dce31a875abdecfd8ba683e94ee5d38afd1b9e SHA256 375bbaa1c4655ed503c24d341edc708ed5b923eabe505a1c8969a04393929132
-EBUILD viewvc-1.1.6.ebuild 2671 RMD160 fac4990872aed76846161eb8d9aaa2f025b9149b SHA1 446d51ef4f44de0a0bbf3ab1062c8aaebbe44801 SHA256 2e8b277773fbc348f66de1c20695798e2c373911fe393375a4191c8e76853d50
-EBUILD viewvc-1.1.7.ebuild 2672 RMD160 39865c042c2af9f86fdbf5fc40ae548fabc3ac6e SHA1 91775d9b6cd73d10d9199451a00bbf8934389c21 SHA256 10a414af4550a50c57af4ec3d152b383250d405acdb93b32d11eade4b7e1516d
 EBUILD viewvc-1.1.8.ebuild 2681 RMD160 6e2f58956e2c56189c823b781ff03ae4dbdca0fa SHA1 84bdfb552a421cde70d087d8ffb0fb558e6fd535 SHA256 0d03adf9119295a7aa4e6e480228b4dda5f9424f9ec9eaa7da5bf6bba6871f18
 EBUILD viewvc-1.1.9.ebuild 2999 RMD160 f4567df3df134bffd110fb740f8d2579d1ce4010 SHA1 3ca76e3f57462b58cf2864a7c44aee9316846eb8 SHA256 0a4405c330a9da4007dfd4f1f00f1971cbb5c797d2f1ad47cf8634c704fd7b5b
 MISC ChangeLog 9181 RMD160 7d48a8a35cd519d2d8d2eb731c4c1a4b84c4d29e SHA1 5956b475507960e0dde0e03debcc61de99e3ac30 SHA256 f3805d6bb3c329f95a50d138e26328893aa191c2a9aef51db304bf49428594d6
 MISC metadata.xml 548 RMD160 ee15901cda630ea71795e4309b5bb1572758ae5d SHA1 8c80d2999238cc039d7fc3804fdb77dbdc3a56a9 SHA256 6a19b8afa2e811ee5e525127ef3a562e7085167e43df792ba171772516b44540
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNtfazAAoJENgZr6v6gHY02QUQAJe39AxwxnqFt6Ih9+cm3GLa
+kSWYEi918Dq2R8I2WXfkxvRe8ddaqHc77WIxTSRFwkfPUYIx3rt6RfDHB3lZ+M/P
+Q9F5YzYzfgGrwl04fybHhrYazu9yu3FAA3kQVHU0A0OH0bgQdOoyvoynDn2sofjo
+YAznmQTMCv8ffNatAK76kQr2orTupYzrZrS7NH4W0qto5b99WJzWHNh4xAhqRzB1
+6NEBA7YCNW9Pb/k7oJldHDzjPoA/dx7R100zlFVxgOzr5ZvtdfVMeIMtvQrCp5T7
+rf4h/vtTtrO/jDvJMblZheBvHqtDN8o270onHPBaPq1563OwDZLwagg03LjnLEZe
+YbakIf5ArXPpdDO8/ocGZE7HmGaBtigYRwXsdGvWwJYgWOPLCgP4W6Q5ZRBE8Sh7
++T2pm+QE2p62R/JSfMYuhc7zl9LrnchhVKRjeMfyKY0P57BfCi7ym4MN6uEle3QB
+e/7fpniDUOuC+7aOqw7p+ZJoD2GvY1HNtCJzs1v8Qyq3H8FI8FcBIggoNlYBe54m
+5OqvMStdIc2eqoaENW0wncnhsL2tTQANpL3ahy39hJ1Xgab+mw3P998UlQ7WTfu8
++6eM7bxspAhaSrFa4z2xKUhSjFW7Uu2dtJSUXF/W1dqjT2+P6Jpagr7/NhBfi2va
+Hqa+BxIPOcGjTpr4De05
+=V7UE
+-----END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.6.ebuild b/www-apps/viewvc/viewvc-1.1.6.ebuild
deleted file mode 100644
index f861c3decb54..000000000000
--- a/www-apps/viewvc/viewvc-1.1.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.6.ebuild,v 1.10 2010/07/18 14:14:10 nixnut Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit confutils eutils python webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-DOWNLOAD_NUMBER="47623"
-SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="cvs cvsgraph mod_python mod_wsgi mysql pygments +subversion"
-SLOT="0"
-
-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 )
-"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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
-	mv conf/viewvc.conf{.dist,}
-	mv conf/cvsgraph.conf{.dist,}
-	mv conf/mimetypes.conf{.dist,}
-
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGES COMMITTERS INSTALL README
-
-	installation() {
-		insinto "$(python_get_sitedir)/${PN}"
-		doins -r lib/*
-	}
-	python_execute_function installation
-
-	insinto "${MY_APPDIR}"
-	doins -r templates/
-	doins -r templates-contrib/
-
-	if use mysql; then
-		exeinto "${MY_HOSTROOTDIR}/bin"
-		doexe bin/{*dbadmin,make-database,loginfo-handler}
-	fi
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins conf/{viewvc,cvsgraph,mimetypes}.conf
-
-	if use mod_python; then
-		insinto "${MY_HTDOCSDIR}"
-		doins bin/mod_python/viewvc.py
-		doins bin/mod_python/handler.py
-		doins bin/mod_python/.htaccess
-		use mysql && doins bin/mod_python/query.py
-	else
-		exeinto "${MY_CGIBINDIR}"
-		doexe bin/cgi/viewvc.cgi
-		use mysql && doexe bin/cgi/query.cgi
-	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.7.ebuild b/www-apps/viewvc/viewvc-1.1.7.ebuild
deleted file mode 100644
index 42bc26493e7e..000000000000
--- a/www-apps/viewvc/viewvc-1.1.7.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.7.ebuild,v 1.4 2010/10/31 17:38:51 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit confutils eutils python webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-DOWNLOAD_NUMBER="48158"
-SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc 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 )
-"
-
-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
-	mv conf/viewvc.conf{.dist,}
-	mv conf/cvsgraph.conf{.dist,}
-	mv conf/mimetypes.conf{.dist,}
-
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGES COMMITTERS INSTALL README
-
-	installation() {
-		insinto "$(python_get_sitedir)/${PN}"
-		doins -r lib/*
-	}
-	python_execute_function installation
-
-	insinto "${MY_APPDIR}"
-	doins -r templates/
-	doins -r templates-contrib/
-
-	if use mysql; then
-		exeinto "${MY_HOSTROOTDIR}/bin"
-		doexe bin/{*dbadmin,make-database,loginfo-handler}
-	fi
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins conf/{viewvc,cvsgraph,mimetypes}.conf
-
-	if use mod_python; then
-		insinto "${MY_HTDOCSDIR}"
-		doins bin/mod_python/viewvc.py
-		doins bin/mod_python/handler.py
-		doins bin/mod_python/.htaccess
-		use mysql && doins bin/mod_python/query.py
-	else
-		exeinto "${MY_CGIBINDIR}"
-		doexe bin/cgi/viewvc.cgi
-		use mysql && doexe bin/cgi/query.cgi
-	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
-}