Make doc easier to maintain.

5 files changed, 50 insertions, 11 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index da32f8423916..9c72782f72f9 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.196 2004/06/09 17:57:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.197 2004/06/10 22:56:54 zul Exp $
 
   09 Jun 2004; Guy Martin <gmsoft@gentoo.org> apache-1.3.31-r1.ebuild,
   apache-2.0.49-r3.ebuild:
@@ -10,6 +10,11 @@
   apache-2.0.49-r3.ebuild:
   Stable on ppc.
 
+  10 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, apache-2.0.49-r3.ebuild,
+  files/00_apache_manual.conf:
+  Make apache easier to maintain.
+
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> apache-1.3.31-r1.ebuild,
   apache-2.0.49-r3.ebuild:
   Stable on ia64
diff --git a/net-www/apache/apache-2.0.49-r1.ebuild b/net-www/apache/apache-2.0.49-r1.ebuild
index ad910af4e979..278ffe5b4a29 100644
--- a/net-www/apache/apache-2.0.49-r1.ebuild
+++ b/net-www/apache/apache-2.0.49-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r1.ebuild,v 1.27 2004/06/07 01:34:16 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r1.ebuild,v 1.28 2004/06/10 22:56:54 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -24,7 +24,6 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	doc? ( =app-doc/apache-manual-2.0.49-r1 )
 	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 IUSE="berkdb gdbm ldap threads ipv6 doc ssl"
 
@@ -257,8 +256,12 @@ src_install () {
 	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
-	if use docs; then
+	if use doc; then
+		MANUAL_VERSION="2.0.49-r1"
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/00_apache_manual.conf
 		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+		sed -i -e "s:2.0.49:${MY_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
 	fi
 
 	#SLOT=2!!!
diff --git a/net-www/apache/apache-2.0.49-r2.ebuild b/net-www/apache/apache-2.0.49-r2.ebuild
index 6850f58980c6..5ec1ce9fea4f 100644
--- a/net-www/apache/apache-2.0.49-r2.ebuild
+++ b/net-www/apache/apache-2.0.49-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r2.ebuild,v 1.12 2004/06/07 01:34:16 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r2.ebuild,v 1.13 2004/06/10 22:56:54 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -25,7 +25,6 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	doc? ( =app-doc/apache-manual-2.0.49-r1 )
 	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 
 apache_setup_vars() {
@@ -266,9 +265,13 @@ src_install () {
 	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
-	if use docs; then
+	if use doc; then
+		MANUAL_VERSION="2.0.49-r2"
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/00_apache_manual.conf
 		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	fi
+		sed -i -e "s:2.0.49:${MY_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
+		fi
 
 	#SLOT=2!!!
 	cd ${D}
diff --git a/net-www/apache/apache-2.0.49-r3.ebuild b/net-www/apache/apache-2.0.49-r3.ebuild
index b4864915bf5b..f91e5bebb717 100644
--- a/net-www/apache/apache-2.0.49-r3.ebuild
+++ b/net-www/apache/apache-2.0.49-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.12 2004/06/09 17:57:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.13 2004/06/10 22:56:54 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -26,7 +26,6 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	doc? ( =app-doc/apache-manual-2.0.49-r1 )
 	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
 
 apache_setup_vars() {
@@ -267,8 +266,12 @@ src_install () {
 	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
 
 	#drop in a convenient link to the manual
-	if use docs; then
+	if use doc; then
+		MANUAL_VERSION="2.0.49-r3"
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/00_apache_manual.conf
 		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+		sed -i -e "s:2.0.49:${MY_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
 	fi
 
 	#SLOT=2!!!
diff --git a/net-www/apache/files/00_apache_manual.conf b/net-www/apache/files/00_apache_manual.conf
new file mode 100644
index 000000000000..542ace48593c
--- /dev/null
+++ b/net-www/apache/files/00_apache_manual.conf
@@ -0,0 +1,25 @@
+Alias /manual "/usr/share/doc/apache-2.0.49/manual"
+
+<IfModule mod_alias.c>
+	AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/usr/share/doc/apache-2.0.49/manual/$1"
+</IfModule>
+
+
+
+<Directory "/usr/share/doc/apache-2.0.49/manual">
+	Options Indexes
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+
+	<Files *.html>
+		SetHandler type-map
+	</Files>
+	SetEnvIf Request_URI ^/manual/de/ prefer-language=de
+	SetEnvIf Request_URI ^/manual/en/ prefer-language=en
+	SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
+	SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
+	SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
+	SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
+	RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
+</Directory>