gentoo resync : 25.03.2022

4 files changed, 132 insertions, 2 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index a583e7a79772..ba75dbf2942f 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,7 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
+AUX 1.32.0-meson-Fix-disabling-gtk_doc.patch 862 BLAKE2B c03eba757dd14ec5d4812bc9e735dd3d3a8aa25dc2497b286b50f00dbbd282de7ea6616105b6d1ea525e13d374b28ee07b1a8c479257c04642479def27350b7b SHA512 a34c58b573db453a4082b87774290ebd63cdf88f38cd7726469bc50de174dea135c3f126c7c82099a7c41eb599f055b993ca6f3203624f742d5d2935a6d7b872
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1968 BLAKE2B 893e1a059f197ecf3b2bcd71a34a9ec430098e15f49cca5b7119a699aecb7b7014be85cc1ce2fab4c5973c217ff5730028e29383f005e18039ea2f79c784b927 SHA512 e09f5a8698f520fd5ac39898460d92461e5ad95b1cd25b858d4f02207d870404f998dfd1abb5991babe2eb5284bcc21127dea5f88fd877462f48d9a25891bdd3
+DIST libpeas-1.32.0.tar.xz 193572 BLAKE2B a29be56dd4add53ac11e52e7a9b6f9aaf1634bec0be6efe33d99fbb1a323cdc2f9d81917f160c3d8f4b88068d13a3b6cc732aa147bba1c1e524ed5eb1e238ad9 SHA512 520a5fd8657f75dc0e28a17ccab88a2952d018f81384eaea0fc65779e66b0ebc79b0dc8ce184e49d43406381c75c2028b402c1bb9d650eae2edf35ec8617a897
+EBUILD libpeas-1.30.0.ebuild 1986 BLAKE2B c4e963b3d6103b993a9c1169a876311c462f0202bf86cf8cb6bc9bd33b4db648ae7792f723eb966c16061c89689eeb943d9af4d93a1081c69ee76823b62c0c53 SHA512 82cb94465f47027893c1c9da11562ad4a7be402392d68f3421ce31ed1a9fc916cb24a7b3bab7b74aa8e2a825d6afc901aabe2d6f59bd49b3d9776a3a36bb6df0
+EBUILD libpeas-1.32.0.ebuild 2213 BLAKE2B 9565154e4c57417a5bb7b38a09962eccef5439cfd443843eec250111e25db7faee2f40cc6dc3c6b723da8f120f7c59b257f571bef3ac1ac1ee31110c85199b28 SHA512 455ebe7d9e81461924efe9430becfc5315b0f415c5de0e712e64f4c3308cda0d3b12e57a23afee3a6e246bcba38f7583711e6893213286f5b33a9644c96248f0
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch b/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
new file mode 100644
index 000000000000..39377b392dee
--- /dev/null
+++ b/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/34
+
+From 1be9b5a51ca4200d9cff69642368c24225b58dd5 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 21 Mar 2022 19:13:04 -0700
+Subject: [PATCH] meson: Fix disabling gtk_doc
+
+Without this, even passing -Dgtk_doc=false will cause documentation to
+be built if gi-docgen is available.
+
+Fixes: 82119a6 ("gi-docgen: Initial commit")
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index c77b352..91b8ca8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -251,7 +251,7 @@ configure_file(
+ )
+ 
+ # Options
+-build_gtk_doc = gi_docgen_dep.found()
++build_gtk_doc = get_option('gtk_doc') and gi_docgen_dep.found()
+ 
+ install_glade_catalog = get_option('glade_catalog')
+ if install_glade_catalog and not gladeui_dep.found()
+-- 
+2.34.1
+
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index a760f2697bdb..3af483ae7446 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-lin
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ${PYTHON_REQUIRED_USE} )
+	gtk-doc? ( gtk )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
new file mode 100644
index 000000000000..aa4f25fae10e
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.32.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="glade +gtk gtk-doc lua +python vala"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.39:=
+	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
+	glade? ( >=dev-util/glade-3.9.1:3.10 )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
+		')
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Gentoo-specific lua tweak hack
+	"${FILESDIR}"/1.26.0-lua.patch
+
+	"${FILESDIR}"/${PV}-meson-Fix-disabling-gtk_doc.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
+		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
+		-Dpython2=false
+		$(meson_use python python3)
+		# introspection was always enabled in autotools; would need readiness by consumers
+		# to USE flag it, but most need it for python plugins anyways
+		-Dintrospection=true
+		$(meson_use vala vapi)
+		$(meson_use gtk widgetry)
+		$(meson_use glade glade_catalog)
+		-Ddemos=false
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/libpeas{,-gtk}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}