diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index bfb2a2e8dd128..fbdd56dc98168 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -3,14 +3,7 @@
 
 EAPI=8
 
-DOCS_BUILDER="sphinx"
-DOCS_DIR="doc"
-DOCS_AUTODOC=0
-
-PYTHON_COMPAT=( python3_{11..14} )
-
-# python-any-r1 is inherited first because docs.eclass sources it, and cmake.eclass exports phases.
-inherit python-any-r1 cmake docs flag-o-matic linux-info
+inherit cmake flag-o-matic linux-info
 
 DESCRIPTION="UPnP Media Server"
 HOMEPAGE="https://gerbera.io"
@@ -26,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug doc +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib test"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer icu +javascript +magic +matroska mysql systemd +taglib test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -47,6 +40,7 @@ RDEPEND="
 	exiv2? ( media-gfx/exiv2:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer[png] )
+	icu? ( dev-libs/icu:= )
 	javascript? ( dev-lang/duktape:= )
 	magic? ( sys-apps/file )
 	matroska? ( media-libs/libmatroska:= )
@@ -55,13 +49,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-		media-gfx/graphviz
-	)
 	test? ( dev-cpp/gtest )
 "
 
@@ -80,6 +67,7 @@ src_configure() {
 		-DWITH_EXIF=$(usex exif)
 		-DWITH_EXIV2=$(usex exiv2)
 		-DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
+		-DWITH_ICU=$(usex icu)
 		-DWITH_INOTIFY=ON
 		-DWITH_JS=$(usex javascript)
 		-DWITH_LASTFM=OFF
@@ -95,11 +83,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
 src_install() {
 	cmake_src_install
 
@@ -107,7 +90,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN}
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-2.6.1.config config.xml
+	newins "${FILESDIR}"/${PN}-3.2.1.config config.xml
 	fperms 0640 /etc/${PN}/config.xml
 	fowners root:gerbera /etc/${PN}/config.xml
 }