gentoo resync : 30.06.2018

3 files changed, 2 insertions, 73 deletions

diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 2435171b3b4b..d6990a793c96 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,6 +1,4 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
-DIST ddskk-16.1.tar.gz 878564 BLAKE2B 4b57311cf4478999d19835f12594943e1a74ee4f8705ddd6140c924bd1a90251f4127187de7df7ae1bf0635f582c4e9fbd29e644dc80a89fb3fd2eed84589b72 SHA512 68875f7ad89ce847103bbe4644db3800c84cc5907a4769c37f7aab5bc64577e1ea5f49de41c5708daf3f5f2bb7176237dcec5ea05e52a61f7c78cfb2670ced7b
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
-EBUILD ddskk-16.1.ebuild 1530 BLAKE2B 25ca1e53ff1570539f8f55b7506d520fcf937c87ef20801282bf87ddf179c440da028e267321387ca2b32ecb1ed71669a680e8198da069c06938378661cbc6d0 SHA512 554ecbfad8b0a35090c4c5a66ca6eff2f4dcdc665504f77e72fa614c45c7ef7922a293a7436dc63811effd858a28c96335323e98f5747374b5c4039bc264c493
-EBUILD ddskk-16.2.ebuild 1499 BLAKE2B 6fd21b73afddf010412d836cbb6fdfe4239cddce649613b28d12d4b3132f7c1e853d3497fa6a981242b6a07aee647e0cdfffb7e3236a1ff1902f6845893713a1 SHA512 a632010ecd7fbfc7d238f9a3952fa7b829c8c2d17f9734de0f065f94f97ad40bb1c60df8b91b7f10298df7cab9f193aa37d50568f3b5a2d471a22037b68befaa
+EBUILD ddskk-16.2.ebuild 1495 BLAKE2B bc16dbebf4a48dd75767065018240d5013a916ce71fa158b6a8a8666d82a6aa8b20b6f8c2bc337b13f4856c8ee925ad0bdc08dc5ad7edef7209b9f410907827d SHA512 e1edfb53fdc5497d44a9e519eca699c773dfb1e997ee6369a5deb95e91d27c222ba8c65df0371d22970cdc49fea26d2c4a3980eb94c96ba726890181a7f16e49
 MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.1.ebuild b/app-emacs/ddskk/ddskk-16.1.ebuild
deleted file mode 100644
index 34e4e7c32c86..000000000000
--- a/app-emacs/ddskk/ddskk-16.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23"
-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"
-
-DEPEND=""
-RDEPEND="|| (
-		app-i18n/skk-jisyo
-		virtual/skkserv
-	)
-	ruby? ( ${RUBY_DEPS} )"
-S="${WORKDIR}/${PN}-${P}_Futamata"
-
-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
-	mv {bayesian,tut-code}/*.el .
-}
-
-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.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index b5543cea892c..ec56dd3838d2 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
 
 DEPEND=""