gentoo resync : 10.04.2018

20 files changed, 220 insertions, 24 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index ca78d70ebf8f..e43bb1c3501c 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index ba0eb05a0b97..10179556552e 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,5 @@
 DIST exo-0.10.7.tar.bz2 1262301 BLAKE2B f9a0454b1f5f125fec49de834bdefd12ad827e88a852596315090cca92f92628d594fe609a35b9f926c4d19ac67fbfa60fcd5e277d6cd69082b27273ff17c823 SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60
 DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
-EBUILD exo-0.10.7.ebuild 998 BLAKE2B 831684574330a2684a85dbca7fc50b421e9557ee43d4e72931aa1cf9a606af240d6e58bb5851a266e357bd6430cca79cc0e5f68c727af93794caa22a7d48c66f SHA512 7a716f21e23b2edbf9ba95e7d6d39fd7be3a189d16e0a005413c12dc547e590bb5e74e224ee1de4de58bd4582885b2e349864a7f71f32e1ddee45de86e476eee
-EBUILD exo-0.12.0.ebuild 970 BLAKE2B a190fe9e1304fffac4c0957f83364d1be961cdd7b1f567e5aa15b50559f3c9ba39ecd168bfd3ea332c858bc794747bd9ca31b1d3de540037871535a095446b99 SHA512 14acbe8df6cb3fa1e3d5fedd36121de002e892fee67a2c55ab37dd36e06c1bebb43a0f21c4b2527de79321e4584e26c2a8f14566785e8144d980813fda66a3de
+EBUILD exo-0.10.7.ebuild 999 BLAKE2B 494d2a2c795f897b4407c7a87e7fdb507ff2dcef5f3bd100a8b018428eca4668aef4aeacaeadabe8639f29f29c35007ff30ee782734c515f0280ad6c2dd21e37 SHA512 ada3bcf2c65344bf189bffe809352ceafc16368a5fe7fb543f861a4c51df0d384c553f6e46fa5de513466ffa9e6c63d70339916296404442565578659d27492c
+EBUILD exo-0.12.0.ebuild 967 BLAKE2B 628758c37c151f4fe3a7f4195647de1d2d89db85c95adda71f28a7dd1a98df55924c7b9d2441ff8afe952128ddb2809ed677bbe691f19a1597a6c131a3d881d4 SHA512 4a80e98ece336e6d5243cde943e67bb2027d20728ae89c2b752aad3fec4aafb648b6c3c3760f3d5af0a3679d0075db827e6a1632d08e589328f2017cc1aa4634
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.10.7.ebuild b/xfce-base/exo/exo-0.10.7.ebuild
index b057906bfbba..4f487bb2ba83 100644
--- a/xfce-base/exo/exo-0.10.7.ebuild
+++ b/xfce-base/exo/exo-0.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/exo/exo-0.12.0.ebuild b/xfce-base/exo/exo-0.12.0.ebuild
index 40a8273b293e..e35536166c72 100644
--- a/xfce-base/exo/exo-0.12.0.ebuild
+++ b/xfce-base/exo/exo-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index f130d4a71c76..eae5afd7531b 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,5 @@
 DIST garcon-0.5.0.tar.bz2 456940 BLAKE2B 1e2eb7351fc63c3dcaef358174f38e6da308141923474ad215309304644db85112d7f1edfd258bca5bca3c596f8e98c5d38cc830bcc11e91d5fc71e4c1c956d4 SHA512 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5
 DIST garcon-0.6.1.tar.bz2 511415 BLAKE2B 03c9076d8507737ed64b48597ff53c4cb3ae9beafd14b28d4d61fc29fa007f5ac4757f96ba0dc56c8b069a4eebd5d38202862856f96a1b08474de2aa93d518ca SHA512 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
