diff --git a/dev-python/nab-index/nab-index-0.0.22-r1.ebuild b/dev-python/nab-index/nab-index-0.0.22-r1.ebuild
index 39745c7938..ca773b8ad4 100644
--- a/dev-python/nab-index/nab-index-0.0.22-r1.ebuild
+++ b/dev-python/nab-index/nab-index-0.0.22-r1.ebuild
@@ -20,9 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.22[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/truststore[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab-index/nab-index-0.0.23.ebuild b/dev-python/nab-index/nab-index-0.0.23.ebuild
index 79ec37b95d..8ab907a787 100644
--- a/dev-python/nab-index/nab-index-0.0.23.ebuild
+++ b/dev-python/nab-index/nab-index-0.0.23.ebuild
@@ -20,9 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.23[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/truststore[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab-index/nab-index-0.0.24.ebuild b/dev-python/nab-index/nab-index-0.0.24.ebuild
index 9ef8b88513..8ab907a787 100644
--- a/dev-python/nab-index/nab-index-0.0.24.ebuild
+++ b/dev-python/nab-index/nab-index-0.0.24.ebuild
@@ -20,9 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.24[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/truststore[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab-index/nab-index-0.0.25.ebuild b/dev-python/nab-index/nab-index-0.0.25.ebuild
index f7b4d6aaa4..8ab907a787 100644
--- a/dev-python/nab-index/nab-index-0.0.25.ebuild
+++ b/dev-python/nab-index/nab-index-0.0.25.ebuild
@@ -20,9 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.25[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/truststore[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab-markersets/nab-markersets-0.0.22-r1.ebuild b/dev-python/nab-markersets/nab-markersets-0.0.22-r1.ebuild
index ca6cc01118..b9f2c1574f 100644
--- a/dev-python/nab-markersets/nab-markersets-0.0.22-r1.ebuild
+++ b/dev-python/nab-markersets/nab-markersets-0.0.22-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-resolver-0.0.22[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/nab-markersets/nab-markersets-0.0.23.ebuild b/dev-python/nab-markersets/nab-markersets-0.0.23.ebuild
index c59d790d29..b9f2c1574f 100644
--- a/dev-python/nab-markersets/nab-markersets-0.0.23.ebuild
+++ b/dev-python/nab-markersets/nab-markersets-0.0.23.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-resolver-0.0.23[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/nab-markersets/nab-markersets-0.0.24.ebuild b/dev-python/nab-markersets/nab-markersets-0.0.24.ebuild
index cc9da2bd0c..b9f2c1574f 100644
--- a/dev-python/nab-markersets/nab-markersets-0.0.24.ebuild
+++ b/dev-python/nab-markersets/nab-markersets-0.0.24.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-resolver-0.0.24[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/nab-markersets/nab-markersets-0.0.25.ebuild b/dev-python/nab-markersets/nab-markersets-0.0.25.ebuild
index 73fc9cf2ea..b9f2c1574f 100644
--- a/dev-python/nab-markersets/nab-markersets-0.0.25.ebuild
+++ b/dev-python/nab-markersets/nab-markersets-0.0.25.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-resolver-0.0.25[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/nab-project/nab-project-0.0.22-r1.ebuild b/dev-python/nab-project/nab-project-0.0.22-r1.ebuild
index 9ebd31a6ce..281f949d5e 100644
--- a/dev-python/nab-project/nab-project-0.0.22-r1.ebuild
+++ b/dev-python/nab-project/nab-project-0.0.22-r1.ebuild
@@ -26,8 +26,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/installer[${PYTHON_USEDEP}]
 	dev-python/httpx2[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.22[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nab-project/nab-project-0.0.23.ebuild b/dev-python/nab-project/nab-project-0.0.23.ebuild
index ff253fdf4e..1b4f4b0bc8 100644
--- a/dev-python/nab-project/nab-project-0.0.23.ebuild
+++ b/dev-python/nab-project/nab-project-0.0.23.ebuild
@@ -26,8 +26,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
 	dev-python/installer[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.23[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nab-project/nab-project-0.0.24.ebuild b/dev-python/nab-project/nab-project-0.0.24.ebuild
index e7689b55e9..1b4f4b0bc8 100644
--- a/dev-python/nab-project/nab-project-0.0.24.ebuild
+++ b/dev-python/nab-project/nab-project-0.0.24.ebuild
@@ -26,8 +26,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
 	dev-python/installer[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.24[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nab-project/nab-project-0.0.25.ebuild b/dev-python/nab-project/nab-project-0.0.25.ebuild
index 4c126714b0..1b4f4b0bc8 100644
--- a/dev-python/nab-project/nab-project-0.0.25.ebuild
+++ b/dev-python/nab-project/nab-project-0.0.25.ebuild
@@ -26,8 +26,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
 	dev-python/installer[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.25[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nab-provider/nab-provider-0.0.22-r1.ebuild b/dev-python/nab-provider/nab-provider-0.0.22-r1.ebuild
index a6eae19c48..39c91e2c8c 100644
--- a/dev-python/nab-provider/nab-provider-0.0.22-r1.ebuild
+++ b/dev-python/nab-provider/nab-provider-0.0.22-r1.ebuild
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.22[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/nab-provider/nab-provider-0.0.23.ebuild b/dev-python/nab-provider/nab-provider-0.0.23.ebuild
index 27649f4828..39c91e2c8c 100644
--- a/dev-python/nab-provider/nab-provider-0.0.23.ebuild
+++ b/dev-python/nab-provider/nab-provider-0.0.23.ebuild
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.23[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/nab-provider/nab-provider-0.0.24.ebuild b/dev-python/nab-provider/nab-provider-0.0.24.ebuild
index 0c23e4c0f2..39c91e2c8c 100644
--- a/dev-python/nab-provider/nab-provider-0.0.24.ebuild
+++ b/dev-python/nab-provider/nab-provider-0.0.24.ebuild
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.24[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/nab-provider/nab-provider-0.0.25.ebuild b/dev-python/nab-provider/nab-provider-0.0.25.ebuild
index 4dc4ca15f2..39c91e2c8c 100644
--- a/dev-python/nab-provider/nab-provider-0.0.25.ebuild
+++ b/dev-python/nab-provider/nab-provider-0.0.25.ebuild
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
-	~dev-python/nab-markersets-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.25[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/nab/nab-0.0.22-r1.ebuild b/dev-python/nab/nab-0.0.22-r1.ebuild
index 8db4468530..e85a517ca4 100644
--- a/dev-python/nab/nab-0.0.22-r1.ebuild
+++ b/dev-python/nab/nab-0.0.22-r1.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-project-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.22[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.22[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-project-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab/nab-0.0.23.ebuild b/dev-python/nab/nab-0.0.23.ebuild
index 7730927ca1..e85a517ca4 100644
--- a/dev-python/nab/nab-0.0.23.ebuild
+++ b/dev-python/nab/nab-0.0.23.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-project-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.23[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.23[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-project-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab/nab-0.0.24.ebuild b/dev-python/nab/nab-0.0.24.ebuild
index eef0b15bb8..e85a517ca4 100644
--- a/dev-python/nab/nab-0.0.24.ebuild
+++ b/dev-python/nab/nab-0.0.24.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-project-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.24[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.24[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-project-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nab/nab-0.0.25.ebuild b/dev-python/nab/nab-0.0.25.ebuild
index 8b6a04a499..e85a517ca4 100644
--- a/dev-python/nab/nab-0.0.25.ebuild
+++ b/dev-python/nab/nab-0.0.25.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-python/httpx2[${PYTHON_USEDEP}]
-	~dev-python/nab-index-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-markersets-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-project-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-provider-0.0.25[${PYTHON_USEDEP}]
-	~dev-python/nab-resolver-0.0.25[${PYTHON_USEDEP}]
+	~dev-python/nab-index-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-markersets-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-project-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-provider-${PV}[${PYTHON_USEDEP}]
+	~dev-python/nab-resolver-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.5.0[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "