gentoo resync : 29.12.2022

3 files changed, 5 insertions, 91 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ba75dbf2942f..c19307761ce0 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,7 +1,5 @@
 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
 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
+EBUILD libpeas-1.32.0.ebuild 2282 BLAKE2B 4414f88356583577d30eab167627129cccebaac1c1d27805512584c0637291bc8e944e64e4e98092a79e44a6ae7e3e03a17fea21ffe9c353b00f5c0c20725882 SHA512 ea65e367976411794e10f74735e142eba05a5f43f6c71bd322562d8ed374f8bd796c54af71651d5ed256988037d288da862120687b03ca4c7a83336781104d22
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
deleted file mode 100644
index 3af483ae7446..000000000000
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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} )
-	gtk-doc? ( gtk )"
-
-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
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-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
-}
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
index aa4f25fae10e..6e84aa57f353 100644
--- a/dev-libs/libpeas/libpeas-1.32.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.32.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
 DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		>=dev-util/gi-docgen-2021.7
 		app-text/docbook-xml-dtd:4.3 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig