app-dicts/aspell-de-alt: Bump to EAPI 6

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

diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
index 2de0141d34f9deecdd8270b607b0d6017e44aa72..a67e49d53e56afd83d1670598feba61b993853f6 100644 (file)
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 ASPELL_LANG="German (traditional orthography)"
-ASPOSTFIX="6"
+ASPELL_VERSION=6
 
-inherit eutils aspell-dict
+inherit aspell-dict-r1
 
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${P}-dict-name.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-dict-name.patch" )
 
 src_install() {
-       aspell-dict_src_install
-       newdoc doc/README README.hk || die
-       dodoc doc/README.bj || die
+       aspell-dict-r1_src_install
+
+       newdoc doc/README README.hk
+       dodoc doc/README.bj
 }

diff --git a/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch b/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch
index 5c74ed74c56cff91e02c1e73bf6992b8655895e4..103f19222dcb8b45948e92fdfb98faf41933f36c 100644 (file)
--- a/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch
+++ b/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch
@@ -2,8 +2,8 @@ Aspell dictionaries should be named LANGUAGE[_REGION][-VARIETY][-SIZE],
 therefore this patch adds de-1901 and de_DE-1901 as such alias names.
 See also: http://www.iana.org/assignments/language-subtag-registry
 
---- Makefile.pre
-+++ Makefile.pre
+--- a/Makefile.pre
++++ b/Makefile.pre
 @@ -7,7 +7,8 @@
  data_files = de-alt.dat de-alt_phonet.dat de-alt_affix.dat
  doc_files = README COPYING Copyright
@@ -14,8 +14,8 @@ See also: http://www.iana.org/assignments/language-subtag-registry
  rws_files = de-alt.rws
  
  distdir=aspell6-${lang}-${version}
---- README
-+++ README
+--- a/README
++++ b/README
 @@ -1,4 +1,4 @@
 -GNU Aspell 0.60 German - Old Spelling (Deutsch - Alter Spelling) Dictionary Package
 +GNU Aspell 0.60 German - Old Spelling (Deutsch - alte Rechtschreibung) Dictionary Package
@@ -31,16 +31,16 @@ See also: http://www.iana.org/assignments/language-subtag-registry
  Whereas the names in parentheses are alternate names for the
  dictionary preceding the parentheses.
  
---- de-1901.alias
-+++ de-1901.alias
+--- a/de-1901.alias
++++ b/de-1901.alias
 @@ -0,0 +1 @@
 +add de-alt.multi
---- de_DE-1901.alias
-+++ de_DE-1901.alias
+--- a/de_DE-1901.alias
++++ b/de_DE-1901.alias
 @@ -0,0 +1 @@
 +add de-alt.multi
---- info
-+++ info
+--- a/info
++++ b/info
 @@ -1,5 +1,5 @@
  name_english German - Old Spelling
 -name_ascii Deutsch - Alter Spelling