gentoo resync : 22.05.2018

7 files changed, 52 insertions, 4 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index d15a31b98ec7..2ff931d692e7 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index cbbe78ecb716..b478422e0fed 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-clipman-plugin-1.4.2.tar.bz2 485244 BLAKE2B 6e183b82db5c3325691d04afa110c4dd83b013a94ed9b3b1b1b7bbb4166bcb1176a6b4ed52fd0b3256b7f73816a0031ea6084f31344a9ac3187b7b5fd25f01ed SHA512 f12d9e3e37a26f9dade5b76e73ac3998030112b53e7ec7b756128f7f1ee28d19a1d7b8d4a26e0ccb69aaba2f0ab2f6c4cd5a435bd1cc7efd81c05b711480eba6
-EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1128 BLAKE2B 301cfb34bd1044b2627f8e5d310e3be9684a6c18e9ea7549f1a1b1e2f0c14b39793c2d08020f48e780f851f358ed92b234662dc9d169807356bf9e4762e30e3e SHA512 8bb0cd93a5551478af69c7e299779f421c5ae15ee5ef673bef65dbcf4f9464c3d4a0418a739a97e51ee9e727500c0849fe658cc15d6ff307367a17b45eb749f6
+EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1131 BLAKE2B d6953e95b6a0d922b2ae761ef61067a6150db03de594c02d7f1159f407b4b515750788e1791303ddb0ba5c19c2eb63bc38d01ea2ba38f850c70825cf66caea5e SHA512 7933f3bbdea6758f3c6b98fefe0e68d345e46e8ec0f5d473cdd05b92dd37c31ec60131cd2346ee24f66ae2617a69501b31313f4372e73c5254fcddbc8c38d748
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
index a9d2e45397f5..5f1a2cdaf06b 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	local myconf=(
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 92742a23141b..548918091c21 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
-EBUILD xfce4-power-manager-1.6.1.ebuild 1396 BLAKE2B d6f31ac3972f7437ea95971e8d78135c0e78b4beffbc4896090a7accb9f3c8e8cfda25672d1c39093951708979eb85d93a804c395375d01b417485461f429250 SHA512 bcc0fd5a384108ec2de2d2d0d11c8774d5dfba7b4d9629ec7b45999d2bb0ca8f3db3e08e7c35431e8e58ef40f8a6d103ad43652084179ab058cdb22480e7b555
+EBUILD xfce4-power-manager-1.6.1.ebuild 1399 BLAKE2B 5565398a5edb8c8e42150e102f9761c72226f1b3c31d5aa7a45fa64afce2892059d560d0bc572d7d80e45e1bfce0b4ed928b019f0cc61990ebb7905c53e38b43 SHA512 2b8bd24e4e133501218d41ea36503a3835513e13d6cc6f38d990264d834d5d675cc5bc82756f3fad478caffd4867e31b20ea231734d57c00520dd9f13ab8da19
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
index 00beb27e3ac3..c69433e99643 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	local myconf=(
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 9ddcab1243bd..b9ada9e8a6b4 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -2,8 +2,10 @@ DIST xfce4-whiskermenu-plugin-1.7.5.tar.bz2 164129 BLAKE2B 904cc32ec73ff89847732
 DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f789ab69c3ce9bff91a4fd6507202cf4e78950b8f29ab2585b5142ecab9d009b3e08fe8161d82c51a442c055f63b7012fd73fa972136 SHA512 54e308b516ef1694f9649578cb8297f830132e456e1f498183074386956873f7f9f6ea8a0167d506086a87ae17acfbfd8a2b34eb6f0acb97f896872f8799b1f1
 DIST xfce4-whiskermenu-plugin-2.1.6.tar.bz2 166910 BLAKE2B 344bf87bca119fe52da48a62be5d762db1498ea0e248bf394e657f5aa08f48c721806d17acedd52edf34b4775b80d054d95a8d482a8c3c3c0fb1c64b72981bec SHA512 20888a8d16edfccc8da0ec958af39041c423683ed3f56f60b1d520bb54bbc4cfd58841582d24813a4eea364030d2a16fce7f7eb3beeb386ccfa2b43cb1471ef4
 DIST xfce4-whiskermenu-plugin-2.1.7.tar.bz2 167498 BLAKE2B 415466b61bb9e7c940a5234024ce04b4d505393c3732bf77b8a706e853273070bd61a3df33bbf72747e4a8ca486cd50cca1eeaac50d023710812c6c697dad475 SHA512 ae912318c0e60b5040486a3dd9b832822a66073db66afc0a7f9344bec25486c57d164ec0fdc18917ff439bcb8715a650e1a39897243b10d33413964729865704
+DIST xfce4-whiskermenu-plugin-2.2.0.tar.bz2 168577 BLAKE2B aca6aaa7cf7da6ead40ded6025a5ae67ebe360ae6ad358aaf3563044751fe97bcc231c03a9137b9635fefc57a2978430d9e842ab2285344b843dbe3c8e082111 SHA512 0fd86a2f82f196cc24022a0a5c17882bef4f554ccd0d271f86ec61ea0d2b3dd9206990e7469e874aaabb6f0931ed62da2e50d5086b850137ee759a5a54b4c41b
 EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 873 BLAKE2B 6088679e00cd89a08a3693e87c8331bf8552d1fd25fe16f0edc9b284af2008b4e6a21fc57183a2cb02e1c2bf943d11e13f32729c64080f10e892f6211f0f0a01 SHA512 9bab065373adda0f0bb524d2b6226f391e1912d6c766e753ef05bbfba672f04c7db6eec542499f1c521ee95130d3dfb2fd9287e4e47fe72bccfc4de3f37de72e
 EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 882 BLAKE2B aace5f408b1b9e669414a1e9e42f9611b3c75e368ec1a35e54ea84eec069cb0e1ef151ed70db971f4d1e9b6901ded300b136271274f88db07d21071f8ea32b15 SHA512 1078c943cc24939c9593466180913145b473c13da08c3550fd73b1a949b190d8d6fb19d012a2055074073c4f283e7b709668055c37e534affa70ba1d8a239579
 EBUILD xfce4-whiskermenu-plugin-2.1.6.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
 EBUILD xfce4-whiskermenu-plugin-2.1.7.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
+EBUILD xfce4-whiskermenu-plugin-2.2.0.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
new file mode 100644
index 000000000000..0cdcb3cdeaf7
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
+SRC_URI="mirror://xfce/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-0.11.0:=
+	xfce-base/garcon:=
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel:="
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AS_NEEDED=OFF
+		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+		-DENABLE_DEVELOPER_MODE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}