CHROMIUM : Update portage variable lists

Also add LINGUAS and AFDO_LOCATION to manual lists.

BUG=b:232414749
BUG=b:227198440
TEST=stack test

Change-Id: I17c60b3ba32320e3b5c691f5ae2c76356891a98b
diff --git a/src/ShellCheck/Data.hs b/src/ShellCheck/Data.hs
index a6a796d..89ce048 100644
--- a/src/ShellCheck/Data.hs
+++ b/src/ShellCheck/Data.hs
@@ -119,7 +119,13 @@
     "RESTRICT_PYTHON_ABIS", "PYTHON_MODNAME",
 
     -- ABI variables
-    "ABI", "DEFAULT_ABI"
+    "ABI", "DEFAULT_ABI",
+
+    -- AFDO variables
+    "AFDO_LOCATION",
+
+    -- Linguas
+    "LINGUAS"
   ]
 
 eclassVarsFromMap :: String -> [String]
diff --git a/src/ShellCheck/PortageAutoInternalVariables.hs b/src/ShellCheck/PortageAutoInternalVariables.hs
index 741da10..fdb1349 100644
--- a/src/ShellCheck/PortageAutoInternalVariables.hs
+++ b/src/ShellCheck/PortageAutoInternalVariables.hs
@@ -6,7 +6,7 @@
 -- third_party/chromiumos-overlay/dev-util/shellcheck/files/get_vars.py
 
 
--- Last Generated: 04/11/22
+-- Last Generated: 12/02/22
 
 import qualified Data.Map
 
@@ -15,19 +15,6 @@
     [
     ("alternatives", ["ALTERNATIVES", "SOURCE"]),
 
-    ("ant-tasks", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "JAVA_ANT_CLASSPATH_TAGS", "JAVA_ANT_DISABLE_ANT_CORE_DEP",
-    "JAVA_ANT_IGNORE_SYSTEM_CLASSES", "JAVA_PKG_ALLOW_VM_CHANGE",
-    "JAVA_PKG_BSFIX", "JAVA_PKG_BSFIX_ALL", "JAVA_PKG_BSFIX_NAME",
-    "JAVA_PKG_BSFIX_SOURCE_TAGS", "JAVA_PKG_BSFIX_TARGET_TAGS",
-    "JAVA_PKG_COMPILERS_CONF", "JAVA_PKG_COMPILER_DIR", "JAVA_PKG_DEBUG",
-    "JAVA_PKG_E_DEPEND", "JAVA_PKG_FORCE_ANT_TASKS", "JAVA_PKG_FORCE_COMPILER",
-    "JAVA_PKG_FORCE_VM", "JAVA_PKG_IUSE", "JAVA_PKG_WANT_BOOTCLASSPATH",
-    "JAVA_PKG_WANT_BUILD_VM", "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET",
-    "JAVA_RM_FILES", "WANT_ANT_TASKS"]),
-
     ("apache-2", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
     "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EPATCH_COMMON_OPTS",
     "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
@@ -39,10 +26,6 @@
     "MY_MPM", "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL",
     "_LATEST_AUTOMAKE"]),
 
-    ("apache-module", ["APACHE2_EXECFILES", "APACHE2_MOD_CONF",
-    "APACHE2_MOD_DEFINE", "APACHE2_MOD_FILE", "APACHE2_VHOST_CONF",
-    "APXS2_ARGS", "APXS2_S", "DOCFILES"]),
-
     ("arc-build", ["ARC_BASE", "ARC_ETC_DIR", "ARC_LLVM_VERSION", "ARC_PREFIX",
     "ARC_VENDOR_DIR", "ARC_VERSION_MAJOR", "ARC_VERSION_MINOR",
     "ARC_VERSION_PATCH", "AUTOTEST_BASE", "BUILD_DIR", "CHROMITE_BIN_DIR",
@@ -55,8 +38,6 @@
     "MULTILIB_CHOST_TOOLS", "MULTILIB_COMPAT", "MULTILIB_USEDEP",
     "MULTILIB_WRAPPED_HEADERS", "_MULTILIB_FLAGS"]),
 
