sys-libs/libosinfo: Version bump to 1.10.0

Signed-off-by: Matt Turner <mattst88@gentoo.org>

3 files changed, 116 insertions, 0 deletions

diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index fa3169fc5486..905e4e1dd2fe 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1 +1,2 @@
+DIST libosinfo-1.10.0.tar.xz 293804 BLAKE2B 5c676a466459c4e4150294fd263cd32ed95f181a3dea913977165f61dd81d75fb545dd96d0f87661ea13db9f10706c064421a5ecf0ec1b220054149c66c957d1 SHA512 58a30d62d5a4862150826fd9fda3d5189df3693efca3a8732efaa470fa65dbb64181987534ccc13c0bf2fd4efda229217a169590405f0601927472f6ca08e4e7
 DIST libosinfo-1.9.0.tar.xz 279376 BLAKE2B 9f231f022d80e96fc9b031ff8f16ea1e432e5e3ce079e384ad123043b89dd5e47ae119aec3052c8926965bf30c49b150f0ee727fb3b0e0391d393b1031aabeab SHA512 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
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.10.0.ebuild b/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
new file mode 100644
index 000000000000..4dd94f67dd1e
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwdata
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-Add-option-to-disable-libsoup3.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(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
+	)
+	meson_src_configure
+}