Version bump, fixes #179612, #175618, #175840.

Package-Manager: portage-2.1.2.8

4 files changed, 131 insertions, 9 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index 80f95faeceb9..e47f15f1a2a0 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/viewvc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.6 2007/05/24 12:54:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.7 2007/05/26 22:14:36 rl03 Exp $
+
+*viewvc-1.0.4 (26 May 2007)
+
+  26 May 2007; Renat Lumpau <rl03@gentoo.org> +viewvc-1.0.4.ebuild:
+  Version bump, fixes #179612, #175618, #175840.
 
   24 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> viewvc-1.0.3.ebuild:
   Keyworded ~sparc wrt #129395
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index 1a8d61cbb4a3..d3cf5ba8de17 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST viewvc-1.0.3.tar.gz 406570 RMD160 2e36a2f1228b0648ac003c75469a1bce56e024f3 SHA1 4523be70f3cf743991201b82f93fcd7f9799b955 SHA256 20cf5a8c5e46a147f4b484934f5f254d9acf74f149a4dc6326d0040527513ead
+DIST viewvc-1.0.4.tar.gz 383491 RMD160 2f08d6697d69bbdf0d6660be0000d1a1aef76faa SHA1 6946266c8d7392f8c8b7b890723c23d57926891f SHA256 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f
 EBUILD viewvc-1.0.3.ebuild 2781 RMD160 fea980e52969564322ac49120d8ab495a4fcb3cb SHA1 4073f15e297741cda01cba6b3c364998f10faa66 SHA256 10dd998a89d3026d37144c8c6183a39b75dd1d6660038430466123dbddccdfe3
 MD5 690ae87a02349c136ff1ba46e1d77108 viewvc-1.0.3.ebuild 2781
 RMD160 fea980e52969564322ac49120d8ab495a4fcb3cb viewvc-1.0.3.ebuild 2781
 SHA256 10dd998a89d3026d37144c8c6183a39b75dd1d6660038430466123dbddccdfe3 viewvc-1.0.3.ebuild 2781
-MISC ChangeLog 965 RMD160 4b2faea9211a7712b252f3d0e07503ca4b09a1d0 SHA1 86c32ddfd856109f7a4c773945ccaa51a4a98d42 SHA256 49aa97d17a6b5420cf610f06779ca1dcf887069a6ad24789d304c408894f95ad
-MD5 5dab4035d8dd940554920537d7971023 ChangeLog 965
-RMD160 4b2faea9211a7712b252f3d0e07503ca4b09a1d0 ChangeLog 965
-SHA256 49aa97d17a6b5420cf610f06779ca1dcf887069a6ad24789d304c408894f95ad ChangeLog 965
+EBUILD viewvc-1.0.4.ebuild 2828 RMD160 ffa68a39c93f6ae6df4ec040bcc5e83ce9066fd4 SHA1 865eaaa482798ae03759bb1d509215e7d4acd085 SHA256 5a423eb2f688630e2374a137adcfa47644cd369f96542187dd7390b6144847d6
+MD5 fc0944f285e13a3139306343bde76c8b viewvc-1.0.4.ebuild 2828
+RMD160 ffa68a39c93f6ae6df4ec040bcc5e83ce9066fd4 viewvc-1.0.4.ebuild 2828
+SHA256 5a423eb2f688630e2374a137adcfa47644cd369f96542187dd7390b6144847d6 viewvc-1.0.4.ebuild 2828
+MISC ChangeLog 1108 RMD160 62aa1e8477e1cabaaac4a7ba316042cbd107779a SHA1 7efd32cb61be325068363c608565023a86cd72a6 SHA256 5091d8fc2e41e244371689c1fbf23c214d22ea1634b94427ed9df50c6bd85cf4
+MD5 314247e4a0bb08e206b2de1f6740ed0c ChangeLog 1108
+RMD160 62aa1e8477e1cabaaac4a7ba316042cbd107779a ChangeLog 1108
+SHA256 5091d8fc2e41e244371689c1fbf23c214d22ea1634b94427ed9df50c6bd85cf4 ChangeLog 1108
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -17,10 +22,13 @@ SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata
 MD5 9049649c61436989b243d5b5c72fe689 files/digest-viewvc-1.0.3 238
 RMD160 20edb91552cf4dd6f4bbd166b133c5ebda16242e files/digest-viewvc-1.0.3 238
 SHA256 67513527e3bd34c7bbaf94233c72259fc95b2356abd211ca93cc1c090b393479 files/digest-viewvc-1.0.3 238
