new web stuffs

2 files changed, 70 insertions, 78 deletions

diff --git a/app-doc/gentoo-web/files/xsl/guide-main.xsl b/app-doc/gentoo-web/files/xsl/guide-main.xsl
index 6f60bd490e27..ffda5c46bdb5 100755
--- a/app-doc/gentoo-web/files/xsl/guide-main.xsl
+++ b/app-doc/gentoo-web/files/xsl/guide-main.xsl
@@ -46,7 +46,6 @@
 						main menu ::<br/>
 						&#160;<a class="oldlink" href="/index.html">About Gentoo Linux</a><br/>
 						&#160;<a class="oldlink" href="/index-download.html">Download/Install</a><br/> 
-						&#160;<a class="oldlink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a><br/> 
 						&#160;<a class="oldlink" href="/index-changelog.html">CVS Changelog</a><br/> 
 						&#160;<a class="oldlink" href="/index-projects.html">Projects</a><br/> 
 						<br/>
@@ -272,14 +271,6 @@ of your sale will go towards further Gentoo Linux development.</p>
 						</xsl:otherwise>
 					</xsl:choose>
 					<xsl:choose>
-						<xsl:when test="/mainpage/@id='download'">
-							<a class="highlight" href="/index-download.html">Download/Install</a> | <a class="menulink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a> |
-						</xsl:when>
-						<xsl:otherwise>
-							<a class="menulink" href="/index-download.html">Download/Install</a> | <a class="menulink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a> |
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:choose>
 						<xsl:when test="/mainpage/@id='changelog'">
 							<a class="highlight" href="/index-changelog.html">CVS Changelog</a> |
 						</xsl:when>
@@ -334,16 +325,16 @@ User Docs:<br/>
 						<br/>
 	
 						Mailing Lists:<br/><br/>
-						<font color="#ff0000">New! General User List:</font><br/> <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-user">gentoo-user</a><br/><br/>
-						<font color="#ff0000">New! Ebuild submissions:</font><br/> <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</a><br/><br/>
+						<font color="#ff0000">New! General User List:</font><br/> <a class="altlink" href="http://lists.gentoo.org/gentoo-user">gentoo-user</a><br/><br/>
+						<font color="#ff0000">New! Ebuild submissions:</font><br/> <a class="altlink" href="http://lists.gentoo.org/gentoo-ebuild">gentoo-ebuild</a><br/><br/>
 						
-						Developer list:<br/> <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</a><br/><br/>
-						Announcements:<br/> <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</a><br/><br/>
-						Daily CVS logs:<br/>  <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-cvs">gentoo-cvs</a><br/><br/>
-						<a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo">Complete list of mailing lists</a><br/>
+						Developer list:<br/> <a class="altlink" href="http://lists.gentoo.org/gentoo-dev">gentoo-dev</a><br/><br/>
+						Announcements:<br/> <a class="altlink" href="http://lists.gentoo.org/gentoo-announce">gentoo-announce</a><br/><br/>
+						Daily CVS logs:<br/>  <a class="altlink" href="http://lists.gentoo.org/gentoo-cvs">gentoo-cvs</a><br/><br/>
+						<a class="altlink" href="http://lists.gentoo.org">Complete list of mailing lists</a><br/>
 						<br/>
 						Other Resources:<br/>
-						<a class="altlink" href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> (browse our repository)<br/>
+						<a class="altlink" href="http://www.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> (browse our repository)<br/>
 						IRC: #gentoo on <a class="altlink" href="http://www.openprojects.net/">OPN</a><br/>
 						<br/><br/></p></td></tr></table>
 					</td></tr>
diff --git a/app-doc/gentoo-web/gentoo-web-2.2.ebuild b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
index 3537409906f6..62f8b1850763 100644
--- a/app-doc/gentoo-web/gentoo-web-2.2.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.22 2001/10/11 03:43:46 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.23 2001/11/15 00:46:57 drobbins Exp $
  
 # WARNING: THIS EBUILD SHOULD BE EDITED BY DANIEL ROBBINS ONLY
  
@@ -11,125 +11,126 @@ DESCRIPTION="www.gentoo.org website"
 SRC_URI="http://www.red-bean.com/cvs2cl/cvs2cl.pl"
 HOMEPAGE="http://www.gentoo.org"
 RDEPEND="sys-devel/python dev-libs/libxslt"
