diff --git a/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
index b28405cdf9bcf..abbd1a71dfa3b 100644
--- a/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
+++ b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Asturian"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
index eddcca64a5705..c0ce4d1b71559 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Belarusian"
 ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
index 27380d30535f9..17358f8b0468e 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Catalan"
 ASPELL_VERSION=6
-MY_PN="${PN/aspell/aspell${ASPELL_VERSION}}"
+MY_PN="${PN/aspell/aspell"${ASPELL_VERSION}"}"
 MY_P="${MY_PN}-${PV}"
 
 inherit aspell-dict-r1
diff --git a/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
index c726dd55fd8a6..5243f41e97755 100644
--- a/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
+++ b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="German, Austria-German and Swiss-German"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV//./-}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV//./-}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
index 3e2223358d122..f7bdc02252a46 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ASPELL_LANG="Esperanto"
 ASPELL_VERSION=6
 MY_PV="$(ver_cut 1-3)a-$(ver_cut 4)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
index d02c50cedb9bd..738ebd03c7a3e 100644
--- a/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Irish"
 ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
index 1e31ec0ee6d00..ba5c7ee1f17cd 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ASPELL_LANG="Galician"
 ASPELL_VERSION=6
 MY_PV="$(ver_cut 1-2)a-$(ver_cut 3)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
index 5ca016b0ddc8b..737d132830055 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ASPELL_LANG="Italian"
 ASPELL_VERSION=6
 MY_PV="${PV#*.}"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%%.*}.${MY_PV//./-}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%%.*}.${MY_PV//./-}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
index 6f3d9ed429ec8..717b03ec818dc 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Lithuanian"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
index 87b2c9d3ff472..07f56c3b6b9fc 100644
--- a/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
+++ b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Malayalam"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-pt/aspell-pt-20220621.ebuild b/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
index 71972c1b634b2..59b1833c30ebb 100644
--- a/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 ASPELL_LANG="Portuguese"
 ASPELL_VERSION=6
 MY_PN="${PN/-/.}"
-MY_P="${MY_PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
-MY_S="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${MY_PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
+MY_S="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
index fe0dad58877b6..d92599c11f7c1 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Romanian"
 ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
index c235b67bba95a..663473a7a4238 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ASPELL_LANG="Russian"
 ASPELL_VERSION=6
 MY_PV="$(ver_cut 1-2)f7-$(ver_cut 3)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
index 1ee14685ec038..de48f0755f84d 100644
--- a/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
+++ b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Sardinian"
 ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
index 311b782b8a7b6..c52ffaf9f09ae 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Slovak"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
index e730744bf8f78..5223b4b3f4fc3 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Serbian"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
index 1d3c81aa5749a..019d8238a49b0 100644
--- a/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
+++ b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Tetum"
 ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
 
 inherit aspell-dict-r1
 
diff --git a/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
index 1d4a4b365a73e..b911a2ad86cb8 100644
--- a/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
+++ b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ASPELL_LANG="Tagalog"
 ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
 
 inherit aspell-dict-r1