Version bump.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 121 insertions, 16 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index a947234938ec..3f52508db19e 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.53 2010/04/15 20:47:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.54 2010/06/03 20:46:34 arfrever Exp $
+
+*viewvc-1.1.6 (03 Jun 2010)
+
+  03 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -viewvc-1.1.3.ebuild, -viewvc-1.1.4.ebuild, +viewvc-1.1.6.ebuild:
+  Version bump.
 
   15 Apr 2010; Markus Meier <maekke@gentoo.org> viewvc-1.1.5.ebuild:
   amd64 stable, bug #312165
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index eece0b0a2bdf..608d44d3322f 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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
 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
+DIST viewvc-1.1.6.tar.gz 595029 RMD160 791c0f6220fb4c3c34fc309f3130967508be4189 SHA1 1aaae735bca316833d041473236baf680b39d864 SHA256 857a2685740ba2793753cccd1ce96ddeb7249692c0d0843d0f59e32423fbfd0c
 EBUILD viewvc-1.1.5.ebuild 2557 RMD160 3e1c0bd5cfc8a8487931ddfb17bf35156ce4a98c SHA1 53c6e3f4b46aaa6ee1c76313744fb8e88bd02f13 SHA256 39c0a7972d9c65e7b18553ad07194e5437273a1c143227648615661b0c03b8c2
-MISC ChangeLog 6841 RMD160 b7c2cf5f59b6f6920971892288d1c64812696047 SHA1 b98152f5271f19734a5d71cac0163078a4336faa SHA256 17bac2da512936438143da8a1b4f911b7be2593895afa3218dfb2877710ad6db
+EBUILD viewvc-1.1.6.ebuild 2586 RMD160 740549eb4cf4071f352ecb09edc4093becadb054 SHA1 15e41d75ce18f9f2f20e97379dec7592d75ce667 SHA256 af0a2ee90938aec58f9236bc0b0952ac2b0e9b152f0e20aac7734ef9589bfcd9
+MISC ChangeLog 7030 RMD160 791caab481e1369377edee4bba5176e5b719dcbe SHA1 8a6d9822f9a4d307efa59dff358d43f0cae87aa5 SHA256 ef5d2f50fb69ca090704951ec28d57ee7638f4da56d3347a04bcb79390adf87d
 MISC metadata.xml 484 RMD160 5c0fa7acd5ec1eedda23ce6a0d6738064a9952ea SHA1 0359206773da56686eea748ad4ff6640f8c3b754 SHA256 6c7c15eaff5601bc1efbc9300f8f1b69be4aec6241cf167a0c93a61729e8e937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvHexcACgkQkKaRLQcq0GJuMQCeOcYSKX3q5Zi/WdhOHp/DybjU
-1HcAoK5vevwCUCQTVF5jWzS0VERe7I+6
-=geaQ
------END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.6.ebuild b/www-apps/viewvc/viewvc-1.1.6.ebuild
new file mode 100644
index 000000000000..8c687d110970
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.6.ebuild
@@ -0,0 +1,111 @@
+# 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.1 2010/06/03 20:46:34 arfrever 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 mysql pygments +subversion"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="
+	cvs? (
+		dev-vcs/rcs
+	)
+
+	subversion? (
+		>=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() {
+	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,}
+}
+
+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
+}