Added multiviews for /usr/share/doc, closes #30862.

4 files changed, 53 insertions, 43 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index d214a3f66afe..baeec7aed504 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # 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.114 2004/04/03 07:23:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.115 2004/04/04 01:52:12 zul Exp $
+
+  03 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48.ebuild,
+  files/conf/commonapache.conf:
+  Added multiviews for /usr/share/doc. Closes #30862.
 
   02 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.49.ebuild:
   fix bug #46585.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 51df2d831d68..781716cc0ba8 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,25 +1,25 @@
-MD5 d172e61a4129d10e6f679543bc7595b1 apache-2.0.48.ebuild 11203
-MD5 da1c08c8716b9cc1449c4d2329963898 apache-2.0.48-r2.ebuild 12008
-MD5 9ccb266dd9f8ba601a66c8d8cf7bed96 apache-1.3.27-r3.ebuild 7652
-MD5 a8a143a5f5b62cd3fdcf15eb602b6ae6 apache-2.0.48-r4.ebuild 12283
-MD5 d0008ca37363cd4cafd360564aad605b apache-2.0.47.ebuild 11472
-MD5 554ddccc7b6d2d393a709a029183f02a apache-1.3.29.ebuild 7381
-MD5 d9046ac93b1e3da1076cf109660edab2 apache-1.3.29-r1.ebuild 7412
-MD5 b7737e1559b3508b5ba3dc679ae33537 apache-2.0.48-r1.ebuild 11662
-MD5 eb712f73255ce50b7e71fe3ffad00ba6 apache-2.0.49.ebuild 12676
-MD5 450d24552a1de4f3c3cafe8f990585a3 apache-2.0.48-r3.ebuild 12060
-MD5 605bfd933b04a3b248073a478952157e ChangeLog 21663
-MD5 28e0f7ec35e9ffd32ca9b85eba551071 apache-1.3.28-r1.ebuild 7670
+MD5 7bab5c5e1d35878f5ece30ce8e091292 apache-2.0.48.ebuild 11293
+MD5 a26d7272e8bb71a11b039b26bc453e14 apache-2.0.48-r2.ebuild 12009
+MD5 550ad9c89cc83883b979d5064f7a04f0 apache-1.3.27-r3.ebuild 7653
+MD5 0356ad3c8c8f98aab312d3c45226f9a0 apache-2.0.48-r4.ebuild 12284
+MD5 19e2b87577db3ad3bfa74c554f3a27a9 apache-2.0.47.ebuild 11473
+MD5 c9b77db193d034968ab8287d4b625a80 apache-1.3.29.ebuild 7382
+MD5 bab1a33028c74eb9d3f71294e8816126 apache-1.3.29-r1.ebuild 7413
+MD5 dcd66758c6c1536d6b0ad001be8d98de apache-2.0.48-r1.ebuild 11663
+MD5 316637e1a71f080e0f027db9ddf1683f apache-2.0.49.ebuild 12677
+MD5 0c605a3397eed2626b9170fa2d3c0662 apache-2.0.48-r3.ebuild 12061
+MD5 0a248880b63e5a597117324cbf617498 ChangeLog 21813
+MD5 ec841d27e5613d0aae57ddf2083a7597 apache-1.3.28-r1.ebuild 7671
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 3604262d4ff6e52fbbb35796df8cd865 apache-2.0.47-r1.ebuild 10758
-MD5 67747d74a9762563074e67f1d6b54db1 apache-1.3.27-r4.ebuild 8678
-MD5 9ad659015ff71d249e4a9b80579cb47a apache-2.0.46.ebuild 11059
-MD5 f16958750d664f94b6e756727a1a88a1 apache-1.3.28.ebuild 8903
+MD5 b4580094775cde0d53605e4c036ec191 apache-2.0.47-r1.ebuild 10759
+MD5 fcc5fef301f573c52854462740975b0b apache-1.3.27-r4.ebuild 8679
+MD5 f73405c24e4fe9e86c870dca88cc7284 apache-2.0.46.ebuild 11060
+MD5 52063286236598300600f9324e40fb56 apache-1.3.28.ebuild 8904
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
-MD5 7be16a0103be642b354ddcba5fb4bd91 files/apache-builtin-mods 2464
+MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
 MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28-r1 211
@@ -34,47 +34,47 @@ MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
-MD5 026baf622cdfe118b1641b955fce19a5 files/apache.rc6 1058
+MD5 bd1febd65fb7e4170aa2d9c5b0ff8ada files/apache.rc6 1059
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 a0252c6abb04b4211f28e828eaabe5d3 files/apachelogserverstatus 4762
-MD5 bf269395d653f995f21b543a4ceb42a9 files/robots.txt 339
-MD5 d0e867a1725d08e241f43cbab60ac3bb files/apacheaddmod 5976
+MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
+MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
+MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
 MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 2ab9f43e3c8529e441e139bdd64074f4 files/apachedelmod 3184
+MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 e43ba2376715ab56be96eec80e200ee5 files/apache2 311
+MD5 53491bef84e66a2ae0afb6634da07229 files/apache2 312
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29 211
-MD5 961de7bbaaeee7a96240f50cf6966bea files/apachesplitlogfile 4958
+MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
 MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 8ecc5ddcd2c3804c8d6f35cb31e1933c files/apache.confd 999
+MD5 158ae679067a535097854981105c6c06 files/apache.confd 1000
 MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238
-MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169
-MD5 49f74daf31509c98150f0b77c31a1195 files/conf/VirtualHomePages.conf 906
-MD5 717560c61bce028ba96c40bc6067bafc files/conf/Vhosts.conf 1902
-MD5 7c47e2641f7719c7c76607bc720b7b82 files/conf/DynamicVhosts.conf 962
+MD5 75e88ab5a3193fe8ff31c09f5bae2c09 files/conf/commonapache.conf 22175
+MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
+MD5 bb04f10b8e54f2ee95a8149fc50bb35b files/conf/Vhosts.conf 1903
+MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
 MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776
-MD5 8ae5a1ea62ef8fbd5acc44b859c94320 files/2.0.48-r1/apache2.confd 1954
-MD5 3d986d9efa2af8de7a12e3bedfe0fa60 files/2.0.48-r1/apache2.initd 2417
+MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955
+MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
 MD5 429d2311b221deba1bc181e17e046543 files/2.0.48-r1/apache2.conf 7652
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 75f0dfc2d25c9047d1451a368e8eadb4 files/2.0.40/apache2-builtin-mods 2212
-MD5 44e6cb453fc9166b2f1cdea29814c8c4 files/2.0.40/gentestcrt.sh 8804
+MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
+MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805
 MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
 MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
 MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
 MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
-MD5 6a2a6bd30168a28993fe4d6344810784 files/2.0.40/apache2.confd 783
-MD5 c6836da0273e08b4b5a9aa39a7f917b5 files/2.0.40/apache2.initd 1159
+MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
+MD5 cf5600eadc7f31990840d631ef518d6c files/2.0.40/apache2.initd 1160
 MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
@@ -84,12 +84,12 @@ MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
-MD5 b3a6d1c01772a3623f7d467e9d8ad51c files/2.0.49/apache2-builtin-mods 2210
-MD5 e72d437366d1c9875fd37d86966798fa files/2.0.49/gentestcrt.sh 8799
+MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
+MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 dc5c8ebe712dc08bdb83fa8563924c96 files/2.0.49/commonapache2.conf 31775
-MD5 4a7d5e937948ff12e82e520baa675745 files/2.0.49/apache2.confd 1950
-MD5 d60753c94b45c1e533a4587f8af719a6 files/2.0.49/apache2.initd 2427
+MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
+MD5 7f5a7cefa6f0a27dba75dc7f2d51666f files/2.0.49/apache2.initd 2428
 MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
diff --git a/net-www/apache/apache-2.0.48.ebuild b/net-www/apache/apache-2.0.48.ebuild
index 546c0f8848e4..7904130a37df 100644
--- a/net-www/apache/apache-2.0.48.ebuild
+++ b/net-www/apache/apache-2.0.48.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.48.ebuild,v 1.4 2004/01/15 03:55:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.5 2004/04/04 01:52:12 zul Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -234,6 +234,12 @@ src_install () {
 	#drop in a convenient link to the manual
 	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
 
+	if [ -d /etc/logroate.d ]
+	then
+		insinto /etc/logrotate.d
+		doins ${FILESDIR}/apache2
+	fi
+
 	#SLOT=2!!!
 	cd ${D}
 	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
diff --git a/net-www/apache/files/conf/commonapache.conf b/net-www/apache/files/conf/commonapache.conf
index cda503d744c6..c40d4ad4857e 100644
--- a/net-www/apache/files/conf/commonapache.conf
+++ b/net-www/apache/files/conf/commonapache.conf
@@ -1,5 +1,5 @@
 ### /etc/apache/conf/commonapache.conf
-### $Id: commonapache.conf,v 1.5 2003/09/27 04:47:18 woodchip Exp $
+### $Id: commonapache.conf,v 1.6 2004/04/04 01:52:12 zul Exp $
 ###
 ### Common server configuration.
 ###
@@ -692,7 +692,7 @@ ErrorDocument 404 "The document you requested has not been installed on your sys
 </Directory>
 
 <Directory /usr/share/doc>
-    Options Indexes FollowSymLinks
+    Options Indexes FollowSymLinks MultiViews
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1