Fix #25258, #25999, --datadir moves to /var/www/localhost

1 files changed, 31 insertions, 28 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index ac9ff9e49112..712cfcf41408 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,49 +1,52 @@
-MD5 4ae22b17d15b2875b593e660b938f4ab ChangeLog 12945
-MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
+MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
+MD5 d7d8e9aad515d185d7649fb364384255 ChangeLog 13436
+MD5 d49003778a78d50c5a8bf8120b39c262 apache-2.0.47-r1.ebuild 10708
 MD5 d059ab302d0e6b1b96070adc4458ae08 apache-1.3.27-r4.ebuild 8653
-MD5 a9d070561f89df4b231e17ce84564e92 apache-1.3.28.ebuild 8873
 MD5 13eef3200abf41ea1ae8bb18ab40e481 apache-2.0.46.ebuild 10682
-MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
-MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
+MD5 a9d070561f89df4b231e17ce84564e92 apache-1.3.28.ebuild 8873
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
+MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
+MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
+MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
+MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 b521110a970b3b41c1499596a59713fb files/apache.rc6 1020
+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 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
+MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
+MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-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 211
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
-MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
+MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
+MD5 f440f0a32308bc9dc9d9acd041c8b6c5 files/conf/apache.conf 7247
+MD5 e68da4777c0641e3bc5b284ee7f6fcf2 files/conf/commonapache.conf 22140
+MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
+MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
+MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
 MD5 14aebf386646fe7ab2623dad993a32fa files/2.0.40/40_mod_ssl.conf 3420
-MD5 8ce666f3b8ad3ed00c081dc29e19fe90 files/2.0.40/41_mod_ssl.default-vhost.conf 8039
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
-MD5 e14a1f0add1f5400e97cc6df5ad84429 files/2.0.40/apache2-builtin-mods 2230
-MD5 8203712c2d827475922d031ffb4061d4 files/2.0.40/apache2.conf 7643
-MD5 97cdfe2abbfdc3fa55671c54e726123b files/2.0.40/apache2.confd 775
-MD5 a50cd3bc27ab7007fc5730f916fc969d files/2.0.40/apache2.initd 1120
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 3c758c167d3aad7ed29b65e9ee565126 files/2.0.40/commonapache2.conf 30925
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
+MD5 e14a1f0add1f5400e97cc6df5ad84429 files/2.0.40/apache2-builtin-mods 2230
 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 287e41fba04d207f2107e3d64f4c06dd files/2.0.40/commonapache2.conf 31741
+MD5 3bcbe7fae380806bd65e8d7a6d04d05e files/2.0.40/apache2.confd 775
+MD5 46ddeda9735bc19a3ffa120ce7b3c153 files/2.0.40/apache2.initd 1132
+MD5 12f8ec6337e2990c8bb2161c98bbef33 files/2.0.40/apache2.conf 7649
 MD5 548304216950e0192bf40ae0f5ace370 files/2.0.40/vhosts.conf 1683
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
-MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 f440f0a32308bc9dc9d9acd041c8b6c5 files/conf/apache.conf 7247
-MD5 e68da4777c0641e3bc5b284ee7f6fcf2 files/conf/commonapache.conf 22140
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840