gentoo resync : 05.12.2021

4 files changed, 3 insertions, 151 deletions

diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 9e408e5b71a4..2cf7e5724a27 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,8 +1,4 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
-DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
-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 1554 BLAKE2B 8a03ff9c7c77b979e7627a54f4ff0209b2ad6d8e57e493a02093267e70e47f6fd3762e358f656dec99bfc569e247ef6f085151c05157da382433779b2fa05bc1 SHA512 1123ff8abe0fa3d170ec1522af711e3ae13ca4bacc9d0a36c9f75a69c370f6b93c9ff5ab1db0efb8596f57a96368cbfe51eed05340094bca658245b427b7059b
-EBUILD ddskk-16.3.ebuild 1601 BLAKE2B 97cf522ef4babfe70eccb3fb68eb854ee39e68f62274738cd2f1041d6a95c6536eb3b2c12e5570bfbe22adb7a3ef5727d37299bde234f9a48fcb8cd4167909ca SHA512 993cd7e1134d3d12668f532082df858df50d97d722a23075ab5063a226a1ebc52fc5fa4197f62dcc0601ac659a8f32d43a509b359e77582cf41f446549cfccdc
-EBUILD ddskk-17.1.ebuild 1596 BLAKE2B a0545c2813431fc6fcd7f33e7552c7b3130aa7e0f74a43e1522086ab7721bfb811a270715d3cd0255a651327df440fc8c0edfea9870f346d54fb5556c0f08d62 SHA512 4b857055be9641230486b9742fc1fd9ddd07d32ebbd5b43d81a107d0ba728c4adab8add68c0b3114111f849445443a15150eb86a8d39177d4c430c4f486129b8
+EBUILD ddskk-17.1.ebuild 1592 BLAKE2B 6c7f6de3bff3d9fef86921aa72d82d0570eb581e169028c0de3b7a8aa10baad4eab9fe1e4d8e531ee7a1c8b087fe8b882e715507e985ab129b262a6311d4d324 SHA512 9ea1472d5bf92a50fe962811ea20c531ac3ddaf5772752c4fd381ee1e4d5ec8758204591da4cc4a01302509cd1cf2f96f0a816a97abfff569dcaad8bbb1653fa
 MISC metadata.xml 451 BLAKE2B 14a7b69794890a92e6e81d00adcea5d65e6f688c5148bf139cee0a72c83c8a2827d45f4291415366ec127671d5c145984c176c35c7926b6e7b49222bea208cc7 SHA512 06cee2183783d6632d2db9b2e28a7b32419f2ba409cc0b03fdb00da93698736d349be1a439b3c4c5ba220c64e4b0d41ed590847c3f15df6ff16fa222607e5d29
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
deleted file mode 100644
index 6e93fa9e0178..000000000000
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby24 ruby25 ruby26"
-NEED_EMACS="24"
-
-inherit elisp ruby-single
-
-DESCRIPTION="One Japanese input methods on Emacs"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/"
-SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ruby"
-RESTRICT="test"
-
-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-16.3.ebuild b/app-emacs/ddskk/ddskk-16.3.ebuild
deleted file mode 100644
index 4f37c7983dae..000000000000
--- a/app-emacs/ddskk/ddskk-16.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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"
-RESTRICT="test"
-
-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
index beefab39e5ae..7a62d17f1c04 100644
--- a/app-emacs/ddskk/ddskk-17.1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/skk-dev/${PN}/archive/${P}_Neppu.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
 RESTRICT="test"