gentoo resync : 20.03.2022

3 files changed, 16 insertions, 23 deletions

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index e4bcc6102d02..ae7457df42eb 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,9 +1,9 @@
 DIST libxfce4ui-4.16.1.tar.bz2 785811 BLAKE2B d1267b328b7e2d07bfe85ce320da6a60d5a7d739c5ded9b213b83b0cde2061d3badc937e71c4353291ed435fb9d1294cadcc99402cdae69f4bcecf412dd525f2 SHA512 c183bbc75539c777fe704d0a1c4e533fdd2efb6cbc980cfedc2eaa80d0e6223db038498774ffcdc720d7f991dd8d9634183a757a4c4d1728cc9956a33cb187d0
-DIST libxfce4ui-4.17.1.tar.bz2 805413 BLAKE2B 008ab4988e66bc4f3dff3a9071ff1bcb83b7100193a5b10bec123a3c55ae94a21e43cb1bbf9723d5b736bede32f96425ff3e1768f43d607142d0b42ece5ddf29 SHA512 4ec6da3c454752c024e8ca26a84e6524d5fc12644a36c77a77375d533faf8f971d95dec555db7441ec100a17dd9fffd094144226efe27a155490a7c2bdea6484
-DIST libxfce4ui-4.17.2.tar.bz2 887332 BLAKE2B bc87ffe478350dc4c11fd9474e71c9d4d2603297dcc78f0f7232327247b552be927ab94023fdd8c4b6df0040b8db0e8417cc13920177d8c3cedc34942cc385ca SHA512 49465366ce29df072ae52414197720d9df774c13fcc7eff3dca2a065f2132980726bdb019dfe476dcfb40ff27d227d23e0814fbf40ef62a044faf3b873ded6e6
 DIST libxfce4ui-4.17.3.tar.bz2 886464 BLAKE2B f6e6b03b5612b45250f795c12cc657c356474dce4d9ecfbe265ff53339f592ad99bc0f2f819bd6899dce5fe337c2655eaa4176ef73c9127a8297976e39bcbedc SHA512 3c41cc922b7a97a81353eafa40f8828289e672514c2d0fabff2fe16f15ff6017c4cca6126f7e00ed321e0d286afc2c5726cc4f40f97ef7146533badfbfdea35c
+DIST libxfce4ui-4.17.4.tar.bz2 853808 BLAKE2B 1b3c4b9266a4c57ba3cfa518542bd860d2add23ed134e63b8a71111bac11672ca776fbededaaf0d374a6cac1ed3559bb4258caeec3ce1b3d758afb89bb2deac6 SHA512 eba085b7a0cd0e01600a7ab9659cb5f19d559a134c00f2036109b633dbfc79a0fd0f2db2b350e53f8266f4ff2b1961e193d7e6930488a4a7885d8606804bf5e9
+DIST libxfce4ui-4.17.5.tar.bz2 888881 BLAKE2B 066b45de62c5f949eaef2babf248a2e6d2237a74319cfcfb86662d4384b22d2b1e99bdbc591e2fd64e425539fb76d89c8f10fbf1d90ddefd98795455615286f2 SHA512 ed7ececd2723fcc0bed90c0bf17a1d40032304b949e68d8087bef8b67cd0726e8620e7fcc22d5010960821a6e526b211b7fb45d224206dba95c9914d63da48c4
 EBUILD libxfce4ui-4.16.1.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
-EBUILD libxfce4ui-4.17.1.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
-EBUILD libxfce4ui-4.17.2.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
 EBUILD libxfce4ui-4.17.3.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
+EBUILD libxfce4ui-4.17.4.ebuild 1675 BLAKE2B adb8b179f74a2aedc264e6bf21c7906dddfae31e3422de09a490e558e045aa1d09fe6ad9abeaf323bf99466c6e437f9e4929ede9fdc957386e9aab5a895ee2b9 SHA512 56c2953868f915acdf94bbe7c1e8515b47f008f67aad6bb14ea4f74f11fd270dbe2c940d06dd4bd27a53afaa6c098b57c724fa0b7e5cd30e2e81a3b0292e90bc
+EBUILD libxfce4ui-4.17.5.ebuild 1679 BLAKE2B 34a12cd0c24ff3bc7444b406cc60924b9dfd364996073cdba80cb1a99dc8d4531276d5c8ed6e40a099db2831503823f3c0e4af94ea6309f044bc1fc18a12ae77 SHA512 becc3e44aab0e3983d9022d2d9d649d86bb374095d01008383ce2be64a44e255e9ec4a8cb89601a16103f62d00b7e2b8adc4ef0d86830b80c34a545ff0448ecc
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.17.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.17.4.ebuild
index 4652758c2dc4..757934a0db33 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.17.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.17.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg-utils vala
 
@@ -38,11 +38,6 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )"
 
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
 src_configure() {
 	local myconf=(
 		$(use_enable introspection)
@@ -55,7 +50,7 @@ src_configure() {
 		--with-vendor-info=Gentoo
 	)
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	econf "${myconf[@]}"
 }
 
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.17.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.17.5.ebuild
index 4652758c2dc4..30e4ac726aed 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.17.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.17.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg-utils vala
 
@@ -30,18 +30,16 @@ RDEPEND="
 		dev-libs/libgudev
 		gnome-base/libgtop
 		>=media-libs/libepoxy-1.2
-	)"
+	)
+"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
+BDEPEND="
+	dev-lang/perl
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
+	vala? ( $(vala_depend) )
+"
 
 src_configure() {
 	local myconf=(
@@ -55,7 +53,7 @@ src_configure() {
 		--with-vendor-info=Gentoo
 	)
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	econf "${myconf[@]}"
 }