gentoo resync : 08.07.2021

7 files changed, 4 insertions, 140 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 9185858bfcc3..476ecc37ef29 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 00ffa4c07017..e43ae61bcb0c 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-panel-4.16.2.tar.bz2 1381569 BLAKE2B d4b8455e31f942d0facfc0d90b14fb050142b3d8b3d0e61d5b687f973769e2888ea7f058c4f6a86f96dbd67329719ef49e72896774ac36591c2793847aa411ba SHA512 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d
 DIST xfce4-panel-4.16.3.tar.bz2 1382659 BLAKE2B c7c6b189fbe782df716c4e9b494c7a407a41f60106623c9960119c9cc535d337037bbd6fded40761d0ed918fde42366853a6188120adbfa1e25cc61f5eba9e37 SHA512 08ac27d59a4e08229e170a1c7ffb7a981ae1d3ab1548850cd815a0de64c47d1c20d69f6585c2ec9890b060483bfd569fc52ebd88db0d1264ebca00c1b0bb38fa
 EBUILD xfce4-panel-4.16.2-r1.ebuild 1529 BLAKE2B 9b479e7c3535a274d6fe4570c55487a03101b915a5acce92633f034406d83c019c86287feee5a60e51902329015622826ffcacbe9a0d9b8cb2148d04f802be6c SHA512 4ab0868367fedc799a23c283c99b5aa998c66c97c9ad8a95ea04e10e9ba277457a4631c418acf4c70154670518b8eca8ceea1a049a60e6489ff8202870bf24bb
-EBUILD xfce4-panel-4.16.3.ebuild 1564 BLAKE2B b2c847dfd6bca187ca3292961ba6553a0fa8ee751d925a4b6aa2bc914e3fe1ed5100bdfcf5fb8a0792c8ba6d0b6d54a363fcaa2dcacc0bd535f19e1950411f0c SHA512 1e0c635efabfec99460b60456c434a764e239164c8df6a26338acd50729f8f9b91895fc3a1acd5202497160d3a9734865955fe05dcadca80d8e64d0b7b57fa4a
+EBUILD xfce4-panel-4.16.3.ebuild 1562 BLAKE2B c72d6d404ad4996607d3bfcd5a3b10b4e2829f340cdb3e30c07ee6c52a5302e5f60e9e6a95aa4c79e38be3c9a385d9763b988959206d58a7774ce958e2f88585 SHA512 0b65769992d42680e5c6c6853e75de43a8cbb604647ae1573b89dc5a6630931a16c40fd4837f6117e46988c0c2c4ac2eb037041d7c6c1365dc4b33a84705f477
 MISC metadata.xml 376 BLAKE2B 8e3bae72680451c622ad0c7594d756af6027e70fcc35e6f48fab7b63f511322034311ef496595c9edf301d668f4aeea3f8d6950e8db5555b3f90905d60aad8fb SHA512 75403270836578c8c7207777feac8b88b784976f3b887c472d29fdfb5bad7ad738eeae4ec0739a71993988f41378da1187b93b010cddc2d227a59ae9995f67a4
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
index c2cfef2372e1..6613dfce02a7 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.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 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 4a35ee331f9e..f712d5e272f6 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-settings-4.16.0.tar.bz2 1492754 BLAKE2B 10bfa7ce556547a4a41e1a3691ea3e41b9de57bd21760a91424cd27469917264ce00ae7324ee1d81bdf27f6b275415af932d63aeba4e80de729e42df1cbff488 SHA512 38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238
-DIST xfce4-settings-4.16.1.tar.bz2 1496053 BLAKE2B dd4176a5edc6a52c885ec80d4f5855ba7ea0ed6a70180f8b15d9754a246a097c82eeba4fb52b3ff1f551c905c21073c153fac3a4c47259710fae9cef8a95f45e SHA512 0f918ea61dfa71816366663114250ca97bb7e41f3cbd0e569b12e8271641f1b2b622ad17f9a185a30f638093328db0c6d175b7e7d03de56963b19e44eb29383c
 DIST xfce4-settings-4.16.2.tar.bz2 1500270 BLAKE2B 04915db8071050a841f972e54ecb3119638b0cc3d806d1e17e5ae23c90bb7819d33cfa349c1273a5493538d8c66543ba07e469e8b929c6e0479ddc9cd476e0d9 SHA512 48908318f8c20f9f0f5e83556c4a86a1c8c963f37d4627aa051f00b537a87a6575b35ddb6bc91108a41312dcf2e90d6dff8259a624ed23cc04649887828141ed
-EBUILD xfce4-settings-4.16.0.ebuild 1723 BLAKE2B 8d9b77e0d005e432cffdb12c0188df9223a7213c2133dff1011f48e69b90be10a6dd4aeb949cba15c953d34753c72229c9a11c000d84f424d6c404b491de82f1 SHA512 3d6d9abfdcd61161666fe50ceb94dee3506ebd6998d802aa182fe6ab10f0ff6551f00f1ee333aafdaec276f0b8ad372cef9583d28b8b62a3e77260d164a40e12
-EBUILD xfce4-settings-4.16.1.ebuild 1736 BLAKE2B 4683a7f5f762d7cbe1e7c125b47eab9f0cf513a1ed8700f46745eb9effc927afb8d9d86eeba57d8d8d16e545416966056e6d3219a9ebccabf65f5ea1a6103317 SHA512 11a6243011c5ac404c6708f80d0d8df366f3925bec9fc6c350f44146f06fda3f2a998304ce328d14299115fe460f2893d13ac6b0b5e90388e94b59d9923d62ef
-EBUILD xfce4-settings-4.16.2.ebuild 1732 BLAKE2B fad50a5c100c161f16580248ef792064e36dc2c563c00aa1c68cc2a25a60c9b79405cf469bf0c9cdbe6a3b2f195d6176344a79fb49b6a6e991791b9979081f1e SHA512 162fd6c5351699e8785be0fd9bda57a5a2fc1b6b75cb9c5d06665ceae9577568cbb2dcb50722407dd6e332894aef6716d14607f808eb80514104498470bb454b
+EBUILD xfce4-settings-4.16.2.ebuild 1730 BLAKE2B 8a0ecc5c12338c275747931769f7d3147116f52588b88dba1381527b0aa907ab30237cb71ca2f6da29cb9323bff41ab7a1e327d102d05a9a19cb4968cb6a409b SHA512 03bc4d9523e816eebf47665be425689c86f4b06219d8b7926bc2570d9f004014315af91b30b28b9b0cd731ae0e6cac1c2d209234132b9fcfb4f2dea8d8b53d6d
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
deleted file mode 100644
index 319ea8937db7..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-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 ~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}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-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
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild
deleted file mode 100644
index d5c9cffb5845..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-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}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-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
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
index 966aeb7336d7..a8df5ee66c9f 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
@@ -12,7 +12,7 @@ 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"
+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}