gentoo resync : 31.05.2021

3 files changed, 2 insertions, 89 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index c57f97198e23..4d4d56a48969 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 libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
-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.28.0-r100.ebuild 2040 BLAKE2B fb7fdcc138182770dc0e904aee6162fe6b9eeb873c139e309ae1a1a88fbf8c9fe76f9c50538fffa94c1b1b06ccb37ad078f854a3f8325f4429f1f6843256e188 SHA512 aeabcc490ab781cf1fe4ede74f724c6f9ab63c6b1f7bceb6ba768d51f87a1b4a455c059fda906a7d4e1a2ca7d4c7dd02f2c98d5c2ccd83079d5a51d5f1a197a3
-EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 4a46bc3b4047f9597e5385f4366c6132bdaf0615dc6b0ff15ed4acd9081d16c542e3f2d7a3c54f3467fb2d379050b7ca74cb7a0652e863ac5885ebc00cbfdb6c SHA512 2175312d704f747450208ec0a423c985ad4d3de7ea5d92e2387acdd528a9428ffc8b5385a951721c4f82f38997566c499369747f016a7c35baeef323865f8775
+EBUILD libpeas-1.30.0.ebuild 1967 BLAKE2B 7341b999788c5f064aeb6c9c5a230603196b4dfd4a4c8280cfd9dbb6fa2406bdec4fd2594c60b23a925ea48bab9a29b7c2a0bdc80ab838e5cc7ab2a0fbb6a8ba SHA512 09f8a95941f6dafa3dfb524a05188507ff8d3dbe743acbb6366ba39ff0fbe28f01a2fd06a6eca86a479d5f0f8d58724b88db4ef2a3d57f99bdc8dac8e4670d29
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
deleted file mode 100644
index f0e4f3205a53..000000000000
--- a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 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 ~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_MULTI_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}"/${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
-}
-
-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.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index d011e421c633..ae87e0986133 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )