From: David Seifert <soap@gentoo.org>
Date: Sat, 1 Apr 2017 10:41:24 +0000 (+0200)
Subject: app-dicts/aspell-en: Bump to EAPI 6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=44afff34b8a572a34efe75f96e98eb0d4b8a8e93;p=gentoo.git

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

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

diff --git a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
index f5c4eea3b996..92ecb8d907b2 100644
--- a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
@@ -4,14 +4,12 @@
 EAPI=6
 
 ASPELL_LANG="English (US, British, Canadian)"
-ASPOSTFIX="6"
+ASPELL_VERSION=6
 
-inherit aspell-dict versionator
+inherit aspell-dict-r1 versionator
 
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
 IUSE=""
-
-SRC_URI="mirror://gnu/aspell/dict/${SPELLANG}/${PN%-*}${ASPOSTFIX}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
diff --git a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild b/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
index 09f02043d32e..1e8780872766 100644
--- a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
@@ -4,14 +4,12 @@
 EAPI=6
 
 ASPELL_LANG="English (US, British, Canadian)"
-ASPOSTFIX="6"
+ASPELL_VERSION=6
 
-inherit aspell-dict versionator
+inherit aspell-dict-r1 versionator
 
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
 IUSE=""
-
-SRC_URI="mirror://gnu/aspell/dict/${SPELLANG}/${PN%-*}${ASPOSTFIX}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"