+MD5 92fad8d668e882bb2998a84cc3b06f19 files/digest-viewvc-1.0.4 238
+RMD160 79dff3f1c4ee7b952983469a68409fd917c6507a files/digest-viewvc-1.0.4 238
+SHA256 14d65c49443589592f2181cf9991229b4c2f9344094eb5844267be93b5dcfa7a files/digest-viewvc-1.0.4 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFGVYsoKRy60XGEcJIRAkUMAJ9znvlfv8cnSDereJ3p1cAyDelCJgCdFiaE
-DJVQuUiRF743zx23bgS1yQs=
-=e77i
+iD8DBQFGWLFmEzitwsaoONoRAqXOAKDHATsN7hZzqSk56QE5aTdVSwwb9wCg1h42
+ekDTZv/7jikauouQucGRmDs=
+=hPPM
 -----END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/files/digest-viewvc-1.0.4 b/www-apps/viewvc/files/digest-viewvc-1.0.4
new file mode 100644
index 000000000000..93ce752b8378
--- /dev/null
+++ b/www-apps/viewvc/files/digest-viewvc-1.0.4
@@ -0,0 +1,3 @@
+MD5 e55ba2864a23b0597f80ccf726966b96 viewvc-1.0.4.tar.gz 383491
+RMD160 2f08d6697d69bbdf0d6660be0000d1a1aef76faa viewvc-1.0.4.tar.gz 383491
+SHA256 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f viewvc-1.0.4.tar.gz 383491
diff --git a/www-apps/viewvc/viewvc-1.0.4.ebuild b/www-apps/viewvc/viewvc-1.0.4.ebuild
new file mode 100644
index 000000000000..52dd2a8c1782
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.0.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.0.4.ebuild,v 1.1 2007/05/26 22:14:36 rl03 Exp $
+
+inherit python eutils
+
+SLOT="0"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/37319/${P}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cvs cvsgraph enscript highlight mod_python mysql subversion"
+
+RDEPEND="
+		cvs? (
+			>=dev-lang/python-1.5.2
+			app-text/rcs
+		)
+
+		subversion? (
+			>=dev-lang/python-2.0
+			>=dev-util/subversion-1.2.0
+		)
+
+		cvsgraph? ( >=dev-util/cvsgraph-1.5.0 )
+		enscript? ( app-text/enscript )
+		highlight? ( >=app-text/highlight-2.2.10 )
+		mod_python? ( dev-python/mod_python )
+		mysql? (
+			>=dev-python/mysql-python-0.9.0
+		)
+"
+
+pkg_setup() {
+	if use subversion && ! built_with_use dev-util/subversion python ; then
+		eerror "Your Subversion has been built without Python bindings"
+		die "Emerge dev-util/subversion with USE=\"python\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	python_version
+	local LIB_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
+	local CONF_PATH="/usr/share/webapps/${PN}/viewvc.conf"
+	find bin -type f |
+		xargs sed -ie "	s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${LIB_DIR}\"|g
+						s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONF_PATH}\",g"
+	sed -i "s|template_dir = templates|template_dir = /usr/share/webapps/${PN}/templates|" \
+		viewvc.conf.dist
+}
+
+src_install() {
+	python_version
+
+	dodir /usr/share/webapps/${PN} /usr/share/webapps/${PN}/cgi-bin \
+		/usr/share/webapps/${PN}/mod_python /usr/share/webapps/${PN}/bin \
+		/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+
+	exeinto /usr/share/webapps/${PN}/cgi-bin
+	doexe bin/cgi/viewvc.cgi
+
+	if use mysql ; then
+		exeinto /usr/share/webapps/${PN}/cgi-bin
+		doexe bin/cgi/query.cgi
+	fi
+
+	if use mod_python ; then
+		insinto /usr/share/webapps/${PN}/mod_python
+		doins bin/mod_python/viewvc.py
+		doins bin/mod_python/handler.py
+		doins bin/mod_python/.htaccess
+
+		if use mysql ; then
+			insinto /usr/share/webapps/${PN}/mod_python
+			doins bin/mod_python/query.py
+		fi
+	fi
+
+	cp -p bin/* ${D}/usr/share/webapps/${PN}/bin
+	cp -rp templates ${D}/usr/share/webapps/${PN}
+	cp -rp lib/* ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+
+	insinto /usr/share/webapps/${PN}
+	doins viewvc.conf.dist cvsgraph.conf.dist
+
+	dodoc CHANGES COMMITTERS INSTALL README TODO
+	dohtml -r viewvc.org/*
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+
+	local mansuffix=$(ecompress --suffix)
+	elog "Now read /usr/share/doc/${P}/INSTALL${mansuffix} to configure ${PN}"
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}