diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
new file mode 100644
index 0000000..b3346fd
--- /dev/null
+++ b/www-apps/viewvc/Manifest
@@ -0,0 +1,24 @@
+AUX postinstall-new-en.txt 931 RMD160 ff08bc4bf9371be9848988f0cec782a8c37c573c SHA1 e14e5461f8538f075fa89477df6efb363c3c6474 SHA256 bff43862f84ccc7834a39b584c332db655f2b2d360f3a297d06cae834f80caf4
+MD5 1b32bf6325f9983c89618aa94a224696 files/postinstall-new-en.txt 931
+RMD160 ff08bc4bf9371be9848988f0cec782a8c37c573c files/postinstall-new-en.txt 931
+SHA256 bff43862f84ccc7834a39b584c332db655f2b2d360f3a297d06cae834f80caf4 files/postinstall-new-en.txt 931
+AUX reconfig 685 RMD160 d62a5d19966f1088dfc5ebf9d5e01146c394c4a8 SHA1 3969ff04525380a8dd3cc25f07141c70e3a5155c SHA256 a5365878f812c46756200a4ba8fb0621cd714553f7e3556d49d9d84dd888f7f8
+MD5 ff27fbdb3719913491b6a64b57b3bff8 files/reconfig 685
+RMD160 d62a5d19966f1088dfc5ebf9d5e01146c394c4a8 files/reconfig 685
+SHA256 a5365878f812c46756200a4ba8fb0621cd714553f7e3556d49d9d84dd888f7f8 files/reconfig 685
+DIST viewvc-1.0.1.tar.gz 378269 RMD160 202adfe6c86784c5cc55ffcaf690c85563a7f280 SHA1 590ad7c5329535f39321b06817eb17f4712bcb69 SHA256 7ea8765d47ecef77da48613226a63558eb97132ef2ed1b0ad2260b83f8e56cbd
+DIST viewvc-1.0.2.tar.gz 406307 RMD160 fce27c91c5d329c1a41d675825b65b58c00ae8e9 SHA1 589738e54b65444f295c3bbd66fa8a64a34725bd SHA256 7ba9c308cedba382188415fa27af6a6a0b91e99fa672dc94c44ee2761ae054cb
+EBUILD viewvc-1.0.1.ebuild 2976 RMD160 5ddc47f032e2237333be5394651e4e28e9d613cc SHA1 e2e52c52c73dfa0b85b9523c9a12841b0a4dc645 SHA256 d1b8ffce221bfe43208c7ef53869416e8d0c2959ca4f8940a0d85e0f95e2d826
+MD5 dbc3e4de75f65a58ed81a3b8d582053a viewvc-1.0.1.ebuild 2976
+RMD160 5ddc47f032e2237333be5394651e4e28e9d613cc viewvc-1.0.1.ebuild 2976
+SHA256 d1b8ffce221bfe43208c7ef53869416e8d0c2959ca4f8940a0d85e0f95e2d826 viewvc-1.0.1.ebuild 2976
+EBUILD viewvc-1.0.2.ebuild 2976 RMD160 0073a3f3796915c21bc2ebe22469ca0e76b8f924 SHA1 4b70cdc10c0f5c8fc9ec972482f5a833be1d62fc SHA256 930cabf9d698acf511a461e018c7197e5717ddc45fa0191923862f2d44247892
+MD5 e9005fb6d5cb7a5e9a879601ac39ce7a viewvc-1.0.2.ebuild 2976
+RMD160 0073a3f3796915c21bc2ebe22469ca0e76b8f924 viewvc-1.0.2.ebuild 2976
+SHA256 930cabf9d698acf511a461e018c7197e5717ddc45fa0191923862f2d44247892 viewvc-1.0.2.ebuild 2976
+MD5 d691cb2548f27b040dac7809a4b2f99c files/digest-viewvc-1.0.1 238
+RMD160 e48241c61eff4845f5199012e170dab0e4191a37 files/digest-viewvc-1.0.1 238
+SHA256 22d4783b8a529e26fc16996f19f65337a57e87aa394687440d88d31e64667cc9 files/digest-viewvc-1.0.1 238
+MD5 7aaf4b91aaa7b99ce89bd3e92747c3ea files/digest-viewvc-1.0.2 238
+RMD160 a91880cf3d76af88de381caa617485cb81285d6a files/digest-viewvc-1.0.2 238
+SHA256 2bdd457a7db327b545943d7d46fda9859e2e54ec150a6b95affb9e743d4fa108 files/digest-viewvc-1.0.2 238
diff --git a/www-apps/viewvc/files/digest-viewvc-1.0.1 b/www-apps/viewvc/files/digest-viewvc-1.0.1
new file mode 100644
index 0000000..1badec4
--- /dev/null
+++ b/www-apps/viewvc/files/digest-viewvc-1.0.1
@@ -0,0 +1,3 @@
+MD5 2e14b2aeadd4e9ddd6b3876ffd184e61 viewvc-1.0.1.tar.gz 378269
+RMD160 202adfe6c86784c5cc55ffcaf690c85563a7f280 viewvc-1.0.1.tar.gz 378269
+SHA256 7ea8765d47ecef77da48613226a63558eb97132ef2ed1b0ad2260b83f8e56cbd viewvc-1.0.1.tar.gz 378269
diff --git a/www-apps/viewvc/files/digest-viewvc-1.0.2 b/www-apps/viewvc/files/digest-viewvc-1.0.2
new file mode 100644
index 0000000..2c2d9a4
--- /dev/null
+++ b/www-apps/viewvc/files/digest-viewvc-1.0.2
@@ -0,0 +1,3 @@
+MD5 47569c8ab2ac67831340e460e685c3a9 viewvc-1.0.2.tar.gz 406307
+RMD160 fce27c91c5d329c1a41d675825b65b58c00ae8e9 viewvc-1.0.2.tar.gz 406307
+SHA256 7ba9c308cedba382188415fa27af6a6a0b91e99fa672dc94c44ee2761ae054cb viewvc-1.0.2.tar.gz 406307
diff --git a/www-apps/viewvc/files/postinstall-new-en.txt b/www-apps/viewvc/files/postinstall-new-en.txt
new file mode 100644
index 0000000..e12efa8
--- /dev/null
+++ b/www-apps/viewvc/files/postinstall-new-en.txt
@@ -0,0 +1,22 @@
+If you are using Apache, consider adding something like this to your
+apache.conf:
+
+ScriptAlias /viewcvs ${VHOST_CGIBINDIR}/${PN}/viewcvs.cgi
+ScriptAlias /cvsquery ${VHOST_CGIBINDIR}/${PN}/cvsquery.cgi
+
+Before using viewcvs, be sure to configure it properly.
+Edit ${VHOST_ROOT}/${PN}/viewcvs.conf and ${VHOST_ROOT}/${PN}/cvsgraph.conf to
+suit your needs.
+
+If you're using mod_python, remember to add '-D PYTHON' in
+/etc/conf.d/apache. The needed settings for viewcvs have been included in
+${VHOST_ROOT}/htdocs/.htaccess.
+
+If you're wanting to use the query engine, you'll need to first create a
+database. Next, run the following command to populate the database with tables
+you'll need.
+
+# mysql -u root -p <database name> < /usr/share/webapps/${PN}/${PV}/sqlscripts/mysql/${PV}_create.sql
+
+After this, please read the upstream documentation on how to setup the query
+engine. This can be located at /usr/share/docs/${P}/INSTALL.gz.
diff --git a/www-apps/viewvc/files/reconfig b/www-apps/viewvc/files/reconfig
new file mode 100644
index 0000000..f2bd4c2
--- /dev/null
+++ b/www-apps/viewvc/files/reconfig
@@ -0,0 +1,15 @@
+#!/bin/bash
+# $Id: reconfig,v 1.6 2005/10/03 14:06:18 ramereth Exp $
+
+if [ $1 = "install" ] ; then
+    find ${VHOST_CGIBINDIR}/viewvc ${VHOST_ROOT}/viewvc ${VHOST_ROOT}/viewvc/bin -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewvc/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewvc/viewvc.conf\",g" -i
+elif [ $1 = "upgrade" ] ; then
+    find ${VHOST_CGIBINDIR}/viewvc ${VHOST_ROOT}/viewvc ${VHOST_ROOT}/viewvc/bin -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewvc/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewvc/viewvc.conf\",g" -i
+elif [ $1 = "clean" ] ; then
+    echo $1
+fi
+
diff --git a/www-apps/viewvc/viewvc-1.0.1.ebuild b/www-apps/viewvc/viewvc-1.0.1.ebuild
new file mode 100644
index 0000000..c4449c4
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.0.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild,v 1.3 2005/10/09 22:17:08 ramereth Exp $
+
+inherit webapp depend.apache eutils python
+
+PS=${P/_/-}
+DESCRIPTION="ViewVC, a web interface to cvs and subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/33320/${PS}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="cvsgraph enscript highlight mod_python mysql"
+
+want_apache
+
+RDEPEND="|| ( >=dev-util/cvs-1.11
+			  dev-util/subversion )
+		dev-lang/python
+		>=app-text/rcs-5.7
+		sys-apps/diffutils
+		cvsgraph? ( dev-util/cvsgraph )
+		enscript? ( app-text/enscript )
+		highlight? ( app-text/highlight )
+		apache2? ( mod_python? ( dev-python/mod_python ) )
+		mysql? ( dev-db/mysql
+				 dev-python/mysql-python )
+		!apache? ( !apache2? ( www-servers/lighttpd ) )"
+
+S=${WORKDIR}/${PS}
+
+pkg_setup() {
+	if has_version dev-util/subversion && ! built_with_use dev-util/subversion python ; then
+		eerror "Your subversion has been built without python bindings"
+		eerror "If you want subversion to work with viewvc, please"
+		eerror "enable the 'python' useflag"
+		die "pkg_setup failed"
+	fi
+	if use mod_python && ! use apache2 ; then
+		eerror "mod_python requires at least apache2"
+		die "pkg_setup failed"
+	fi
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
+
+	exeinto ${MY_CGIBINDIR}/${PN}
+	doexe bin/cgi/viewvc.cgi
+
+	if use mysql ; then
+		exeinto ${MY_CGIBINDIR}/${PN}
+		doexe bin/cgi/query.cgi
+	fi
+
+	if use mod_python && use apache2 ; then
+		insinto ${MY_HTDOCSDIR}
+		doins bin/mod_python/viewvc.py
+		if use mysql ; then
+			insinto ${MY_HTDOCSDIR}
+			doins bin/mod_python/query.py
+		fi
+		insinto ${MY_HTDOCSDIR}
+		doins bin/mod_python/.htaccess
+		doins bin/mod_python/handler.py
+	fi
+
+	cp -rp bin/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -rp lib/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -rp templates/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	newins viewvc.conf.dist viewvc.conf.example
+	newins cvsgraph.conf.dist cvsgraph.conf.example
+
+	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
+	dodoc CHANGES COMMITTERS INSTALL README TODO
+	dohtml -r viewvc.org/*
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewvc.conf.example
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf.example
+	webapp_postinst_txt en ${FILESDIR}/postinstall-new-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+
+	if use mysql && has_version "=dev-db/mysql-4.0*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.0.sql
+	elif use mysql && has_version "=dev-db/mysql-4.1*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.1.sql
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	python_mod_optimize ${MY_HOSTROOTDIR}/${PN}/lib
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/www-apps/viewvc/viewvc-1.0.2.ebuild b/www-apps/viewvc/viewvc-1.0.2.ebuild
new file mode 100644
index 0000000..706051d
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.0.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild,v 1.3 2005/10/09 22:17:08 ramereth Exp $
+
+inherit webapp depend.apache eutils python
+
+PS=${P/_/-}
+DESCRIPTION="ViewVC, a web interface to cvs and subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/34450/${PS}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="cvsgraph enscript highlight mod_python mysql"
+
+want_apache
+
+RDEPEND="|| ( >=dev-util/cvs-1.11
+			  dev-util/subversion )
+		dev-lang/python
+		>=app-text/rcs-5.7
+		sys-apps/diffutils
+		cvsgraph? ( dev-util/cvsgraph )
+		enscript? ( app-text/enscript )
+		highlight? ( app-text/highlight )
+		apache2? ( mod_python? ( dev-python/mod_python ) )
+		mysql? ( dev-db/mysql
+				 dev-python/mysql-python )
+		!apache? ( !apache2? ( www-servers/lighttpd ) )"
+
+S=${WORKDIR}/${PS}
+
+pkg_setup() {
+	if has_version dev-util/subversion && ! built_with_use dev-util/subversion python ; then
+		eerror "Your subversion has been built without python bindings"
+		eerror "If you want subversion to work with viewvc, please"
+		eerror "enable the 'python' useflag"
+		die "pkg_setup failed"
+	fi
+	if use mod_python && ! use apache2 ; then
+		eerror "mod_python requires at least apache2"
+		die "pkg_setup failed"
+	fi
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
+
+	exeinto ${MY_CGIBINDIR}/${PN}
+	doexe bin/cgi/viewvc.cgi
+
+	if use mysql ; then
+		exeinto ${MY_CGIBINDIR}/${PN}
+		doexe bin/cgi/query.cgi
+	fi
+
+	if use mod_python && use apache2 ; then
+		insinto ${MY_HTDOCSDIR}
+		doins bin/mod_python/viewvc.py
+		if use mysql ; then
+			insinto ${MY_HTDOCSDIR}
+			doins bin/mod_python/query.py
+		fi
+		insinto ${MY_HTDOCSDIR}
+		doins bin/mod_python/.htaccess
+		doins bin/mod_python/handler.py
+	fi
+
+	cp -rp bin/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -rp lib/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -rp templates/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	newins viewvc.conf.dist viewvc.conf.example
+	newins cvsgraph.conf.dist cvsgraph.conf.example
+
+	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
+	dodoc CHANGES COMMITTERS INSTALL README TODO
+	dohtml -r viewvc.org/*
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewvc.conf.example
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf.example
+	webapp_postinst_txt en ${FILESDIR}/postinstall-new-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+
+	if use mysql && has_version "=dev-db/mysql-4.0*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.0.sql
+	elif use mysql && has_version "=dev-db/mysql-4.1*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.1.sql
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	python_mod_optimize ${MY_HOSTROOTDIR}/${PN}/lib
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}