-EBUILD garcon-0.5.0-r2.ebuild 882 BLAKE2B c02b50be7c8fadfd1bc2bfcd19db2c890da7670735740f76966d577cc5dcab5044a305b6ff960b512f9c7e3166bcb01e3ab5866fae44dbdd54766075293d7c8a SHA512 fb46b6587b982dd65add9af523cf34dd33b6111b6f833e0855eb55c27102af691f69d2ccadac3084e7ef407719fa20a9fbf1b240b06106113873aad1aa65d1d5
-EBUILD garcon-0.6.1.ebuild 1018 BLAKE2B c002d1e999152a0dddd8cbb85d00de5d5d7543b3c9cb6bcf9feb9bab7418490aac1db8c96899773396d46af036d4ba5f7e92c565bb36137951790f4975e4df86 SHA512 dfa80c3e8c766af3d170536f6d7c48793da6bccd4f1647ac8194130a521eb852bf6872514a75e8da7d0eec02eca53d76e431c4371c6f9c891a68fa516fdca8b7
+EBUILD garcon-0.5.0-r2.ebuild 883 BLAKE2B efb17cb4da1265e5ee57c8b81b1b4daa8aac343926f545d0673892e4252439aba883fa3fd3ac20e566ecf35fee1fcc27adb238a61a881f8621bb6553cc51e08a SHA512 7a016fd17c6ba43bab7eaffde25d81d653c82495ad34096f41e64c854176c307364c91703ed3e8337f7152f8d044404881914d8a58647e904d368506fe60e726
+EBUILD garcon-0.6.1.ebuild 1015 BLAKE2B e5f627df3045f98c236c1229872c27b322368b3c214aabffac3efd5e4a493e9299151f28af3b19ea26ad26cdeb716f8cef6e910566082becea387ca420d1c5e8 SHA512 4fc3de290898dc9f11706fbd95706397d80fcb1c579bad4f8041548cd030e5462c4a716a23f1da3bc7b844cceabec47602ee02e57664db3380c1f8880e7736b2
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.5.0-r2.ebuild b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
index f44d41bb8058..0d87c4d1dc9d 100644
--- a/xfce-base/garcon/garcon-0.5.0-r2.ebuild
+++ b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/garcon/garcon-0.6.1.ebuild b/xfce-base/garcon/garcon-0.6.1.ebuild
index 65c9f8e54991..5fe54524ff71 100644
--- a/xfce-base/garcon/garcon-0.6.1.ebuild
+++ b/xfce-base/garcon/garcon-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index bc2ef8bc1fd8..d1b403193c8b 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -5,7 +5,7 @@ DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd3
 DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90de6202d8b830335fb49561c85428ee13753bdc1cb810713e628b977aacf78c93d7bd88c9ac90e3a78f8d74f5737 SHA512 200d2f7a30529fa9a93340a24d019a883193952157f3b37e67d4618ccff95823dfa06f6b04845d185fcb5ead780ea5c69ba9b846c82ea22bc433321b2b160ffb
 DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
 EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
-EBUILD thunar-1.6.14.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
+EBUILD thunar-1.6.14.ebuild 1963 BLAKE2B 1b47bcfa6dfcbb711b0088a6d2e9011a18adce3687b888faaea3c88bc6055254a47ae968099754bc81db3a5e2a4b053c909bec873f8b66948c2d09e4132ff391 SHA512 434e6ee9251da871ecbcd4390076e69d6cdcb0dd4fce2aa1b7f50cd97ec16021ada9d45b505547de1a276ad7487bb2fad93cc77b7e92131cbc5f066b6007f9f5
 EBUILD thunar-1.6.15.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
 EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 EBUILD thunar-1.7.2.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
diff --git a/xfce-base/thunar/thunar-1.6.14.ebuild b/xfce-base/thunar/thunar-1.6.14.ebuild
index 39633fa570c5..44f8936cb829 100644
--- a/xfce-base/thunar/thunar-1.6.14.ebuild
+++ b/xfce-base/thunar/thunar-1.6.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 4ad61f92d1b2..1be81747dcd2 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,5 +1,6 @@
 DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
 DIST xfce4-appfinder-4.13.0.tar.bz2 476547 BLAKE2B 179f77efcbb3d24982fd0598ac840a2f60bbd5cc95275621f2483da23557cd5175c7a348467d67f8b029eed62cf7035567ee433f8560ee535bf1148a30ae22a7 SHA512 1efd2dcedeadd6e14ee7db9defbec3c8233a5634a38b0c6274b9a858cfebaff815dc0095515866b83aad1981a363e6ca4b3c12190faa64f485421d570c5155b2
-EBUILD xfce4-appfinder-4.12.0-r1.ebuild 891 BLAKE2B 002dd5544bbf1e68f8c38319fb52f44aca4e8fef7618365b0f843b50cb18e9a4f25f0b459d9b4313e8b1287cb51b30c9dc5b29d1d386396e22b56c6be6826aee SHA512 3b16621323b4d1e9b71f427a9d7e39c7a4549bc5314a119f3dce8a8db06240da5be5950e56fac76439d3ba7fd5e87aa989e24a119707ce98c941357fc9aa34d4
+EBUILD xfce4-appfinder-4.12.0-r1.ebuild 892 BLAKE2B cbbc5414ad1b57a76116338a59a9d6a5841304fff38121be78ed2c659b3ccd77fcb738d69276a12a1c0ea5ed5d01af3b61666890be2c9c7c36ec2beb869731de SHA512 bd8709b8860f703cba2e97948384774341276c24398a441e982d28d7ceb2d70ea5662458c9a051951a8835f2ecaf4b3ce8651c41376dac2d952c3698d698952a
+EBUILD xfce4-appfinder-4.12.0-r2.ebuild 855 BLAKE2B 8a1cf1fefe340c48a45e85d0d0a579ddea6edc46055c37aacbfe71b6cf93740278dd47ac263ebb8b48063de9fba0dbb31cd8128606300963150ff0a171f39c3f SHA512 840e68deab778027c7380b85a2f5e7f7d65ccab2c25669ecbbc3c3202f57ba0e0097b2056cec023c6173f60584c1883e199d94cfb7400c8841d893879716bff3
 EBUILD xfce4-appfinder-4.13.0.ebuild 778 BLAKE2B 2cd6f18622c0a444965e5e3b32070f4f5f825cec44080007917bcef48d13c63f97d024cbbae4cb09db8ccbec1ca518e3b5d737eaf486eb4cfe7df2207f146d12 SHA512 28e21845b501092b09ade6c778724880c773abb215336017fd1ddfd814549c585993dc58509381d031a03296ba9409592001a33453357f7124c46b66c5357226
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
index 24dfaddbd128..cd7ec6c1723d 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
new file mode 100644
index 000000000000..ab9caaa97bfc
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=x11-libs/gtk+-3.2:3=
+	>=xfce-base/garcon-0.3:=
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	>=xfce-base/xfconf-4.10:=
+	!xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--enable-gtk3
+	)
+	econf "${myconf[@]}"
+}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 78a88d997757..5ad261e60654 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,6 +3,7 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
-EBUILD xfce4-session-4.12.1-r1.ebuild 1906 BLAKE2B e2ed3718c176ae8ee61e3ee2d3b79a5b4cf1dda252a8e76e8808eaf063e959d7f58a23dc5058f4db09705bcc03e57dd299db1ef6299dc4b1b5d9a33b49a506e5 SHA512 5d6bd2d39c26b21d21942ce5c247e559d1cefa69903e998e2a20432eb257c27d84a75ca9edf3bf46f5e486f4720308c131cfcc67a66ee0b12a1caf6da078aae4
+EBUILD xfce4-session-4.12.1-r1.ebuild 1907 BLAKE2B 71cc1a811ca6c1eebad8598743fa1b78ef2a013b877e018fc034be9cbbd269637002b7d1639fc4c10bc4a8bf6d8477956c5c70118e05bae144c2440b5461b46f SHA512 dd2555e54e6c8d24e30e2889eefda9402b6a540bcc01347a3bc3f96bc0930f255b85e5a0332e5b72757e27122a68802ae5175e741f86cc238720e522431e3698
+EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B d5ad58e4c6003ec6f76539196f46b8e1ed5e56f5292f2d08c99ac45e09ecf5abbd3339b10f36af84ec3643b83e9ce2536f39f8be152d4f0a22d2513b1c393644 SHA512 c97415b3f4dcb3eb0aa59e0c48c69301e23a8bda51295ca2db6ef5ab3c44500c681ddb33f49ec5c42b3a04719d0d0cfd4b00161541bf18dc8c6936ecb405429a
 EBUILD xfce4-session-4.13.0-r1.ebuild 1833 BLAKE2B dd046f6f515a107bfc74fe19403c57f91f7db6e8a7e9a5a93fda610052e1f6943b3123ab723adbbb3965846257f44dd870d958dad96cfd8feda3582adaeb01e5 SHA512 92a5933023c5f6a3243f7cd845a1c4f14c6da4fa1aaae4a6f9fdd52eaca9d10226744ae4b5679c2c824b6d57f895c7add1c2dc1e32fd4a57340a05f856d95c33
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
index 840196ac61a5..a34ac02f6aea 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug nls policykit systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
new file mode 100644
index 000000000000..19efc8cad645
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="nls policykit systemd upower +xscreensaver"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	x11-apps/iceauth
+	x11-libs/libSM:=
+	>=x11-libs/libwnck-2.30:1=
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/xfconf-4.10:=
+	policykit? ( >=sys-auth/polkit-0.102:= )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	!systemd? ( upower? ( sys-power/pm-utils ) )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.26
+		x11-misc/light-locker
+		>=x11-misc/xlockmore-5.43
+		x11-misc/slock
+		x11-misc/alock[pam]
+	) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="systemd? ( policykit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
+	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+	)
+	use upower && myconf+=( --enable-upower )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	local sessiondir=/etc/X11/Sessions
+	echo startxfce4 > "${T}"/Xfce4 || die
+	exeinto ${sessiondir}
+	doexe "${T}"/Xfce4
+	dosym Xfce4 ${sessiondir}/Xfce
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index b6354b9a4ba7..7e2c83aac12a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -2,7 +2,7 @@ AUX xfce4-settings-4.12.0-HDMI-power-cycling.patch 542 BLAKE2B e3c46cd52b11e5f59
 DIST xfce4-settings-4.12.0.tar.bz2 973324 BLAKE2B 2c6103ac0d43c89f523e530d2eccc0974b6a67a9206f300aba8630b6ea819ea16774141d92647e7b3682b437555a75a4c0a8e06e4abf593a302010342dfb3a10 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856
 DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
 DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
