gentoo resync : 27.03.2021

3 files changed, 16 insertions, 88 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 4b4f5248c829..bd90c3e3ab05 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -2,8 +2,8 @@ AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a4
 AUX libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
 DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f
 DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374
+DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
 EBUILD libpeas-1.26.0-r100.ebuild 1956 BLAKE2B bd378be55d13ca21fde9f6fa2f8c07f9a663d74d79557fba54c3a91a0403637de3f2cd9cc3b1f5b5e93547ef53ba372e39e3ca554e800d5be81720b9fcb26042 SHA512 c6916121ae64171904763a553584b35630c4b6ef3df12ee2343c6baf7080aff8c963822b4e50d5ae223b42b4f12ec743c21ba6eb7c5709fe75a4d40121c32688
-EBUILD libpeas-1.26.0.ebuild 1828 BLAKE2B a052f862f6df977647fae388d086f4a58e62ee8aa959a59a8f04955f5179ef88e50a438d2ad524abf64aaad1d2cac098e3f24b11a7ccad03dda117d444dfc8df SHA512 a60c7fe2b57869f6ffb09c3656843a6107c61c99d73c3e2150b5a2dedeea6b5527bc068fde600a346fc45899c7b014c27beb7c0ff7d5e512f9fcc3e80945c343
 EBUILD libpeas-1.28.0-r100.ebuild 2041 BLAKE2B 6a213c0d7428aca879da294e886f953afefbb29e46956f0e71f3d39f10858bb669665c007ee2760a6963ea7976bb0623d51e810b1829a92a0db0754bf53afeee SHA512 2796b1f8a6048f9ad98be9353a13d608dfb5376359a8ef41a62227a50452ec608e5fbd8a2674b547c619af0be53031410e7687876c610a48418a1399463dfbd9
-EBUILD libpeas-1.28.0.ebuild 1914 BLAKE2B 53b96b1de5fb90616095e8554161765267962b185cd0e2b435025a92bf3e8f1239455f5e3f4bd565f7060aa78c6fee63523d26fe0fa7f97cd496627ebf8efba6 SHA512 0308757a0f445917886290b6ef5ddc451439510b9656f8b07f48c42b65f3a06c1d11c33f77a13614bbb2b3858a4ec425012f076cc73f31edf6c7f27ab9a1f3ea
+EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 4a46bc3b4047f9597e5385f4366c6132bdaf0615dc6b0ff15ed4acd9081d16c542e3f2d7a3c54f3467fb2d379050b7ca74cb7a0652e863ac5885ebc00cbfdb6c SHA512 2175312d704f747450208ec0a423c985ad4d3de7ea5d92e2387acdd528a9428ffc8b5385a951721c4f82f38997566c499369747f016a7c35baeef323865f8775
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.26.0.ebuild b/dev-libs/libpeas/libpeas-1.26.0.ebuild
deleted file mode 100644
index 04ae731a6e92..000000000000
--- a/dev-libs/libpeas/libpeas-1.26.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit gnome.org 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 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua luajit +python vala"
-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? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	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}"/${PV}-lua.patch
-)
-
-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 !luajit lua) lua51)
-		$(meson_feature $(usex lua 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.28.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index c9ab7549dba1..d011e421c633 100644
--- a/dev-libs/libpeas/libpeas-1.28.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit gnome.org meson python-single-r1 vala virtualx xdg
+inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
@@ -13,8 +15,9 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="glade +gtk gtk-doc lua luajit +python vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+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
@@ -22,9 +25,11 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
 	glade? ( >=dev-util/glade-3.9.1:3.10 )
 	lua? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
+		')
+	)
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -44,10 +49,10 @@ BDEPEND="
 PATCHES=(
 	# Gentoo-specific lua tweak hack
 	"${FILESDIR}"/1.26.0-lua.patch
-	"${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
 )
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
@@ -58,8 +63,8 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature $(usex lua !luajit lua) lua51)
-		$(meson_feature $(usex lua luajit lua) luajit)
+		$(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