From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 xfce-extra/xfce4-whiskermenu-plugin/Manifest       |  4 +-
 .../xfce4-whiskermenu-plugin-2.3.3.ebuild          | 57 ----------------------
 .../xfce4-whiskermenu-plugin-2.3.4.ebuild          | 10 ++--
 3 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild

(limited to 'xfce-extra/xfce4-whiskermenu-plugin')

diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index b615dd8740bb..da8903436d0d 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-whiskermenu-plugin-2.3.3.tar.bz2 160277 BLAKE2B c4c96175f1d8a7202e8a6d207dc113ec172493eb724f7da7ef18fa3de26e52c3b86bc0135ca8cb1e650a0e9d835e065b6baa18816dee7c90c4034dcfc9033639 SHA512 06e8c0ec623538103974c266c26b8efea94f97093324b5f55305ba6832a8c9eb7fa19c636249dffbc09ed4c7e3f543d338b2bd3455c14601237b2253683f5ac6
 DIST xfce4-whiskermenu-plugin-2.3.4.tar.bz2 160614 BLAKE2B 276842ef860965d139166ea6d8e988d39694aa06ace52bc3f48d6e3d9c9d8c930c3b9e44c3d9f84aaf7bb6fd9412a5efdda39834d8c2d33ed3f048db68893266 SHA512 8e59b6d0067e2302e3bf3e7f528cf96d613586c78c2ce6040143b449bffb3e3037b0d08738450c701d57f11cc5393154221bfbe5fa43825ca5df7ddd3c9f4cf4
-EBUILD xfce4-whiskermenu-plugin-2.3.3.ebuild 1101 BLAKE2B 0ec7c8b3e67e3e6d228903a0756cd1eca7fb2d2939cd91fc80ead4d1cc1daee1696afe1f916fe16772dd579e750159af9079b7a0d264a4c56811a63bded6242c SHA512 ea0a9b10a9e1def314bae0b97f5ddd5fd4a254572d1c4d0eadaa24f3c7399d601d17c0001b7fd676e5f013c77c8a6ce43f53e40fdd2f1bb1dfed262b8248e792
-EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1102 BLAKE2B a034535ea55fc7ddc549d770305ef6013e500e485c08a3da0aada53c6cb75dfd35c6500df0c759403b43cd24ecc0caf5df4d7c9313fa50edf962ea59b750392b SHA512 45dd57417a4cf34056834a8dcdc1c268d23bcc576adbdccc095e5bb8e615cd8aa1a50923271845bb5df7583158fc5619e6ff80ac2183200fcfef8eba852f5c2a
+EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1082 BLAKE2B 791bb658bf695009b4b18386c6abb0672fa6a8cdc589eae707e13c0da2880d74a7c346f7b3548ca226f0cd803627a62e19e4690ec6adc4d4becb20b198b4f28b SHA512 779c2371da3b988a3c89d97940922a989cf0e338ac788fff7a026d06db926a811fce3385e747b2749ae99c34e9662809a9499b4e5dcdec2fecb661bce281f39c
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild
deleted file mode 100644
index 530eae19a64a..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils 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-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_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.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
index 0fc87c2d21bf..203d930b0b47 100644
--- 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Alternate application launcher for Xfce"
 HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
@@ -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="
@@ -35,7 +35,7 @@ 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-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -45,7 +45,7 @@ src_configure() {
 		-DENABLE_DEVELOPER_MODE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3