gentoo resync : 28.04.2021

3 files changed, 3 insertions, 76 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 88864586084f..00dc3534e93b 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-panel-4.16.1.tar.bz2 1381003 BLAKE2B 103d1b60c13758ad5e3f139d3bc66923e648540195c7a71fb6c39bcdb06b109f620ced42b7eb6c36ccf5a833e97957c373e760feab3f062c5a7ecd3038803366 SHA512 ec55a9812d61db755ea56a87ea1b709af2870703fc0e5a45797406f2f4c78e8afecd6e1bc081f3618a81030c9c0595ae8edbb29731d4bef3750e202bbf35e99c
 DIST xfce4-panel-4.16.2.tar.bz2 1381569 BLAKE2B d4b8455e31f942d0facfc0d90b14fb050142b3d8b3d0e61d5b687f973769e2888ea7f058c4f6a86f96dbd67329719ef49e72896774ac36591c2793847aa411ba SHA512 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d
-EBUILD xfce4-panel-4.16.1.ebuild 1524 BLAKE2B 6bff168a5b40c0dc7c61c455c80cdd17be3215e5e8645c56f080d50375a73bdd61c8d85be244251f1528f396336b1a397247a2a081cc741de1c95392a745e786 SHA512 bd93a9220fde1b4cd65d8d086074b373eaddadfe12f7d9d6d6907ad1a70a31b142a3a10fb3d8e843f306788b8ca36a536fc0efa57786345f0c39d7f05b1e62bc
-EBUILD xfce4-panel-4.16.2.ebuild 1529 BLAKE2B e05304f973f50adc97528efb98a6a161f64add9ef09953ce9ea015a36a0f70db0bf3f24e6bf8e045adc4ad82037983d4de0ef1afad8f1c3ee161ecb7fd1e1d65 SHA512 6b3fee88d609eae1b5d4aaf56f699453916b7be499cc7beb374c09186978084cd14c21bd439c8cdfa416b1109bce28642d872b407a451f58e05d19e830988741
+EBUILD xfce4-panel-4.16.2-r1.ebuild 1529 BLAKE2B 9b479e7c3535a274d6fe4570c55487a03101b915a5acce92633f034406d83c019c86287feee5a60e51902329015622826ffcacbe9a0d9b8cb2148d04f802be6c SHA512 4ab0868367fedc799a23c283c99b5aa998c66c97c9ad8a95ea04e10e9ba277457a4631c418acf4c70154670518b8eca8ceea1a049a60e6489ff8202870bf24bb
 MISC metadata.xml 376 BLAKE2B 8e3bae72680451c622ad0c7594d756af6027e70fcc35e6f48fab7b63f511322034311ef496595c9edf301d668f4aeea3f8d6950e8db5555b3f90905d60aad8fb SHA512 75403270836578c8c7207777feac8b88b784976f3b887c472d29fdfb5bad7ad738eeae4ec0739a71993988f41378da1187b93b010cddc2d227a59ae9995f67a4
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.ebuild
index e64f096e7b73..8d87e930110b 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.50
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
 	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
 	>=xfce-base/xfconf-4.13:=
 	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
 	introspection? ( dev-libs/gobject-introspection:= )
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild
deleted file mode 100644
index b3238b007d87..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel 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+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}