gentoo resync : 06.08.2019

23 files changed, 42 insertions, 101 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 83005b16de30..851aeb9f1f99 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index d3bcd2315ba8..46fa5f50bdc4 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,7 +1,7 @@
 DIST garcon-0.6.2.tar.bz2 539745 BLAKE2B 1bcbb136cd525f1280f6539ea447b4b84f935297f6bd4391407e31925cf873fdd0cfbeb70dba5ce882e4620f1ce7b89d51c9c26232db88b1202f5a0fca3f6175 SHA512 7a96c33b47302fa989862098bc5b8ed64515a60e19a4b8dbb049398cf847d64584f93f85b1f6e1327653b22f0b44a805b737258bbc9ac69197639ef7f13f20b1
 DIST garcon-0.6.3.tar.bz2 538164 BLAKE2B 98c86491ba833fad261d1a759a33af7fbd69768e0b4a34f5712f2e0a5c8ea7734bdd984df925a50f1948e83e6f09a113e7acdadf428aca9d0aa8d0a764dc50de SHA512 1adc4373728ed19641441e0f38778d7401c78e7db52c76a258c378287c5a324e87e2aa11bca134813de4b1eaa807c62ccdf73a4c5e4d83d6acab27aafa61b5b0
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
-EBUILD garcon-0.6.2.ebuild 1031 BLAKE2B 0a045d8e14929a4b42b7c906369274bff0f526e803073181a86f510d754e5bb19bbb3241bf735dbc96574018a5f9a2ebc1eda77bb780cf4b7f0595075ba86c0f SHA512 f366daaafbaa129fadb059112ba76c044981a6830c0186a34d3edf71e3819c7453cba92f3307b24d4988dcfe257d6c7ecd58229868058adefae8b67edd6f5504
-EBUILD garcon-0.6.3.ebuild 1037 BLAKE2B 0495bcac8428d004ee7ae30ed448a5069eee65468f772a168400f5894dcd58f217e7a1fd9bfe04134ed423e9342ab5155bb79e2621a7cf742e5ae6d69b1c08f9 SHA512 7bcff58af4c0d8eaee7cb088444fe6a3586a076cc553a32885f0a242de1dc4063f7fd2d40c4bb60c24293ea1e1d4e476e292c45b8ff002711c7e29d9eba2e91e
-EBUILD garcon-0.6.4.ebuild 1037 BLAKE2B 0495bcac8428d004ee7ae30ed448a5069eee65468f772a168400f5894dcd58f217e7a1fd9bfe04134ed423e9342ab5155bb79e2621a7cf742e5ae6d69b1c08f9 SHA512 7bcff58af4c0d8eaee7cb088444fe6a3586a076cc553a32885f0a242de1dc4063f7fd2d40c4bb60c24293ea1e1d4e476e292c45b8ff002711c7e29d9eba2e91e
+EBUILD garcon-0.6.2-r1.ebuild 1040 BLAKE2B b58a61f8ce366705f214ebe1b0eb1169b9d585b51bad1435f314ce723f0bb27a20d5cde369711236c0685199c6fab811857a4c59b05b202b36b1bef7856d7a95 SHA512 221fc399d020e3e3975b96f04aefe2937a0aea4e7626651f22a110f2c7255c7e48136ff51e3dba40e1b208ce1a0009607f6d23e2f0b5e6410251aaf24fecbf4a
+EBUILD garcon-0.6.3.ebuild 1046 BLAKE2B 2b5a4cc52a54321e55b55656f836f8337c66f1c0a17ea69b5a44eb08625c0e9355304c0e46091356bf6c12dd0c81f3b7d25db5b0b58b18dbf5dc08f6ad0bb6f4 SHA512 8b84e4f00941586171be8fdf1a4dd023a87a2b9570bcb7d3dbaacc31ee93dad8ddb554e5db8a721aecd63ad90316941cff93d5f3fdd841dbb8fc405ce9e39f1b
+EBUILD garcon-0.6.4-r1.ebuild 1046 BLAKE2B 2b5a4cc52a54321e55b55656f836f8337c66f1c0a17ea69b5a44eb08625c0e9355304c0e46091356bf6c12dd0c81f3b7d25db5b0b58b18dbf5dc08f6ad0bb6f4 SHA512 8b84e4f00941586171be8fdf1a4dd023a87a2b9570bcb7d3dbaacc31ee93dad8ddb554e5db8a721aecd63ad90316941cff93d5f3fdd841dbb8fc405ce9e39f1b
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.6.2.ebuild b/xfce-base/garcon/garcon-0.6.2-r1.ebuild
index 821f2c9ab0cb..edf7baab9f21 100644
--- a/xfce-base/garcon/garcon-0.6.2.ebuild
+++ b/xfce-base/garcon/garcon-0.6.2-r1.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/xfce-base/garcon/garcon-0.6.3.ebuild b/xfce-base/garcon/garcon-0.6.3.ebuild
index b4bb94d0b25d..fe58837f910d 100644
--- a/xfce-base/garcon/garcon-0.6.3.ebuild
+++ b/xfce-base/garcon/garcon-0.6.3.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/xfce-base/garcon/garcon-0.6.4.ebuild b/xfce-base/garcon/garcon-0.6.4-r1.ebuild
index b4bb94d0b25d..fe58837f910d 100644
--- a/xfce-base/garcon/garcon-0.6.4.ebuild
+++ b/xfce-base/garcon/garcon-0.6.4-r1.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 7c483d5dfcb0..9a222ca3567a 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -3,5 +3,5 @@ DIST libxfce4ui-4.13.7.tar.bz2 738592 BLAKE2B e59727f05d4772a164ed097ad8629a7327
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 EBUILD libxfce4ui-4.13.4.ebuild 1723 BLAKE2B 698707c36f3a30b529171b1a28bd2718e2d4496222704c91c8b86c47098d2a33d0b0fbb0035cdfa371d4d469b9b79c0918d58aaed708a0e826a0fbdd7017b76f SHA512 d58835c325c64a905ee6d34a9647f2cc9c1691d096b99383b1d165dd1d4d4ac6b21b447e23fc64e13717ab957a2d3ebe93621a283acb4062ef411d3714181412
 EBUILD libxfce4ui-4.13.7.ebuild 1731 BLAKE2B 30d3994b8df3509a67c7244ed62d87169c68dfdafb98089d24939512b9dd9695b3833c006be5e297d6e129fe5183ecbae3fb86367ba303a0fb84dbaa5ae6e86a SHA512 4da02374411dd9bf12809deea135f97ce81da05f2a6c6c7be537cc1ffdd26195087d9ab6aa24efbffb840b703760f2388ec67c4a5775a835a8d6ebbb339144be
