app-dicts/aspell-pl: EAPI-7 bump

Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <[email protected]>
johu · Mar 12, 2021 · 50d049f · 50d049f
1 parent ff10661
commit 50d049f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ASPELL_LANG="Polish"
 ASPELL_VERSION=6
-
-inherit versionator aspell-dict-r1
-
-MY_P="${PN/aspell/aspell6}-$(replace_version_separator 2 _ $(replace_version_separator 3 -))"
+inherit aspell-dict-r1
 
 HOMEPAGE="https://sjp.pl/slownik/en/"
-SRC_URI="http://www.sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
+
+MY_P="${PN/aspell/aspell6}-$(ver_rs 2 _ 3 -)"
+SRC_URI="https://sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"

diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ASPELL_LANG="Polish"
 ASPELL_VERSION=6
-
-inherit aspell-dict-r1 eapi7-ver
-
-MY_P="sjp-${PN/aspell/aspell6}-$(ver_rs 2 _ $(ver_rs 3 -))"
+inherit aspell-dict-r1
 
 HOMEPAGE="https://sjp.pl/slownik/en/"
-SRC_URI="https://www.sjp.pl/slownik/ort/${MY_P}.tar.bz2"
+
+MY_P="sjp-${PN/aspell/aspell6}-$(ver_rs 2 _ 3 -)"
+SRC_URI="https://sjp.pl/slownik/ort/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P/sjp-/}"
 
 LICENSE="Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1 "