Ebuild improvements, added wrapper for 2.0.49-r1

7 files changed, 77 insertions, 29 deletions

diff --git a/app-doc/apache-manual/ChangeLog b/app-doc/apache-manual/ChangeLog
index 7c2510b89e38..38e2bfd58c9f 100644
--- a/app-doc/apache-manual/ChangeLog
+++ b/app-doc/apache-manual/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-doc/apache-manual
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/apache-manual/ChangeLog,v 1.1 2004/04/28 13:45:45 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/apache-manual/ChangeLog,v 1.2 2004/04/28 17:28:27 zul Exp $
+
+*apache-manual-2.0.49-r1 (29 Apr 2004)
+
+  29 Apr 2004; Chuck Short <zul@gentoo.org> apache-manual-2.0.49-r1.ebuild,
+  apache-manual-2.0.49.ebuild, files/00_apache_manual.conf,
+  files/apache_manual.conf:
+  Added apache manual wrapper for 2.0.49-r1.
+
+  29 Apr 2004; Chuck Short <zul@gentoo.org> apache-manual-2.0.49.ebuild,
+  files/00_apache_manual.conf, files/apache_manual.conf:
+  Ebuild improvements.
 
 *apache-manual-2.0.49 (28 Apr 2004)
 
diff --git a/app-doc/apache-manual/Manifest b/app-doc/apache-manual/Manifest
index 421fcf30c285..b9c3e25445a1 100644
--- a/app-doc/apache-manual/Manifest
+++ b/app-doc/apache-manual/Manifest
@@ -1,5 +1,7 @@
-MD5 c9e8d080da354b08dde1f433c956f0e5 apache-manual-2.0.49.ebuild 975
-MD5 716c62a018d0fdee1224974be3ea1008 ChangeLog 415
+MD5 64a86918da776b6abd2c73c1227c331b apache-manual-2.0.49-r1.ebuild 767
+MD5 195d562f93152f95e7040f34fe0b5a1c apache-manual-2.0.49.ebuild 764
+MD5 ac19c776bd63615bb9a957fcd4958468 ChangeLog 819
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-manual-2.0.49 65
-MD5 f53cc24ae620055e91766f9c656359b4 files/apache_manual.conf 207
+MD5 445dafa0fd4e44a52da1ef59348f7d60 files/00_apache_manual.conf 766
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-manual-2.0.49-r1 65
diff --git a/app-doc/apache-manual/apache-manual-2.0.49-r1.ebuild b/app-doc/apache-manual/apache-manual-2.0.49-r1.ebuild
new file mode 100644
index 000000000000..503b42834fc5
--- /dev/null
+++ b/app-doc/apache-manual/apache-manual-2.0.49-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/apache-manual/apache-manual-2.0.49-r1.ebuild,v 1.1 2004/04/28 17:28:27 zul Exp $
+
+DESCRIPTION="Configures the apache manual for local viewing."
+HOMEPAGE="http://www.apache.org"
+SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
+KEYWORDS="~x86 ~ppc ~hppa ~mips ~sparc ~amd64 ~ia64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="=net-www/apache-2*
+	>=sys-apps/sed-4"
+
+IUSE=""
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_compile() {
+	einfo "Nothing to do."
+}
+
+src_install() {
+	sed -i -e "s:2.0.49:${PV}" ${FILESDIR}/00_apache_manual.conf
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/00_apache_manual.conf
+}
diff --git a/app-doc/apache-manual/apache-manual-2.0.49.ebuild b/app-doc/apache-manual/apache-manual-2.0.49.ebuild
index 887ae1e2f9a3..93db100af091 100644
--- a/app-doc/apache-manual/apache-manual-2.0.49.ebuild
+++ b/app-doc/apache-manual/apache-manual-2.0.49.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/apache-manual/apache-manual-2.0.49.ebuild,v 1.1 2004/04/28 13:45:45 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/apache-manual/apache-manual-2.0.49.ebuild,v 1.2 2004/04/28 17:28:27 zul Exp $
 
-DESCRIPTION="The full apache manual."
+DESCRIPTION="Configures the apache manual for local viewing."
 HOMEPAGE="http://www.apache.org"
 SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
 KEYWORDS="~x86 ~ppc ~hppa ~mips ~sparc ~amd64 ~ia64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND="=net-www/apache-2*"
+DEPEND="=net-www/apache-2*
+	>=sys-apps/sed-4"
 
 IUSE=""
 
@@ -20,17 +21,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/doc/html/${PF}
-	cp -rp ${S}/docs/manual ${D}/usr/share/doc/html/${PF}
-
-	if [ -d /usr/share/doc/html/${PF} ];
-	then
-		rm -f /usr/share/doc/html/${PF}
-		dosym /usr/share/doc/html/${PF}/manual /usr/share/doc/html/manual
-	else
-		dosym /usr/share/doc/html/${PF}/manual /usr/share/doc/html/manual
-	fi
-
-	insinto /etc/apache2/conf/addon-modules
-	doins ${FILESDIR}/apache_manual.conf
+	sed -i -e "s:2.0.49:${PV}" ${FILESDIR}/00_apache_manual.conf
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/00_apache_manual.conf
 }
diff --git a/app-doc/apache-manual/files/00_apache_manual.conf b/app-doc/apache-manual/files/00_apache_manual.conf
new file mode 100644
index 000000000000..22fce64f120a
--- /dev/null
+++ b/app-doc/apache-manual/files/00_apache_manual.conf
@@ -0,0 +1,25 @@
+Alias /manual "/usr/share/doc/apache-2.0.49-r1/manual"
+
+<IfModule mod_alias.c>
+AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/localhost/htdocs/manual/$1"
+</IfModule>
+
+
+
+<Directory "/var/www/localhost/htdocs/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>
diff --git a/app-doc/apache-manual/files/apache_manual.conf b/app-doc/apache-manual/files/apache_manual.conf
deleted file mode 100644
index 9afa082a442e..000000000000
--- a/app-doc/apache-manual/files/apache_manual.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /manual "/var/www/localhost/manual"
-
-<Directory "/usr/share/html/doc/manual">
-    Options Indexes FollowSymlinks MultiViews
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
diff --git a/app-doc/apache-manual/files/digest-apache-manual-2.0.49-r1 b/app-doc/apache-manual/files/digest-apache-manual-2.0.49-r1
new file mode 100644
index 000000000000..caa6620e2194
--- /dev/null
+++ b/app-doc/apache-manual/files/digest-apache-manual-2.0.49-r1
@@ -0,0 +1 @@
+MD5 275d3d37eed1b070f333d3618f7d1954 httpd-2.0.49.tar.gz 5919279