-EBUILD libxfce4ui-4.14.1.ebuild 1731 BLAKE2B 30d3994b8df3509a67c7244ed62d87169c68dfdafb98089d24939512b9dd9695b3833c006be5e297d6e129fe5183ecbae3fb86367ba303a0fb84dbaa5ae6e86a SHA512 4da02374411dd9bf12809deea135f97ce81da05f2a6c6c7be537cc1ffdd26195087d9ab6aa24efbffb840b703760f2388ec67c4a5775a835a8d6ebbb339144be
-MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
+EBUILD libxfce4ui-4.14.1.ebuild 1726 BLAKE2B cc9925fb5189c719d48e0eeaf718339ed733b1b87cb2b88c7fdb4fd99128308a90324bdf745d702dd32a14cbe0b0d339a08545d6c0c28458c806f20cf17da8e0 SHA512 677a0c3b1e82681f65704053c0bfbe7d46be063cf58d17543dd728141141eba0a360ab56f4a223bd95bdc8a05a2547d82db7c23003eb4f7455e8c965c5a4fe05
+MISC metadata.xml 422 BLAKE2B b6215119e3f826c198e24eca0a32f244fff44e185be8f17e9c568ea54cf5a40e102e48431539f4797bb07e6dcad1374fb1fe560b637be7864711000efd28dc4c SHA512 e66d13a060043bda0b9eb2c632e3564dc0c81fff21bf0e08725b0d95d7c43d6673147e7bd6752660731316d357d8ec8424b4ee82d4e851af8c5ff36222d43d10
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
index e44453634d38..a3d70f36e050 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
@@ -12,11 +12,11 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection startup-notification vala"
+IUSE="debug glade +gtk2 introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!gtk2? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-2.24:2=
 	>=x11-libs/gtk+-3.18:3=[introspection?]
 	x11-libs/libX11:=
 	x11-libs/libICE:=
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/glib-2.42:2=
 	>=xfce-base/libxfce4util-4.12:=[introspection?]
 	>=xfce-base/xfconf-4.12:=
 	glade? ( dev-util/glade:3.10= )
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	introspection? ( dev-libs/gobject-introspection:= )
 	startup-notification? ( x11-libs/startup-notification:= )
 	!xfce-base/xfce-utils"
