diff -urN gentoo-apache-2.0.58-r2.orig/conf/apache2-builtin-mods gentoo-apache-2.0.58-r2/conf/apache2-builtin-mods
--- gentoo-apache-2.0.58-r2.orig/conf/apache2-builtin-mods	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/apache2-builtin-mods	2007-02-18 15:28:53 -0500
@@ -1,7 +1,7 @@
-# This file will be installed into /etc/apache2 when you first emerge
+# This file will be installed into XXX_EPREFIX_XXX/etc/apache2 when you first emerge
 # Apache2.  If/when you upgrade, it will be consulted for your options,
 # thus preserving your previous configuration.  The default configuration
-# in files/ is used if the one in /etc/apache2 isn't available.
+# in files/ is used if the one in XXX_EPREFIX_XXX/etc/apache2 isn't available.
 #
 # To compile a module statically into the apache binary, simply put
 # static beside it.  To compile a module as a DSO, put shared beside
diff -urN gentoo-apache-2.0.58-r2.orig/conf/httpd.conf gentoo-apache-2.0.58-r2/conf/httpd.conf
--- gentoo-apache-2.0.58-r2.orig/conf/httpd.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/httpd.conf	2007-02-18 18:27:37 -0500
@@ -39,8 +39,8 @@
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
 # with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
-# with ServerRoot set to "/usr/lib/apache2" will be interpreted by the
-# server as "/usr/lib/apache2/logs/foo.log".
+# with ServerRoot set to "XXX_EPREFIX_XXX/usr/lib/apache2" will be interpreted by the
+# server as "XXX_EPREFIX_XXX/usr/lib/apache2/logs/foo.log".
 #
 
 ### Section 1: Global Environment
@@ -61,12 +61,12 @@
 #
 # Do NOT add a slash at the end of the directory path.
 #
-ServerRoot "/usr/lib/apache2"
+ServerRoot "XXX_EPREFIX_XXX/usr/lib/apache2"
 
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-#LockFile "/var/run/apache2.lock"
+#LockFile "XXX_EPREFIX_XXX/var/run/apache2.lock"
 
 #
 # ScoreBoardFile: File used to store internal server process information.
@@ -77,7 +77,7 @@
 # scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
 #
 <IfModule !perchild.c>
-    #ScoreBoardFile /var/run/apache2_runtime_status
+    #ScoreBoardFile XXX_EPREFIX_XXX/var/run/apache2_runtime_status
 </IfModule>
 
 
@@ -85,7 +85,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
-PidFile "/var/run/apache2.pid"
+PidFile "XXX_EPREFIX_XXX/var/run/apache2.pid"
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@ -181,7 +181,7 @@
     
     Multiplexer nobody nobody
     
-    Processor apache apache
+    Processor XXX_WWW_USER_XXX XXX_WWW_GROUP_XXX
     
     # chroot dir is optional:
     # Processor user group /path/to/chroot
@@ -210,7 +210,7 @@
 # prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
 #
 #Listen 12.34.56.78:80
-Listen 80
+Listen XXX_WWW_PORT_XXX
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -378,7 +378,7 @@
 # We Include extra .conf files from /etc/apache2/modules.d
 # This is used to load things like PHP and mod_ssl.
 #
-Include /etc/apache2/modules.d/*.conf
+Include XXX_EPREFIX_XXX/etc/apache2/modules.d/*.conf
 
 ### Section 2: 'Main' server configuration
 #
@@ -404,8 +404,8 @@
 #  when the value of (unsigned)Group is above 60000; 
 #  don't use Group #-1 on these systems!
 #
-User apache
-Group apache
+User XXX_WWW_USER_XXX
+Group XXX_WWW_GROUP_XXX
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -470,7 +470,7 @@
 # Control access to UserDir directories.  The following is an example
 # for a site where these directories are restricted to read-only.
 #
-    <Directory /home/*/public_html>
+    <Directory XXX_WWW_USERDIR_XXX>
         AllowOverride FileInfo AuthConfig Limit Indexes
         Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
         <Limit GET POST OPTIONS PROPFIND>
