Version bump, bug #426690

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 145 insertions, 21 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index b4467738be38..2ea2a512b8ba 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.85 2012/06/07 13:12:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.86 2012/11/11 01:45:13 blueness Exp $
+
+*viewvc-1.1.17 (11 Nov 2012)
+
+  11 Nov 2012; Anthony G. Basile <blueness@gentoo.org> +viewvc-1.1.17.ebuild:
+  Version bump, bug #426690
 
   07 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -viewvc-1.1.11.ebuild,
   -viewvc-1.1.12-r1.ebuild:
@@ -331,4 +336,3 @@
   +viewvc-1.0.3.ebuild:
   Version bump from www-apps/viewcvs. Fixes bugs #107033, #108367, #110020,
   #111767, #113767, #114487, #116504, #129395, #136552, #142377, 155144.
-
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index 02bbd2b75952..ef27d1416ca8 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST viewvc-1.1.13.tar.gz 607965 RMD160 393f86e995d2f39b3252ee69d43965af26bc15ab SHA1 f26b8ea8a38f6040a88b1bba2622e2fe8c5490df SHA256 29b946a296bf59f685d892460fa0da639884dd5911ab5bce8c2afc7b2aea47a8
-EBUILD viewvc-1.1.13.ebuild 3070 RMD160 dfa0f8a368c090c0398d549c3ebbe3d6f7e7b81a SHA1 e5c49a5f7c8970ebf24d0d146ece0887917b7905 SHA256 3896a2275c7da48d9837b971e2d24a437a01ef85c5ee1823fa194e6d231673ef
-MISC ChangeLog 10975 RMD160 9e2da1eec23b28091d250c1526d5c6ae97198fb4 SHA1 df1538e469d5446de58150f185cd47759053eb07 SHA256 990d5e4e1052cd622e6d23f0575643d34b2387108cc32c4072fcbb0767522647
-MISC metadata.xml 548 RMD160 ee15901cda630ea71795e4309b5bb1572758ae5d SHA1 8c80d2999238cc039d7fc3804fdb77dbdc3a56a9 SHA256 6a19b8afa2e811ee5e525127ef3a562e7085167e43df792ba171772516b44540
+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 3072 SHA256 63cdc3653f19cf31a936913c909179b26fb08272acfd1b77d1a0fd6ef8acd967 SHA512 70824bd8e9623cb45c8835b95f390f396f1e18f07e6fc40e48e48ee8c5ff28d6ff3e36e5a79900f7c4ee92eba098a9de0ddb11e9101807b333b007d6e3cea213 WHIRLPOOL 92a4ae22e352c9577c238702e3277e58f180eb651356d4cde26237c5fd54b4a2bb34ba6a55d565e5895b3f5ded4e1795bdae226ce0eb1274a541e73eeaee8b55
+MISC ChangeLog 11110 SHA256 2ab9cbc90d03d103136dc4b7965786c855376d1c135af65ceb03a1e6556fe832 SHA512 114867bc8349c0a1df8b31d789ac648d97cd4de0b4f739c87dee69b69f0631b8c6080e44c1d0ff68db6ce9e2d51c846eeca823f98063449d1fc45e94e923ec42 WHIRLPOOL bf22df5128ccb5adcfb0ebc8dc51da299901580e5228a30f1b1c205c0d994802f1a76c744c8e2ae65ed545fd53c4ba0c7660a271c678a63b864d3987b349a005
+MISC metadata.xml 548 SHA256 6a19b8afa2e811ee5e525127ef3a562e7085167e43df792ba171772516b44540 SHA512 5c85c6949a74d40d927611ce54cb59bf862e275fdf8b6df8ee110a5b7a51a9154f32197f3d37a58d32e0450cdea4baadf0c615703683612d25bd1387fcc90743 WHIRLPOOL 1ce8f03ff5fefbf77b9ab60214d71903cb9569e810d3a5d2065abe83a76a4e2dcbbc67140c6d262996826d9c48f1bdcbf02b64cd9d49a90897b43a4c1670917a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP0KjvAAoJEOSiRoyO7jvoAEIP+gKr6Lq42EUbgIdAbl8dXG6R
-eKXgZ1qNZ8/E6fFEJg67A21CWgkmDYD/Ir0rnDe5MOnbmO++DKIg7H86uESJQiiv
-i2BU3l1RrC4sNrUXZ8s35OSMx6ObTwucmbup74Bjj5Mbmbo9fdbg9JR5QSZsqW3E
-WZ2Vf9AH3EYw9BRZDyn4th8JJ9bpVS4X6rknwvEdGYo5nNz7/2sFCGjxSBfY9NKV
-+5ftFd32B1n6sAq2OisyLa8KmYUkeiSXf4Nu7Q/seEOVx9fsiTfP2wZTeZQYQuHa
-vkeslnD328c+x865ck/n3AbGVVHAoI6zmG4dMKee5ktvePECCSgrr2dIBrZUCUAy
-k2XOKWmCYr6u9dx+548zWn4FxRzmfKlwwod/9lEH3H42hSKPgE6Z7n2qnKdyDAoj
-HKxvQNCzHnZSaPr7qIXVqkCglkco9onhcYdWjlddcxBXLJd4laF6cWcq9CioWxYb
-BdkUwbShm+INTRVlQnDBnFbDys2sX/MsDBOijW019cDQNfbyLwra+FmJogZDwgQX
-/rbYQCcHM2rDtkMCgCxBpOE/biNs/afPtHfkH6wJKL3zMYcvg4bNIn+MdvkbEMT6
-4ccEte5+UY8oB19JlP2vyRxKSsJDZ8yO2imYQMxPCs2xlKnYGbseKseqK+1e9X8z
-wkrb8Zq6HBDymULCcyAT
-=bO+Q
+iQIcBAEBCAAGBQJQnwMuAAoJEJOE+m71LUu6EyUP/06OV/lrgiqjncyyvtNGNL5e
+B1ZAAWhPy5eYeWAyyCSrjVMGmCPMahHWmuJb2m0ca/FMPnl1qWrknLhcO8iQPslB
+fFtv8QCWKFRIAXgeJvNQ9fHgXZUTMRULhEwLmp4cMdJklFH0g1hndLWZFSSmKqHS
+8/Yqaj/SfxHzHn87tMsnFOuOoaEQpl+gjj7y2OdJrzJYDb4r1bqTI7z6B4qfPjzH
+biKU6wcNG/nWoSVQXjk920Kym/K8g0F3RpcZQFwIFDz1DjG8dTL8DoMXo2sw+i+q
+/KYnWgKC2cMvqpZ2IVbNJ9KORpi6mPPUr0DQYNCyVuDMYqZ7FgasqiwJ0bsC9kgR
+mO95ZkznryYM8juKtTUa1VIo5sE6Z6vlTxI+d3BH8Nd+xZbG6+cTRLo7BUO6dy8H
+gRV5VRyImTw6aohhduk5g5WrwaIo+QuemVwf5GH4GOWj7yHdyiYj8Kpiuwq9MMF0
+hrbMD1QlJLf2RGArQY3YJ6BKKDA5dyVSYjcMh37qs/1y5BYwalBwmbEOGZg1bVbt
+idDtada+LuhIEtBJXMGmO3G+p4pqJMT5KVHrK41r5gUI6BFhOsqrs0sbqZoyjHOd
+moF9/qPAIWavkK7Z1aiO/mIqAmCXvQqJBMsO+GDaQnOKJqV7v2y7ilHObC+MzQIY
+ZPSGef32irKLe9Gs56Qr
+=26vI
 -----END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.17.ebuild b/www-apps/viewvc/viewvc-1.1.17.ebuild
new file mode 100644
index 000000000000..9a2ac8d20394
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.17.ebuild
@@ -0,0 +1,118 @@
+# 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.1 2012/11/11 01:45:13 blueness 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="49243"
+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
+}