gentoo resync : 25.08.2020

4 files changed, 151 insertions, 2 deletions

diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 7c5b9d549d5f..664ceb621d43 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,4 +1,8 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
-EBUILD ddskk-16.2.ebuild 1491 BLAKE2B 9c128ebe2d7ebf3559085c48ab45ecb72e3b4185e3fcf85506bc519cfcf923959f15d9c8f68faef9e4ef5ab805f3dfffb6c08e40a6838991c0268de899c54905 SHA512 1939dc7bd18d3f3e6d8874e98e27761d6e7aba9b0759ee2dbab0d2807ac3b002d62fb446feed4e96302f957f0ef4d2d62889d57ee81ac56416ec65747b2e5c5b
+DIST ddskk-16.3.tar.gz 1252772 BLAKE2B 133685fc0587e10c89145eeaf014c8e0d1ce0dad63b9207559030598f521aee00facbca9550753493e579d5acec10e8b36c1499087d1b6c05317754c434b9b69 SHA512 47624690851269ca818bed5cfdfdb21bbbd3152c0a7c64a114ab595a92d2e79600fe738953e6a73a26b0195102eb1e9e03ad4f6bfca1bc4d3e3732bf59aa8a27
+DIST ddskk-17.1.tar.gz 952635 BLAKE2B fae34e37f972250d5e48f316fb90418b4b902684431c6ed18f44f3b5155556ceac1b04c8f8542c5651233e36085f864bac41381069dd70e841fdd9eedf7273ed SHA512 e0b924111a6289acd29ee5a5d94ea70730fe8f4e1dd5ed279520263efab0c69a6940e5b1b6182e45ed30c0b1ddca9e44ff75b7b3fdab5c8a3e1b2b9f82cc20fa
+EBUILD ddskk-16.2.ebuild 1538 BLAKE2B 93884559326df13e481bded668c5c049c917826ba806761cc25d2160b09f35945ecac23a85e53ea61354ac8e06f868b01ea9d3fc8146d0968388bf37f5729a82 SHA512 78f60376cfc74c8b64fdda191fe4a1d96fc210e01c3af1617902ddea5c194f31e8b0747ae8e03532d87802ca142b130ce2f15194e8c60f0ff8e9d58cac8811c8
+EBUILD ddskk-16.3.ebuild 1585 BLAKE2B 46d25c0ea8057d1f859d1462e722427f1c26c0e29788996601e34fda34c4ee6bcf29b6917703c5a5b02cb72800f7870dc2f52c720fb4921cfdd04645ccb56d67 SHA512 48c557008dd3702a37765e4169bcb1f986790e4e542e1eb5147667423f383fcd59f9c6fac40fe296d11a78a5ce672f2a518d8dc82d201dafa85dabfc5439095a
+EBUILD ddskk-17.1.ebuild 1580 BLAKE2B f3f7b7c24bdbd38cf23a50fd0cebd7f99a431dfcaa3a72abeb5f8186b6285a5433c7a6a6540520e25332e5f22cc8247e567b35ddaf5ee30c5f4b43b2852714f5 SHA512 76940787fa14389a6eda96c0439ccfc141947fd62f31889f7a19a6334dd10510507a886a8621d9409dc4d976d4ccf2c98e59c9c047255dadcd1ea572bcf62902
 MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index 184535ef601e..3fbcc4fac46f 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -34,7 +34,10 @@ src_prepare() {
 	default
 
 	rm -f skk-lookup.el
-	mv {bayesian,tut-code}/*.el .
+	if use ruby; then
+		cp bayesian/*.el . || die
+	fi
+	cp tut-code/*.el . || die
 }
 
 src_compile() {
diff --git a/app-emacs/ddskk/ddskk-16.3.ebuild b/app-emacs/ddskk/ddskk-16.3.ebuild
new file mode 100644
index 000000000000..396611aca952
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-16.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
+NEED_EMACS="24"
+
+inherit elisp ruby-single vcs-snapshot
+
+DESCRIPTION="One Japanese input methods on Emacs"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="https://github.com/skk-dev/${PN}/archive/${P}_Kutomatsunai.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ruby"
+
+DEPEND=""
+RDEPEND="|| (
+		app-i18n/skk-jisyo
+		virtual/skkserv
+	)
+	ruby? ( ${RUBY_DEPS} )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	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
+
+	default
+
+	rm -f skk-lookup.el
+	if use ruby; then
+		cp bayesian/*.el . || die
+	fi
+	cp tut-code/*.el . || die
+}
+
+src_compile() {
+	emake elc info
+
+	emake -C nicola
+}
+
+src_install() {
+	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}
+
+	dodoc ChangeLog* README.md READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
+	doinfo doc/skk.info
+
+	local exts=( nicola tut-code ) d f
+	elisp-install ${PN} nicola/*.{el,elc}
+	if use ruby; then
+		dobin bayesian/bskk
+		exts+=( bayesian )
+	fi
+	for d in ${exts[@]}; do
+		docinto ${d}
+		for f in ${d}/{ChangeLog,README}*; do
+			[[ -s ${f} ]] && dodoc ${f}
+		done
+	done
+}
diff --git a/app-emacs/ddskk/ddskk-17.1.ebuild b/app-emacs/ddskk/ddskk-17.1.ebuild
new file mode 100644
index 000000000000..c36507bd934b
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-17.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+USE_RUBY="ruby25 ruby26 ruby27"
+NEED_EMACS="24.3"
+
+inherit elisp ruby-single vcs-snapshot
+
+DESCRIPTION="One Japanese input methods on Emacs"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="https://github.com/skk-dev/${PN}/archive/${P}_Neppu.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ruby"
+
+DEPEND=""
+RDEPEND="|| (
+		app-i18n/skk-jisyo
+		virtual/skkserv
+	)
+	ruby? ( ${RUBY_DEPS} )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	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
+
+	default
+
+	rm -f skk-lookup.el
+	if use ruby; then
+		cp bayesian/*.el . || die
+	fi
+	cp tut-code/*.el . || die
+}
+
+src_compile() {
+	emake elc info
+
+	emake -C nicola
+}
+
+src_install() {
+	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}
+
+	dodoc ChangeLog* README.md READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
+	doinfo doc/skk.info
+
+	local exts=( nicola tut-code ) d f
+	elisp-install ${PN} nicola/*.{el,elc}
+	if use ruby; then
+		dobin bayesian/bskk
+		exts+=( bayesian )
+	fi
+	for d in ${exts[@]}; do
+		docinto ${d}
+		for f in ${d}/{ChangeLog,README}*; do
+			[[ -s ${f} ]] && dodoc ${f}
+		done
+	done
+}