3 files changed, 120 insertions, 12 deletions
diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index abceb080f1aa..20362c2510b3 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/viewvc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.45 2010/03/05 07:34:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.46 2010/03/24 16:04:21 darkside Exp $
+
+*viewvc-1.1.4 (24 Mar 2010)
+
+  24 Mar 2010; Jeremy Olexa <darkside@gentoo.org> +viewvc-1.1.4.ebuild:
+  Version bump for bug 309195, fixes possible XSS security attack and now
+  installs templates-contrib as well
 
   05 Mar 2010; Ulrich Mueller <ulm@gentoo.org> viewvc-1.1.2.ebuild,
   viewvc-1.1.3.ebuild:
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index 36914bf27bf3..419a09628bfe 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST viewvc-1.1.2.tar.gz 588066 RMD160 4edefe7ccf3feb0c21a133d794a93e788c8f2e21 SHA1 e4a112bf901adb29015ffb2047acd09b3b029bf4 SHA256 129a5b2b29cc720c089dd671c2ba9e7adaf6541a976de03aabaf0850b7100931
 DIST viewvc-1.1.3.tar.gz 593173 RMD160 ce20074f5a01d0bfd3223f12ccb4e9c824bb2d30 SHA1 0be1f4ccf3e831c86352e2ded6c5c48ae9af217a SHA256 d1a1d0602198fd0f38379c7c0e647532e8f8a1d267236d293227c125f39a001f
+DIST viewvc-1.1.4.tar.gz 593549 RMD160 60ed3ee6d3e621d3bb8f1d8be9ea04442e0c361a SHA1 b6c9731e11f76d0eba51e9a863f034fb4fb06fc8 SHA256 2aa36028e484f6419aa8f1a7bc161d88bcfc89e46ea4eef6d8294e52e69311b2
 EBUILD viewvc-1.1.2.ebuild 2549 RMD160 938a099eecf9a5c40109dc7904e2a78aa3b5faa1 SHA1 56e6073d36478f2ac1d9c917107bf3c93a0539f6 SHA256 ee93d33ce9e01c4dae4a5355907cf5054838bd3cefcb7fc5ea08667b2125163c
 EBUILD viewvc-1.1.3.ebuild 2525 RMD160 fa3409df7f5c3f63c06f53a74b0ab14f67267428 SHA1 3a5ac43e845b5e691d3fb66eff84cbc2b33322c0 SHA256 5519b72d800ae3692b88e946ffa2577d54f9343432da6310448b7edbf23c5430
-MISC ChangeLog 5826 RMD160 7885f787bb9e75aeb4cc860011932ffb9226ff8e SHA1 3625f6218d62327a0918f8866043797afe2049c1 SHA256 7041a656a677f5dc24cf7bc641c714b9c9de6c01c5e3cf076001deacd2c5278d
+EBUILD viewvc-1.1.4.ebuild 2563 RMD160 b683485e06725dbfa010d3dea412d628bade37e5 SHA1 225eec68177aa2d13032159bd7953548c46e2b4e SHA256 be7ba471469af2a3b0cf60b1a65fc331914189342209667ec8be452999e9e69c
+MISC ChangeLog 6044 RMD160 09f686eae2a52dea3b201d9a6aa9fb64c15ef864 SHA1 d73c782820ae65dd9b52f183410c15104f92f33d SHA256 56b71a24ea9a2a6b349325724d8438e29697646de395423191856feb671142dc
 MISC metadata.xml 484 RMD160 5c0fa7acd5ec1eedda23ce6a0d6738064a9952ea SHA1 0359206773da56686eea748ad4ff6640f8c3b754 SHA256 6c7c15eaff5601bc1efbc9300f8f1b69be4aec6241cf167a0c93a61729e8e937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkuQtBcACgkQOeoy/oIi7uyqSACgggEC0lNdd1gNkrixu2/ezIIp
-T18AoL8OIDfYzqWAZrA1BEEeasY0hfE6
-=ul34
------END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.4.ebuild b/www-apps/viewvc/viewvc-1.1.4.ebuild
new file mode 100644
index 000000000000..635b8b575287
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.4.ebuild
@@ -0,0 +1,110 @@
+# 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.4.ebuild,v 1.1 2010/03/24 16:04:21 darkside Exp $
+
+EAPI="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/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/47426/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cvs cvsgraph mod_python mysql pygments +subversion"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="
+	cvs? (
+		>=dev-lang/python-1.5.2
+		dev-vcs/rcs
+	)
+
+	subversion? (
+		>=dev-lang/python-2.0
+		>=dev-util/subversion-1.3.1[python]
+	)
+
+	mod_python? ( www-apache/mod_python )
+	!mod_python? ( virtual/httpd-cgi )
+
+	cvsgraph? ( >=dev-util/cvsgraph-1.5.0 )
+	mysql? ( >=dev-python/mysql-python-0.9.0 )
+	pygments? ( dev-python/pygments )
+"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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,}
+}
+
+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() {
+	webapp_pkg_postinst
+	python_mod_optimize viewvc
+	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup viewvc
+}