gentoo resync : 25.08.2020

4 files changed, 6 insertions, 76 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 0b0c5e2d492d..361db658934d 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,7 @@
-DIST xfce4-panel-4.14.3.tar.bz2 1304748 BLAKE2B 7e009e2afcc59b1d014fe776c439cd27c8ddb9b46215a9766f25f384802bc27a672201d0a73eff8aab3714822ee5f2c062806a60ccaf70cf6b5ec65f38f7e8a1 SHA512 c317741df1196a9f8d675c87732155f973022d1cb30a8815393980747d1569e8348c386253fc9056068c35fbdc13faefb4a0bef6678d072d51461c4aae909940
 DIST xfce4-panel-4.14.4.tar.bz2 1307938 BLAKE2B 79e0abcc5dfe41faaab1de981b8a61a99e9c11ab5b3ddba5fb7385517d24b50210f12d0a6a49720d6d8458fa7143ed65d7960025c5e8c01af1a59dd6b339a2d9 SHA512 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85
-DIST xfce4-panel-4.15.2.tar.bz2 1302860 BLAKE2B 0c2ee5dac584cd1cae940872ca1130ae710e23f46089ee16241f03f87317d905937f1eb6c382140659e9b01669ccce26bf7e6e64e90207db3c7b7a7865c71674 SHA512 7f2e0d1de70db1778cd5a0c0ae4845ffef960b16f1e147ec6fd47543a6360e2281d8290bc055bc83993796bdbd97edeaca867a6790052bc07d8e2bffa412e5a2
 DIST xfce4-panel-4.15.3.tar.bz2 1321860 BLAKE2B dbe4eff757e612267c0de6edc0689bf3b469c30cf8060f06e3e99de9093924bc0e8dbb4f1362349904c6d99dc250b240f34cbde218de0b13abdd259a8482cee0 SHA512 ab3ad010899cf86368e5dd8e469937d89221f6847f54d047536c120bf282bf5e7756dd8aa2837984c35a10c2f5c46c75874839d1b4cbbfe91417875fff4c3cc2
-EBUILD xfce4-panel-4.14.3.ebuild 1494 BLAKE2B 73021f104029c59f7f829083e61e558e76865ff57dd1faaf191c2a8d8c6cd927004d42f7f36c144841c40804c151f5bbba4512e65492d15ee40f3202445bb6aa SHA512 8105bf3c2606467e4763f86a5fa78b027aa26365977f62e752fa2ec921cb63b264540cb5ab91b936c952bb6093a705a956b9ff4ab6a9949055a5bdd8c9d7a923
-EBUILD xfce4-panel-4.14.4.ebuild 1528 BLAKE2B 34b45d8e47d944c1c762533671f9280c3e69c1c5687b7f928e1a3c85a7c795f828ee1083f5cf904433f17a1e7285e0b85919ef1d3ef5e04200b9a0a986ebea17 SHA512 0de8fdcdc6bc1379e9b0d26d67a374c565135df99517857fc3db6808f3d959c82762934be57978159a263bcf71ed0db741ad9b6d9511736dddda2758f251b075
-EBUILD xfce4-panel-4.15.2.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+DIST xfce4-panel-4.15.4.tar.bz2 1358752 BLAKE2B 0920ee2cbc97e2884ded7a739db015bbe60498fcdf2cfee0672139508a1f98ef9dbfbda3a029dacaf790d9ec73aa63766bba8b2cc0dad66c9730c4aa11a3f596 SHA512 f8d48fa9691af64e12ea55b190206b6dd6a5faa4a361f45c485591c9ea0bcf01759c5457cd5bb48438f40411862ff873e3913bf3100afd2d9c9b4ab950816ae7
+EBUILD xfce4-panel-4.14.4.ebuild 1527 BLAKE2B d2934e562562ecbd321d33662f71fd5f2eb1f98a55cc65142487d4c94417a9bb2f21d6a344348383b1bc404007320469ba5f732e89af8f52ec990681fc35e561 SHA512 4e39319392bea17946856bb1ad3b0cbbe33f0104cf310a345c889fc51bbf09a2cc17ebf68ece96b0d1c76855328bce133c6a9158ef9566f37f393a7e0997f0f1
 EBUILD xfce4-panel-4.15.3.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+EBUILD xfce4-panel-4.15.4.ebuild 1453 BLAKE2B dea32d45f298c36c35d730f146a6dfa4fd8fca3fe8d6483fdf934080b96016b5e5c61da5e6b45529671caf16dab4a63bc7225f8e7c515d72572a2d4112b129b5 SHA512 73be6d66478fd2973a0654e1fd94daa553804696900de594c9d3052e0c953f7420deb95dd5982b51fc9836f4db306683df9f26e40998bc59eb2f0b47fa50e345
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild
deleted file mode 100644
index ffed406fa275..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 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="+gtk2 introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=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.13:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	gtk2? ( >=x11-libs/gtk+-2.20:2 )
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	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 gtk2)
-		$(use_enable introspection)
-		$(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
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
index 73f4ea9adf6c..73e89381c67e 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.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 ~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="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!gtk2? ( test )"
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.15.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.15.4.ebuild
index 9861259a3be5..ef53f027ae2c 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.15.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.15.4.ebuild
@@ -16,6 +16,7 @@ IUSE="introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.42
+	>=dev-libs/libdbusmenu-16.04.0[gtk3]
 	>=x11-libs/cairo-1
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	x11-libs/libX11
@@ -23,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
 	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
+	>=xfce-base/libxfce4util-4.15.2:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}