-    ("aspell-dict", ["ASPELL_LANG", "ASPOSTFIX"]),
-
     ("autotest", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR",
     "AUTOTEST_BASE", "AUTOTEST_FILE_MASK", "AUTOTEST_FORCE_LIST",
     "CHROMITE_BIN_DIR", "CHROMITE_DIR", "CHROOT_SOURCE_ROOT",
@@ -109,46 +90,16 @@
     "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
 
-    ("boost-utils", ["BOOST_MAX_SLOT"]),
-
-    ("bsdmk", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "mymakeopts"]),
-
-    ("bzr", ["EBZR_BOOTSTRAP", "EBZR_CACHE_DIR", "EBZR_DIFF_CMD",
-    "EBZR_EXPORT_CMD", "EBZR_FETCH_CMD", "EBZR_OFFLINE", "EBZR_OPTIONS",
-    "EBZR_PATCHES", "EBZR_REPO_URI", "EBZR_REVISION", "EBZR_REVNO_CMD",
-    "EBZR_STORE_DIR", "EBZR_UPDATE_CMD", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
     ("cargo", ["CARGO_INSTALL_PATH"]),
 
     ("cbi-image", ["CROS_CBI_IMAGE_DIR", "EEPROM_SIZE"]),
 
-    ("cdrom", ["CDROM_OPTIONAL"]),
-
-    ("chromium", ["CHROMIUM_LANGS", "CONFIG_CHECK", "DESKTOP_DATABASE_DIR",
-    "EGYP_CHROMIUM_COMMAND", "EGYP_CHROMIUM_DEPTH", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "GCONFTOOL_BIN",
-    "GLIB_COMPILE_SCHEMAS", "GNOME2_ECLASS_GDK_PIXBUF_LOADERS",
-    "GNOME2_ECLASS_GLIB_SCHEMAS", "GNOME2_ECLASS_ICONS",
-    "GNOME2_ECLASS_SCHEMAS", "GNOME2_ECLASS_SCROLLS", "KBUILD_OUTPUT",
-    "KERNEL_DIR", "KV_DIR", "KV_EXTRA", "KV_FULL", "KV_LOCAL", "KV_MAJOR",
-    "KV_MINOR", "KV_OUT_DIR", "KV_PATCH", "MIMEINFO_DATABASE_DIR",
-    "SCROLLKEEPER_DIR", "SCROLLKEEPER_UPDATE_BIN", "_LINUX_CONFIG_EXISTS_DONE"]),
-
     ("chromium-source", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR",
     "AUTOTEST_BASE", "CHROMITE_BIN_DIR", "CHROMITE_DIR",
     "CHROMIUM_GCLIENT_TEMPLATE", "CHROOT_SOURCE_ROOT", "CROS_GIT_AOSP_URL",
     "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL", "DEPOT_TOOLS", "EGCLIENT",
     "ENINJA"]),
 
-    ("clutter", ["DOCS", "EXAMPLES"]),
-
     ("cmake", ["BUILD_DIR", "CMAKE_BINARY", "CMAKE_BUILD_TYPE",
     "CMAKE_EXTRA_CACHE_FILE", "CMAKE_IN_SOURCE_BUILD",
     "CMAKE_MAKEFILE_GENERATOR", "CMAKE_QA_SRC_DIR_READONLY",
@@ -180,21 +131,6 @@
     "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
     "EPATCH_USER_SOURCE"]),
 
-    ("common-lisp-common-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("common-lisp-common-3", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("confutils", ["EBUILD_SUPPORTS_SHAREDEXT", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("coreboot-sdk", ["COREBOOT_SDK_PREFIX", "COREBOOT_SDK_PREFIX_arm",
     "COREBOOT_SDK_PREFIX_arm64", "COREBOOT_SDK_PREFIX_mips",
     "COREBOOT_SDK_PREFIX_nds32", "COREBOOT_SDK_PREFIX_riscv",
@@ -204,10 +140,6 @@
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
 
-    ("cron", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("cros-arm64", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR",
     "AUTOTEST_BASE", "CHROMITE_BIN_DIR", "CHROMITE_DIR", "CHROOT_SOURCE_ROOT",
     "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
@@ -381,13 +313,22 @@
     "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
     "CROS_RUST_CRATE_NAME", "CROS_RUST_CRATE_VERSION", "CROS_RUST_EMPTY_CRATE",
     "CROS_RUST_EMPTY_CRATE_FEATURES", "CROS_RUST_HOST_TESTS",
-    "CROS_RUST_OVERFLOW_CHECKS", "CROS_RUST_PLATFORM_TEST_ARGS",
+    "CROS_RUST_OVERFLOW_CHECKS", "CROS_RUST_PACKAGE_IS_HOT",
+    "CROS_RUST_PLATFORM_TEST_ARGS", "CROS_RUST_PREINSTALLED_REGISTRY_CRATE",
     "CROS_RUST_REMOVE_DEV_DEPS", "CROS_RUST_REMOVE_TARGET_CFG",
     "CROS_RUST_SUBDIR", "CROS_RUST_TESTS", "CROS_RUST_TEST_DIRECT_EXEC_ONLY",
     "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
     "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
 
+    ("cros-rustc", ["CROS_RUSTC_BUILD_RAW_SOURCES", "EPATCH_COMMON_OPTS",
+    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
+    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
+    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EPYTHON", "PYTHON",
+    "PYTHON_COMPAT", "PYTHON_COMPAT_NO_STRICT", "PYTHON_COMPAT_OVERRIDE",
+    "PYTHON_DEPS", "PYTHON_REQ_USE", "PYTHON_USEDEP",
+    "RUSTC_BARE_TARGET_TRIPLES", "RUSTC_TARGET_TRIPLES", "_PYTHON_ALL_IMPLS"]),
+
     ("cros-sanitizers", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
@@ -419,24 +360,6 @@
     "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
     "EPATCH_USER_SOURCE", "NVCCFLAGS"]),
 
-    ("cvs", ["ECVS_AUTH", "ECVS_BRANCH", "ECVS_CLEAN", "ECVS_CO_OPTS",
-    "ECVS_CVS_COMMAND", "ECVS_CVS_COMPRESS", "ECVS_CVS_OPTIONS", "ECVS_LOCAL",
-    "ECVS_LOCALNAME", "ECVS_MODULE", "ECVS_PASS", "ECVS_RUNAS", "ECVS_SERVER",
-    "ECVS_SSH_HOST_KEY", "ECVS_TOP_DIR", "ECVS_UP_OPTS", "ECVS_USER",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("depend.apache", ["APACHE2_2_DEPEND", "APACHE2_DEPEND", "APACHE_BASEDIR",
-    "APACHE_BIN", "APACHE_CONFDIR", "APACHE_CTL", "APACHE_DEPEND",
-    "APACHE_MODULESDIR", "APACHE_MODULES_CONFDIR", "APACHE_VERSION",
-    "APACHE_VHOSTS_CONFDIR", "APXS"]),
-
-    ("depend.php", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "PHPCHECKNODIE"]),
-
     ("distutils-r1", ["BUILD_DIR", "DESKTOP_DATABASE_DIR",
     "DISTUTILS_ALL_SUBPHASE_IMPLS", "DISTUTILS_IN_SOURCE_BUILD",
     "DISTUTILS_OPTIONAL", "DISTUTILS_SINGLE_IMPL", "DISTUTILS_USE_SETUPTOOLS",
@@ -455,12 +378,9 @@
     "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
     "DLC_CRITICAL_UPDATE", "DLC_DAYS_TO_PURGE", "DLC_DESCRIPTION",
     "DLC_ENABLED", "DLC_FACTORY_INSTALL", "DLC_FS_TYPE", "DLC_ID",
-    "DLC_MOUNT_FILE_REQUIRED", "DLC_NAME", "DLC_PACKAGE", "DLC_PREALLOC_BLOCKS",
-    "DLC_PRELOAD", "DLC_RESERVED", "DLC_SCALED", "DLC_USED_BY", "DLC_VERSION"]),
-
-    ("eclipse-ext", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
+    "DLC_LOADPIN_VERITY_DIGEST", "DLC_MOUNT_FILE_REQUIRED", "DLC_NAME",
+    "DLC_PACKAGE", "DLC_PREALLOC_BLOCKS", "DLC_PRELOAD", "DLC_RESERVED",
+    "DLC_SCALED", "DLC_USED_BY", "DLC_VERSION"]),
 
     ("elisp", ["BYTECOMPFLAGS", "DOCS", "ELISP_PATCHES", "ELISP_TEXINFO",
     "EMACS", "EMACSFLAGS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
@@ -471,10 +391,6 @@
     ("elisp-common", ["BYTECOMPFLAGS", "EMACS", "EMACSFLAGS", "SITEETC",
     "SITELISP"]),
 
-    ("embassy", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("emboss", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
     "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EBO_DESCRIPTION",
     "EBO_EAUTORECONF", "EBO_EXTRA_ECONF", "EPATCH_COMMON_OPTS",
@@ -483,17 +399,6 @@
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
     "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
 
-    ("enlightenment", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "ECVS_AUTH",
-    "ECVS_BRANCH", "ECVS_CLEAN", "ECVS_CO_OPTS", "ECVS_CVS_COMMAND",
-    "ECVS_CVS_COMPRESS", "ECVS_CVS_OPTIONS", "ECVS_LOCAL", "ECVS_LOCALNAME",
-    "ECVS_MODULE", "ECVS_PASS", "ECVS_RUNAS", "ECVS_SERVER",
-    "ECVS_SSH_HOST_KEY", "ECVS_TOP_DIR", "ECVS_UP_OPTS", "ECVS_USER",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
     ("epatch", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
@@ -512,11 +417,6 @@
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
 
-    ("font", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "FONTDIR",
-    "FONT_CONF", "FONT_PN", "FONT_S", "FONT_SUFFIX"]),
-
     ("fortran", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
     "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EPATCH_COMMON_OPTS",
     "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
@@ -526,48 +426,11 @@
 
     ("fortran-2", ["FORTRAN_NEEDED", "FORTRAN_NEED_OPENMP", "FORTRAN_STANDARD"]),
 
-    ("fox", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("freebsd", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "mymakeopts"]),
-
-    ("freedict", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "FORLANG",
-    "TOLANG"]),
-
     ("games", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS",
     "PATCHES"]),
 
-    ("games-ggz", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
-
-    ("games-mods", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
-
-    ("games-q3mod", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
-
-    ("gdesklets", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("gems", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "PATCHES",
-    "USE_RUBY"]),
-
     ("git-2", ["EGIT_BOOTSTRAP", "EGIT_BRANCH", "EGIT_COMMIT", "EGIT_DIR",
     "EGIT_HAS_SUBMODULES", "EGIT_MASTER", "EGIT_NONBARE", "EGIT_NOUNPACK",
     "EGIT_OPTIONS", "EGIT_PROJECT", "EGIT_PRUNE", "EGIT_REPACK",
@@ -578,35 +441,6 @@
     "EGIT_MIRROR_URI", "EGIT_REPO_URI", "EGIT_SUBMODULES", "EVCS_OFFLINE",
     "EVCS_UMASK"]),
 
-    ("gkrellm-plugin", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("gnat", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("gnatbuild", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
-    ("gnome-games", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DOCS",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES",
-    "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
-    ("gnome-python-common", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
     ("gnome.org", ["GNOME_ORG_MODULE", "GNOME_ORG_PVP", "GNOME_TARBALL_SUFFIX"]),
 
     ("gnome2", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
@@ -625,24 +459,9 @@
     "GNOME2_ECLASS_SCHEMAS", "GNOME2_ECLASS_SCROLLS", "MIMEINFO_DATABASE_DIR",
     "SCROLLKEEPER_DIR", "SCROLLKEEPER_UPDATE_BIN"]),
 
-    ("gnustep-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("gnustep-base", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("go-module", ["EGO_SUM", "_GOMODULE_GOPROXY_BASEURI",
     "_GOMODULE_GOSUM_REVERSE_MAP"]),
 
-    ("go-mono", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DOCS", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES",
-    "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
     ("golang-base", ["EGO_PN"]),
 
     ("golang-build", ["EGO_BUILD_FLAGS", "EGO_PN"]),
@@ -654,46 +473,11 @@
 
     ("golang-vcs-snapshot", ["EGO_PN", "EGO_VENDOR"]),
 
-    ("gpe", ["ELTCONF", "GPE_DOCS"]),
-
-    ("gst-plugins-bad", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("gst-plugins-base", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("gst-plugins-good", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("gst-plugins-ugly", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("gst-plugins10", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("gtest", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR", "AUTOTEST_BASE",
     "CHROMITE_BIN_DIR", "CHROMITE_DIR", "CHROOT_SOURCE_ROOT",
     "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
     "GTEST_METADATA_INSTALL_DIR"]),
 
-    ("gtk-sharp-module", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DESCRIPTION",
-    "DOCS", "EAUTORECONF", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "GTK_SHARP_MODULE", "GTK_SHARP_MODULE_DIR",
-    "GTK_SHARP_REQUIRED_VERSION", "HOMEPAGE", "HTML_DOCS", "PATCHES",
-    "PV_MAJOR", "S", "SRC_URI", "TARBALL", "WANT_AUTOCONF", "WANT_AUTOMAKE",
-    "WANT_LIBTOOL", "_LATEST_AUTOMAKE", "gapi_users_list"]),
-
     ("haskell-cabal", ["CABAL_DEBUG_LOOSENING", "CABAL_EXTRA_BUILD_FLAGS",
     "CABAL_EXTRA_CONFIGURE_FLAGS", "CABAL_EXTRA_TEST_FLAGS",
     "CABAL_REPORT_OTHER_BROKEN_PACKAGES", "EPATCH_COMMON_OPTS",
@@ -701,19 +485,6 @@
     "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "GHC_BOOTSTRAP_FLAGS"]),
 
-    ("horde", ["ECVS_AUTH", "ECVS_BRANCH", "ECVS_CLEAN", "ECVS_CO_OPTS",
-    "ECVS_CVS_COMMAND", "ECVS_CVS_COMPRESS", "ECVS_CVS_OPTIONS", "ECVS_LOCAL",
-    "ECVS_LOCALNAME", "ECVS_MODULE", "ECVS_PASS", "ECVS_RUNAS", "ECVS_SERVER",
-    "ECVS_SSH_HOST_KEY", "ECVS_TOP_DIR", "ECVS_UP_OPTS", "ECVS_USER",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WEBAPP_DEPEND",
-    "WEBAPP_NO_AUTO_INSTALL", "WEBAPP_OPTIONAL"]),
-
-    ("intel-sdp", ["INTEL_ARCH", "INTEL_BIN_RPMS", "INTEL_DAT_RPMS",
-    "INTEL_DID", "INTEL_DPN", "INTEL_DPV", "INTEL_RPMS_DIRS", "INTEL_SDP_DB",
-    "INTEL_SDP_DIR", "INTEL_SDP_EDIR", "INTEL_SUBDIR", "INTEL_X86"]),
-
     ("java-ant-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
@@ -727,27 +498,6 @@
     "JAVA_PKG_WANT_BUILD_VM", "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET",
     "JAVA_RM_FILES", "WANT_ANT_TASKS"]),
 
-    ("java-mvn-src", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "JAVAC_ARGS",
-    "JAVADOC_ARGS", "JAVA_ENCODING", "JAVA_GENTOO_CLASSPATH",
-    "JAVA_GENTOO_CLASSPATH_EXTRA", "JAVA_JAR_FILENAME",
-    "JAVA_PKG_ALLOW_VM_CHANGE", "JAVA_PKG_COMPILERS_CONF",
-    "JAVA_PKG_COMPILER_DIR", "JAVA_PKG_DEBUG", "JAVA_PKG_E_DEPEND",
-    "JAVA_PKG_FORCE_ANT_TASKS", "JAVA_PKG_FORCE_COMPILER", "JAVA_PKG_FORCE_VM",
-    "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
-    "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES",
-    "JAVA_SRC_DIR"]),
-
-    ("java-osgi", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "JAVA_PKG_ALLOW_VM_CHANGE", "JAVA_PKG_COMPILERS_CONF",
-    "JAVA_PKG_COMPILER_DIR", "JAVA_PKG_DEBUG", "JAVA_PKG_E_DEPEND",
-    "JAVA_PKG_FORCE_ANT_TASKS", "JAVA_PKG_FORCE_COMPILER", "JAVA_PKG_FORCE_VM",
-    "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
-    "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES", "_OSGI_T"]),
-
     ("java-pkg-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
@@ -766,18 +516,6 @@
     "JAVA_PKG_OPT_USE", "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
     "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES"]),
 
-    ("java-pkg-simple", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "JAVAC_ARGS",
-    "JAVADOC_ARGS", "JAVA_ENCODING", "JAVA_GENTOO_CLASSPATH",
-    "JAVA_GENTOO_CLASSPATH_EXTRA", "JAVA_JAR_FILENAME",
-    "JAVA_PKG_ALLOW_VM_CHANGE", "JAVA_PKG_COMPILERS_CONF",
-    "JAVA_PKG_COMPILER_DIR", "JAVA_PKG_DEBUG", "JAVA_PKG_E_DEPEND",
-    "JAVA_PKG_FORCE_ANT_TASKS", "JAVA_PKG_FORCE_COMPILER", "JAVA_PKG_FORCE_VM",
-    "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
-    "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES",
-    "JAVA_SRC_DIR"]),
-
     ("java-utils-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
@@ -787,63 +525,15 @@
     "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
     "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES"]),
 
-    ("java-virtuals-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "JAVA_PKG_ALLOW_VM_CHANGE", "JAVA_PKG_COMPILERS_CONF",
-    "JAVA_PKG_COMPILER_DIR", "JAVA_PKG_DEBUG", "JAVA_PKG_E_DEPEND",
-    "JAVA_PKG_FORCE_ANT_TASKS", "JAVA_PKG_FORCE_COMPILER", "JAVA_PKG_FORCE_VM",
-    "JAVA_PKG_WANT_BOOTCLASSPATH", "JAVA_PKG_WANT_BUILD_VM",
-    "JAVA_PKG_WANT_SOURCE", "JAVA_PKG_WANT_TARGET", "JAVA_RM_FILES"]),
-
     ("java-vm-2", ["EPREFIX", "JAVA_VM_BUILD_ONLY", "JAVA_VM_CONFIG_DIR",
     "JAVA_VM_DIR", "JAVA_VM_SYSTEM"]),
 
-    ("kde4-base", ["CMAKE_REQUIRED", "CPPUNIT_REQUIRED", "EAPI", "ESVN_MIRROR",
-    "ESVN_PROJECT_SUFFIX", "ESVN_UP_FREQ", "KDEBASE", "KDE_DOC_DIRS",
-    "KDE_LINGUAS", "KDE_LINGUAS_DIR", "KDE_LIVE_SLOTS", "KDE_MINIMAL",
-    "KDE_REQUIRED", "KDE_SLOTS", "MULTIMEDIA_REQUIRED", "OPENGL_REQUIRED",
-    "PREFIX", "QT_MINIMAL", "WEBKIT_REQUIRED"]),
-
-    ("kde4-functions", ["EAPI", "KDEBASE", "KDE_DOC_DIRS", "KDE_LINGUAS",
-    "KDE_LINGUAS_DIR", "KDE_LIVE_SLOTS", "KDE_SLOTS"]),
-
-    ("kde4-meta", ["CMAKE_REQUIRED", "CPPUNIT_REQUIRED", "EAPI", "ESVN_MIRROR",
-    "ESVN_PROJECT_SUFFIX", "ESVN_UP_FREQ", "KDEBASE", "KDE_DOC_DIRS",
-    "KDE_LINGUAS", "KDE_LINGUAS_DIR", "KDE_LIVE_SLOTS", "KDE_MINIMAL",
-    "KDE_REQUIRED", "KDE_SLOTS", "KMCOMPILEONLY", "KMEXTRA", "KMEXTRACTONLY",
-    "KMMODULE", "KMNAME", "KMNOMODULE", "KMTARPARAMS", "MULTIMEDIA_REQUIRED",
-    "OPENGL_REQUIRED", "PREFIX", "QT_MINIMAL", "WEBKIT_REQUIRED"]),
-
-    ("kde4-meta-pkg", ["EAPI", "KDEBASE", "KDE_DOC_DIRS", "KDE_LINGUAS",
-    "KDE_LINGUAS_DIR", "KDE_LIVE_SLOTS", "KDE_SLOTS"]),
-
     ("kernel-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
 
     ("l10n", ["PLOCALES", "PLOCALE_BACKUP"]),
 
-    ("latex-package", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES", "SUPPLIER"]),
-
-    ("leechcraft", ["BUILD_DIR", "CMAKE_BINARY", "CMAKE_BUILD_TYPE",
-    "CMAKE_EXTRA_CACHE_FILE", "CMAKE_IN_SOURCE_BUILD",
-    "CMAKE_MAKEFILE_GENERATOR", "CMAKE_MIN_VERSION", "CMAKE_REMOVE_MODULES",
-    "CMAKE_REMOVE_MODULES_LIST", "CMAKE_USE_DIR",
-    "CMAKE_UTILS_QA_SRC_DIR_READONLY", "CMAKE_VERBOSE", "CMAKE_WARN_UNUSED_CLI",
-    "DESKTOP_DATABASE_DIR", "EGIT_BOOTSTRAP", "EGIT_BRANCH", "EGIT_COMMIT",
-    "EGIT_DIR", "EGIT_HAS_SUBMODULES", "EGIT_MASTER", "EGIT_NONBARE",
-    "EGIT_NOUNPACK", "EGIT_OPTIONS", "EGIT_PROJECT", "EGIT_PRUNE",
-    "EGIT_REPACK", "EGIT_REPO_URI", "EGIT_SOURCEDIR", "EGIT_STORE_DIR",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EVCS_OFFLINE",
-    "LEECHCRAFT_PLUGIN_CATEGORY", "MIMEINFO_DATABASE_DIR", "NINJAOPTS",
-    "mycmakeargs"]),
-
     ("libchrome", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
@@ -897,37 +587,6 @@
     "PYTHON_COMPAT_NO_STRICT", "_MULTILIB_FLAGS", "_PYTHON_ALL_IMPLS",
     "emesonargs"]),
 
-    ("mozconfig-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("mozconfig-3", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("mozcoreconf", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("mozcoreconf-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("mozextension", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("mozilla-launcher", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
-    ("mozlinguas", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "MOZ_FTP_URI",
-    "MOZ_LANGPACK_PREFIX", "MOZ_LANGPACK_SUFFIX", "MOZ_LANGS", "MOZ_P",
-    "MOZ_PN", "MOZ_PV"]),
-
     ("multibuild", ["BUILD_DIR", "MULTIBUILD_ID", "MULTIBUILD_VARIANT",
     "MULTIBUILD_VARIANTS"]),
 
@@ -947,92 +606,13 @@
     "MULTILIB_COMPAT", "MULTILIB_USEDEP", "MULTILIB_WRAPPED_HEADERS",
     "_MULTILIB_FLAGS"]),
 
-    ("myspell-r2", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "MYSPELL_DICT", "MYSPELL_HYPH",
-    "MYSPELL_THES", "PATCHES"]),
-
-    ("mysql", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EGIT_BOOTSTRAP", "EGIT_BRANCH",
-    "EGIT_COMMIT", "EGIT_DIR", "EGIT_HAS_SUBMODULES", "EGIT_MASTER",
-    "EGIT_NONBARE", "EGIT_NOUNPACK", "EGIT_OPTIONS", "EGIT_PROJECT",
-    "EGIT_PRUNE", "EGIT_REPACK", "EGIT_REPO_URI", "EGIT_SOURCEDIR",
-    "EGIT_STORE_DIR", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "EVCS_OFFLINE", "MYSQL_COMMUNITY_FEATURES", "MYSQL_PV_MAJOR",
-    "MYSQL_VERSION_ID", "PERCONA_VER", "WANT_AUTOCONF", "WANT_AUTOMAKE",
-    "WANT_LIBTOOL", "XTRADB_VER", "_LATEST_AUTOMAKE"]),
-
-    ("mysql-autotools", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EPREFIX", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
-    ("mysql-cmake", ["BUILD_DIR", "CMAKE_BINARY", "CMAKE_BUILD_TYPE",
-    "CMAKE_EXTRA_CACHE_FILE", "CMAKE_IN_SOURCE_BUILD",
-    "CMAKE_MAKEFILE_GENERATOR", "CMAKE_MIN_VERSION", "CMAKE_REMOVE_MODULES",
-    "CMAKE_REMOVE_MODULES_LIST", "CMAKE_USE_DIR",
-    "CMAKE_UTILS_QA_SRC_DIR_READONLY", "CMAKE_VERBOSE", "CMAKE_WARN_UNUSED_CLI",
-    "DESKTOP_DATABASE_DIR", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "EPREFIX", "MIMEINFO_DATABASE_DIR", "NINJAOPTS",
-    "mycmakeargs"]),
-
-    ("mysql-multilib-r1", ["MYSQL_CMAKE_EXTRA_DEFINES",
-    "MYSQL_CMAKE_NATIVE_DEFINES", "MYSQL_CMAKE_NONNATIVE_DEFINES",
-    "MYSQL_EXTRAS_VER", "MYSQL_PV_MAJOR", "MYSQL_VERSION_ID"]),
-
-    ("mysql-v2", ["BUILD", "MYSQL_EXTRAS_VER", "MYSQL_PV_MAJOR",
-    "MYSQL_VERSION_ID", "PERCONA_VER", "XTRADB_VER"]),
-
-    ("netsurf", ["BUILD_DIR", "DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "MULTIBUILD_ID", "MULTIBUILD_VARIANT",
-    "MULTIBUILD_VARIANTS", "MULTILIB_ABI_FLAG", "MULTILIB_CHOST_TOOLS",
-    "MULTILIB_COMPAT", "MULTILIB_USEDEP", "MULTILIB_WRAPPED_HEADERS",
-    "NETSURF_BUILDSYSTEM", "NETSURF_BUILDSYSTEM_SRC_URI",
-    "NETSURF_COMPONENT_TYPE", "PATCHES", "SRC_URI", "_MULTILIB_FLAGS",
-    "netsurf_makeconf"]),
-
     ("ninja-utils", ["NINJAOPTS"]),
 
-    ("nsplugins", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("oasis", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS",
-    "OASIS_BUILD_DOCS", "OASIS_BUILD_TESTS", "OASIS_NO_DEBUG", "PATCHES"]),
-
     ("obs-download", ["OBS_PACKAGE", "OBS_PROJECT", "OPENSUSE_RELEASE"]),
 
     ("obs-service", ["ADDITIONAL_FILES", "OBS_PACKAGE", "OBS_PROJECT",
     "OBS_SERVICE_NAME", "OPENSUSE_RELEASE"]),
 
-    ("office-ext", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "OO_EXTENSIONS"]),
-
-    ("office-ext-r1", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "OFFICE_EXTENSIONS", "OFFICE_EXTENSIONS_LOCATION", "OFFICE_IMPLEMENTATIONS",
-    "OFFICE_REQ_USE"]),
-
-    ("openib", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS",
-    "OFED_RC", "OFED_RC_VER", "OFED_SNAPSHOT", "OFED_SUFFIX", "OFED_VER",
-    "OFED_VERSIONS", "PATCHES"]),
-
     ("osreleased", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
@@ -1059,48 +639,10 @@
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "GENTOO_DEPEND_ON_PERL",
     "SOURCE", "UNPACKER_BZ2"]),
 
-    ("php-ext-base-r1", ["PHP_EXT_INI", "PHP_EXT_NAME", "PHP_EXT_ZENDEXT"]),
-
-    ("php-ext-pecl-r1", ["DOCS", "PHP_EXT_PECL_FILENAME", "PHP_EXT_PECL_PKG"]),
-
-    ("php-ext-pecl-r2", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DOCS",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "PHP_EXT_INI", "PHP_EXT_NAME",
-    "PHP_EXT_OPTIONAL_USE", "PHP_EXT_PECL_FILENAME", "PHP_EXT_PECL_PKG",
-    "PHP_EXT_S", "PHP_EXT_SKIP_PHPIZE", "PHP_EXT_ZENDEXT", "USE_PHP",
-    "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE",
-    "my_conf"]),
-
-    ("php-ext-source-r1", ["DOCS", "PHP_EXT_NAME", "PHP_EXT_SKIP_PHPIZE",
-    "my_conf"]),
-
-    ("php-ext-source-r2", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DOCS",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "PHP_EXT_INI", "PHP_EXT_NAME",
-    "PHP_EXT_OPTIONAL_USE", "PHP_EXT_S", "PHP_EXT_SKIP_PHPIZE",
-    "PHP_EXT_ZENDEXT", "USE_PHP", "WANT_AUTOCONF", "WANT_AUTOMAKE",
-    "WANT_LIBTOOL", "_LATEST_AUTOMAKE", "my_conf"]),
-
-    ("php-ezc", ["EZC_BASE_MIN", "EZC_PV", "PEAR_PV", "PHP_PEAR_PKG_NAME"]),
-
-    ("php-lib-r1", ["DOCS", "PHP_LIB_NAME"]),
-
     ("php-pear", ["PEAR_PV", "PHP_PEAR_PKG_NAME"]),
 
     ("php-pear-r1", ["PEAR_PV", "PHP_PEAR_PKG_NAME"]),
 
-    ("php5_2-sapi", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "MY_PHP_P",
-    "PHP_EXTRA_BRANDING", "PHP_PACKAGE", "PHP_PATCHSET_REV", "SUHOSIN_PATCH",
-    "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
     ("platform", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR",
     "AUTOTEST_BASE", "CHROMITE_BIN_DIR", "CHROMITE_DIR", "CHROOT_SOURCE_ROOT",
     "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
@@ -1124,12 +666,6 @@
 
     ("plocale", ["PLOCALES", "PLOCALE_BACKUP"]),
 
-    ("poppler", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HOMEPAGE",
-    "HTML_DOCS", "PATCHES", "POPPLER_MODULE", "POPPLER_MODULE_S", "S",
-    "SRC_URI"]),
-
     ("prefix", ["EPREFIX"]),
 
     ("python-any-r1", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
@@ -1139,9 +675,6 @@
     "PYTHON_COMPAT_OVERRIDE", "PYTHON_DEPS", "PYTHON_REQ_USE", "PYTHON_USEDEP",
     "_PYTHON_ALL_IMPLS"]),
 
-    ("python-distutils-ng", ["PYTHON_COMPAT", "PYTHON_DISABLE_COMPILATION",
-    "PYTHON_DISABLE_SCRIPT_REDOS", "PYTHON_OPTIONAL", "PYTHON_USE"]),
-
     ("python-r1", ["BUILD_DIR", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
     "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
     "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
@@ -1163,10 +696,6 @@
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EPYTHON",
     "PYTHON", "PYTHON_COMPAT_NO_STRICT", "_PYTHON_ALL_IMPLS"]),
 
-    ("qmail", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
     ("qmake-utils", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
@@ -1181,20 +710,6 @@
     ("readme.gentoo-r1", ["DISABLE_AUTOFORMATTING", "FORCE_PRINT_ELOG",
     "README_GENTOO_SUFFIX"]),
 
-    ("rox", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
-    ("rox-0install", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE",
-    "AT_NOELIBTOOLIZE", "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WANT_AUTOCONF",
-    "WANT_AUTOMAKE", "WANT_LIBTOOL", "_LATEST_AUTOMAKE"]),
-
     ("rpm", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
@@ -1203,25 +718,9 @@
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "PATCHES"]),
 
-    ("ruby-fakegem", ["RUBY_FAKEGEM_BINDIR", "RUBY_FAKEGEM_BINWRAP",
-    "RUBY_FAKEGEM_DOCDIR", "RUBY_FAKEGEM_DOC_SOURCES", "RUBY_FAKEGEM_EXTRADOC",
-    "RUBY_FAKEGEM_EXTRAINSTALL", "RUBY_FAKEGEM_GEMSPEC", "RUBY_FAKEGEM_NAME",
-    "RUBY_FAKEGEM_RECIPE_DOC", "RUBY_FAKEGEM_RECIPE_TEST",
-    "RUBY_FAKEGEM_REQUIRE_PATHS", "RUBY_FAKEGEM_TASK_DOC",
-    "RUBY_FAKEGEM_TASK_TEST", "RUBY_FAKEGEM_VERSION", "RUBY_OPTIONAL",
-    "RUBY_PATCHES", "RUBY_QA_ALLOWED_LIBS", "RUBY_S", "USE_RUBY"]),
-
     ("ruby-ng", ["RUBY_OPTIONAL", "RUBY_PATCHES", "RUBY_QA_ALLOWED_LIBS",
     "RUBY_S", "USE_RUBY"]),
 
-    ("ruby-ng-gnome2", ["RUBY_FAKEGEM_BINDIR", "RUBY_FAKEGEM_BINWRAP",
-    "RUBY_FAKEGEM_DOCDIR", "RUBY_FAKEGEM_DOC_SOURCES", "RUBY_FAKEGEM_EXTRADOC",
-    "RUBY_FAKEGEM_EXTRAINSTALL", "RUBY_FAKEGEM_GEMSPEC", "RUBY_FAKEGEM_NAME",
-    "RUBY_FAKEGEM_RECIPE_DOC", "RUBY_FAKEGEM_RECIPE_TEST",
-    "RUBY_FAKEGEM_REQUIRE_PATHS", "RUBY_FAKEGEM_TASK_DOC",
-    "RUBY_FAKEGEM_TASK_TEST", "RUBY_FAKEGEM_VERSION", "RUBY_OPTIONAL",
-    "RUBY_PATCHES", "RUBY_QA_ALLOWED_LIBS", "RUBY_S", "USE_RUBY"]),
-
     ("ruby-single", ["RUBY_DEPS", "RUBY_TARGETS_PREFERENCE", "USE_RUBY"]),
 
     ("ruby-utils", ["RUBY_TARGETS_PREFERENCE"]),
@@ -1229,39 +728,36 @@
     ("scons-utils", ["EXTRA_ESCONS", "SCONSOPTS", "SCONS_MIN_VERSION",
     "USE_SCONS_FALSE", "USE_SCONS_TRUE", "myesconsargs"]),
 
-    ("scsh", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("selinux-policy-2", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE"]),
-
     ("sgml-catalog", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
     "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
     "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
     "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
 
-    ("tast-bundle", ["CROS_GO_BINARIES", "CROS_GO_PACKAGES",
-    "CROS_GO_SKIP_DEP_CHECK", "CROS_GO_SOURCE", "CROS_GO_TEST",
-    "CROS_GO_VERSION", "CROS_GO_VET", "CROS_GO_VET_FLAGS", "CROS_GO_WORKSPACE",
+    ("tast-bundle", ["ARC_ETC_DIR", "ARC_PREFIX", "ARC_VENDOR_DIR",
+    "AUTOTEST_BASE", "CHROMITE_BIN_DIR", "CHROMITE_DIR", "CHROOT_SOURCE_ROOT",
+    "CROS_GIT_AOSP_URL", "CROS_GIT_HOST_URL", "CROS_GIT_INT_HOST_URL",
+    "CROS_GO_BINARIES", "CROS_GO_PACKAGES", "CROS_GO_SKIP_DEP_CHECK",
+    "CROS_GO_SOURCE", "CROS_GO_TEST", "CROS_GO_VERSION", "CROS_GO_VET",
+    "CROS_GO_VET_FLAGS", "CROS_GO_WORKSPACE", "CROS_WORKON_ALWAYS_LIVE",
+    "CROS_WORKON_COMMIT", "CROS_WORKON_DESTDIR", "CROS_WORKON_EGIT_BRANCH",
+    "CROS_WORKON_INCREMENTAL_BUILD", "CROS_WORKON_INPLACE",
+    "CROS_WORKON_LOCALNAME", "CROS_WORKON_MAKE_COMPILE_ARGS",
+    "CROS_WORKON_MANUAL_UPREV", "CROS_WORKON_OPTIONAL_CHECKOUT",
+    "CROS_WORKON_OUTOFTREE_BUILD", "CROS_WORKON_PROJECT", "CROS_WORKON_REPO",
+    "CROS_WORKON_SRCPATH", "CROS_WORKON_SRCROOT", "CROS_WORKON_SUBDIRS_TO_COPY",
+    "CROS_WORKON_SUBDIRS_TO_REV", "CROS_WORKON_SUBTREE", "CROS_WORKON_TREE",
+    "CROS_WORKON_USE_VCSID", "EGIT_BOOTSTRAP", "EGIT_BRANCH", "EGIT_COMMIT",
+    "EGIT_DIR", "EGIT_HAS_SUBMODULES", "EGIT_MASTER", "EGIT_NONBARE",
+    "EGIT_NOUNPACK", "EGIT_OPTIONS", "EGIT_PROJECT", "EGIT_PRUNE",
+    "EGIT_REPACK", "EGIT_REPO_URI", "EGIT_SOURCEDIR", "EGIT_STORE_DIR",
+    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
+    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
+    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EVCS_OFFLINE",
     "TAST_BUNDLE_EXCLUDE_DATA_FILES", "TAST_BUNDLE_PRIVATE"]),
 
     ("tegra-bct", ["TEGRA_BCT_CHIP_FAMILY", "TEGRA_BCT_FLASH_CONFIG",
     "TEGRA_BCT_ODM_DATA_CONFIG", "TEGRA_BCT_SDRAM_CONFIG"]),
 
-    ("tetex", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("tetex-3", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("texlive-module", ["TEXLIVE_MODULE_BINSCRIPTS", "TEXLIVE_MODULE_CONTENTS",
-    "TEXLIVE_MODULE_DOC_CONTENTS", "TEXLIVE_MODULE_SRC_CONTENTS", "TL_PV"]),
-
     ("toolchain", ["EGIT_BOOTSTRAP", "EGIT_BRANCH", "EGIT_COMMIT", "EGIT_DIR",
     "EGIT_HAS_SUBMODULES", "EGIT_MASTER", "EGIT_NONBARE", "EGIT_NOUNPACK",
     "EGIT_OPTIONS", "EGIT_PROJECT", "EGIT_PRUNE", "EGIT_REPACK",
@@ -1270,33 +766,6 @@
     "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
     "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EVCS_OFFLINE"]),
 
-    ("toolchain-binutils", ["EGIT_BOOTSTRAP", "EGIT_BRANCH", "EGIT_COMMIT",
-    "EGIT_DIR", "EGIT_HAS_SUBMODULES", "EGIT_MASTER", "EGIT_NONBARE",
-    "EGIT_NOUNPACK", "EGIT_OPTIONS", "EGIT_PROJECT", "EGIT_PRUNE",
-    "EGIT_REPACK", "EGIT_REPO_URI", "EGIT_SOURCEDIR", "EGIT_STORE_DIR",
-    "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG",
-    "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EVCS_OFFLINE",
-    "UNPACKER_BZ2"]),
-
-    ("twisted", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("twisted-r1", ["BUILD_DIR", "DESKTOP_DATABASE_DIR",
-    "DISTUTILS_ALL_SUBPHASE_IMPLS", "DISTUTILS_IN_SOURCE_BUILD",
-    "DISTUTILS_OPTIONAL", "DISTUTILS_SINGLE_IMPL", "DISTUTILS_USE_SETUPTOOLS",
-    "DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EPYTHON",
-    "EXAMPLES", "HTML_DOCS", "MIMEINFO_DATABASE_DIR", "MULTIBUILD_ID",
-    "MULTIBUILD_VARIANT", "MULTIBUILD_VARIANTS", "PATCHES", "PYTHON",
-    "PYTHON_COMPAT", "PYTHON_COMPAT_NO_STRICT", "PYTHON_COMPAT_OVERRIDE",
-    "PYTHON_DEPS", "PYTHON_MULTI_USEDEP", "PYTHON_REQUIRED_USE",
-    "PYTHON_REQ_USE", "PYTHON_SINGLE_USEDEP", "PYTHON_USEDEP", "TWISTED_P",
-    "TWISTED_PLUGINS", "TWISTED_PN", "TWISTED_RELEASE", "_PYTHON_ALL_IMPLS",
-    "mydistutilsargs"]),
-
     ("unpacker", ["UNPACKER_BZ2"]),
 
     ("vala", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
@@ -1309,51 +778,9 @@
     "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
     "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
 
-    ("vdr-plugin-2", ["DOCS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES"]),
-
     ("verify-sig", ["VERIFY_SIG_OPENPGP_KEYSERVER",
     "VERIFY_SIG_OPENPGP_KEY_PATH", "VERIFY_SIG_OPENPGP_KEY_REFRESH"]),
 
-    ("vim", ["BASHCOMPFILES", "BASHCOMPLETION_NAME", "ECVS_AUTH", "ECVS_BRANCH",
-    "ECVS_CLEAN", "ECVS_CO_OPTS", "ECVS_CVS_COMMAND", "ECVS_CVS_COMPRESS",
-    "ECVS_CVS_OPTIONS", "ECVS_LOCAL", "ECVS_LOCALNAME", "ECVS_MODULE",
-    "ECVS_PASS", "ECVS_RUNAS", "ECVS_SERVER", "ECVS_SSH_HOST_KEY",
-    "ECVS_TOP_DIR", "ECVS_UP_OPTS", "ECVS_USER", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "EPREFIX"]),
-
-    ("vim-spell", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("virtuoso", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DOCS", "ECVS_AUTH", "ECVS_BRANCH",
-    "ECVS_CLEAN", "ECVS_CO_OPTS", "ECVS_CVS_COMMAND", "ECVS_CVS_COMPRESS",
-    "ECVS_CVS_OPTIONS", "ECVS_LOCAL", "ECVS_LOCALNAME", "ECVS_MODULE",
-    "ECVS_PASS", "ECVS_RUNAS", "ECVS_SERVER", "ECVS_SSH_HOST_KEY",
-    "ECVS_TOP_DIR", "ECVS_UP_OPTS", "ECVS_USER", "EPATCH_COMMON_OPTS",
-    "EPATCH_EXCLUDE", "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS",
-    "EPATCH_SINGLE_MSG", "EPATCH_SOURCE", "EPATCH_SUFFIX",
-    "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "HTML_DOCS", "PATCHES",
-    "VOS_EXTRACT", "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL",
-    "_LATEST_AUTOMAKE"]),
-
-    ("vmware", ["EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE"]),
-
-    ("vmware-mod", ["BUILD_PARAMS", "BUILD_TARGETS", "CONFIG_CHECK",
-    "ECONF_PARAMS", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE", "EPATCH_FORCE",
-    "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
-    "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE",
-    "KBUILD_OUTPUT", "KERNEL_DIR", "KV_DIR", "KV_EXTRA", "KV_FULL", "KV_LOCAL",
-    "KV_MAJOR", "KV_MINOR", "KV_OBJ", "KV_OUT_DIR", "KV_PATCH",
-    "MODULES_OPTIONAL_USE", "MODULE_NAMES", "_LINUX_CONFIG_EXISTS_DONE"]),
-
     ("waf-utils", ["WAF_BINARY", "WAF_VERBOSE"]),
 
     ("webapp", ["WEBAPP_DEPEND", "WEBAPP_NO_AUTO_INSTALL", "WEBAPP_OPTIONAL"]),
@@ -1362,27 +789,12 @@
     "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG", "EPATCH_SOURCE",
     "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE", "EPATCH_USER_SOURCE", "WX_GTK_VER"]),
 
-    ("x-modular", ["CONFIGURE_OPTIONS", "DOCS", "FONT_DIR", "MODULE", "PATCHES",
-    "SNAPSHOT", "XDIR"]),
-
     ("xdg", ["DESKTOP_DATABASE_DIR", "MIMEINFO_DATABASE_DIR"]),
 
     ("xdg-utils", ["DESKTOP_DATABASE_DIR", "MIMEINFO_DATABASE_DIR"]),
 
     ("xemacs-elisp", ["SIMPLE_ELISP"]),
 
-    ("xfconf", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
-    "AT_SYS_M4DIR", "AUTOTOOLS_AUTO_DEPEND", "DESKTOP_DATABASE_DIR", "DOCS",
-    "EAUTORECONF", "EINTLTOOLIZE", "EPATCH_COMMON_OPTS", "EPATCH_EXCLUDE",
-    "EPATCH_FORCE", "EPATCH_MULTI_MSG", "EPATCH_OPTS", "EPATCH_SINGLE_MSG",
-    "EPATCH_SOURCE", "EPATCH_SUFFIX", "EPATCH_USER_EXCLUDE",
-    "EPATCH_USER_SOURCE", "GCONFTOOL_BIN", "GLIB_COMPILE_SCHEMAS",
-    "GNOME2_ECLASS_GDK_PIXBUF_LOADERS", "GNOME2_ECLASS_GLIB_SCHEMAS",
-    "GNOME2_ECLASS_ICONS", "GNOME2_ECLASS_SCHEMAS", "GNOME2_ECLASS_SCROLLS",
-    "HTML_DOCS", "MIMEINFO_DATABASE_DIR", "PATCHES", "SCROLLKEEPER_DIR",
-    "SCROLLKEEPER_UPDATE_BIN", "WANT_AUTOCONF", "WANT_AUTOMAKE", "WANT_LIBTOOL",
-    "XFCONF", "_LATEST_AUTOMAKE"]),
-
     ("xorg-2", ["AM_OPTS", "AT_M4DIR", "AT_NOEAUTOMAKE", "AT_NOELIBTOOLIZE",
     "AT_SYS_M4DIR", "AUTOTOOLS_AUTORECONF", "AUTOTOOLS_AUTO_DEPEND",
     "AUTOTOOLS_IN_SOURCE_BUILD", "AUTOTOOLS_PRUNE_LIBTOOL_FILES", "BUILD_DIR",