gentoo auto-resync : 28:11:2024 - 02:00:16

3 files changed, 18 insertions, 12 deletions

diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index 870c7c9547cb..d5fd8cb567d9 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1,4 +1,4 @@
 DIST aravis-0.8.5.tar.gz 966208 BLAKE2B abeb87911e20898765a41a663a539932cafe65a297ae3887379ca2760132150fde1fb87dbd5f718618b90f5eb2f2fd4941a85ebf7139b0d4ae8a6be458338450 SHA512 2e6ab898be0d1e9a93555bcf83bb447f19c46c5d3c3a8713b9a2174fd165992d5737393f417f6e46504d120d15955dc67e89342449f11356a3fd1e6968ac233e
-EBUILD aravis-0.8.5.ebuild 1518 BLAKE2B 7ae87be61bf70b32cbac7a814c3362068f33c8b319bfaf2fd8bc2795ec1dec3004c18448462a3e24b796286ac7c176965e538e8c99415d1a2e8100d292b12d41 SHA512 b6bd875e0d01e9fe112f5f31878684b368cf563aebbe7fb80ea3ebce241da737710881ec7b5d4f387878e924ae48085e542a3d700d0d8362319308aceb5713a0
-EBUILD aravis-9999.ebuild 1583 BLAKE2B edd715fb9fdb9165a09220f99d56aa291c61aa9a0b712dd842f875a2c3141cd9d89c7506fa9eb4c1cfd8c81d76f70a76f9c3df8ed16d20c2628cbf870c6ed2ac SHA512 22684658e389605e30f2e23d7bcc2c9cb2f59955d84d51e915a65b97a1ee4a86dd3b887ac83350eeca19ce5bc99f5dff553eb13f907bb6d764ffb06154f09cc3
+EBUILD aravis-0.8.5-r1.ebuild 1544 BLAKE2B 73609c9e9f12b918001fe35d02cd19e33741664fac18c447df07d7c31cd0aad9b75afde6673bd41e0edb8632862b553935efa0ba8ad4334ea65cd5ad1d2570ab SHA512 3da59af486ff95c72f87444228c8f4c601ae37dfec9927afc3a3ea4582eaa1002d5594c97227164b5097763c1050e6d04491f8c0f0787535dee7829f84da15ca
+EBUILD aravis-9999.ebuild 1614 BLAKE2B 5c1d3739a3b556790afc62ddd6916376f9540438a6b345fd74abdd29444edf961f96850f29d9110403ad1b48771b5754962db3a5e2055d9769d75277fe453adb SHA512 50db01103fe3b1a0b4efd45fb31f658c8711458306fe0ae436429875c303f63e536c9ab542bbff55ba1f59041fdf4c924dc6a40cb01ea45ec86d8d076f41edfc
 MISC metadata.xml 1008 BLAKE2B 2758ec9ccefa04afee55b5a96170ec5b3a29872a4088d7a943e70a1e736a3b2c346ac3320b7f330c16ec6269e9853b4a730523e63bab4d414b3dc68ae7c056d5 SHA512 da6b072602e998ec58a9bfa3813c208df68c312f4ed41ae7555bb2f5bb1bfc463b95ef8fa8bcf5057a64696b9105dec0763fc97e0c8467b47ab3affb95565444
diff --git a/media-video/aravis/aravis-0.8.5.ebuild b/media-video/aravis/aravis-0.8.5-r1.ebuild
index 5b917f730ca2..da52864b35b9 100644
--- a/media-video/aravis/aravis-0.8.5.ebuild
+++ b/media-video/aravis/aravis-0.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket test usb viewer"
+IUSE="doc fast-heartbeat gstreamer introspection packet-socket test usb viewer"
 RESTRICT="!test? ( test )"
 
 GST_DEPEND="
@@ -29,14 +29,17 @@ GST_DEPEND="
 BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
-	gtk-doc? (
+	doc? (
 		dev-util/gtk-doc
 		app-text/docbook-xml-dtd:4.3
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	dev-libs/glib:2[gtk-doc?]
+	dev-libs/glib:2
+	doc? (
+		dev-libs/glib:2[gtk-doc(+),doc(+)]
+	)
 	dev-libs/libxml2:2
 	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
@@ -56,7 +59,7 @@ fi
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature gtk-doc documentation)
+		$(meson_feature doc documentation)
 		$(meson_use fast-heartbeat)
 		$(meson_feature gstreamer gst-plugin)
 		$(meson_feature introspection)
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
index f2dd9137fe00..5a36a90e452d 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 # FIXME: As of right now tests are always built, once that changes a USE flag
 # should be added. c.f. https://github.com/AravisProject/aravis/issues/286
-IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer"
+IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb viewer"
 
 GST_DEPEND="
 	media-libs/gstreamer:1.0
@@ -29,14 +29,17 @@ GST_DEPEND="
 BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
-	gtk-doc? (
+	doc? (
 		dev-util/gtk-doc
 		app-text/docbook-xml-dtd:4.3
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	dev-libs/glib:2[gtk-doc?]
+	dev-libs/glib:2
+	doc? (
+		dev-libs/glib:2[gtk-doc(+),doc(+)]
+	)
 	dev-libs/libxml2:2
 	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
@@ -56,7 +59,7 @@ fi
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use gtk-doc documentation)
+		$(meson_use doc documentation)
 		$(meson_use fast-heartbeat)
 		$(meson_use gstreamer gst-plugin)
 		$(meson_use introspection)