gentoo resync : 09.07.2022

8 files changed, 75 insertions, 146 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 4737a31b6e07..34b83ed97042 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index a1a7c814e639..e51f3c6c10db 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,12 +1,6 @@
 AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
-DIST exo-4.16.2.tar.bz2 881098 BLAKE2B df1ad499becd22087724abb716d07a50e432ec555d03a3892d0b81745045c334cb3705419e901697e4c3bc10328837b4f5c4055800d1b6c79c9cfc503427643b SHA512 9c1252d78f5bb900254841a79f1c1b952cb60d9d0197e184266c35a86c340140cdff2460fa83f6fabb66380e2b3d7ab8a08719b4f4784d2215dde51410ce33e8
-DIST exo-4.16.3.tar.bz2 885516 BLAKE2B 1689821fc8cc72fc848d627d2cccd886223740c2910ed2f42fa70545dfb604eb184d3cfbf6aa93e7723fcc59291e0c33f77e478429e1e4296b2243155e277604 SHA512 0dc4d2da6dd80a4c1b05a5316bb6e7ad02858d3fb49b666d6065bd7b11d7b8aed2732135eee8393185a0c321a242807d97b51f794186ce7a769ec2c9106ba8fd
 DIST exo-4.16.4.tar.bz2 876080 BLAKE2B a29511c0d2e1bbbd861cfd8946d2f2917eb1004bb85621d0bb8bb9b1339f213a14da651e16a6492138cceff8e3e0ec1d1132226ac60a9846426bf6dc2a621ded SHA512 2cf2267a0bd8526dc870cbe48a0d95573c153a990caffabb13365c6e90c155b6d3383ad1282715cb22ce413e704d170bf7fec1af09ad1b0609507a46c4d1233d
-DIST exo-4.17.1.tar.bz2 877757 BLAKE2B 152e168568f4ad12e1eb03f7b1971b3369647da0adac57f55d36fc176c36f7c2ccf9125f6bad386843753855b4bbb679a7a6abd80a9375d2212550e0987d4fa4 SHA512 597fee2cc0188159d5278bb5d547f1a4619645684ba3da4046946c5eb38b2a4913731e589caeeb2f8505516bdcbba64bee03291857215e2b4208aa3d2c563988
 DIST exo-4.17.2.tar.bz2 878021 BLAKE2B 2756a032be106f371de17cf2c862acecb1a1a264f7f91b4c452d6a0cc8addc93ebf918b5e2e17baa1a78e8dc3bca6fde505d994fb3258a2bcceeb49899cd3b6c SHA512 99d688f9dc2f1a66f546943780521572d3df689e616b75a2a1e26a1d8c95b534175f6bc9a1a1782a7ffb8c09fa40e649ee6d688105344c748775ee3fdd10d1d0
