[gentoo-commits] repo/gentoo:master commit in: app-dicts/aspell-ru/

[David Seifert]

commit:     4348cfb8cbc54edc35ad8e8a9c3b969ede20085f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 10:41:27 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 10:44:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4348cfb8

app-dicts/aspell-ru: Bump to EAPI 6

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4237

 app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
index 553c104fdf9..793e034b27b 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 ASPELL_LANG="Russian"
-ASPOSTFIX="6"
+ASPELL_VERSION=6
 
-inherit aspell-dict
+inherit aspell-dict-r1
 
-LICENSE="GPL-2"
+# very strange filename not supported by the gentoo naming scheme
+MY_P="aspell6-ru-0.99f7-1"
 
+SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-# very strange filename not supported by the gentoo naming scheme
-FILENAME=aspell6-ru-0.99f7-1
+S=${WORKDIR}/${MY_P}
 
-SRC_URI="mirror://gnu/aspell/dict/ru/${FILENAME}.tar.bz2"
-S=${WORKDIR}/${FILENAME}
+src_prepare() {
+	default
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	einfo "Set default dictionary to ru-yeyo."
+	einfo "Setting default dictionary to ru-yeyo"
 	cp -v ru-yeyo.multi ru.multi || die
 }