Added doc use flag so that apache-manual can be used.

3 files changed, 55 insertions, 50 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 5fdaf20f80b4..c0b9e16d7ca8 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,10 +1,14 @@
 # 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.135 2004/04/27 22:14:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.136 2004/04/28 17:48:55 zul Exp $
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> apache-1.3.29-r1.ebuild:
   Add inherit eutils
 
+  29 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Added support for the apache-manual wrapper. To enable it. Add "doc" to your
+  use-flags. Closes #48066.
+
 *apache-1.3.29-r2 (26 Apr 2004)
 
   26 Apr 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r2.ebuild,
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index b7b55df2e024..7b81f4b81253 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,77 +1,77 @@
-MD5 5435380c141889fa8163c7f93ae1bcee ChangeLog 25523
-MD5 5fa557ec8a5b26ec62e9238fa55518be apache-2.0.49-r1.ebuild 11708
 MD5 406289807ec3ab35345d70b58fb810dd apache-1.3.29-r2.ebuild 7144
-MD5 f681b5f3612add79ecfa062e15314f2c apache-1.3.29-r1.ebuild 7433
+MD5 c6d75203b497b40618ce623a3b76fd57 apache-2.0.49-r1.ebuild 11755
 MD5 738de16a708fdae922876faebfa4ddd7 apache-2.0.48-r4.ebuild 12398
+MD5 f681b5f3612add79ecfa062e15314f2c apache-1.3.29-r1.ebuild 7433
 MD5 ea96abae5deb246f351efaea6def3719 apache-2.0.49.ebuild 12693
+MD5 e758552b512649c2e0a3739dada9be1d ChangeLog 25695
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
+MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
+MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
+MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r4 65
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r1 65
+MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
+MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
+MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
 MD5 2672fba6aa4ef487ede4387f43972e2c files/apache.rc6 1073
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
+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 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
+MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
 MD5 d3339c25967ce7b36ef24495542f044a files/apachesplitlogfile 4948
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r1 65
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
 MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
-MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
-MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
-MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
-MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r4 65
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
-MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
+MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
+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 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 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
-MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
-MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
-MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
-MD5 cf5600eadc7f31990840d631ef518d6c files/2.0.40/apache2.initd 1160
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
+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 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
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
-MD5 bb04f10b8e54f2ee95a8149fc50bb35b files/conf/Vhosts.conf 1903
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
-MD5 75e88ab5a3193fe8ff31c09f5bae2c09 files/conf/commonapache.conf 22175
-MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
-MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
-MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
-MD5 429d2311b221deba1bc181e17e046543 files/2.0.48-r1/apache2.conf 7652
-MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955
-MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
-MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.49/40_mod_ssl.conf 3185
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
-MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
-MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
-MD5 1f7353fc77165ffd4dacc32e0b0ce7c2 files/2.0.49/apache2.initd 2417
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
-MD5 65f0d13e644e1dba96e3f0470488c75e files/2.0.49/commonapache2.conf 32101
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
+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 65f0d13e644e1dba96e3f0470488c75e files/2.0.49/commonapache2.conf 32101
+MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
+MD5 1f7353fc77165ffd4dacc32e0b0ce7c2 files/2.0.49/apache2.initd 2417
+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
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
diff --git a/net-www/apache/apache-2.0.49-r1.ebuild b/net-www/apache/apache-2.0.49-r1.ebuild
index dea76cfd8d5e..17e360ab7146 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.6 2004/04/24 13:04:20 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r1.ebuild,v 1.7 2004/04/28 17:48:56 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails
 
@@ -24,8 +24,9 @@ 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"
+IUSE="berkdb gdbm ldap threads ipv6 doc"
 
 apache_setup_vars() {
 	# Sane makeopts