-EBUILD xfce4-settings-4.12.0-r2.ebuild 1573 BLAKE2B 4678ab6ee86da69004b9665daec2d1fdafd77cca518120a597898ebd20780198b4ca2a8bbc31f1c265703090c9cde5408ddaca7607c51636a8602c7f3b01acb0 SHA512 65a30d30a81b375d4729f1ad925d27cb6041434d1c8d564a7f0d51c8d98ef6cfabbf4ae354c1a7a2fa2368d3727a41c0e4f6cce42bd3a7e325b755e61ee902f6
-EBUILD xfce4-settings-4.12.3.ebuild 1559 BLAKE2B 04f03e9c2a56b9d3991f393fa69a1ec0005a0b3186fa81ea27b10df626dd511dbcdff4bcb2133a1373709ec87407e2fa230fa63ab4799693ec6654301ad5a014 SHA512 1ba5706abda0cffe26df6d739598899a0e5173a68df9974850aa87a6b0c8ad184913d27ae989e10e8edfc1496a3c71b758c3b9876a7a65db3becf8f66768faa1
+EBUILD xfce4-settings-4.12.0-r2.ebuild 1574 BLAKE2B f80894440d4d1844938468bd5e07648740edb6915f94dc96278f432dd25d0f2db72e11ab096f988bba0bd12063843832683c63ef2151da32509d0dc2c0c13cd6 SHA512 2202146f23073dc4c45b7bea405d6ff30407d13b926e00cbddc8a71ba41380471275832300c45ddd020d4b591e01cb5f908a9bfb565461ddf99b31ac989d587d
+EBUILD xfce4-settings-4.12.3.ebuild 1556 BLAKE2B ec9997731e51c8c2f8f09e5777490b0283505d7a7c96f0ce4be63df4900f004584bfd1db9f49800ed18991870b14420d1e6a4a338c7bc4ff71c82d4417f56742 SHA512 e767809abe9ac9980132a721338fcba97b8ba465fc28bed9a02d7b57c597170a56fe0e36c748e4948038f8c6dc1a2f9a5c4bf4311724905edd9b6e6bc3d47f7b
 EBUILD xfce4-settings-4.13.2.ebuild 1553 BLAKE2B e014eb160a0765e36b8625ec051fc1ef5014c9b836c42a2c91d27fd0fda90091a4e270cdd428fab64cfaa0d777c17ffb4dcdf887698b748283c0beb484d63bda SHA512 5a55273e2500f3a1a23f31dce9a1160cd6d21fd86a50508bc845b8f8de4df26f022de50c745b4a3fd296b77e53a5654c966021c5c886f0e1032c2fd25d4d50b6
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
index c951ca5884d8..2c95eaf7c41c 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
index 1a6651fff45d..1e76f4fc39ff 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index bc569a7cd5f0..520cbe3794fc 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,6 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
+EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B efb440814d76cda63c879f32a9476fe3982b649b80667acb909830259c83dcb154c189979244ea5764d4946cad6c90f9281716d2febdc6e34cf86c6c9ef737ad SHA512 be35dca28ac0c084195fc9f6ff6cd30634593cbe7f23437d352dca00428480b57bf2244830d76b39ff27632651f010753266f231002dbd45a5bc7138a6dd526f
 EBUILD xfconf-4.12.1.ebuild 1496 BLAKE2B d5f1e391025f6339da53bf505ccafc5bb29ea057d294134a0169541d8983ff3d780e9cd1d6c6cbb49fce41716b741920fbc8cfa103f86f9af817dc205e33a341 SHA512 9b5165e8d4246cba0eb0d3c37f1dbc363385bd14f24f06b4159cae98169c924a60563ba897ec6891bd860c8f93cc1ec67f154cae2158311a6b20bcc8a21d41db
 EBUILD xfconf-4.13.4.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