+WEBROOT=/www/virtual/www.gentoo.org/htdocs
 
 src_unpack() {
 	if [ "$MAINTAINER" != "yes" ]
 	then
-		echo "This will zap stuff in /usr/local/httpd/htdocs."
+		echo "This will zap stuff in ${WEBROOT}."
 		echo "Beware -- maintainers only."
 	fi
 }
 
 src_install() {
-	dodir /usr/local/httpd/htdocs/doc
-	dodir /usr/local/httpd/htdocs/projects
-	insinto /usr/local/httpd/htdocs/doc
+	dodir ${WEBROOT}/doc
+	dodir ${WEBROOT}/projects
+	insinto ${WEBROOT}/doc
 	cd ${FILESDIR}
 	local x
 	for x in build desktop xml-guide portage-user gentoo-howto faq nvidia_tsg openafs cvs-tutorial
 	do
-		xsltproc $TEMPLATE xml/${x}.xml > ${D}/usr/local/httpd/htdocs/doc/${x}.html || die
+		xsltproc $TEMPLATE xml/${x}.xml > ${D}${WEBROOT}/doc/${x}.html || die
 	done
-	dodir /usr/local/httpd/htdocs/images
-	insinto /usr/local/httpd/htdocs/images
+	dodir ${WEBROOT}/images
+	insinto ${WEBROOT}/images
 	cd ${FILESDIR}/images
 	doins paypal.png gtop-s.jpg gbot-s.gif gridtest.gif gentoo-new.gif install*.gif fishhead.gif line.gif icon-* keychain-2.gif gentoo-2.gif
-	insinto /usr/local/httpd/htdocs
+	insinto ${WEBROOT}
 	doins favicon.ico
 	
 
 	
 	#dynamic firewalls tools page
 	cd ${FILESDIR}
-	xsltproc $TEMPLATE xml/dynfw.xml > ${D}/usr/local/httpd/htdocs/projects/dynfw.html	|| die
-	xsltproc $TEMPLATE xml/project-xml.xml > ${D}/usr/local/httpd/htdocs/projects/xml.html	|| die
+	xsltproc $TEMPLATE xml/dynfw.xml > ${D}${WEBROOT}/projects/dynfw.html	|| die
+	xsltproc $TEMPLATE xml/project-xml.xml > ${D}${WEBROOT}/projects/xml.html	|| die
 	
 	#resume
-	xsltproc xsl/resume-html.xsl xml/resume.xml > ${D}/usr/local/httpd/htdocs/resume.html || die
+	xsltproc xsl/resume-html.xsl xml/resume.xml > ${D}${WEBROOT}/resume.html || die
 	
 	#both URLs should work
-	dodir /usr/local/httpd/htdocs/projects/keychain
-	xsltproc $TEMPLATE xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain.html || die	
-	xsltproc $TEMPLATE xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain/index.html	|| die
+	dodir ${WEBROOT}/projects/keychain
+	xsltproc $TEMPLATE xml/keychain.xml > ${D}${WEBROOT}/projects/keychain.html || die	
+	xsltproc $TEMPLATE xml/keychain.xml > ${D}${WEBROOT}/projects/keychain/index.html	|| die
 	
-	insinto /usr/local/httpd/htdocs/projects
+	insinto ${WEBROOT}/projects
 	doins dynfw/dynfw-1.0.1.tar.gz 
 	
 	cd ..
-	tar czvf ${D}/usr/local/httpd/htdocs/projects/guide-xml-latest.tar.gz files 
+	tar czvf ${D}${WEBROOT}/projects/guide-xml-latest.tar.gz files 
 	cd ${FILESDIR}
 	
-	insinto /usr/local/httpd/htdocs
+	insinto ${WEBROOT}
 
-	xsltproc $TEMPLATE xml/main-news.xml > ${D}/usr/local/httpd/htdocs/index.html || die
-	xsltproc $TEMPLATE xml/main-about.xml > ${D}/usr/local/httpd/htdocs/index-about.html || die
-	xsltproc $TEMPLATE xml/main-download.xml > ${D}/usr/local/httpd/htdocs/index-download.html || die
-	xsltproc $TEMPLATE xml/main-projects.xml > ${D}/usr/local/httpd/htdocs/index-projects.html || die
+	xsltproc $TEMPLATE xml/main-news.xml > ${D}${WEBROOT}/index.html || die
+	xsltproc $TEMPLATE xml/main-about.xml > ${D}${WEBROOT}/index-about.html || die
+	xsltproc $TEMPLATE xml/main-download.xml > ${D}${WEBROOT}/index-download.html || die
+	xsltproc $TEMPLATE xml/main-projects.xml > ${D}${WEBROOT}/index-projects.html || die
 
 	doins css/main-new.css css/resume.css
 	
 	#install XSL for later use
-	dodir /usr/local/httpd/htdocs/xsl
-	insinto /usr/local/httpd/htdocs/xsl
+	dodir ${WEBROOT}/xsl
+	insinto ${WEBROOT}/xsl
 	cd ${FILESDIR}/xsl
 	doins cvs.xsl guide-main.xsl
 
 	#install snddevices script
-	dodir /usr/local/httpd/htdocs/scripts
-	insinto /usr/local/httpd/htdocs/scripts
+	dodir ${WEBROOT}/scripts
+	insinto ${WEBROOT}/scripts
 	cd ${FILESDIR}/scripts
 	doins snddevices
 
 	#wikistuffs
-	dodir /usr/local/httpd/htdocs/wiki/images
-	dodir /usr/local/httpd/htdocs/wiki/bios
-	insinto /usr/local/httpd/htdocs/wiki
-	cd ${FILESDIR}/wiki
-	doins *.php
-	cd images
-	insinto /usr/local/httpd/htdocs/wiki/images
-	doins *.gif
-	cd ../bios
-	insinto /usr/local/httpd/htdocs/wiki/bios
-	doins *.png *.jpg *.gif
+#	dodir ${WEBROOT}/wiki/images
+#	dodir ${WEBROOT}/wiki/bios
+#	insinto ${WEBROOT}/wiki
+#	cd ${FILESDIR}/wiki
+#	doins *.php
+#	cd images
+#	insinto ${WEBROOT}/wiki/images
+#	doins *.gif
+#	cd ../bios
+#	insinto ${WEBROOT}/wiki/bios
+#	doins *.png *.jpg *.gif
 	
-	cd ${D}
-	chmod -R g+rw,o+r *
-	chown -R root.root *
-	cd ${D}/usr/local/httpd
-	chown -R drobbins.webadmin htdocs 
-	chmod -R g+rws htdocs
+#	cd ${D}
+#	chmod -R g+rw,o+r *
+#	chown -R root.root *
+#	cd ${D}/usr/local/httpd
+#	chown -R drobbins.webadmin htdocs 
+#	chmod -R g+rws htdocs
 
 	dobin ${DISTDIR}/cvs2cl.pl
 	dosbin ${FILESDIR}/bin/cvslog.sh
-	dosbin ${FILESDIR}/bin/wiki.pl
-	chmod o-rwx,g+rx ${D}/usr/sbin/wiki.pl
-	chown root.dbadmin ${D}/usr/sbin/wiki.pl
+#	dosbin ${FILESDIR}/bin/wiki.pl
+#	chmod o-rwx,g+rx ${D}/usr/sbin/wiki.pl
+#	chown root.dbadmin ${D}/usr/sbin/wiki.pl
 
-	ln -s /home/mailman/icons ${D}/usr/local/httpd/htdocs/mailman-images
+#	ln -s /home/mailman/icons ${D}${WEBROOT}/mailman-images
 }
 
 pkg_preinst() {
-	if [ -d /usr/local/httpd/htdocs.bak ]
+	if [ -d ${WEBROOT}.bak ]
 	then
-		rm -rf /usr/local/httpd/htdocs.bak
+		rm -rf ${WEBROOT}.bak
 	fi
-	if [ -d /usr/local/httpd/htdocs ]
+	if [ -d ${WEBROOT} ]
 	then
-		cp -ax /usr/local/httpd/htdocs /usr/local/httpd/htdocs.bak
+		cp -ax ${WEBROOT} ${WEBROOT}.bak
 	fi
 }
 
