gentoo resync : 03.03.2021

4 files changed, 2 insertions, 78 deletions

diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 11fb432ee0c0..0e6b79c5c803 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-xkb-plugin-0.8.1-panel-4.15.patch 633 BLAKE2B dac32f28a935af31aa7a90bc348a6a82dcaa437ae42156ef026a1e6a1a2a3e982efe56eeab1c128d1359f12ee1af18fe426b8f6af4e2800735ff2fcaa3ce39bd SHA512 cd0d6fe9d6353f26410d1e04f6e3e7e70071c7bb6025aeb4824c89911acb97dc78e8aecc018c88ad61eb5c7ffb5a4c3bb75e0f7b008b04877e8442af4756cd2f
-DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
 DIST xfce4-xkb-plugin-0.8.2.tar.bz2 868539 BLAKE2B 20a7a27903be434490b3328f04d57a4ceb505dc1b63e4c98d584c72e6ad0dbc742251c0d9f43ba1da869caa2924627b6cfddd969874a3f5fae8fbf90ef577da6 SHA512 3078c11e1c10195480251c455995e4342c27b06949fc754396824f03bed885f32078f4c1436d86782de031cf4f4f806b530ca53116d4bedb54dda19b68ec7062
-EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1148 BLAKE2B 81514b3746a9c21f5b69aa77e60392da1ab73a81b42392cf32706655448820027b35dbeeb1ccccdadceb6175780d29dd5927f27108c42caa34331579f0d40eac SHA512 00e85399100eb8c86bcffbd7aa198f1d22db8a7ad5aef1066671e5e3ad7ce234fb82f85f92612c6b426254740d7a415b762dad2af2b498899e3ca358c74d5a97
-EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1062 BLAKE2B 14407386e22e0c58198873f9b6d5578f6214db09d20d42ebc9b31db98572944f676f98f4408e811adb68c887c2c82e8774874691dae7b7ae4d9f3c35c61d96b6 SHA512 1f1540c4e74c73a11d27de33840791bf0cb8bccd93add1aedcec6fcff8d28fe7359e64123841864b61edf2c4c15ffc40d4252410e0f569ad2dba131df0254a97
+EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1061 BLAKE2B 6a7030377ed9d64cb915e9ee10ee85b88d96d30e13fd90b7fe481725c5780a4b42f06136f088c3c43deb61164d3a6ed93f96d65dae20c684e3c10ed08e24d320 SHA512 5f1943efbb9b47d2313d3ec11f28fe6f16014e30c5a9b381d086f170e9d92ae0c475c8e5e91515563fdb913ea1a8a8a577353b080a940de9b1a3d5bab71e36e2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
deleted file mode 100644
index aeb1b0a2be2d..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ecfb91c6b68477262111125977a8229ff142058 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Sat, 19 Oct 2019 19:23:30 -0300
-Subject: [PATCH] Fix build with panel 4.15
-
----
- panel-plugin/xkb-plugin.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/xkb-plugin.h b/panel-plugin/xkb-plugin.h
-index 3fe3ce5..eeb10e5 100644
---- a/panel-plugin/xkb-plugin.h
-+++ b/panel-plugin/xkb-plugin.h
-@@ -26,7 +26,7 @@
- #ifndef _XFCE_XKB_H_
- #define _XFCE_XKB_H_
- 
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "xkb-xfconf.h"
- 
--- 
-GitLab
-
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
deleted file mode 100644
index de5974e72236..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="gnome-base/librsvg:=
-	x11-libs/gtk+:3=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=x11-libs/libxklavier-5.4:=
-	xfce-base/garcon:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12.1:="
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	>=xfce-base/xfce4-settings-4.11"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-panel-4.15.patch
-)
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
index 4a51bab98192..99f92837e026 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="gnome-base/librsvg:=
 	x11-libs/gtk+:3=