1 files changed, 35 insertions, 31 deletions

diff --git a/app-emacs/ddskk/ddskk-14.4.ebuild b/app-emacs/ddskk/ddskk-14.4.ebuild
index e3d2df368fb6..5a185679e025 100644
--- a/app-emacs/ddskk/ddskk-14.4.ebuild
+++ b/app-emacs/ddskk/ddskk-14.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI="6"
 
 inherit elisp
 
@@ -15,46 +15,50 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
-			 >=virtual/emacs-22 )"
-RDEPEND="${DEPEND}
-	|| ( app-i18n/skk-jisyo virtual/skkserv )"
+DEPEND="<virtual/emacs-24"
+RDEPEND="|| (
+		app-i18n/skk-jisyo
+		virtual/skkserv
+	)"
 
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	find . -type f | xargs sed -i -e "s:/usr/local:${EPREFIX}/usr:g" || die
+	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
+	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
+
+	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
+
+	eapply_user
+
+	rm -f skk-lookup.el
+	mv {bayesian,tut-code}/*.el .
 }
 
 src_compile() {
-	emake < /dev/null || die "emake failed"
-	emake info < /dev/null || die "emake info failed"
-	#cd nicola
-	#emake < /dev/null || die
-	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L .."
-	cd "${S}/tut-code"
-	elisp-compile *.el || die "elisp-compile tut-code/*.el failed"
-
-	cd "${S}/bayesian"
-	elisp-compile *.el || die "elisp-compile bayesian/*.el failed"
+	emake elc info
+
+	emake -C nicola
 }
 
 src_install () {
-	elisp-install ${PN} *.{el,elc} nicola/*.el tut-code/*.{el,elc} bayesian/*.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	insinto /usr/share/skk
-	doins etc/*SKK.tut* etc/skk.xpm || die
-
-	dodoc READMEs/* ChangeLog*
-	doinfo doc/skk.info* || die
+	local lispdir=${SITELISP}/${PN}
+	emake install-elc
+	elisp-compile "${ED}"/${lispdir}/skk-setup.el
+	rm -f "${ED}"/${lispdir}/leim-list.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
-	#docinto nicola
-	#dodoc nicola/ChangeLog* nicola/README* || die
-	docinto tut-code
-	dodoc tut-code/README.tut || die
+	dodoc ChangeLog* READMEs/README READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
+	doinfo doc/skk.info
 
-	#dobin bayesian/bskk || die
+	local exts=( nicola tut-code bayesian ) d f
+	elisp-install ${PN} nicola/*.{el,elc}
+	for d in ${exts[@]}; do
+		docinto ${d}
+		for f in ${d}/{ChangeLog,README}*; do
+			[[ -s ${f} ]] && dodoc ${f}
+		done
+	done
 	docinto bayesian
-	dodoc bayesian/README.ja bayesian/bskk || die
+	dodoc bayesian/bskk
 }