-pkg_postinst() {
-	source /home/drobbins/.wiki-auth
-	cd /usr/local/httpd/htdocs/wiki
-	cp functions.php functions.php.orig
-	sed -e "s:##USER##:${WIKI_USER}:g" -e "s:##PASS##:${WIKI_PASS}:g" -e "s:##DB##:${WIKI_DB}:g" functions.php.orig > functions.php
-	rm functions.php.orig
-	cd /usr/sbin
-	cp wiki.pl wiki.pl.orig
-	sed -e "s:##USER##:${WIKI_USER}:g" -e "s:##PASS##:${WIKI_PASS}:g" -e "s:##DB##:${WIKI_DB}:g" wiki.pl.orig > wiki.pl
-	rm wiki.pl.orig
-}
+#pkg_postinst() {
+#	source /home/drobbins/.wiki-auth
+#	cd ${WEBROOT}/wiki
+#	cp functions.php functions.php.orig
+#	sed -e "s:##USER##:${WIKI_USER}:g" -e "s:##PASS##:${WIKI_PASS}:g" -e "s:##DB##:${WIKI_DB}:g" functions.php.orig > functions.php
+#	rm functions.php.orig
+#	cd /usr/sbin
+#	cp wiki.pl wiki.pl.orig
+#	sed -e "s:##USER##:${WIKI_USER}:g" -e "s:##PASS##:${WIKI_PASS}:g" -e "s:##DB##:${WIKI_DB}:g" wiki.pl.orig > wiki.pl
+#	rm wiki.pl.orig
+#}