@@ -41,11 +42,10 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable startup-notification)
 		$(use_enable vala)
-		# TODO: check revdeps and make it optional one day
-		--enable-gtk2
 		# requires deprecated glade:3 (gladeui-1.0), bug #551296
 		--disable-gladeui
 		# this one's for :3.10
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index f53823b4b9e2..c9c136a2dab2 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
+    <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index be58309ae257..d815d11b882e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -3,8 +3,8 @@ DIST Thunar-1.6.17.tar.bz2 1995398 BLAKE2B c6bc0ebc29cdf8b0d3d184fd5b5019bb6f4ca
 DIST Thunar-1.8.7.tar.bz2 2326995 BLAKE2B 2eceeedabc66ced9ced70089b2ce66932a2223f4c4f6a6ae624199c00552d3d0fbb98f1c67bb0408d99d4167172698ecc9d020117d7c5fd41363b543b768ef69 SHA512 d4faf28857ee7c29c799bec9c5d7c639596b213f2aeb1089125d074083a4a13e91425cf3f35c63ce313330ee9ef070653a868a1a4526dc443a5d603bd9dec588
 DIST Thunar-1.8.8.tar.bz2 2333563 BLAKE2B be9903ea0d468982d45fa702fcb792150f3c757992f6a561d0a8747b18aec0f9794432c33ad42477f7e0753a83439eba19bea6afc184d15f7170c561d74b19e3 SHA512 364ca63169e01e8d7fe26c300ec7a6b8fd6734a364c9d0dd8943caf9ba08d6721ffdcef4905f9fdabca0da74503b8cbc4995ce271b7a5f787ae4b96b87f6bf96
 DIST Thunar-1.8.9.tar.bz2 2375302 BLAKE2B e98659633b448e1d231e466c72741de71ce448ecf413a4f29df47acd78c9353a8cbc374961b6bb09d4d9d6ff4b98b81d575e987059999a742e30038a7c549604 SHA512 8e1bff80692ee22393a0c0cfa09178aa14cc476a058f406cab7ca873778ac4673cbac2d271f525a51e0120f1b17f8872c58407e8d7b77c6e67b721f4e5318f80