-EBUILD exo-4.16.2.ebuild 1037 BLAKE2B fc845e4cba69c4bfde2512f34e6c8674b9dc0614617d76f6ef050b8f6ba25dc8616622eaa9b6abd18aa52f5e2515a0a68a9230f07168fa70c798308f17ff3331 SHA512 0962ad579e7bdbb0f2e0127c9bd90972d4a6dddd57ca7b383084b5852743f7308731ec4a9b393fb76db710b13f4971f5d2390f94e0298aa021a89612e9b3788a
-EBUILD exo-4.16.3.ebuild 1162 BLAKE2B 15951f356c35d0268c1724efc3bd1f9859ad7fc11677350b59b1f6ca4016b1dda6e55d70bdfc0b12158ad10cafa36d4684d5202ea63f5a7fa0006eb47feeb567 SHA512 d8154db5c11d65addbcca1844d9463e213699a8fd342d87161ef2f217ffe08bc34e8b6b85e41d0180773e5858ac8ee7d6181ea45625ca9a5c07c3b9136f07ee9
-EBUILD exo-4.16.4.ebuild 1171 BLAKE2B eb0a581be812f2c46615767e0ca164acd064b77a10fbd8197fbde213faf0fa6c7d7ce7d3bc8651a46a8ccc6505d2d3aef6e3b8825d6417efd63649305f0a7963 SHA512 cb5f7d128ec4da75f2e0cc8da5b690f5d2f03e8fe4047c1473e3ed68f7747f8b6a6565cfabcf0a531f98caacdc4846bfb96fb2bcdbe96552568ded23740e1153
-EBUILD exo-4.17.1.ebuild 935 BLAKE2B 22e3173c32dc14eb338e159298070d55815c11b7e75a34935a14d125077f8b5822d234305fcbd8dd550667fe151abd99847c54d884342bccbdbefc334a515ab1 SHA512 37d72958a4967cdce59632e24ca231a3bc582182634aac2fc8a798d571b4b742845ab6a571db3847f0702ff5d9d670cc712cb1970b46ff3c37b862bcd62fa957
+EBUILD exo-4.16.4.ebuild 1169 BLAKE2B f10c409f2ecb2e12bcc5988fb75cfe4d9249a3db144af8a87e0458faf05e5e6ae273b36ffa042b0a2411b80bb83888b667282e830a63266418bfc8f5e85c388e SHA512 fa48fdf48cad6eb613d6047f4911b4eb4a347b0dfe2c8afd8738061438eeee61af99d5a2dc96b2f63446da785141ed91cc8fe998e40994f3f4c04e204921e43f
 EBUILD exo-4.17.2.ebuild 942 BLAKE2B 221b81d4e6131ae084178b5d45b71c9dbc1cfd2896fac6bcb41110d5043d6aa6a757e9dcb9ec965ec156775d02318eb4891a661abc2008465039e9888ac4fbf4 SHA512 2ede1b9df14198493a0634786ce6506170ac94febb372d2f626f981010671d129ef806132db240fdc291629803bbfce8967bc09c0eff636646e081042561755d
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.16.2.ebuild b/xfce-base/exo/exo-4.16.2.ebuild
deleted file mode 100644
index e8c508424cb6..000000000000
--- a/xfce-base/exo/exo-4.16.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.16.3.ebuild b/xfce-base/exo/exo-4.16.3.ebuild
deleted file mode 100644
index ba9c8dfe9c47..000000000000
--- a/xfce-base/exo/exo-4.16.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	# needs to be executed after glib-gettextize, bug 829859
-	intltoolize --automake --copy --force || die "intltoolize failed"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.16.4.ebuild b/xfce-base/exo/exo-4.16.4.ebuild
index b3f85d5a8334..dc41a78a4f84 100644
--- a/xfce-base/exo/exo-4.16.4.ebuild
+++ b/xfce-base/exo/exo-4.16.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.50
diff --git a/xfce-base/exo/exo-4.17.1.ebuild b/xfce-base/exo/exo-4.17.1.ebuild
deleted file mode 100644
index 0afdec17d30d..000000000000
--- a/xfce-base/exo/exo-4.17.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.17:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 3a8e52c70db3..5222dffcea39 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-settings-4.16.2.tar.bz2 1500270 BLAKE2B 04915db8071050a841f972e54ecb3119638b0cc3d806d1e17e5ae23c90bb7819d33cfa349c1273a5493538d8c66543ba07e469e8b929c6e0479ddc9cd476e0d9 SHA512 48908318f8c20f9f0f5e83556c4a86a1c8c963f37d4627aa051f00b537a87a6575b35ddb6bc91108a41312dcf2e90d6dff8259a624ed23cc04649887828141ed
+DIST xfce4-settings-4.16.3.tar.bz2 1462300 BLAKE2B 64bd149eea6afa4054e59b7ffa29327298aae4584d4b4a17dff12480bd0e3b017c152efc2e06201d39397f27c3bedc633715383473a8bc3c32aff4a97091e683 SHA512 62183e500d97625c079cc95c900fb6afae8e08a24d5e0574fcfd0a803eb4e7e10095a527a76a0cd4b5f2abb944203650ccbbb78ab21e024df6b4da670159896b
 EBUILD xfce4-settings-4.16.2.ebuild 1731 BLAKE2B 88a6df19d7ce92438035526d14231cb400db144541503184095bf2274a0b7f91afa1f421a03b8cc0bc910480d9ae643e8617d0bce67b0a77d108fc3ddd56f162 SHA512 72b9afca62e1acdb63dddc702d2b87e73a2b0bd11bb64b16886195849a8e00a878fe1b1b9b6dc42502c337a46afd586126f7be6f1873dfd1a1464038ef895922
+EBUILD xfce4-settings-4.16.3.ebuild 1760 BLAKE2B aca2cbd85220ee6580425ee0751512993b218a182ab0c24a464ce2578b102e62f2f71f637d7b70778cbcdf8d45eb58cd0b792956f8341602c28f2bae99a4f599 SHA512 06e632598b72e6a4fd9f4b4b5b50c1c0e02e18b160e3a12c6a210f68a0e2989f171b62ee5c75e6057f4fe8a01f28ed48b7b3de972100325d44a79a4951f242ff
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.3.ebuild
new file mode 100644
index 000000000000..05cc5126ad29
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.16.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-settings/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.50
+	media-libs/fontconfig
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2:=
+	>=xfce-base/exo-4.15.1:=
+	>=xfce-base/libxfce4ui-4.15.1:=
+	>=xfce-base/libxfce4util-4.15.2:=
+	>=xfce-base/xfconf-4.13:=
+	colord? ( x11-misc/colord:= )
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	upower? ( >=sys-power/upower-0.9.23 )
+	xklavier? ( >=x11-libs/libxklavier-5 )
+	!<xfce-base/exo-4.15.1
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable upower upower-glib)
+		$(use_enable input_devices_libinput xorg-libinput)
+		$(use_enable libnotify)
+		$(use_enable colord)
+		$(use_enable xklavier libxklavier)
+		$(use_enable libcanberra sound-settings)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}