gentoo resync : 29.12.2022

5 files changed, 56 insertions, 116 deletions

diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 5d3e4ea1fc5d..6b496d30f990 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,8 +1,7 @@
 AUX 1.9.5-meson-add-introspection-option.patch 2825 BLAKE2B 4592c45d3fcbd94a79923a79655eb76ac5bff48efba0c75157ef94d6820bc1e79351e2bf493b73933ee22d937d5a2a770c4379673e9b59f48a7c4030d857d618 SHA512 45dd0a9dcfc88a50f1c9f7be25e149fff3e8610a2ae466842e5c7ee219e2feb0c08400f9546d30567a5c4fc19095dcd29666efb4080e49d37142a6bfa0f4a158
 AUX 1.9.5-meson-add-vapi-option.patch 1600 BLAKE2B 1d6cdfb25740c310c6bd4c1ce7be98464e2e9286619fdb58c4fc518ba2b6a60414091ac7580384e9921b1744f949545a8c09c7240f95cb11c257878f751f76fd SHA512 9397d758f850bf24793f95baff2f0ebc2f5b2375ccc4bf13c7d336d14e88cd172dc85e281ab52ccf11ad475309ebd88d9663ba1b6c3ba45321a0eab390431e86
-AUX libmediaart-1.9.4-drop-bashisms-configure.patch 1524 BLAKE2B 6ae4ba196772750f9a09ad90d6c3e66965ee3c2a828211531aa3321f582da5b3c8e3304687fb077ff67fd1c0a5fe4ef39d9421382073452abf0e94de50eeb769 SHA512 ed049f69e5899e4fc8a897c245845a2b80e4aead9d7a28b9e20ce4b73de3c495f35afb0b8d44481ced868c537ecd0236dd5cbcc674e7483d75ac329c4ca9c0db
-DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
 DIST libmediaart-1.9.5.tar.xz 5549620 BLAKE2B 6656baeb52aa0f4c355354dab3eb5499af957a2d9c5530e46874127a71a55b744b0370ec25b5e187ea9b615acb195f5b817196d59e668c34f2e3c8c4f8060598 SHA512 b1d54f4b480cb5cf63a2231b082635268ac1ab708ba829a3e5ccfdfb530e9d463c5ac505cd1dc44643f23f787c4df2ef287a7e68d56e93a05b97be450c7799b6