-EBUILD thunar-1.6.16.ebuild 1960 BLAKE2B c019fcce4664c75abe5ba4aabb7164171dbbbaa0e53eea7b210252e6333e3d0b9b3f81c0566dccff3d64e21e92dd487d673336af56246d85cfaf6dcb6cbc1e68 SHA512 5ba324097ce89ba71fc964277b3757a0e870767c87c06fa677a3509d5bd6949e0630b382a051459b03c0fa74d055ba7b67cff5ac5f8422d80e89773471c7cc04
-EBUILD thunar-1.6.17.ebuild 1972 BLAKE2B 2a95e601efc109fb0fb19992eefee63c5ffa83fb7bf7883071f08f58341903257d99321dc0593719b913e5e4f3347a3e51f30e7e9ed05e9d23fc3a45020ad37d SHA512 41f4ef5833d1436a188111a974a24ee7b3b957655d6287f6a09982f420a08bcc011dd50b6b419dcfc8a5ff296faba31c116f6d8d6cb84ff850907bdf6d99e9be
+EBUILD thunar-1.6.16-r1.ebuild 1969 BLAKE2B d4dea0da89421e4d0b8e34e0b03f7741293f2beda52f954a79899ab4b8591207261865f090d7a3bcb09afdfcd13a77fedf2cbe5dc60e8f4aaa47477fd98bd37f SHA512 b17c86fe25ee4bcc596e3a8fdc74e1651895eac3952de6dca9ee7e77fabc3baacc9f7dcb5f8af0dcf802960acfdf4d03a1eada0d1b4a54baad97f274fde1fc52
+EBUILD thunar-1.6.17.ebuild 1981 BLAKE2B 8543702254272adc4e1e9df108a6b3bcb3c231ca2aa3d4b2cccc0d53af92e39e07a8ed257df366cae8eed7d5534995b1b4455c64f40e39d3494f517e005f78ce SHA512 4b391f6a93113adae93446dffa7931b9cbe2592d01bfb16378bafe5de832f645a65f815924146b9561323088ddf61f93ae11debee1375dbdac0b2c9fefa09515
 EBUILD thunar-1.8.7.ebuild 1932 BLAKE2B 0adb8a03b12ba85b46117d9e9e8f50aa601fa9ab9ea1683056f6e215c041c714a62d586ee53dcc66edb47340450c3d6a47389401df061973331047f78a7b7a35 SHA512 1bc55bfafe5789ce04b4fecc88e0f4c1a5a04d0a68dfd46498cdbeafaa1e8e9c4d33078cc7288d07c7eaade869ef9a0fcbbd2321def520facad70450254d3af0
 EBUILD thunar-1.8.8.ebuild 1932 BLAKE2B 0adb8a03b12ba85b46117d9e9e8f50aa601fa9ab9ea1683056f6e215c041c714a62d586ee53dcc66edb47340450c3d6a47389401df061973331047f78a7b7a35 SHA512 1bc55bfafe5789ce04b4fecc88e0f4c1a5a04d0a68dfd46498cdbeafaa1e8e9c4d33078cc7288d07c7eaade869ef9a0fcbbd2321def520facad70450254d3af0
 EBUILD thunar-1.8.9.ebuild 1925 BLAKE2B fea768d4bc5e70fb339a98907d6c9c9fb15c9f78783c79a2b974d45a74688507df50399f31f98efa86b0f52e6fcd199566aa2f813bd8f5b409a3e4d84b51c9aa SHA512 17ae32c3972d9532a8a0555c22feddbaa36bc811f4d75c3dfd0aef6fc2cdf5d420cef943ede9300ca0e3727a75d8902dd79107fc83402c73caf1f9c18170fc57
diff --git a/xfce-base/thunar/thunar-1.6.16.ebuild b/xfce-base/thunar/thunar-1.6.16-r1.ebuild
index c209d3386cdd..7ee1cdf4239e 100644
--- a/xfce-base/thunar/thunar-1.6.16.ebuild
+++ b/xfce-base/thunar/thunar-1.6.16-r1.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=x11-libs/gdk-pixbuf-2.14:=
 	>=x11-libs/gtk+-2.24:2=
 	>=xfce-base/exo-0.10:=
-	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10.1:=
 	>=xfce-base/xfconf-4.10:=
 	dbus? ( >=dev-libs/dbus-glib-0.100:= )
diff --git a/xfce-base/thunar/thunar-1.6.17.ebuild b/xfce-base/thunar/thunar-1.6.17.ebuild
index 229f1f055f14..f713a39b8413 100644
--- a/xfce-base/thunar/thunar-1.6.17.ebuild
+++ b/xfce-base/thunar/thunar-1.6.17.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=x11-libs/gdk-pixbuf-2.14:=
 	>=x11-libs/gtk+-2.24:2=
 	<xfce-base/exo-0.12.5-r100:=
