gentoo resync : 20.03.2022

3 files changed, 59 insertions, 3 deletions

diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 12068666a0d5..eca5f6edd2b7 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,4 @@
-DIST libosinfo-1.9.0.tar.xz 279376 BLAKE2B 9f231f022d80e96fc9b031ff8f16ea1e432e5e3ce079e384ad123043b89dd5e47ae119aec3052c8926965bf30c49b150f0ee727fb3b0e0391d393b1031aabeab SHA512 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
-EBUILD libosinfo-1.9.0-r1.ebuild 1544 BLAKE2B dd4be2f6c856cc0a5ebd3a6e9beb913641679c1d297906dbb9064b2a4a7376d48d03b05c61acff210232d79a7aca7184b0f21e28240645807ecefe6587c47f4d SHA512 107109bef38ea2b6b6c9cc56bc324b8efa692d8ce1da8ff37b073ba08fd9cdaa2f2383f8762edbd07639e5d0e29c109852803096d716d3ea0ce6a320028aff74
+AUX 1.10.0-build-Add-option-to-disable-libsoup3.patch 1484 BLAKE2B a67153267432e60910e9f013dcc1aee243da3488386fac2b3a79e1d08df47aa5612289bcf7c62866ed919da0f67bb8d6e542bba309f632cfbe5d4ff9e7843d5c SHA512 34a819fd67ef78b55064d663652ff78bf2110521c4fd333e650975728bbec32c0680bf522b5c2e21c62061194acdd497ff0ac0bad652a30ca2eaeb9b6712b792
+DIST libosinfo-1.10.0.tar.xz 293804 BLAKE2B 5c676a466459c4e4150294fd263cd32ed95f181a3dea913977165f61dd81d75fb545dd96d0f87661ea13db9f10706c064421a5ecf0ec1b220054149c66c957d1 SHA512 58a30d62d5a4862150826fd9fda3d5189df3693efca3a8732efaa470fa65dbb64181987534ccc13c0bf2fd4efda229217a169590405f0601927472f6ca08e4e7
+EBUILD libosinfo-1.10.0.ebuild 1643 BLAKE2B 60596f6bc7fb1781085a16ff78c6fa5798808b57d4718864c253bacf695de4f851a9415a5a3e20bc359babf3f4bac1fa68da7f6f7376f33f772dd40f2c79e7ff SHA512 3d728843b4e4eb258d0b545c42fe9f13d9e200affd7624d35c1fa19281456ee828eea8f62114d7a9d7bf2cf7d71840b173d030193f7bd053a6f64a69c195d19d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-libs/libosinfo/files/1.10.0-build-Add-option-to-disable-libsoup3.patch b/sys-libs/libosinfo/files/1.10.0-build-Add-option-to-disable-libsoup3.patch
new file mode 100644
index 000000000000..a2b13067679e
--- /dev/null
+++ b/sys-libs/libosinfo/files/1.10.0-build-Add-option-to-disable-libsoup3.patch
@@ -0,0 +1,50 @@
+https://gitlab.com/libosinfo/libosinfo/-/merge_requests/134
+
+From 7148e47e84199d5ffeb695bcf064400b7fa0da77 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 15 Feb 2022 12:22:00 -0800
+Subject: [PATCH] build: Add option to disable libsoup3
+
+... and fall back to libsoup2 if disabled. This allows distributions
+that ship both versions to choose which version of libsoup will be
+linked.
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ meson.build       | 2 +-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a664402..4f1d2df 100644
+--- a/meson.build
++++ b/meson.build
+@@ -71,7 +71,7 @@ gio_dep = dependency('gio-2.0', version: glib_version_info)
+ gobject_dep = dependency('gobject-2.0', version: glib_version_info)
+ 
+ #  everything else
+-libsoup_dep = dependency('libsoup-3.0', required: false)
++libsoup_dep = dependency('libsoup-3.0', required: get_option('libsoup3'))
+ #    fallback to libsoup2
+ if not libsoup_dep.found()
+   libsoup_dep = dependency('libsoup-2.4')
+diff --git a/meson_options.txt b/meson_options.txt
+index 13fc358..2084677 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -24,6 +24,12 @@ option('enable-vala',
+     description: 'Enable Vala bindings'
+ )
+ 
++option('libsoup3',
++    type: 'feature',
++    value: 'enabled',
++    description: 'Whether to enable libsoup3'
++)
++
+ option('with-pci-ids-path',
+     type: 'string',
+     value: '',
+-- 
+2.34.1
+
diff --git a/sys-libs/libosinfo/libosinfo-1.9.0-r1.ebuild b/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
index 018a2bb3d169..8e38dda5a5dc 100644
--- a/sys-libs/libosinfo/libosinfo-1.9.0-r1.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,10 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-Add-option-to-disable-libsoup3.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	use vala && vala_src_prepare
@@ -53,6 +57,7 @@ src_configure() {
 		$(meson_feature introspection enable-introspection)
 		$(meson_use test enable-tests)
 		$(meson_feature vala enable-vala)
+		-Dlibsoup3=disabled
 		-Dwith-pci-ids-path="${EPREFIX}"/usr/share/hwdata/pci.ids
 		-Dwith-usb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
 	)