new file mode 100644
index 000000000000..d95b921ef80b
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit virtualx xdg-utils
+
+DESCRIPTION="A configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug perl"
+
+RDEPEND=">=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.30
+	>=xfce-base/libxfce4util-4.10
+	perl? (
+		dev-lang/perl:=[-build(-)]
+		dev-perl/glib-perl
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	perl? (
+		dev-perl/ExtUtils-Depends
+		dev-perl/ExtUtils-PkgConfig
+	)"
+
+src_configure() {
+	local myconf=(
+		$(use_enable perl perl-bindings)
+		$(use_enable debug checks)
+		--with-perl-options=INSTALLDIRS=vendor
+	)
+	[[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-visibility ) #366857
+
+	xdg_environment_reset
+	econf "${myconf[@]}"
+}
+
+src_prepare() {
+	# https://bugzilla.xfce.org/show_bug.cgi?id=9556
+	cat <<-EOF >> po/POTFILES.skip
+	xfconf-perl/xs/Xfconf.c
+	xfconf-perl/xs/XfconfBinding.c
+	xfconf-perl/xs/XfconfChannel.c
+	EOF
+
+	default
+}
+
+src_compile() {
+	emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+my_test() {
+	local out=$(./xfconfd/xfconfd --daemon) || return 1
+	eval "${out}"
+
+	local ret=0
+	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
+	nonfatal emake -j1 check || ret=1
+
+	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
+	return "${ret}"
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
+	fi
+}