-	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10.1:=
 	>=xfce-base/xfconf-4.10:=
 	dbus? ( >=dev-libs/dbus-glib-0.100:= )
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 276d8b793b75..567a2c25e745 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -5,5 +5,5 @@ DIST xfce4-panel-4.14.0.tar.bz2 1291792 BLAKE2B 16cc35eba39440fd03ff0e55ed1750f5
 EBUILD xfce4-panel-4.12.2.ebuild 1491 BLAKE2B 12dab0bd4770c030e2ff4832d223c06d24da5947d324b0d7c0969fee86e70b7821cfc8bbfe8f6031f57c6f683b033a69c68d8b7c975d66ca78ca6890d9b537e1 SHA512 f1207ea0902c5288b81596959c93e0ff0d8a7026d122cf7750e79aa8eeb8c498df2bee5ca74f0dcb77e7c5ac206de6109d13f219da318661255dc8c566b8e8cf
 EBUILD xfce4-panel-4.13.6.ebuild 1332 BLAKE2B cf1d10ab77e93319b1d0e9e0112d40eb848c06d76ab26bdf41d6f9ed18b8709b827a85809c99d2a8d710c7aafb589552659ffabd5ac3c6ffe66d8cad401688a0 SHA512 76d6935c1d25abd10ae953770c2ce13ecc43c28c22d84ff2f53052f839bc0f40857699f7af3d5e7127365914fb46e57d14990b2459d71beff698f44fdf4d4e1f
 EBUILD xfce4-panel-4.13.7.ebuild 1492 BLAKE2B 1a50249d830963389f9f76e35f1c2b86b9be6e7c64373566ded2de7d63a54cf0c5fb4f5a0c8a8a29a11c844898c26514ec2f094ed321edf7b8bc18b443c0c9cc SHA512 992c9b8625b035f57a2d46a496a4bd90f8080d3228ed18b0a89415632f06d18ea84483c7757e8493273268c04ea2e09505f385acca727c3aa95a34a59b12b1b6
-EBUILD xfce4-panel-4.14.0.ebuild 1483 BLAKE2B cb8a24b95bc8cd96ea27b2968df471484598a7c15a89b45bbd0609ebf1574a8df53c3d4773a6855353bbea7660cc7dc0b0913aee71144b8d59114b62f6e122c5 SHA512 a72d1671ede58cde87d8b3d86ced803731beb279befb0ca535644ab8e6678da5aa9b206ba8e8b7763ca13770efe8168e26d66740995cdf0f309e10383ccbbea9
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
+EBUILD xfce4-panel-4.14.0.ebuild 1499 BLAKE2B 36a0768d8ee93c8fc33960e304662b52fba9f71c9123f364940ba4696c1c696ed6699fc4c32030182b49ed5220295eb1627754176763c5a501e22dbbeae304d3 SHA512 567f1f199e3f55f8a647d15497b7bc51e0fa53a904fd57be5bba0d57bee45212863a256b434bfbf2126aa2dd1084637c206529ce94e807a790ff9a2badfae96b
+MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/metadata.xml b/xfce-base/xfce4-panel/metadata.xml
index 359901b31db4..b307dd980e01 100644
--- a/xfce-base/xfce4-panel/metadata.xml
+++ b/xfce-base/xfce4-panel/metadata.xml
@@ -5,4 +5,7 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <use>
+    <flag name='gtk2'>Enable GTK+2 plugin support.</flag>
+  </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
index 0bba6eebc237..0598e0545e8d 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://archive.xfce.org/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-linux ~x86-linux ~x86-solaris"
-IUSE="introspection vala"
+IUSE="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!gtk2? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.42
 	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	x11-libs/libX11
 	x11-libs/libwnck:3
@@ -26,6 +26,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=xfce-base/libxfce4ui-4.13:=
 	>=xfce-base/libxfce4util-4.13:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
+	gtk2? ( >=x11-libs/gtk+-2.20:2 )
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
@@ -42,11 +43,9 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable vala)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
 	)
 
 	use vala && vala_src_prepare
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 10b9fc23c3c7..c0d13898ebec 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,9 +1,7 @@
 DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