@@ -487,7 +487,7 @@
 # Enable this additional section if you would like to make use of a
 # suexec-enabled cgi-bin directory on a per-user basis.
 #
-#<Directory /home/*/public_html/cgi-bin>
+#<Directory XXX_WWW_USERDIR_XXX/cgi-bin>
 #    Options ExecCGI
 #    SetHandler cgi-script
 #</Directory>
@@ -525,7 +525,7 @@
 # TypesConfig describes where the mime.types file (or equivalent) is
 # to be found.
 #
-TypesConfig /etc/mime.types
+TypesConfig XXX_EPREFIX_XXX/etc/mime.types
 
 #
 # DefaultType is the default MIME type the server will use for a document
@@ -661,9 +661,9 @@
 # We include the /icons/ alias for FancyIndexed directory listings.  If you
 # do not use FancyIndexing, you may comment this out.
 #
-Alias /icons/ "/var/www/localhost/icons/"
+Alias /icons/ "XXX_EPREFIX_XXX/var/www/localhost/icons/"
 
-<Directory "/var/www/localhost/icons/">
+<Directory "XXX_EPREFIX_XXX/var/www/localhost/icons/">
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
@@ -678,21 +678,21 @@
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
+ScriptAlias /cgi-bin/ XXX_EPREFIX_XXX/var/www/localhost/cgi-bin/
 
 <IfModule mod_cgid.c>
     #
     # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
     # for setting UNIX socket for communicating with cgid.
     #
-    #Scriptsock            /var/run/cgisock
+    #Scriptsock            XXX_EPREFIX_XXX/var/run/cgisock
 </IfModule>
 
 #
-# "/var/www/localhost/cgi-bin/" should be changed to whatever your ScriptAliased
+# "XXX_EPREFIX_XXX/var/www/localhost/cgi-bin/" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "/var/www/localhost/cgi-bin/">
+<Directory "XXX_EPREFIX_XXX/var/www/localhost/cgi-bin/">
     AllowOverride None
     Options None
     Order allow,deny
@@ -1097,4 +1097,4 @@
 # For Gentoo we include External Virtual Hosts Files.
 # Please see vhosts.d/00_default_vhost.conf for the default virtual host.
 #