-EBUILD libmediaart-1.9.4.ebuild 1800 BLAKE2B 0b6aff357fd291cc560b8195d0d7eaa141d70671d8216e0f477ee4c1a120c5b2294b7f391ad702a130152e38ced7c7cf7de2547d58f2c5b58121693239770f56 SHA512 667c3ff283ff2de3c97fa9496146c1930a752bf1748a4128638030336a91533ba71830b5f7f9946126580bb9845a2ea879dd4323a2d415aef899b554fc2844ba
-EBUILD libmediaart-1.9.5.ebuild 1194 BLAKE2B 88b32ddfca1334e88e482dc71f6f97a6c888ca1b478fccb2ad7f22d63b9ec9d4a81c1531ee3e5d1210c9f3822caca143d8ad3a3a04c60f42fb15cc9439e465de SHA512 eeea122d0f1ff4c0f6daf7ddbe862e313ebd21878eb23a06ed87a4a31464aef296ff4c38e4c4d058c00c882b8fa5c5c5a3d787425c807a8aebbbed3c170367a8
+DIST libmediaart-1.9.6.tar.xz 5551220 BLAKE2B 15f17592075461d6199c9a4e0de1a99493b88147410c25e360e71dcb3e9f2d5e733977cf66c8bf900c654e4e9930d551d30832f2d64dcb8b2b5306b6ce085f80 SHA512 93af1a06aa7b12d8fc7573201f51abc41838bd9405bc8cf56d4fcfb5cfa9f7427d8d8ddc2ee36501e938bc8e123d91f590cff2cdb4689e1e6ed2358f7264e887
+EBUILD libmediaart-1.9.5.ebuild 1191 BLAKE2B c0beef107a6aa39c624624e093066a6fb496ab7db6bef6632c03e0b40c90813274f81532da6cf50c2827ae4ece20683311def74b8d1771f2832f1841945061ba SHA512 0aef5fe66ac859553fef2f660dc8f1b9c6b4cffe572a74416349e1fd359b3c268b3686219b8d35f7c8e5387de132fdb12e2538d195903f82fa796819d0bf93e3
+EBUILD libmediaart-1.9.6.ebuild 1132 BLAKE2B a6bceb1ab8797857dfbaf3d7689e1854e8ede2be7859b0006363faec4335fcc6d8755613076a723bf2c1f8ad3b8b2c4dd51d01faf32b3a6bf219f7e35beb75e9 SHA512 798b8aa69efe3bd2136158197a151b99741418860b1637b31898f2537dd3d3e950bc5b54a70282c9d46b70aafecca1d0071b9aa26edfa33ffcf2aaf97614a599
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
deleted file mode 100644
index 8d65e7cd5c9f..000000000000
--- a/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a193e48dd01ad3aef9dd998c1247f649719f0a80 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 1 Aug 2021 07:48:51 +0100
-Subject: [PATCH] Drop bashisms from configure.ac
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9ae1292..106ea57 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,18 +218,18 @@ selected_for_media_art="no  (disabled)"
- # Choose between backends (GdkPixbuf/Qt/etc)
- ##################################################################
- 
--if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
-+if test "x$enable_qt" = "xyes" && test "x$enable_gdkpixbuf" = "xyes"; then
-    AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one])
- fi
- 
- if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
--   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
-+   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x5"; then
-        PKG_CHECK_MODULES(QT5,
-                          [Qt5Gui >= $QT5_REQUIRED],
-                          [have_qt5=yes],
-                          [have_qt5=no])
-    fi
--   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
-+   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x4"; then
-        PKG_CHECK_MODULES(QT4,
-                          [QtGui >= $QT4_REQUIRED],
-                          [have_qt4=yes],
--- 
-2.32.0
-
diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
deleted file mode 100644
index 1d664b0ef6e9..000000000000
--- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.16"
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Manages, extracts and handles media art caches"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk +introspection qt5 vala"
-REQUIRED_USE="
-	?? ( gtk qt5 )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2
-	gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	qt5? ( dev-qt/qtgui:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make doc parallel installable
-	cd "${S}"/docs/reference/${PN} || die
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.xml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)libmediaart/\1${PN}-${SLOT}/" \
-		-i html/libmediaart.devhelp2 || die
-	mv libmediaart-docs{,-${SLOT}}.xml || die
-	mv libmediaart-overrides{,-${SLOT}}.txt || die
-	mv libmediaart-sections{,-${SLOT}}.txt || die
-	mv html/libmediaart{,-${SLOT}}.devhelp2 || die
-	cd "${S}" || die
-
-	eapply "${FILESDIR}"/${PN}-1.9.4-drop-bashisms-configure.patch
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	if use qt5 ; then
-		local myconf="--with-qt-version=5"
-	fi
-
-	gnome2_src_configure \
-		--enable-unit-tests \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable introspection) \
-		$(use_enable qt5 qt) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_test() {
-	dbus-launch virtx emake check #513502
-}
diff --git a/media-libs/libmediaart/libmediaart-1.9.5.ebuild b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
index 426d14572a81..56bc6cbb41b6 100644
--- a/media-libs/libmediaart/libmediaart-1.9.5.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection qt5 vala"
 REQUIRED_USE="
 	^^ ( gtk qt5 )
diff --git a/media-libs/libmediaart/libmediaart-1.9.6.ebuild b/media-libs/libmediaart/libmediaart-1.9.6.ebuild
new file mode 100644
index 000000000000..cdaf217b05fa
--- /dev/null
+++ b/media-libs/libmediaart/libmediaart-1.9.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson vala
+
+DESCRIPTION="Manages, extracts and handles media art caches"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk gtk-doc +introspection qt5 test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( gtk qt5 )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2
+	gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	qt5? ( dev-qt/qtgui:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-util/gtk-doc
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local image_library
+	use gtk && image_library=gdk-pixbuf
+	use qt5 && image_library=qt5
+
+	local emesonargs=(
+		-Dimage_library=${image_library}
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}