-DIST xfce4-settings-4.13.7.tar.bz2 1177376 BLAKE2B 3d87347f46e5dcc9ab475a48b6a8c3c953948411f736e57172b200ac8548ebb2ec48b3142f3f37d932ace6c0106c2a2e94e5bfa6f194872ac4fe9060364b8844 SHA512 5fdabb05ba9a5fac7f093bee70f56d0c58f225c649d92071618bdd4c7a5443bc9ee9289878397d7223954a4b3e2533d7ff41b42bb85b5fdb7a69d7bbeb39958d
-DIST xfce4-settings-4.13.8.tar.bz2 1180208 BLAKE2B 179adb1393f474db7848acf15dc40885ba4fda64d4eda5c03a5d325d8bb393cda7bce34c6563cc48cb2bbf6f1206b37cf953a31057939da081178c9a57f8a8ad SHA512 b2f22c7ebe5519a4347e3c3b659e8d2d33fd0ea4c2e2f6edf91950130d555fb3cdbe6c6f17a1e3774468d30a210f327d4f982e0f10cecf0cf3ab68b86b0f4539
 DIST xfce4-settings-4.14.0.tar.bz2 1183972 BLAKE2B 6509deb01dcfab11cf31ca88a9b06a5a1f0a3a00968fccf6c9713482639c0c51e2b38337be6eff86c1edd900eb4ed22e44498b518996c01657e1f93d20b9ea89 SHA512 ab5979d24327e009e3641f75ba37dca7bb4f5bf8bc3a85da4c8355c3d07893b2dd81be1b616c75349e1e33d2fef774c099a47aedcd1bf10d8b245aa9418fe05b
-EBUILD xfce4-settings-4.12.4.ebuild 1493 BLAKE2B 7a741565d640cc17d286eeae654dc07265323fb93bad1c820faeb58abc838d4a72e122632e11b59fc30527a48fb7aa183f3457619168c1233e86fa322402d3ea SHA512 121539f24f69b6ce658dce85ff4c24de0afe7e116804188b83be24cb911af78ac3f42a2c18f884d4d91b581dffdb0896747ee4b2a1895d0b9734b99977ae89e2
-EBUILD xfce4-settings-4.13.7.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
-EBUILD xfce4-settings-4.13.8.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
+DIST xfce4-settings-4.14.1.tar.bz2 1187352 BLAKE2B 797b685e583a142f6f23a743233853c52a0247747e31d90bc0bb07103482fbf0495739493cfc19e738f8965834d18deeb1f28e6e85a11849165ef948df682607 SHA512 d854ca93199ce99d63e83ad38d654b86d883ebef5fb62a5c444f08b481df8f29a7ff27c60053c071e887be8d7ea0c51e9691a6209ca515a4e396e2c7405593b5
+EBUILD xfce4-settings-4.12.4-r1.ebuild 1502 BLAKE2B 4b6a3231b351286e5024d0f4b8394231e4193c21c41a9140f2777db1f6dc5b20bc615faa5ae9c64b952a78b4a28d6c3dad04b9ecdec16b6d61d1900aa9dd4f6a SHA512 a25a83bc8ee3dca0a21ced00437901e6917d8298bf584fa6fd761cc783fe6d791316f7cc3b378899f96c3662cb1e13442d975b2d4968c6da0abe8f31aa3ac6e5
 EBUILD xfce4-settings-4.14.0.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
+EBUILD xfce4-settings-4.14.1.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4-r1.ebuild
index dc8d924b72b2..bdba85f2b923 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=x11-libs/libXrandr-1.2
 	>=xfce-base/garcon-0.2
 	>=xfce-base/exo-0.8
-	>=xfce-base/libxfce4ui-4.11
+	>=xfce-base/libxfce4ui-4.11[gtk2(+)]
 	>=xfce-base/libxfce4util-4.11
 	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild
deleted file mode 100644
index 58f8d5568650..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/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-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.11
-	>=xfce-base/libxfce4ui-4.12
-	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.13
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.7.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
index 58f8d5568650..58f8d5568650 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.7.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 9c5b160b17e6..4ab12c3423a5 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,8 +4,8 @@ DIST xfdesktop-4.13.5.tar.bz2 1487498 BLAKE2B 3884cba5da1798470462ac3b49537ff3db
 DIST xfdesktop-4.13.6.tar.bz2 1487655 BLAKE2B 288d37e316a13dc7de4ab5964344ac4dbd181719f2d4212e87da797095fd58893a7ff599c7614197ac268c0eae09dfc52b5108039bff45be829c64a71f0913c6 SHA512 260d228439a5ba12b6f5e7ed7f165c5668279a27399f51447ca8a8c493293bbc4fda817d797c0122d1a3e367a4c30f8cd607793225ce22007003705b2fc7a368
 DIST xfdesktop-4.14.0.tar.bz2 1517996 BLAKE2B 8e5938e5ca42b29336a31cd362168d45f5ab23bb2a3e85e1ed808c2058fdb856940fde100babb333e902e51be8451b55233cc315767d8216d6d58dc790bbd4e9 SHA512 c5b61bfdeb2e2d0ff46aa01da561c2a7730044f91e0a3d978861569be3a71c001fd8c13f04cde738515ae5b4af7dcd7749ad5c9ca66677acca2aee8177bdd408
 DIST xfdesktop-4.14.1.tar.bz2 1533788 BLAKE2B ea43c57dc9439b5b4799d3859b28287e7cc807a488d57f79ba83424fc1d5257eba6b2d8f9aa712aef68f8aa81d296376fd3ab507cb90566b0b76aab92665c117 SHA512 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c
-EBUILD xfdesktop-4.12.4.ebuild 1292 BLAKE2B c2211f31ba0d9462f60839dfc2c75b0caeadede66dff7ed70d881ebe4beac4b9c0af31677e9b5960a9d2b12be9fa368964c313e82dc6c5a5aa6b77d89bcf30fc SHA512 4b392b50d8ab465436675c341450f5e60b479d79bc65904e9d2c94105855bfa2a629b4ff4f0dd7ba6da9884104554e4a1eb1cc27bc7a17497bb3a1f88e0f4ab4
-EBUILD xfdesktop-4.12.5.ebuild 1298 BLAKE2B 1a4bf3f0ea5ac49d15c9ca13d001bd902356871365982b4cbc52b90dd691b62aa08ec8bbc2a3d4085e3f028645df9bd8aa80cd055f54125b6944c83221f80e13 SHA512 718a8e49724226f258d59d1723d1cbac294742cffd1ee751d4096797dab984d06c4918119c93078289929de267bcc60446f94fab9c60d3f5697daaa680118c35
+EBUILD xfdesktop-4.12.4.ebuild 1301 BLAKE2B 9743058596fd0eb82beeabac53cec07a018d329b547c4a23a2113f8276559acd8b6b1cffcc69e1827470a75ae78d40fc7a875f87949a9325a2b35c213a1df8ee SHA512 8d4e334b64f57d444d8a87fd15376fda081e17e67edf81442a974799f5f7cc50a7b69cf5acb3c42214ce176076fd79135e7001ad1731d876f1c91ed4a2eec1b8
+EBUILD xfdesktop-4.12.5-r1.ebuild 1307 BLAKE2B 732164bef191d09c431508a556832642beec9e164e2640548a04dcc823d8854042cf689d4bde7023762f374e2127c7487defcf3a973f89a184ec027990fc4b7d SHA512 4d9b204fb5b4fbb9f28edad7306ccd1651fd73ff5c9451ffa3945d2639e02b5c001fe4e62fc95a64b3bb12740275abed823f64b509559b8a10e90dcdc3e87ed1
 EBUILD xfdesktop-4.13.5.ebuild 1205 BLAKE2B 918e7f761f6fb4f352ac071b3603512a96606f75fbb0013b5fc9dec0e0e3d3e5e902e52a99136b5d8cceb5b90a523d4af5ce089c354a48def90e219302250c68 SHA512 cce19e056dd3c0717711aa7910084b7d17528f74bfd5ef3f730e9ac2733872796549635b557a1c463145fa4f5ba8ad824cb7d27814cd40e218e9767e1ebbc82b
 EBUILD xfdesktop-4.13.6.ebuild 1196 BLAKE2B d7ee78521f5ea42d85ec1dfc1ecc6a9cccee1c8cd08d5e3c4f338c9ed37046c343f314a0ae7d9cfd177ae8431fc6bde1a89b0434afc6890399a981ec955989a4 SHA512 98c869bcc9a5db228574dc5ead19be41ad39a8b172e31ecad6d27d6099ca70eba5ad89897b97257e4ac532cd934e2f9ceb82f7621be1fcd9baad6db16287ba75
 EBUILD xfdesktop-4.14.0.ebuild 1159 BLAKE2B 9710bdba5d04fd07da725d74fcbd11fb1945e07d89fab578a7f51ca1c1324d364ffd681f8f05b21fa952622628745e82bcbd76bb4c36394d668f55e736f48b7e SHA512 f25e60e9255995e18cb995c93f5275c5811bb5dda1447485b215a7b4c23e702967164445b45e8ea138080a90f37f8921a48dd4abb854dff847ae6374a3ad18c1
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
index 40b9614aeb97..58c055d5681b 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/cairo-1.6:=
 	x11-libs/libX11:=
 	>=xfce-base/exo-0.8:=
 	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.11:=
 	>=xfce-base/xfconf-4.10:=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.5.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.5-r1.ebuild