-Include /etc/apache2/vhosts.d/*.conf
+Include XXX_EPREFIX_XXX/etc/apache2/vhosts.d/*.conf
diff -urN gentoo-apache-2.0.58-r2.orig/conf/modules.d/00_apache_manual.conf gentoo-apache-2.0.58-r2/conf/modules.d/00_apache_manual.conf
--- gentoo-apache-2.0.58-r2.orig/conf/modules.d/00_apache_manual.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/modules.d/00_apache_manual.conf	2007-02-18 15:37:00 -0500
@@ -4,10 +4,10 @@
 # this out if you do not care for the documentation.
 #
 <IfModule mod_alias.c>
-	AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/usr/share/doc/apache-2.0.49/manual$1"
+	AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "XXX_EPREFIX_XXX/usr/share/doc/apache-2.0.49/manual$1"
 </IfModule>
 
-<Directory "/usr/share/doc/apache-2.0.49/manual">
+<Directory "XXX_EPREFIX_XXX/usr/share/doc/apache-2.0.49/manual">
     Options Indexes
     AllowOverride None
     Order allow,deny
diff -urN gentoo-apache-2.0.58-r2.orig/conf/modules.d/40_mod_ssl.conf gentoo-apache-2.0.58-r2/conf/modules.d/40_mod_ssl.conf
--- gentoo-apache-2.0.58-r2.orig/conf/modules.d/40_mod_ssl.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/modules.d/40_mod_ssl.conf	2007-02-18 15:38:42 -0500
@@ -44,7 +44,7 @@
 # standard HTTP port (see above) and to the HTTPS port
 #
 
-Listen 443
+Listen XXX_WWW_SSL_PORT_XXX
 
 ##
 ##  SSL Global Context
@@ -76,12 +76,12 @@
 #SSLSessionCache        shmht:logs/ssl_scache(512000)
 #SSLSessionCache        shmcb:logs/ssl_scache(512000)
 #SSLSessionCache        dbm:/var/cache/apache2/ssl_scache
-SSLSessionCache         shm:/var/cache/apache2/ssl_scache(512000)
+SSLSessionCache         shm:XXX_EPREFIX_XXX/var/cache/apache2/ssl_scache(512000)
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
 
-SSLMutex  file:/var/cache/apache2/ssl_mutex
+SSLMutex  file:XXX_EPREFIX_XXX/var/cache/apache2/ssl_mutex
 </IfModule>
diff -urN gentoo-apache-2.0.58-r2.orig/conf/modules.d/41_mod_ssl.default-vhost.conf gentoo-apache-2.0.58-r2/conf/modules.d/41_mod_ssl.default-vhost.conf
--- gentoo-apache-2.0.58-r2.orig/conf/modules.d/41_mod_ssl.default-vhost.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/modules.d/41_mod_ssl.default-vhost.conf	2007-02-18 18:25:22 -0500
@@ -9,11 +9,11 @@
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:443>
+<VirtualHost _default_:XXX_WWW_SSL_PORT_XXX>
 
 #   General setup for the virtual host
-DocumentRoot "/var/www/localhost/htdocs"
-ServerName localhost:443
+DocumentRoot "XXX_EPREFIX_XXX/var/www/localhost/htdocs"
+ServerName localhost:XXX_WWW_SSL_PORT_XXX
 ServerAdmin root@localhost
 ErrorLog logs/ssl_error_log
 <IfModule mod_log_config.c>
@@ -136,7 +136,7 @@
     SSLOptions +StdEnvVars
 </Files>
 
-<Directory "/var/www/localhost/cgi-bin">
+<Directory "XXX_EPREFIX_XXX/var/www/localhost/cgi-bin">
     SSLOptions +StdEnvVars
 </Directory>
 
diff -urN gentoo-apache-2.0.58-r2.orig/conf/modules.d/45_mod_dav.conf gentoo-apache-2.0.58-r2/conf/modules.d/45_mod_dav.conf
--- gentoo-apache-2.0.58-r2.orig/conf/modules.d/45_mod_dav.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/modules.d/45_mod_dav.conf	2007-02-18 15:40:38 -0500
@@ -26,6 +26,6 @@
 <IfModule mod_dav_fs.c>
 
     # Location of the WebDAV lock database.
-    DavLockDB /var/lib/dav/lockdb
+    DavLockDB XXX_EPREFIX_XXX/var/lib/dav/lockdb
 
 </IfModule>
diff -urN gentoo-apache-2.0.58-r2.orig/conf/vhosts.d/00_default_vhost.conf gentoo-apache-2.0.58-r2/conf/vhosts.d/00_default_vhost.conf
--- gentoo-apache-2.0.58-r2.orig/conf/vhosts.d/00_default_vhost.conf	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/conf/vhosts.d/00_default_vhost.conf	2007-02-18 15:43:14 -0500
@@ -15,7 +15,7 @@
 #
 # Use name-based virtual hosting.
 #
-NameVirtualHost *:80
+NameVirtualHost *:XXX_WWW_PORT_XXX
 
 #
 # VirtualHost example:
@@ -25,7 +25,7 @@
 #
 #<VirtualHost *:80>
 #    ServerAdmin webmaster@dummy-host.example.com
-#    DocumentRoot /www/docs/dummy-host.example.com
+#    DocumentRoot XXX_EPREFIX_XXX/www/docs/dummy-host.example.com
 #    ServerName dummy-host.example.com
 #    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
 #    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
@@ -38,18 +38,18 @@
 #
 
 <IfDefine DEFAULT_VHOST>
-<VirtualHost *:80>
+<VirtualHost *:XXX_WWW_PORT_XXX>
     #
     # DocumentRoot: The directory out of which you will serve your
     # documents. By default, all requests are taken from this directory, but
     # symbolic links and aliases may be used to point to other locations.
     #
-    DocumentRoot "/var/www/localhost/htdocs"
+    DocumentRoot "XXX_EPREFIX_XXX/var/www/localhost/htdocs"
 
     #
     # This should be changed to whatever you set DocumentRoot to.
     #
-    <Directory "/var/www/localhost/htdocs">
+    <Directory "XXX_EPREFIX_XXX/var/www/localhost/htdocs">
 
         #
         # Possible values for the Options directive are "None", "All",
@@ -90,7 +90,7 @@
 
     <IfModule itk.c>
         # The userid and groupid this VirtualHost will run as
-        AssignUserID apache apache
+        AssignUserID XXX_WWW_USER_XXX XXX_WWW_GROUP_XXX
 
         # Optional: A separate MaxClients for the VirtualHost,
         # to limit the maximum number of processes
diff -urN gentoo-apache-2.0.58-r2.orig/patches/config.layout gentoo-apache-2.0.58-r2/patches/config.layout
--- gentoo-apache-2.0.58-r2.orig/patches/config.layout	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/patches/config.layout	2007-02-18 15:46:53 -0500
@@ -1,23 +1,23 @@
 <Layout Gentoo>
-	prefix:          /usr
-	exec_prefix:     /usr
-	bindir:          /usr/bin
-	sbindir:         /usr/sbin
-	libdir:          /usr/lib
-	libexecdir:      /usr/lib/apache2/modules
-	mandir:          /usr/share/man
-	infodir:         /usr/share/info
-	includedir:      /usr/include/apache2
-	installbuilddir: /usr/lib/apache2/build
-	datadir:         /var/www/localhost
-	errordir:        /var/www/localhost/error
-	iconsdir:        /var/www/localhost/icons
-	htdocsdir:       /var/www/localhost/htdocs
-	cgidir:          /var/www/localhost/cgi-bin
-	manualdir:       /usr/share/doc/version/manual
-	sysconfdir:      /etc/apache2
-	localstatedir:   /var
-	runtimedir:      /var/run
-	logfiledir:      /var/log/apache2
-	proxycachedir:   /var/cache/apache2
+	prefix:          XXX_EPREFIX_XXX/usr
+	exec_prefix:     XXX_EPREFIX_XXX/usr
+	bindir:          XXX_EPREFIX_XXX/usr/bin
+	sbindir:         XXX_EPREFIX_XXX/usr/sbin
+	libdir:          XXX_EPREFIX_XXX/usr/lib
+	libexecdir:      XXX_EPREFIX_XXX/usr/lib/apache2/modules
+	mandir:          XXX_EPREFIX_XXX/usr/share/man
+	infodir:         XXX_EPREFIX_XXX/usr/share/info
+	includedir:      XXX_EPREFIX_XXX/usr/include/apache2
+	installbuilddir: XXX_EPREFIX_XXX/usr/lib/apache2/build
+	datadir:         XXX_EPREFIX_XXX/var/www/localhost
+	errordir:        XXX_EPREFIX_XXX/var/www/localhost/error
+	iconsdir:        XXX_EPREFIX_XXX/var/www/localhost/icons
+	htdocsdir:       XXX_EPREFIX_XXX/var/www/localhost/htdocs
+	cgidir:          XXX_EPREFIX_XXX/var/www/localhost/cgi-bin
+	manualdir:       XXX_EPREFIX_XXX/usr/share/doc/version/manual
+	sysconfdir:      XXX_EPREFIX_XXX/etc/apache2
+	localstatedir:   XXX_EPREFIX_XXX/var
+	runtimedir:      XXX_EPREFIX_XXX/var/run
+	logfiledir:      XXX_EPREFIX_XXX/var/log/apache2
+	proxycachedir:   XXX_EPREFIX_XXX/var/cache/apache2
 </Layout>
diff -urN gentoo-apache-2.0.58-r2.orig/scripts/gentestcrt.sh gentoo-apache-2.0.58-r2/scripts/gentestcrt.sh
--- gentoo-apache-2.0.58-r2.orig/scripts/gentestcrt.sh	2007-02-18 15:26:20 -0500
+++ gentoo-apache-2.0.58-r2/scripts/gentestcrt.sh	2007-02-18 16:06:00 -0500
@@ -6,7 +6,7 @@
 ##
 
 #   external tools
-openssl="/usr/bin/openssl"
+openssl="XXX_EPREFIX_XXX/usr/bin/openssl"
 
 #   some optional terminal sequences
 case $TERM in