gentoo resync : 06.04.2022

4 files changed, 194 insertions, 0 deletions

diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 0f7713a39e1d..5d3e4ea1fc5d 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,4 +1,8 @@
+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
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch b/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch
new file mode 100644
index 000000000000..b61f2ed9bf81
--- /dev/null
+++ b/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch
@@ -0,0 +1,87 @@
+https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/14
+
+From 0de77d9eccb6ed78416339a47113f3dc4fe4c453 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 5 Oct 2021 23:35:26 +0200
+Subject: [PATCH] meson: add introspection option
+
+Add introspection option
+
+Fix #3
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ libmediaart/meson.build | 42 +++++++++++++++++++++--------------------
+ meson_options.txt       |  2 ++
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+diff --git a/libmediaart/meson.build b/libmediaart/meson.build
+index 56e00ab..2f44e63 100644
+--- a/libmediaart/meson.build
++++ b/libmediaart/meson.build
+@@ -41,28 +41,30 @@ libmediaart = shared_library(
+   install: true,
+ )
+ 
+-gir_args = [
+-  '--quiet',
+-  '-DLIBMEDIAART_COMPILATION',
+-]
++if get_option('introspection')
++  gir_args = [
++    '--quiet',
++    '-DLIBMEDIAART_COMPILATION',
++  ]
+ 
+-libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
+-  sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
+-  nsversion: libmediaart_api_version,
+-  namespace: 'MediaArt',
+-  identifier_prefix: 'MediaArt',
+-  symbol_prefix: 'media_art',
+-  includes: ['Gio-2.0', 'GObject-2.0'],
+-  header: 'libmediaart/mediaart.h',
+-  export_packages: 'libmediaart-' + libmediaart_api_version,
+-  extra_args: gir_args,
+-  install: true
+-)
++  libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
++    sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
++    nsversion: libmediaart_api_version,
++    namespace: 'MediaArt',
++    identifier_prefix: 'MediaArt',
++    symbol_prefix: 'media_art',
++    includes: ['Gio-2.0', 'GObject-2.0'],
++    header: 'libmediaart/mediaart.h',
++    export_packages: 'libmediaart-' + libmediaart_api_version,
++    extra_args: gir_args,
++    install: true
++  )
+ 
+-libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
+-  sources: libmediaart_gir_and_typelib[0],
+-  packages: 'gio-2.0',
+-  install: true)
++  libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
++    sources: libmediaart_gir_and_typelib[0],
++    packages: 'gio-2.0',
++    install: true)
++endif
+ 
+ libmediaart_dep = declare_dependency(
+   link_with: libmediaart,
+diff --git a/meson_options.txt b/meson_options.txt
+index 3ef49ba..b8c51b1 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,7 @@
+ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
+        description: 'Which image processing backend to use')
++option('introspection', type : 'boolean', value : 'true',
++       description : 'Enable / disable the GObject-Introspection integration')
+ option('gtk_doc',
+   type: 'boolean',
+   value: 'false',
+-- 
+2.34.1
+
diff --git a/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch b/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch
new file mode 100644
index 000000000000..54536c3124af
--- /dev/null
+++ b/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch
@@ -0,0 +1,48 @@
+https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/15
+
+From 8cfc2a3fd5144ad116285f637506b1d39c469212 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 26 Mar 2022 10:25:56 -0700
+Subject: [PATCH] meson: add vapi option
+
+---
+ libmediaart/meson.build | 10 ++++++----
+ meson_options.txt       |  1 +
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/libmediaart/meson.build b/libmediaart/meson.build
+index 2f44e63..74aa4df 100644
+--- a/libmediaart/meson.build
++++ b/libmediaart/meson.build
+@@ -60,10 +60,12 @@ if get_option('introspection')
+     install: true
+   )
+ 
+-  libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
+-    sources: libmediaart_gir_and_typelib[0],
+-    packages: 'gio-2.0',
+-    install: true)
++  if get_option('vapi')
++    libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
++      sources: libmediaart_gir_and_typelib[0],
++      packages: 'gio-2.0',
++      install: true)
++  endif
+ endif
+ 
+ libmediaart_dep = declare_dependency(
+diff --git a/meson_options.txt b/meson_options.txt
+index b8c51b1..c97c054 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,6 +2,7 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q
+        description: 'Which image processing backend to use')
+ option('introspection', type : 'boolean', value : 'true',
+        description : 'Enable / disable the GObject-Introspection integration')
++option('vapi', type : 'boolean', value : 'true')
+ option('gtk_doc',
+   type: 'boolean',
+   value: 'false',
+-- 
+2.34.1
+
diff --git a/media-libs/libmediaart/libmediaart-1.9.5.ebuild b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
new file mode 100644
index 000000000000..426d14572a81
--- /dev/null
+++ b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
@@ -0,0 +1,55 @@
+# 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 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
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-add-introspection-option.patch
+	"${FILESDIR}"/${PV}-meson-add-vapi-option.patch
+)
+
+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 gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}