DATADIR is no longer necessary, same trickery exists for GLOBAL_CONFIG_PATH as for...

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 7029b75a0ff3f385ff792f593b284d5293e4df4c..a74e8bbaff3bf547831cf57ccf8631dd8aac2f36 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -65,7 +65,7 @@ NEWS_LIB_PATH            = "var/lib/gentoo"
 
 # these variables are not used with target_root or config_root
 DEPCACHE_PATH            = "/var/cache/edb/dep"
-GLOBAL_CONFIG_PATH       = DATADIR + "/portage/config"
+GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
 PORTAGE_BASE_PATH        = PORTAGE_BASE
 PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"
 PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"

diff --git a/pym/portage/const_autotool.py b/pym/portage/const_autotool.py
index 27c6906c6eb0e161aecaff139caf24021332e21a..d12003c46cc00a8e574e913f63d8af74410ce30f 100644 (file)
--- a/pym/portage/const_autotool.py
+++ b/pym/portage/const_autotool.py
@@ -3,7 +3,7 @@
 
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
-__all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
+__all__ = ["EPREFIX", "SYSCONFDIR", "PORTAGE_BASE",
                "portageuser", "portagegroup", "rootuser", "rootuid", "rootgid",
                "PORTAGE_BASH", "PORTAGE_MV"]
 
@@ -11,7 +11,6 @@ from os import path
 
 EPREFIX      = "@PORTAGE_EPREFIX@"
 SYSCONFDIR   = "@sysconfdir@"
-DATADIR      = "@datadir@"
 PORTAGE_BASE = "@PORTAGE_BASE@"
 
 portagegroup = "@portagegroup@"