diff --git a/media-libs/libavif/libavif-0.8.4.ebuild b/media-libs/libavif/libavif-0.8.4-r1.ebuild
similarity index 97%
rename from media-libs/libavif/libavif-0.8.4.ebuild
rename to media-libs/libavif/libavif-0.8.4-r1.ebuild
index 156e8afb6ac4c..a1703c043d39d 100644
--- a/media-libs/libavif/libavif-0.8.4.ebuild
+++ b/media-libs/libavif/libavif-0.8.4-r1.ebuild
@@ -10,7 +10,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
 
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r3.ebuild
similarity index 98%
rename from media-libs/libavif/libavif-0.9.0-r2.ebuild
rename to media-libs/libavif/libavif-0.9.0-r3.ebuild
index 349018377345a..b4846ff1d5cfd 100644
--- a/media-libs/libavif/libavif-0.9.0-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.0-r3.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
diff --git a/media-libs/libavif/libavif-0.9.1.ebuild b/media-libs/libavif/libavif-0.9.1-r1.ebuild
similarity index 98%
rename from media-libs/libavif/libavif-0.9.1.ebuild
rename to media-libs/libavif/libavif-0.9.1-r1.ebuild
index 5deb788278368..d06dd645a5462 100644
--- a/media-libs/libavif/libavif-0.9.1.ebuild
+++ b/media-libs/libavif/libavif-0.9.1-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
diff --git a/media-libs/libavif/libavif-0.9.2.ebuild b/media-libs/libavif/libavif-0.9.2-r1.ebuild
similarity index 98%
rename from media-libs/libavif/libavif-0.9.2.ebuild
rename to media-libs/libavif/libavif-0.9.2-r1.ebuild
index 4a9f25f041f95..bf857c5b28001 100644
--- a/media-libs/libavif/libavif-0.9.2.ebuild
+++ b/media-libs/libavif/libavif-0.9.2-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
diff --git a/media-libs/libavif/libavif-0.9.3.ebuild b/media-libs/libavif/libavif-0.9.3-r1.ebuild
similarity index 98%
rename from media-libs/libavif/libavif-0.9.3.ebuild
rename to media-libs/libavif/libavif-0.9.3-r1.ebuild
index fa6ad1dca623f..ee304de7b3022 100644
--- a/media-libs/libavif/libavif-0.9.3.ebuild
+++ b/media-libs/libavif/libavif-0.9.3-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 1be688c4b5e77..3b89a6e532441 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
 EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git"
 
 LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"