gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 77 deletions

diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 161ffff7a701..77cbfac34a1d 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-whiskermenu-plugin-2.3.4.tar.bz2 160614 BLAKE2B 276842ef860965d139166ea6d8e988d39694aa06ace52bc3f48d6e3d9c9d8c930c3b9e44c3d9f84aaf7bb6fd9412a5efdda39834d8c2d33ed3f048db68893266 SHA512 8e59b6d0067e2302e3bf3e7f528cf96d613586c78c2ce6040143b449bffb3e3037b0d08738450c701d57f11cc5393154221bfbe5fa43825ca5df7ddd3c9f4cf4
 DIST xfce4-whiskermenu-plugin-2.3.5.tar.bz2 160984 BLAKE2B c4a53ca34ed0eec2de27837c01d52ace334af5cf952b46b7f9f651314eb7f4aad52f5706ca8df7ddcfb4a9c0ed2fe207a138c3cb432306caa38220a6c13aa2fd SHA512 7697a5d41599df8150d4e7ad1c5898b651d196fb1bd1a657efee33206312455f24056edf679592e0a6a78b17b324fd5d93e202ae7cc461ca70df7cd41794bd58
-DIST xfce4-whiskermenu-plugin-2.4.2.tar.bz2 171280 BLAKE2B acc7ec7316231f3fc46c8407a0ab9d3fe3428ea1e87d8bacae0ddeb02016fe2ec01428da49e6921e213f1140070c7ec4035288f233599ef1239ecaed4209b93a SHA512 00bec0bee2c0311090ad06839ed2ea49c4d63bd4bd2869670cad7f4be3c7693f589cd4167ca7c27c39bcba486a34944449441b45e743b8d542e7003016c8dce7
-EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1082 BLAKE2B 791bb658bf695009b4b18386c6abb0672fa6a8cdc589eae707e13c0da2880d74a7c346f7b3548ca226f0cd803627a62e19e4690ec6adc4d4becb20b198b4f28b SHA512 779c2371da3b988a3c89d97940922a989cf0e338ac788fff7a026d06db926a811fce3385e747b2749ae99c34e9662809a9499b4e5dcdec2fecb661bce281f39c
-EBUILD xfce4-whiskermenu-plugin-2.3.5.ebuild 1084 BLAKE2B 985fc9b50d43684b17eb0429a03c1b59568f2bc5bcbdb87559863ea257dec998862952f945e87b33d8849e89ea084a002e4504e106398f2bb8afa051e9e0cf44 SHA512 b4c4b02ef95e51ec4e75b139ac7564761de6638b45d0ca07e5d85ea2762f5f4a91f753e242487f0dcb760741f18cc972f4317675aa8ef7278937d66025bfa3d0
-EBUILD xfce4-whiskermenu-plugin-2.4.2.ebuild 1122 BLAKE2B b9882e94c6649c8883155bd910e3da494529d433fc0f7a0a1554279ed82ebbf57f1ca5c7842178d273ad6b232a42c567898eb02cbc6c9bd48b33e3b5dad64123 SHA512 c63c728682ca15112400dc22958aee6d4a88f4d7d72a68aac4cfa3e4bdde8d24680c8e4b990e6345e854771a8f396ec0e8a0d593a63512532641dfd425c35a28
+DIST xfce4-whiskermenu-plugin-2.4.3.tar.bz2 171822 BLAKE2B 3bba151c768e9dbd3eb0904e675c334ba073a6e22a2c216e41df3bf1e6d5e2961cf25650b90dd459f40a10b4b12f4209e1a370e66d71fedc05da110693f039ad SHA512 378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32
+EBUILD xfce4-whiskermenu-plugin-2.3.5.ebuild 874 BLAKE2B 5cb115b533044ffecaeb09444f46adb0346601afc71b9abed9cb5681148767f805e369371e5b7cafecb3a1536d0d272a175b5961ca53428a597482068140dd58 SHA512 8c79b718309dd0a3c48347b8343148b48ad7f429dd6f5602c4619623fd3c303d1d1782f1eec1a994294e5d096f7c5d4eefb137c51a8b304322da75b9fd41a227
+EBUILD xfce4-whiskermenu-plugin-2.4.3.ebuild 914 BLAKE2B dbe2088a5b1b3d60feda2c38fd8b86a0ca720ad3b1caf04bc9d06cd295f6ffbee534fb3e517e4b052662e469055f4cddbd04fb2f25fd399be439ab62df6c9866 SHA512 d44b9e619188fe17919c5b8788f6b345decdb85ca3534ce68310db96cb08c42f7d395b2bd1d2145a6d106be7b0c4edb01acdcb3ed015e22cf77aa0ac0ab03bef
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
deleted file mode 100644
index 203d930b0b47..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
index 9587f377d461..08a62d270871 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
@@ -31,13 +31,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_AS_NEEDED=OFF
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
index eababf76189b..14e62615b423 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.2.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
@@ -31,13 +31,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_AS_NEEDED=OFF