[gentoo-commits] repo/gentoo:master commit in: app-emacs/ddskk/, app-emacs/ddskk/files/

[Akinori Hattori]

commit:     a250fa7aa9d55cc5f15470cd4a34cdad0e5c007c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 09:05:59 2016 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 09:05:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a250fa7a

app-emacs/ddskk: install skk-setup.el

Package-Manager: portage-2.3.0

 app-emacs/ddskk/ddskk-14.3.ebuild       | 66 ++++++++++++++++--------------
 app-emacs/ddskk/ddskk-14.4.ebuild       | 66 ++++++++++++++++--------------
 app-emacs/ddskk/ddskk-15.1.ebuild       | 71 ++++++++++++++++++---------------
 app-emacs/ddskk/files/50ddskk-gentoo.el |  5 +--
 4 files changed, 109 insertions(+), 99 deletions(-)

diff --git a/app-emacs/ddskk/ddskk-14.3.ebuild b/app-emacs/ddskk/ddskk-14.3.ebuild
index dde5773..017dd2f 100644
--- a/app-emacs/ddskk/ddskk-14.3.ebuild
+++ b/app-emacs/ddskk/ddskk-14.3.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
 }

diff --git a/app-emacs/ddskk/ddskk-14.4.ebuild b/app-emacs/ddskk/ddskk-14.4.ebuild
index e3d2df3..5a18567 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
 }

diff --git a/app-emacs/ddskk/ddskk-15.1.ebuild b/app-emacs/ddskk/ddskk-15.1.ebuild
index 7f2b765..1ee32b4 100644
--- a/app-emacs/ddskk/ddskk-15.1.ebuild
+++ b/app-emacs/ddskk/ddskk-15.1.ebuild
@@ -1,10 +1,11 @@
-# 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"
+NEED_EMACS="24"
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="One Japanese input methods on Emacs"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
@@ -15,47 +16,51 @@ 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=""
+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
-	epatch "${FILESDIR}"/${P}-skk-mk.patch
+	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 "${FILESDIR}"/${P}-skk-mk.patch
+	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
 }

diff --git a/app-emacs/ddskk/files/50ddskk-gentoo.el b/app-emacs/ddskk/files/50ddskk-gentoo.el
index 548fdb2..66b1e15 100644
--- a/app-emacs/ddskk/files/50ddskk-gentoo.el
+++ b/app-emacs/ddskk/files/50ddskk-gentoo.el
@@ -1,7 +1,4 @@
 (add-to-list 'load-path "@SITELISP@")
-(require 'skk-autoloads)
-(global-set-key "\C-x\C-j" 'skk-mode)
-(global-set-key "\C-xj" 'skk-auto-fill-mode)
-(global-set-key "\C-xt" 'skk-tutorial)
+(require 'skk-setup)
 
 (setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L")