app-i18n/anthy: drop app-i18n/anthy-ss blocker

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/anthy/anthy-9100h-r1.ebuild b/app-i18n/anthy/anthy-9100h-r1.ebuild
index b0dd981411de4a90c0646ebd70a72fdc650e8681..f58590c86977a1c9696f17928bb0256c92712755 100644 (file)
--- a/app-i18n/anthy/anthy-9100h-r1.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI="3"
+
 inherit elisp-common eutils
 
 DESCRIPTION="Anthy -- free and secure Japanese input system"
@@ -9,15 +10,13 @@ HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/anthy/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
-DEPEND="!app-i18n/anthy-ss
-       canna-2ch? ( app-dicts/canna-2ch )
+RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
        emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-anthy_context_t.patch"
@@ -43,7 +42,7 @@ src_configure() {
 src_install() {
        emake DESTDIR="${D}" install || die
 
-       if use emacs ; then
+       if use emacs; then
                elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el || die
        fi
 

diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 6ad6fbaf14479086bde141fc4eebb2308fb77d62..43eb4327bd5da49cba5fdb65c733f499c4674d78 100644 (file)
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit elisp-common
 
@@ -10,20 +10,15 @@ HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/anthy/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
-DEPEND="
-       !app-i18n/anthy-ss
-       canna-2ch? ( app-dicts/canna-2ch )
+RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
        emacs? ( virtual/emacs )"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-anthy_context_t.patch" )
-
 DOCS=( AUTHORS DIARY NEWS README ChangeLog )
 
 src_prepare() {
@@ -54,7 +49,7 @@ src_install() {
                elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el || die
        fi
 
-       rm -v doc/Makefile* || die
+       rm -f doc/Makefile*
        docinto doc
        dodoc doc/*
 }