gentoo resync : 15.01.2020

6 files changed, 300 insertions, 13 deletions

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index ffd1c3bb3200..aed1d056cd1e 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,13 +1,15 @@
 AUX 50mozc-gentoo.el 121 BLAKE2B 0cad49e4a5a04d1cbdcd063cfd5a06c14bf4bab47890bbc089d8bba9889abb5197bea2cfb912f638052f912d7aca51a7e71b743b4742fd90b9d5ab5a60779fe5 SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685
 AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b86020902262de65aef75f82e58fcfcea211b8a8d3c8418898781ac1de2a2c9bdc73ffc4cf68102122a22691d9592d5a02e6c62 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e
+AUX mozc-2.23.2815.102-environmental_variables.patch 4636 BLAKE2B 2c1d952899b50d0205127fe5f708c8cc8ad115db35f1ebfe5b589550203ee64fe06b0d66b10989c12063feff96f679ebd6ee4562651ac81681019634e6e9c462 SHA512 40e87a52d96794a91f5cf77f387d341b7d58a4b27e3d1455c4230fbe75107c09c3bd4784394437265548ee2704a4d1838cc0965f0333e554484dafe8b106cb7b
 AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad
 AUX mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
 AUX mozc-2.23.2815.102-reiwa.patch 924 BLAKE2B 3893f975d43ce29a962c5e712503442b178847acebd92e797040b6b699a37cb051f88a37965e0f194f73bca2e2397a8b070eb6d14bbe92adbba3e17a864e8c8b SHA512 df3f98ab93d7662b5ab038c732d3342b3f5860774559242eca1d0f1cd67275f315c6e4ffad83c6990ef5eb23fc19c0379ed7d3bdd0a377fcb080c066aecd16cc
+AUX mozc-2.23.2815.102-server_path_check.patch 3447 BLAKE2B 8e18cf2f7100cdfeb8e6b1420d773e955994cc7bd5e4bf56e0ffe78cd9a96b044c726c1045c2cd2c326ca151c8bf527b6447b2f509a20e4a912b535f5180ec80 SHA512 106c3170112bde2c6b9eb9ad5d5d460be53bb9162eb5613445170c2ce00f88385946360d13514167a6279c610744784079f8969b8f901f22e51e6397db22b0d3
 AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
