Adding metadata

7 files changed, 27 insertions, 199 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index e33c40641976..0222377015d6 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,2 @@
-DIST libheif-1.18.2.tar.gz 1525096 BLAKE2B 667a68f324f89b2274ea837ec8d40ada5450dce79f2b8d9e8ba365fe5f02d4222195109519380a6d38c4ebca929575e58c3a8e517aed27a2696d67db3e287556 SHA512 8fd47dbc8e31fdb6a972c852bc4e78440492ee3dd769e139f28ad489ccc23e6cf42a90cd23b16405fa30df3c7c43c78b2b65d5ca3ffb449bf06789b457ed3072
-DIST libheif-1.19.7.tar.gz 1717186 BLAKE2B 78c7db44b9131fbf46516fdb1ef149dd402e11512f600f6b0d5d73768d760cce023e4f2481accdbfb1826c9be9668f933b57a6c2a6da58b731c6aa409d94750b SHA512 b0c3226c528daf78d8e8f73b5a07b9104e3ff036c553a66fdd0ca494380d8fb03c799241f0ea66b5f7e42d4fec87d186571f2aae9ac4820ffd7ff76d704f487b
 DIST libheif-1.19.8.tar.gz 1718218 BLAKE2B 048fe46fc6d4a889ff80da51b6768b505d265a11b2363ecc9d908438dfd8613d0e460737a36a30e5fd84c6e91c70f22f86778cb5f04ab1f6a8b9eae54c027ab0 SHA512 ccb7359c2a7632fd598bb82d238482652fec58c8cebfecd3c2fef07d814d6e623d7916db18eeb47887f1c32bbdbb80680533643b7610880844e1dee3e128cade
 DIST libheif-1.20.1.tar.gz 1787033 BLAKE2B 11f312d9b4222a8f07e0953d3f828a7b324d4fb3359d7a33f0ef7f2507cbd9ca06c5d433cf3271934bcf748f5e9a5c9c008b4373e82b21e264fc817190a32fb9 SHA512 360a02e71bd1693c42e110ebf77e8da576775517c8c0250c02bbfd8fd0ceb6b56d3d7cec76eddf8dfc572687c308cfb756e4c3519d31572d25c0a7557d3de415
diff --git a/media-libs/libheif/libheif-1.18.2-r1.ebuild b/media-libs/libheif/libheif-1.18.2-r1.ebuild
deleted file mode 100644
index f06fd824520b..000000000000
--- a/media-libs/libheif/libheif-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg multilib-minimal
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads +webp x265"
-REQUIRED_USE="test? ( go )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		<dev-cpp/catch-3
-		dev-lang/go
-	)
-"
-DEPEND="
-	media-libs/dav1d:=[${MULTILIB_USEDEP}]
-	media-libs/libde265[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/tiff:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-	rav1e? ( media-video/rav1e:= )
-	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:= )
-	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libheif/heif_version.h
-)
-
-src_prepare() {
-	if use test ; then
-		# bug 865351
-		rm tests/catch.hpp || die
-		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
-	fi
-
-	sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466
-
-	cmake_src_prepare
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export GO111MODULE=auto
-	local mycmakeargs=(
-		-DENABLE_PLUGIN_LOADING=true
-		-DWITH_LIBDE265=true
-		-DWITH_AOM_DECODER=$(usex aom)
-		-DWITH_AOM_ENCODER=$(usex aom)
-		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
-		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
-		-DWITH_SvtEnc="$(usex svt-av1)"
-		-DWITH_LIBSHARPYUV=$(usex webp)
-		-DWITH_X265=$(usex x265)
-		-DWITH_KVAZAAR=true
-		-DWITH_JPEG_DECODER=true
-		-DWITH_JPEG_ENCODER=true
-		-DWITH_OpenJPEG_DECODER=true
-		-DWITH_OpenJPEG_ENCODER=true
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	default
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	default
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/libheif/libheif-1.19.7.ebuild b/media-libs/libheif/libheif-1.19.7.ebuild
deleted file mode 100644
index e63a26d89aeb..000000000000
--- a/media-libs/libheif/libheif-1.19.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib gnome2-utils xdg
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-3 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom doc examples gdk-pixbuf openh264 rav1e svt-av1 test +threads +webp x265"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? ( app-text/doxygen )
-"
-DEPEND="
-	media-libs/dav1d:=[${MULTILIB_USEDEP}]
-	media-libs/libde265[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	media-libs/tiff:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
-	rav1e? ( media-video/rav1e:= )
-	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:= )
-	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libheif/heif_version.h
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_PLUGIN_LOADING=true
-		-DWITH_LIBDE265=true
-		-DWITH_AOM_DECODER=$(usex aom)
-		-DWITH_AOM_ENCODER=$(usex aom)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
-		-DWITH_OpenH264_DECODER=$(usex openh264)
-		-DWITH_OpenH264_ENCODER=$(usex openh264)
-		-DWITH_RAV1E=$(multilib_native_usex rav1e)
-		-DWITH_SvtEnc=$(usex svt-av1)
-		-DWITH_LIBSHARPYUV=$(usex webp)
-		-DWITH_X265=$(usex x265)
-		-DWITH_KVAZAAR=true
-		-DWITH_JPEG_DECODER=true
-		-DWITH_JPEG_ENCODER=true
-		-DWITH_OpenJPEG_DECODER=true
-		-DWITH_OpenJPEG_ENCODER=true
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libheif/libheif-1.19.8-r1.ebuild b/media-libs/libheif/libheif-1.19.8-r2.ebuild
index 8d6afffecf3d..430798295797 100644
--- a/media-libs/libheif/libheif-1.19.8-r1.ebuild
+++ b/media-libs/libheif/libheif-1.19.8-r2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3 MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test +threads +webp x265"
+IUSE="+aom dav1d +de265 doc ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test +threads tools +webp x265"
 # IUSE+=" vvdec vvenc"
 RESTRICT="!test? ( test )"
 
@@ -36,6 +36,7 @@ DEPEND="
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+	kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] )
 	openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
@@ -59,7 +60,7 @@ multilib_src_configure() {
 		-DWITH_AOM_DECODER=$(usex aom)
 		-DWITH_AOM_ENCODER=$(usex aom)
 		-DWITH_DAV1D=$(usex dav1d)
-		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_EXAMPLES=$(usex tools) # the examples are tools
 		-DWITH_FFMPEG_DECODER=$(usex ffmpeg)
 		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
 		-DWITH_OpenH264_DECODER=$(usex openh264)
diff --git a/media-libs/libheif/libheif-1.20.1.ebuild b/media-libs/libheif/libheif-1.20.1-r1.ebuild
index 73ffddeaffc1..36a25b2d1e40 100644
--- a/media-libs/libheif/libheif-1.20.1.ebuild
+++ b/media-libs/libheif/libheif-1.20.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3 MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test test-full +threads tools +webp x265"
+IUSE="+aom dav1d +de265 doc ffmpeg gdk-pixbuf gui +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test test-full +threads tools +webp x265"
 # IUSE+=" vvdec vvenc"
 REQUIRED_USE="test-full? ( test )"
 RESTRICT="!test? ( test )"
@@ -37,11 +37,12 @@ DEPEND="
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+	kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] )
 	openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
 	tools? (
-		examples? (
+		gui? (
 			media-libs/libsdl2:=[${MULTILIB_USEDEP}]
 		)
 	)
@@ -56,6 +57,12 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libheif/heif_version.h
 )
 
+pkg_pretend() {
+	if use gui && use !tools ; then
+		ewarn "Building heif-view requires USE=\"gui tools\"."
+	fi
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package doc Doxygen)
@@ -65,8 +72,7 @@ multilib_src_configure() {
 		-DWITH_AOM_DECODER=$(usex aom)
 		-DWITH_AOM_ENCODER=$(usex aom)
 		-DWITH_DAV1D=$(usex dav1d)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_EXAMPLE_HEIF_VIEW=$(usex examples $(usex tools))
+		-DWITH_EXAMPLES=$(usex tools) # the examples are tools
 		-DWITH_FFMPEG_DECODER=$(usex ffmpeg)
 		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
 		-DWITH_OpenH264_DECODER=$(usex openh264)
@@ -96,7 +102,7 @@ multilib_src_configure() {
 	fi
 
 	# TODO WITH_EXAMPLE_HEIF_VIEW in -9999
-	if ! use tools; then
+	if use tools && ! use gui; then
 		mycmakeargs+=(
 			-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
 		)
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index c544ffc5e0f6..aa48bafb4375 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3 MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+aom dav1d +de265 doc examples ffmpeg gdk-pixbuf +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test test-full +threads tools +webp x265"
+IUSE="+aom dav1d +de265 doc ffmpeg gdk-pixbuf gui +jpeg +jpeg2k +kvazaar openh264 rav1e svt-av1 test test-full +threads tools +webp x265"
 # IUSE+=" vvdec vvenc"
 REQUIRED_USE="test-full? ( test )"
 RESTRICT="!test? ( test )"
@@ -37,11 +37,12 @@ DEPEND="
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+	kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] )
 	openh264? ( media-libs/openh264:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
 	tools? (
-		examples? (
+		gui? (
 			media-libs/libsdl2:=[${MULTILIB_USEDEP}]
 		)
 	)
@@ -56,6 +57,12 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libheif/heif_version.h
 )
 
+pkg_pretend() {
+	if use gui && use !tools ; then
+		ewarn "Building heif-view requires USE=\"gui tools\"."
+	fi
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package doc Doxygen)
@@ -65,8 +72,8 @@ multilib_src_configure() {
 		-DWITH_AOM_DECODER=$(usex aom)
 		-DWITH_AOM_ENCODER=$(usex aom)
 		-DWITH_DAV1D=$(usex dav1d)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_EXAMPLE_HEIF_VIEW=$(usex examples $(usex tools))
+		-DWITH_EXAMPLES=$(usex tools) # the examples are tools
+		-DWITH_EXAMPLE_HEIF_VIEW=$(usex tools $(usex gui))
 		-DWITH_FFMPEG_DECODER=$(usex ffmpeg)
 		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
 		-DWITH_OpenH264_DECODER=$(usex openh264)
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 33d8bcecb9cd..80e41a8f39de 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -10,13 +10,13 @@
   <flag name="dav1d">Enable support for the dav1d codec decoding using <pkg>media-libs/dav1d</pkg></flag>
   <flag name="de265">Enable H.265 support using <pkg>media-libs/libde265</pkg></flag>
   <flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
-  <flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
+  <flag name="gui">Build heif-view (requires USE=tools)</flag>
   <flag name="kvazaar">Enable H.265/HEVC encoding support via <pkg>media-libs/kvazaar</pkg></flag>
   <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
   <flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
   <flag name="svt-av1">Use <pkg>media-libs/svt-av1</pkg> for SVT-AV1 encoding</flag>
   <flag name="test-full">Allow tests that rely on options not normally enabled</flag>
-  <flag name="tools">Build heif-view tool</flag>
+  <flag name="tools">Build command line tools</flag>
   <flag name="webp">Enable high-quality YCbCr/RGB color space conversion algorithms</flag>
   <flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
  </use>