13 files changed, 5 insertions, 4 deletions
diff --git a/x11-libs/intel-hybrid-codec-driver/Manifest b/media-libs/intel-hybrid-codec-driver/Manifest
index fdb2e271ea38..fdb2e271ea38 100644
--- a/x11-libs/intel-hybrid-codec-driver/Manifest
+++ b/media-libs/intel-hybrid-codec-driver/Manifest
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
index 0c170579857f..0c170579857f 100644
--- a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
index e410a8cc89c5..e410a8cc89c5 100644
--- a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
index 84562584b6a2..84562584b6a2 100644
--- a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
index 5177e1448539..5177e1448539 100644
--- a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
index 2422e4d1721b..2422e4d1721b 100644
--- a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
diff --git a/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
index 94677eae42f6..94677eae42f6 100644
--- a/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
+++ b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
diff --git a/x11-libs/intel-hybrid-codec-driver/metadata.xml b/media-libs/intel-hybrid-codec-driver/metadata.xml
index b93334ee2543..b93334ee2543 100644
--- a/x11-libs/intel-hybrid-codec-driver/metadata.xml
+++ b/media-libs/intel-hybrid-codec-driver/metadata.xml
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
index 79727411074f..a7d5e4df2625 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=media-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
 
 	hybrid? (
-		>=x11-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
+		>=media-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
 	)
 
 	wayland? (
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 84ce4e86ad3a..bb1c0370ebfe 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -18,7 +18,7 @@
 #--- END OF EXAMPLES ---
 
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-23)
-# Dependency x11-libs/intel-hybrid-codec-driver is only available on unstable
+# Dependency media-libs/intel-hybrid-codec-driver is only available on unstable
 # branch
 media-libs/libva-intel-driver hybrid
 
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index acd5a243334a..a7c1448efa67 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -3,7 +3,7 @@
 
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-26)
 # intel-hybrid-codec-driver does not work on x32
-x11-libs/intel-hybrid-codec-driver
+media-libs/intel-hybrid-codec-driver
 
 # Jonas Licht <jonas.licht@gmail.com> (2022-05-01)
 # Requires net-libs/nodejs, plus mask all reverse-dependecies.
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 270a5372e9c1..ea7045e60329 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-26)
-# Dependency x11-libs/intel-hybrid-codec-driver does not work on x32
+# Dependency media-libs/intel-hybrid-codec-driver does not work on x32
 media-libs/libva-intel-driver hybrid
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-02-09)
diff --git a/profiles/updates/4Q-2022 b/profiles/updates/4Q-2022
index 75a41ab46107..7e58580c34d8 100644
--- a/profiles/updates/4Q-2022
+++ b/profiles/updates/4Q-2022
@@ -2,3 +2,4 @@ move x11-libs/libva media-libs/libva
 move x11-libs/libva-compat media-libs/libva-compat
 move x11-libs/libva-intel-driver media-libs/libva-intel-driver
 move x11-libs/libva-intel-media-driver media-libs/libva-intel-media-driver
+move x11-libs/intel-hybrid-codec-driver media-libs/intel-hybrid-codec-driver