diff -ur /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/config.py WebappConfig/config.py --- /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/config.py 2006-12-30 22:38:36 +0400 +++ WebappConfig/config.py 2007-10-13 19:12:53 +0400 @@ -206,7 +206,7 @@ self.__d = { 'config_protect' : wrapper.config_protect, # Necessary to load the config file - 'my_etcconfig' : '/etc/vhosts/webapp-config', + 'my_etcconfig' : os.environ['EPREFIX'] + '/etc/vhosts/webapp-config', 'my_dotconfig' : '.webapp', 'my_version' : WCVERSION, 'my_conf_version' : '7', @@ -248,7 +248,7 @@ # -- wrobel 'vhost_server_uid' : 'root', 'vhost_server_gid' : 'root', - 'vhost_root' : '/var/www/%(vhost_hostname)s', + 'vhost_root' : os.environ['EPREFIX'] + '/var/www/%(vhost_hostname)s', 'g_htdocsdir' : '%(vhost_root)s/%(my_htdocsbase)s', 'my_appdir' : '%(my_approot)s/%(my_appsuffix)s', 'my_htdocsdir' : '%(my_appdir)s/htdocs', @@ -257,9 +257,9 @@ 'my_cgibindir' : '%(my_hostrootdir)s/%(my_cgibinbase)s', 'my_iconsdir' : '%(my_hostrootdir)s/%(my_iconsbase)s', 'my_errorsdir' : '%(my_hostrootdir)s/%(my_errorsbase)s', - 'my_approot' : '/usr/share/webapps', + 'my_approot' : os.environ['EPREFIX'] + '/usr/share/webapps', 'my_appsuffix' : '%(pn)s/%(pvr)s', - 'my_persistroot' : '/var/db/webapps', + 'my_persistroot' : os.environ['EPREFIX'] + '/var/db/webapps', 'my_hostrootbase' : 'hostroot', 'my_cgibinbase' : 'cgi-bin', 'my_iconsbase' : 'icons', diff -ur /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/db.py WebappConfig/db.py --- /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/db.py 2006-12-30 22:38:35 +0400 +++ WebappConfig/db.py 2007-10-13 15:58:27 +0400 @@ -461,7 +461,7 @@ ''' def __init__(self, - root = '/usr/share/webapps', + root = os.environ['EPREFIX'] + '/usr/share/webapps', package = '', version = '', installed = 'installed_by_webapp_eclass'): diff -ur /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/sandbox.py WebappConfig/sandbox.py --- /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/sandbox.py 2006-12-30 22:38:36 +0400 +++ WebappConfig/sandbox.py 2007-10-13 20:55:05 +0400 @@ -40,7 +40,7 @@ self.config = config self.__path = [config_libdir + '/libsandbox.so', - '/usr/lib/libsandbox.so', '/lib/libsandbox.so'] + os.environ['EPREFIX'] + '/usr/lib/libsandbox.so', os.environ['EPREFIX'] + '/lib/libsandbox.so'] self.__export = {} self.__write = ['g_installdir', 'g_htdocsdir', diff -ur /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/wrapper.py WebappConfig/wrapper.py --- /Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/wrapper.py 2006-12-30 22:38:35 +0400 +++ WebappConfig/wrapper.py 2007-10-13 16:00:34 +0400 @@ -52,7 +52,7 @@ # example, if ABI == 'amd64' then read LIBDIR_amd64. This routine should work on # all arches as it sets '/usr/lib' as a fallback. See bugs #125032 and #125156. -config_libdir = '/usr/lib' +config_libdir = os.environ['EPREFIX'] + '/usr/lib' if 'ABI' in portage.settings.keys(): config_abi = portage.settings['ABI']