-EBUILD mozc-2.23.2815.102.ebuild 9674 BLAKE2B f36a730420f6e6b2dc9fb1643458f942581b04991c1f87508dec3239d28228e545460c15960fe70d77642923bbd2d728e4e63b459e5fe4381f0040b2809c7837 SHA512 309c0975e2c9c2575c1cbf29039127e450837a214a4bb2a343cac0a58e9ea6ed45a096f0cdb72c1ab2846fc73aa44a4b6c3f2f0c79ceffc6b6b6a6131966f164
-EBUILD mozc-9999.ebuild 9514 BLAKE2B 23d6960f9eb6551808b264bc278e647339afadd34133397c55538fe3e361cf174edb9f6654204df25cd51306347cdaed97ac530774aceb1b7b48772737992075 SHA512 4caf2575ff9a41e89c4196e7babd321d7abe14f73eeb2d6b03cfccbb2d488a8d2f69761c447a6f7a70cc51178fa3c580651297d394b38bb85d7b3ab699cf226b
-MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
+EBUILD mozc-2.23.2815.102.ebuild 10873 BLAKE2B 0402f153f37cd286c38c2d14753af354bc8c2433546e56b670983f5e6d3167e7d091673be84ff4e37a9c36b0b3749298a109a15e0b863d9c5a31d3324334043d SHA512 ea21a724c331befdb6b5ffc8c6f065de40d3ead15aa26c4a230224966dd728962476efa097e3abc510f9cfc5872a4c822d0a5ac3305f7e959dab86a44e2efbcb
+EBUILD mozc-9999.ebuild 10713 BLAKE2B 8c22d2a713e01605abe92717e3b4021c76b11dc7fb0e1f6c4bd93b8000810deb1f95f506f9b17899449b0e67b62d3b5d6ce6bc557b04f3aa244a0f2300c2ef75 SHA512 709319d9bea172d9d0233657ec53831d2cc622cf93c2c57bd334c8474ccb9ab6be87324add7b96ed3cd50dae877822997dfeb2fad2b4ce42cc7a52cbac4485ee
+MISC metadata.xml 1149 BLAKE2B 62ba0c21b06854dc0873cd3677245f083cb21923de1f6aeea41065b8d216f54c485f11474afae8901682d5bdb9fe79c19e4e54af2051984a0e69639d80de72d3 SHA512 55c96d85f11cca6cb6b00ab81e2b84905c20db880f0c0dc7484e4b7210e31699fc340ce4a5e32234fda68e20de9d3fef635091658b916dd238a556a60ce9476a
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
new file mode 100644
index 000000000000..02e522a32e9e
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
@@ -0,0 +1,132 @@
+https://github.com/google/mozc/issues/470
+
+--- /src/base/system_util.cc
++++ /src/base/system_util.cc
+@@ -208,28 +208,39 @@
+   dir_ = "/";
+   return;
+ #else  // MOZC_USE_PEPPER_FILE_IO
++  const char *configuration_directory_env;
+   string dir;
+ 
+ #ifdef OS_WIN
+-  DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
+-  dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
++    dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
+-  FileUtil::CreateDirectory(dir);
++    dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
++    FileUtil::CreateDirectory(dir);
+ #endif  // GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++    dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++  }
+ 
+ #elif defined(OS_MACOSX)
+-  dir = MacUtil::GetApplicationSupportDirectory();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    dir = MacUtil::GetApplicationSupportDirectory();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Google");
+-  // The permission of ~/Library/Application Support/Google seems to be 0755.
+-  // TODO(komatsu): nice to make a wrapper function.
+-  ::mkdir(dir.c_str(), 0755);
+-  dir = FileUtil::JoinPath(dir, "JapaneseInput");
++    dir = FileUtil::JoinPath(dir, "Google");
++    // The permission of ~/Library/Application Support/Google seems to be 0755.
++    // TODO(komatsu): nice to make a wrapper function.
++    ::mkdir(dir.c_str(), 0755);
++    dir = FileUtil::JoinPath(dir, "JapaneseInput");
+ #else  //  GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Mozc");
++    dir = FileUtil::JoinPath(dir, "Mozc");
+ #endif  //  GOOGLE_JAPANESE_INPUT_BUILD
++  }
+ 
+ #elif defined(OS_ANDROID)
+   // For android, we do nothing here because user profile directory,
+@@ -237,14 +248,24 @@
+   // is injected from Java layer.
+ 
+ #else  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+-  char buf[1024];
+-  struct passwd pw, *ppw;
+-  const uid_t uid = geteuid();
+-  CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
+-      << "Can't get passwd entry for uid " << uid << ".";
+-  CHECK_LT(0, strlen(pw.pw_dir))
+-      << "Home directory for uid " << uid << " is not set.";
+-  dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    const char *home_env = ::getenv("HOME");
++    if (home_env) {
++      dir = FileUtil::JoinPath(home_env, ".mozc");
++    } else {
++      char buf[1024];
++      struct passwd pw, *ppw;
++      const uid_t uid = geteuid();
++      CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
++          << "Can't get passwd entry for uid " << uid << ".";
++      CHECK_LT(0, strlen(pw.pw_dir))
++          << "Home directory for uid " << uid << " is not set.";
++      dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++    }
++  }
+ #endif  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+ 
+   FileUtil::CreateDirectory(dir);
+@@ -356,6 +377,10 @@
+ #endif  // OS_WIN
+ 
+ string SystemUtil::GetServerDirectory() {
++  const char *server_directory_env = ::getenv("MOZC_SERVER_DIRECTORY");
++  if (server_directory_env) {
++    return server_directory_env;
++  }
+ #ifdef OS_WIN
+   DCHECK(SUCCEEDED(Singleton<ProgramFilesX86Cache>::get()->result()));
+ #if defined(GOOGLE_JAPANESE_INPUT_BUILD)
+@@ -409,6 +434,10 @@
+ }
+ 
+ string SystemUtil::GetDocumentDirectory() {
++  const char *documents_directory_env = ::getenv("MOZC_DOCUMENTS_DIRECTORY");
++  if (documents_directory_env) {
++    return documents_directory_env;
++  }
+ #if defined(OS_MACOSX)
+   return GetServerDirectory();
+ #elif defined(MOZC_DOCUMENT_DIRECTORY)
+--- /src/handwriting/zinnia_handwriting.cc
++++ /src/handwriting/zinnia_handwriting.cc
+@@ -31,6 +31,7 @@
+ 
+ #include "handwriting/zinnia_handwriting.h"
+ 
++#include <cstdlib>
+ #include <memory>
+ #include <string>
+ 
+@@ -48,6 +49,10 @@
+ 
+ // static
+ string ZinniaHandwriting::GetModelFileName() {
++  const char *zinnia_model_file_env = ::getenv("MOZC_ZINNIA_MODEL_FILE");
++  if (zinnia_model_file_env) {
++    return zinnia_model_file_env;
++  }
+ #if defined(MOZC_BUILD)
+   return MOZC_ZINNIA_MODEL_FILE;
+ #else
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
new file mode 100644
index 000000000000..dd606e27fb56
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
@@ -0,0 +1,95 @@
+https://github.com/google/mozc/issues/471
+
+--- /src/ipc/ipc_path_manager.cc
++++ /src/ipc/ipc_path_manager.cc
+@@ -332,9 +332,21 @@
+     return false;
+   }
+ 
++  // Expand symbolic links in the expected server path to avoid false negatives
++  // during comparisons of the expected server path and the actual server path.
++  string real_server_path = server_path;
++#ifndef OS_WIN
++  char real_server_path_[PATH_MAX];
++  if (realpath(server_path.c_str(), real_server_path_) == NULL) {
++    LOG(ERROR) << "realpath failed: " << strerror(errno);
++    return false;
++  }
++  real_server_path = real_server_path_;
++#endif
++
+   // compare path name
+   if (pid == server_pid_) {
+-    return (server_path == server_path_);
++    return (real_server_path == server_path_);
+   }
+ 
+   server_pid_ = 0;
+@@ -344,17 +356,17 @@
+   {
+     std::wstring expected_server_ntpath;
+     const std::map<string, std::wstring>::const_iterator it =
+-        expected_server_ntpath_cache_.find(server_path);
++        expected_server_ntpath_cache_.find(real_server_path);
+     if (it != expected_server_ntpath_cache_.end()) {
+       expected_server_ntpath = it->second;
+     } else {
+       std::wstring wide_server_path;
+-      Util::UTF8ToWide(server_path, &wide_server_path);
++      Util::UTF8ToWide(real_server_path, &wide_server_path);
+       if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) {
+-        // Caches the relationship from |server_path| to
+-        // |expected_server_ntpath| in case |server_path| is renamed later.
++        // Caches the relationship from |real_server_path| to
++        // |expected_server_ntpath| in case |real_server_path| is renamed later.
+         // (This can happen during the updating).
+-        expected_server_ntpath_cache_[server_path] = expected_server_ntpath;
++        expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath;
+       }
+     }
+ 
+@@ -371,9 +383,9 @@
+       return false;
+     }
+ 
+-    // Here we can safely assume that |server_path| (expected one) should be
++    // Here we can safely assume that |real_server_path| (expected one) should be
+     // the same to |server_path_| (actual one).
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     server_pid_ = pid;
+   }
+ #endif  // OS_WIN
+@@ -399,7 +411,7 @@
+ #ifdef OS_LINUX
+   // load from /proc/<pid>/exe
+   char proc[128];
+-  char filename[512];
++  char filename[PATH_MAX];
+   snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid);
+   const ssize_t size = readlink(proc, filename, sizeof(filename) - 1);
+   if (size == -1) {
+@@ -412,18 +424,18 @@
+   server_pid_ = pid;
+ #endif  // OS_LINUX
+ 
+-  VLOG(1) << "server path: " << server_path << " " << server_path_;
+-  if (server_path == server_path_) {
++  VLOG(1) << "server path: " << real_server_path << " " << server_path_;
++  if (real_server_path == server_path_) {
+     return true;
+   }
+ 
+ #ifdef OS_LINUX
+-  if ((server_path + " (deleted)") == server_path_) {
+-    LOG(WARNING) << server_path << " on disk is modified";
++  if ((real_server_path + " (deleted)") == server_path_) {
++    LOG(WARNING) << real_server_path << " on disk is modified";
+     // If a user updates the server binary on disk during the server is running,
+     // "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix.
+     // We allow the special case.
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     return true;
+   }
+ #endif  // OS_LINUX
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 5b85ef8a79d9..967561182aee 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -15,8 +15,8 @@
 	<use>
 		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
-		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg></flag>
-		<flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg></flag>
+		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg> by default</flag>
+		<flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg> by default</flag>
 		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="renderer">Enable native candidate window</flag>
 	</use>
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index f198c294cea6..425b785cbfab 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -44,10 +44,10 @@ BDEPEND="${PYTHON_DEPS}
 	dev-util/gyp
 	dev-util/ninja
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? (
 		app-i18n/fcitx:4
 		virtual/libintl
@@ -108,7 +108,9 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
@@ -304,9 +306,33 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog
+	elog "ENVIRONMENTAL VARIABLES"
+	elog
+	elog "MOZC_SERVER_DIRECTORY"
+	elog "  Mozc server directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+	elog "MOZC_DOCUMENTS_DIRECTORY"
+	elog "  Mozc documents directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+	elog "MOZC_CONFIGURATION_DIRECTORY"
+	elog "  Mozc configuration directory"
+	elog "  Value used by default: \"~/.mozc\""
+	if use gui; then
+		elog "MOZC_ZINNIA_MODEL_FILE"
+		elog "  Zinnia handwriting recognition model file"
+		if use handwriting-tegaki; then
+			elog "  Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elif use handwriting-tomoe; then
+			elog "  Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+		fi
+		elog "  Potential values:"
+		elog "    \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elog "    \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+	fi
+	elog
 	if use emacs; then
-		elisp-site-regen
-
+		elog
 		elog "USAGE IN EMACS"
 		elog
 		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
@@ -324,6 +350,9 @@ pkg_postinst() {
 		elog
 		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
 		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+		elog
+
+		elisp-site-regen
 	fi
 }
 
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 037a8d2d2567..d7c66b558d92 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -44,10 +44,10 @@ BDEPEND="${PYTHON_DEPS}
 	dev-util/gyp
 	dev-util/ninja
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? (
 		app-i18n/fcitx:4
 		virtual/libintl
@@ -108,7 +108,9 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
@@ -303,9 +305,33 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog
+	elog "ENVIRONMENTAL VARIABLES"
+	elog
+	elog "MOZC_SERVER_DIRECTORY"
+	elog "  Mozc server directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+	elog "MOZC_DOCUMENTS_DIRECTORY"
+	elog "  Mozc documents directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+	elog "MOZC_CONFIGURATION_DIRECTORY"
+	elog "  Mozc configuration directory"
+	elog "  Value used by default: \"~/.mozc\""
+	if use gui; then
+		elog "MOZC_ZINNIA_MODEL_FILE"
+		elog "  Zinnia handwriting recognition model file"
+		if use handwriting-tegaki; then
+			elog "  Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elif use handwriting-tomoe; then
+			elog "  Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+		fi
+		elog "  Potential values:"
+		elog "    \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elog "    \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+	fi
+	elog
 	if use emacs; then
-		elisp-site-regen
-
+		elog
 		elog "USAGE IN EMACS"
 		elog
 		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
@@ -323,6 +349,9 @@ pkg_postinst() {
 		elog
 		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
 		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+		elog
+
+		elisp-site-regen
 	fi
 }