Version bump.

Package-Manager: portage-15841-svn/cvs/Linux x86_64

3 files changed, 120 insertions, 14 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index 581bc9eb1cb1..0f7be33ba60c 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.48 2010/03/29 21:53:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.49 2010/03/30 15:22:50 arfrever Exp $
+
+*viewvc-1.1.5 (30 Mar 2010)
+
+  30 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -viewvc-1.1.2.ebuild, +viewvc-1.1.5.ebuild:
+  Version bump.
 
   29 Mar 2010; Markus Meier <maekke@gentoo.org> viewvc-1.1.4.ebuild:
   amd64 stable, bug #309195
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index d080987231f6..bc8ccb6927f9 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,18 +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
+DIST viewvc-1.1.5.tar.gz 593630 RMD160 2b83c28f369d4689cbf6a8e49d803c12ce428d2c SHA1 988d7b9e13af194696db9cba5446510367720b91 SHA256 32ce717330fc780e9c2341cca800079078e9935581d4dfd526e4a15fc1d94919
 EBUILD viewvc-1.1.3.ebuild 2525 RMD160 fa3409df7f5c3f63c06f53a74b0ab14f67267428 SHA1 3a5ac43e845b5e691d3fb66eff84cbc2b33322c0 SHA256 5519b72d800ae3692b88e946ffa2577d54f9343432da6310448b7edbf23c5430
 EBUILD viewvc-1.1.4.ebuild 2559 RMD160 fcac12fdd741cec859f8c5d2bed143d38135df5f SHA1 ab41b482033d647ab48b79118654994a7362d646 SHA256 e2aedd83750c77ab20991907933081989edfb5e1020840e89e3d351db4cb9798
-MISC ChangeLog 6251 RMD160 e5a2fe35614eedb58b49bdcd30b4dc8addb83b1b SHA1 6e1a6b3d952cb2069579aa3b5c4d680e68046f69 SHA256 b72f71c944b5eb96bc8e83e378bb0055b1ab4d6dcc88250ee05197c7bdd00db6
+EBUILD viewvc-1.1.5.ebuild 2563 RMD160 557408010bfbe0e7b257819778185fb65b1f6d7a SHA1 685144cdfd92d51c2e1565e4ffeb1aa59e2f5786 SHA256 f9f51cc51d8003e50a64cc2270c18d7b9836e121690637f63cee2b2442ac9d5a
+MISC ChangeLog 6418 RMD160 c048863659e63e6cedfc1ada8e16b5f7b5b67ff7 SHA1 7f76ef936b3d8cbd9d74f4c2f55b58f73762a1e3 SHA256 e7898ef65b036b28baf5c80fecdedf63443e647e8dfdabe0fbdfb655d5d17f3e
 MISC metadata.xml 484 RMD160 5c0fa7acd5ec1eedda23ce6a0d6738064a9952ea SHA1 0359206773da56686eea748ad4ff6640f8c3b754 SHA256 6c7c15eaff5601bc1efbc9300f8f1b69be4aec6241cf167a0c93a61729e8e937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuxISwACgkQkKaRLQcq0GJGBQCdF5e0fFtTGjeJ9fIXjFwN9j6S
-ClkAoIJ3c74B/jI+NDW4Gw9Kzc/+b7G/
-=K4KU
------END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.5.ebuild b/www-apps/viewvc/viewvc-1.1.5.ebuild
new file mode 100644
index 000000000000..b500e569a2be
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.5.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.5.ebuild,v 1.1 2010/03/30 15:22:50 arfrever Exp $
+
+EAPI="3"
+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/47458/${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
+}