--- /dev/null
+--- a/Makefile
++++ b/Makefile
+@@ -57,16 +57,16 @@
+ $(MAKE) --no-print-directory -C $(SOURCE_PATH) -f $(MAKEFILE) test
+
+ install_common_ :
+- $(MKDIR) -p $(PREFIX)/bin
+- $(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(PREFIX)/bin/yaskkserv_make_dictionary
++ $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
++ $(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(DESTDIR)$(PREFIX)/bin/yaskkserv_make_dictionary
+
+ install : install_normal
+
+ install_all : install_common_
+- $(MKDIR) -p $(PREFIX)/sbin
+- $(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(PREFIX)/sbin/yaskkserv_simple
+- $(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(PREFIX)/sbin/yaskkserv_normal
+- $(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(PREFIX)/sbin/yaskkserv_hairy
++ $(MKDIR) -p $(DESTDIR)$(PREFIX)/sbin
++ $(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(DESTDIR)$(PREFIX)/sbin/yaskkserv_simple
++ $(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(DESTDIR)$(PREFIX)/sbin/yaskkserv_normal
++ $(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(DESTDIR)$(PREFIX)/sbin/yaskkserv_hairy
+
+ install_simple : install_common_
+ $(MKDIR) -p $(PREFIX)/sbin
+--- a/source/Makefile.bsd_cygwin_linux_gcc.common
++++ b/source/Makefile.bsd_cygwin_linux_gcc.common
+@@ -16,16 +16,16 @@
+ endif # DEBUG
+
+ INCLUDE_FLAGS = -I . -I $(VAR_PATH) -I $(PROJECT_ROOT)/source/skk -I $(PROJECT_ROOT)/source/skk/architecture -I $(PROJECT_ROOT)/source/skk/architecture/$(ARCHITECTURE_LOWER_CASE)
+-LIBRARY_FLAGS = -L/usr/lib
++LIBRARY_FLAGS =
+
+-CPPFLAGS = $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
++CPPFLAGS += $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+
+-CXXFLAGS = $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
++CXXFLAGS += $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+
+-LDFLAGS = $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
++LDFLAGS += $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
+
+ CXX = $(CCACHE) $(COMPILER)
+ LD = $(COMPILER)
+ CPP = $(CXX)
+ LD = $(CXX)
+-STRIP = strip
++STRIP = true
+--- a/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
+@@ -12,7 +12,7 @@
+ # RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-suggest --google-japanese-input-timeout=1.1 https://www.google.com
+ # RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com /home/wac/local/share/skk/SKK-JISYO.total+zipcode.yaskkserv
+ # RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com
+-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_HAIRY) $(CXXFLAGS_WARNING_SERVER_HAIRY)
++CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_HAIRY)
+
+ SOURCES = ${wildcard *.cpp}
+ OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE = yaskkserv_make_dictionary
+
+ RUN_FLAGS =
+-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_TOOL) $(CXXFLAGS_WARNING_TOOL)
++CXXFLAGS += $(CXXFLAGS_WARNING_TOOL)
+
+ SOURCES = ${wildcard *.cpp}
+ OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE = yaskkserv_normal
+
+ RUN_FLAGS = --check-update --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
+-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_NORMAL) $(CXXFLAGS_WARNING_SERVER_NORMAL)
++CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_NORMAL)
+
+ SOURCES = ${wildcard *.cpp}
+ OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE = yaskkserv_simple
+
+ RUN_FLAGS = --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
+-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_SIMPLE) $(CXXFLAGS_WARNING_SERVER_SIMPLE)
++CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_SIMPLE)
+
+ SOURCES = ${wildcard *.cpp}
+ OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
--- /dev/null
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Yet Another SKK server"
+HOMEPAGE="http://umiushi.org/~wac/yaskkserv/"
+SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls libressl systemd"
+
+RDEPEND="app-i18n/skk-jisyo
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ systemd? ( virtual/udev[systemd] )"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+DOCS=( README.md )
+HTML_DOCS=( documentation/. )
+
+src_configure() {
+ econf \
+ $(use_enable gnutls) \
+ $(use_enable systemd) \
+ --compiler="${tc_getCXX}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install_all
+ einstalldocs
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ systemd_dounit examples/${PN}.socket
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ pkg_config
+
+ elog "You need to run:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ elog "after updating app-i18n/skk-jisyo from next time."
+}
+
+pkg_postrm() {
+ rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
+ rmdir "${ROOT}"/usr/share/skk 2>/dev/null
+}
+
+pkg_config() {
+ local f
+ for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
+ case ${f} in
+ *.cdb)
+ ;;
+ *.${PN})
+ [[ -f ${f%.*} ]] || rm -f "${f}"
+ ;;
+ *)
+ [[ ${f} -nt ${f}.${PN} ]] && ${PN}_make_dictionary "${f}" "${f}.${PN}"
+ ;;
+ esac
+ done
+}