index 1eb489b1c328..8334da4176c9 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.5.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.5-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/cairo-1.6:=
 	x11-libs/libX11:=
 	<xfce-base/exo-0.12.5-r100:=
 	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.11:=
 	>=xfce-base/xfconf-4.10:=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 6c328c8c3eb4..0719305abc55 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,7 +2,7 @@ DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c7461
 DIST xfwm4-4.13.3.tar.bz2 1143136 BLAKE2B 3d39b9313e97350c8c914b772262be83aa87255521dfde3f9f57a669e855c31824b717a617d7cf6f0b858b6611475dbe256dec5c1708b967e114f4d3cff87f79 SHA512 cbd410c9a5a997be6582c9bcd0af879be2c6e5b5362c0e950bb1281b4d2f4a1acbf40b3da88fb8dea3b22f491b69bc3c6df4f75c09c8c36cf9c76a02b528785a
 DIST xfwm4-4.13.4.tar.bz2 1144261 BLAKE2B 70b54f0393008706bec4dc2e763bd089908ebffed98ee33b85901d99bdf4de325e31525c1e21a50615318b3558d78808f54e7831cc055d5bdea262e34a098b28 SHA512 a4adbd5212ed34f8877adbe43c12edb17372ad871d34ad844a3c64c647f8c2fd3d8b9e44e7e09e12508bfc92837b32116fae7416b9c16d4f430f2fadcb2b845a
 DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c SHA512 27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
-EBUILD xfwm4-4.12.5.ebuild 1539 BLAKE2B 967e753803115f0545775bc70444053bfc897f96e503f8a2e293ff071cb3ebb489e28d876fe6ea5a244e3cf26b36524f11a68a6db5373728932547fdf15941fe SHA512 5152c475ef58719200b3ee1636bacfe72f31712bf7b2ca929e968c2150012cf38c5ad58c374d4e019f81150b63e7230de6c0a3addefdfc71c23f77eaf1973df6
+EBUILD xfwm4-4.12.5-r1.ebuild 1548 BLAKE2B 74e15a4c8873e0ae8f51bbf21e18176337caa0a58256af7d107c78348de4cfb1a98ad944ff960cc822defc7d42f52963fe3ff96021d5890172357498e63fa2e9 SHA512 4adc5ae9ba1f7ba320c2877bf8a538fdce30475bbea0fc74e4b3954b4240713365af4f2f00e4c97358949a1c3b8eb70fab95cce5ce2eb30345330e58a1255874
 EBUILD xfwm4-4.13.3.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
 EBUILD xfwm4-4.13.4.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
 EBUILD xfwm4-4.14.0.ebuild 1676 BLAKE2B 2fc382f1266ff35925f45550d491b4a797401abddff0670be344eb815e54c75e67230597b77110380c2c5921eac8d6a837fdeae2fb34bda3f68b88c1dce09115 SHA512 8875b2c34f02fec9396aa0a7c780f0aa470193dfb5b63407700461f6bfe4bebdf23dbb22d2b549c111b5937b39305298e9ddf393d8474a8850b424f9612244aa
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5-r1.ebuild
index 1edd28d357d9..c320a367906c 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.5-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-libs/dbus-glib:=
 	x11-libs/pango:=
 	>=x11-libs/libwnck-2.30:1=
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
 	>=xfce-base/xfconf-4.10:=
 	startup-notification? ( x11-libs/startup-notification:= )
 	xcomposite? (