summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /xfce-base
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/exo/Manifest2
-rw-r--r--xfce-base/exo/exo-0.10.2-r1.ebuild40
-rw-r--r--xfce-base/exo/exo-0.10.6-r1.ebuild38
-rw-r--r--xfce-base/exo/exo-0.10.6.ebuild38
-rw-r--r--xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch52
-rw-r--r--xfce-base/exo/metadata.xml8
-rw-r--r--xfce-base/garcon/Manifest2
-rw-r--r--xfce-base/garcon/garcon-0.2.1.ebuild31
-rw-r--r--xfce-base/garcon/garcon-0.5.0-r1.ebuild34
-rw-r--r--xfce-base/garcon/garcon-0.5.0-r2.ebuild34
-rw-r--r--xfce-base/garcon/metadata.xml8
-rw-r--r--xfce-base/libxfce4ui/Manifest2
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-4.10.0.ebuild45
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild46
-rw-r--r--xfce-base/libxfce4ui/metadata.xml12
-rw-r--r--xfce-base/libxfce4util/Manifest2
-rw-r--r--xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild32
-rw-r--r--xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild32
-rw-r--r--xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild32
-rw-r--r--xfce-base/libxfce4util/metadata.xml8
-rw-r--r--xfce-base/libxfcegui4/Manifest1
-rw-r--r--xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch14
-rw-r--r--xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild43
-rw-r--r--xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild42
-rw-r--r--xfce-base/libxfcegui4/metadata.xml11
-rw-r--r--xfce-base/metadata.xml32
-rw-r--r--xfce-base/thunar/Manifest2
-rw-r--r--xfce-base/thunar/metadata.xml8
-rw-r--r--xfce-base/thunar/thunar-1.6.10-r1.ebuild69
-rw-r--r--xfce-base/thunar/thunar-1.6.10.ebuild73
-rw-r--r--xfce-base/thunar/thunar-1.6.3.ebuild72
-rw-r--r--xfce-base/xfce4-appfinder/Manifest2
-rw-r--r--xfce-base/xfce4-appfinder/metadata.xml8
-rw-r--r--xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild36
-rw-r--r--xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild36
-rw-r--r--xfce-base/xfce4-meta/metadata.xml8
-rw-r--r--xfce-base/xfce4-meta/xfce4-meta-4.10.ebuild28
-rw-r--r--xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild28
-rw-r--r--xfce-base/xfce4-panel/Manifest2
-rw-r--r--xfce-base/xfce4-panel/metadata.xml8
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild42
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild44
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild44
-rw-r--r--xfce-base/xfce4-session/Manifest2
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch15
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.10.1-systemd.patch400
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch448
-rw-r--r--xfce-base/xfce4-session/metadata.xml8
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild71
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild71
-rw-r--r--xfce-base/xfce4-settings/Manifest2
-rw-r--r--xfce-base/xfce4-settings/metadata.xml13
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild51
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild53
-rw-r--r--xfce-base/xfconf/Manifest2
-rw-r--r--xfce-base/xfconf/metadata.xml8
-rw-r--r--xfce-base/xfconf/xfconf-4.10.0.ebuild65
-rw-r--r--xfce-base/xfconf/xfconf-4.12.0-r1.ebuild67
-rw-r--r--xfce-base/xfdesktop/Manifest3
-rw-r--r--xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch31
-rw-r--r--xfce-base/xfdesktop/metadata.xml11
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.10.2.ebuild47
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild49
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild49
-rw-r--r--xfce-base/xfwm4/Manifest2
-rw-r--r--xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch17
-rw-r--r--xfce-base/xfwm4/metadata.xml8
-rw-r--r--xfce-base/xfwm4/xfwm4-4.10.1.ebuild53
-rw-r--r--xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild64
-rw-r--r--xfce-base/xfwm4/xfwm4-4.12.3.ebuild60
70 files changed, 2821 insertions, 0 deletions
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
new file mode 100644
index 00000000000..10a905f9b0b
--- /dev/null
+++ b/xfce-base/exo/Manifest
@@ -0,0 +1,2 @@
+DIST exo-0.10.2.tar.bz2 1209633 SHA256 b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce SHA512 91a5a7f7b893c427ef10ee6ce248a6b6f8e2aba4281e406a60bc8fe7fa50196eb79d8b0ad6609ab48371acf77425df8cb67124ab11b7c4ff08d1dc83bb180eae WHIRLPOOL 65007fd57a585da8a4ae05af7560e3bcf2a35e08f4e652fd0a9d56ffa5d8505df6de383bf1c648453f14f686f9d455c3d893ec6b01de4adc86e79e75489fc999
+DIST exo-0.10.6.tar.bz2 1276178 SHA256 1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752 SHA512 be537145ea0f0ea87566908f3ed4850ee3b20caf292d27dd752a9eaba7047598b585b398c2a6e4c925d832b5b2f76e0b9cc763ee3c955f08d47c6ac8bf3a2805 WHIRLPOOL 8daa7a8021faea4b87a5204d2a6604fde732efd183aa3d7404b6b0b52444edbceab28ac636a254f145c705689baa3996a4ccd39256edd4a3ae148b7b40dc9034
diff --git a/xfce-base/exo/exo-0.10.2-r1.ebuild b/xfce-base/exo/exo-0.10.2-r1.ebuild
new file mode 100644
index 00000000000..b514894d27c
--- /dev/null
+++ b/xfce-base/exo/exo-0.10.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session support for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30
+ dev-perl/URI
+ >=x11-libs/gtk+-2.24:2
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/libxfce4util-4.10"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${P}-exo_str_looks_like_an_uri.patch )
+
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}
diff --git a/xfce-base/exo/exo-0.10.6-r1.ebuild b/xfce-base/exo/exo-0.10.6-r1.ebuild
new file mode 100644
index 00000000000..62047f3a6f5
--- /dev/null
+++ b/xfce-base/exo/exo-0.10.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session support for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30:=
+ dev-perl/URI
+ >=x11-libs/gtk+-2.24:2=
+ >=xfce-base/libxfce4ui-4.10:=
+ >=xfce-base/libxfce4util-4.10:="
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(xfconf_use_debug)
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}
diff --git a/xfce-base/exo/exo-0.10.6.ebuild b/xfce-base/exo/exo-0.10.6.ebuild
new file mode 100644
index 00000000000..556bc8a7d1a
--- /dev/null
+++ b/xfce-base/exo/exo-0.10.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session support for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30:=
+ dev-perl/URI
+ >=x11-libs/gtk+-2.24:2=
+ >=xfce-base/libxfce4ui-4.10:=
+ >=xfce-base/libxfce4util-4.10:="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}
diff --git a/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch b/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch
new file mode 100644
index 00000000000..9c813745691
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch
@@ -0,0 +1,52 @@
+http://bugs.gentoo.org/466144
+
+From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@gmail.com>
+Date: Sat, 18 May 2013 22:50:01 -0500
+Subject: Fix exo_str_looks_like_an_uri() (bug #10098).
+
+Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to
+fix a hang in thunar by properly recognizing that 'http:' is not an URI,
+however, while doing so, it broke proper URIs like 'magnet:foo'.
+
+As the RFC clearly states:
+
+ The following are two example URIs and their component parts:
+
+ foo://example.com:8042/over/there?name=ferret#nose
+ \_/ \______________/\_________/ \_________/ \__/
+ | | | | |
+ scheme authority path query fragment
+ | _____________________|__
+ / \ / \
+ urn:example:animal:ferret:nose
+
+But even with this succinct example exo_str_looks_like_an_uri() fails.
+
+There is an easy solution; fail only when component part is missing
+('urn:'), but succeed otherwise.
+
+This solution fixes 'magnet:foo', and doesn't break the current
+expectation from thunar that 'http:' should fail, having the best of
+both worlds.
+
+[1] http://www.ietf.org/rfc/rfc3986.txt
+
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+
+diff --git a/exo/exo-string.c b/exo/exo-string.c
+index 33f86f9..056b36a 100644
+--- a/exo/exo-string.c
++++ b/exo/exo-string.c
+@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str)
+ for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s);
+
+ /* <scheme> must be followed by ":" */
+- return (*s == ':' && *(s+1) == '/');
++ return (*s == ':' && *(s+1) != '\0');
+ }
+
+ return FALSE;
+--
+cgit v0.10.1
+
diff --git a/xfce-base/exo/metadata.xml b/xfce-base/exo/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/exo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
new file mode 100644
index 00000000000..9cd3953b842
--- /dev/null
+++ b/xfce-base/garcon/Manifest
@@ -0,0 +1,2 @@
+DIST garcon-0.2.1.tar.bz2 454321 SHA256 48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7 SHA512 2ef784419e58ef3bffef94061735fcf814fb313d16c6bed4d3a1aa86982fccce8ba582b708ff19260c80708fa132b789b4dc81963193484320c86ab3f0d7b003 WHIRLPOOL ff64b1c2f7c62b27e8c03ba13824d8f4d04215a60c794c39b43e6bfe591d80b9a39d4f1ea03f10692daa8a75af6726ce78ac12cd676ff368bb93561da5e77ca0
+DIST garcon-0.5.0.tar.bz2 456940 SHA256 4cc933bb773e3194a0cce188c7a38da8a72e33871635113917eff81bfc98f9c9 SHA512 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5 WHIRLPOOL 9761fbf8a48e483b60bc84d3a1a6cc7b7af270e067a15d5f9b7c801f864467163c4ec02c88c9a81fa67e80d0adaa2439b95e30164dac8f785e769db25ccdbfd3
diff --git a/xfce-base/garcon/garcon-0.2.1.ebuild b/xfce-base/garcon/garcon-0.2.1.ebuild
new file mode 100644
index 00000000000..2a949e308eb
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="http://www.xfce.org/projects/libraries/"
+SRC_URI="mirror://xfce/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.14
+ >=xfce-base/libxfce4util-4.10.1"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+}
diff --git a/xfce-base/garcon/garcon-0.5.0-r1.ebuild b/xfce-base/garcon/garcon-0.5.0-r1.ebuild
new file mode 100644
index 00000000000..eb37c7d48bc
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.5.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="http://www.xfce.org/projects/libraries/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+ >=x11-libs/gtk+-2.24:2=
+ >=x11-libs/gtk+-3.14:3=
+ >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)]
+ >=xfce-base/libxfce4util-4.11:="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+}
diff --git a/xfce-base/garcon/garcon-0.5.0-r2.ebuild b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
new file mode 100644
index 00000000000..cfe13d344f2
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="http://www.xfce.org/projects/libraries/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+ >=x11-libs/gtk+-2.24:2=
+ >=x11-libs/gtk+-3.14:3=
+ >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)]
+ >=xfce-base/libxfce4util-4.11:="
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+}
diff --git a/xfce-base/garcon/metadata.xml b/xfce-base/garcon/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/garcon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
new file mode 100644
index 00000000000..ec24790717f
--- /dev/null
+++ b/xfce-base/libxfce4ui/Manifest
@@ -0,0 +1,2 @@
+DIST libxfce4ui-4.10.0.tar.bz2 545486 SHA256 a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2 SHA512 18de63f3198480730460d93bbe10c17bb64cd115cfc3878be3e1c800e209f5bf1a7441b4661e7c09fc6109b76791c952a7792eac0c2b846827a89e3ddfb2292e WHIRLPOOL 80e2b724805b3bfd120c4e8f6e9fff1ae9a1829b4033e7370806ec4ad95ed79410d8c67b0d57b0095c1bac3ed4d0843fdeddcb86f574e83873392b07b52834a2
+DIST libxfce4ui-4.12.1.tar.bz2 665624 SHA256 3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43 SHA512 9d132a81bc3385b6582c2d97ed7a1fc0ea289d9098cc4c3a7fb523329eb6afb18716bcf98a5832c4484794eb7a2be4242fa2e71083cd5e55cb19e3b8003458a8 WHIRLPOOL bfc23f795755af6dc7a0ea947dfc931c3dc8eaa64d73303361d0be8cad77d5a9206d349551995de8a291281270564ed54f947f4c56285f7bc8ae91dfbfdd538d
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.10.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.10.0.ebuild
new file mode 100644
index 00000000000..516b066f7f8
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Unified widgets and session management libraries for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/libxfce4"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade startup-notification"
+
+RDEPEND=">=dev-libs/glib-2.24
+ >=x11-libs/gtk+-2.20:2
+ x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/xfconf-4.10
+ glade? ( dev-util/glade:3 )
+ startup-notification? ( x11-libs/startup-notification )
+ !xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable startup-notification)
+ $(use_enable glade gladeui)
+ $(xfconf_use_debug)
+ --with-vendor-info=Gentoo
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
new file mode 100644
index 00000000000..7d814884bbe
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Unified widgets and session management libraries for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/libxfce4"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug +gtk3 startup-notification"
+
+RDEPEND=">=dev-libs/glib-2.30:2=
+ >=x11-libs/gtk+-2.24:2=
+ x11-libs/libX11:=
+ x11-libs/libICE:=
+ x11-libs/libSM:=
+ >=xfce-base/libxfce4util-4.12:=
+ >=xfce-base/xfconf-4.12:=
+ gtk3? ( >=x11-libs/gtk+-3.2:3= )
+ startup-notification? ( x11-libs/startup-notification:= )
+ !xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable startup-notification)
+ $(use_enable gtk3)
+ $(xfconf_use_debug)
+ # requires deprecated glade:3 (gladeui-1.0), bug #551296
+ --disable-gladeui
+ --with-vendor-info=Gentoo
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
new file mode 100644
index 00000000000..d2638716d72
--- /dev/null
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+ <use>
+ <flag name='glade'>Build support for Glade 3's GtkBuilder implementation</flag>
+ <flag name='gtk3'>Enable gtk3 support</flag>
+ </use>
+</pkgmetadata>
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
new file mode 100644
index 00000000000..4a154450816
--- /dev/null
+++ b/xfce-base/libxfce4util/Manifest
@@ -0,0 +1,2 @@
+DIST libxfce4util-4.10.1.tar.bz2 453499 SHA256 e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb SHA512 5b8f1ddcd1cb84fc298ab1088644109aa720b04adfec4cf31c1bc2815baaf3e4771b6481f1cf2630f3b27a4d7a7178a9b6c464076c23ad8b514172c20852e770 WHIRLPOOL b3a5215cd12fd70fa0dbc4515ffd20a0355e48baeaa2bebb8d70349cf4d43e63d5fef30aa8a4266269b3e9980e298599709eed5e4c31c0e935764d6c71d2a3ec
+DIST libxfce4util-4.12.1.tar.bz2 455329 SHA256 876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d SHA512 0bd0fe23e9fa325b08559d2b783242dfc61412a8c7aa4e5a81e5262ebceb57a722aa515db12747c9de9804423f67e50805848e5bed328ba7d17e2737f54c2ef9 WHIRLPOOL ad08469f8246a439df7474d58cb41b1d2c278b7c2097e7a60dbc14a8dae10f63ea2e4c3ba910dbb57716bfb40c3d757fe2084efcf416cd32b524d391bfa313af
diff --git a/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild
new file mode 100644
index 00000000000..bd9edf78d19
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.24"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild
new file mode 100644
index 00000000000..a996e66c3eb
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/7"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.24"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-util/gtk-doc-am
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild
new file mode 100644
index 00000000000..9918b4975b6
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/7"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.24"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}
diff --git a/xfce-base/libxfce4util/metadata.xml b/xfce-base/libxfce4util/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/libxfce4util/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
new file mode 100644
index 00000000000..ebdd7fa89c8
--- /dev/null
+++ b/xfce-base/libxfcegui4/Manifest
@@ -0,0 +1 @@
+DIST libxfcegui4-4.10.0.tar.bz2 691012 SHA256 2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533 SHA512 32fe3be287c84d1816154c7632a87025324c2cb9d9524ef3d7813c3b3619ca04e4b70aeb47a3e0fb59090e43e124476988774a0dc5186ebc1a0ccdfe635cbb45 WHIRLPOOL 7390c5d36bf2e3bdea6a8c7de4f9471be9f434e99a250c8925de8ae7fa69f307c43b029d52417118bf49764c0834cfb6b039320846b83488cb8d39ca79cc2e15
diff --git a/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch b/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch
new file mode 100644
index 00000000000..ffb2160827c
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/513568
+http://bugzilla.xfce.org/show_bug.cgi?id=10974
+
+--- libxfcegui4/xfce-exec.c
++++ libxfcegui4/xfce-exec.c
+@@ -79,7 +79,7 @@
+ #ifndef G_OS_WIN32
+ gchar *dpyname = user_data;
+
+- xfce_setenv ("DISPLAY", dpyname, TRUE);
++ g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
new file mode 100644
index 00000000000..def0b07cc6d
--- /dev/null
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A compability library for unported Xfce 4.6 plugins (DEPRECATED)"
+HOMEPAGE="http://wiki.gentoo.org/wiki/No_homepage http://git.xfce.org/archive/libxfcegui4/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+IUSE="glade startup-notification"
+
+RDEPEND="gnome-base/libglade
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/gtk+-2.10:2
+ >=xfce-base/libxfce4util-4.10
+ glade? ( dev-util/glade:3 )
+ startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${P}-no-xfce_setenv.patch )
+
+ XFCONF=(
+ --disable-static
+ $(use_enable startup-notification)
+ $(use_enable glade gladeui)
+ --with-html-dir="${EPREFIX}"/deprecated
+ )
+}
+
+src_install() {
+ xfconf_src_install
+ rm -rf "${ED}"/deprecated
+}
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
new file mode 100644
index 00000000000..b5f774cfe42
--- /dev/null
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A compability library for unported Xfce 4.6 plugins (DEPRECATED)"
+HOMEPAGE="http://wiki.gentoo.org/wiki/No_homepage http://git.xfce.org/archive/libxfcegui4/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+IUSE="glade startup-notification"
+
+RDEPEND="gnome-base/libglade
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/gtk+-2.10:2
+ >=xfce-base/libxfce4util-4.10
+ <xfce-base/libxfce4util-4.11
+ glade? ( dev-util/glade:3 )
+ startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --disable-static
+ $(use_enable startup-notification)
+ $(use_enable glade gladeui)
+ --with-html-dir="${EPREFIX}"/deprecated
+ )
+}
+
+src_install() {
+ xfconf_src_install
+ rm -rf "${ED}"/deprecated
+}
diff --git a/xfce-base/libxfcegui4/metadata.xml b/xfce-base/libxfcegui4/metadata.xml
new file mode 100644
index 00000000000..b7d7565e58d
--- /dev/null
+++ b/xfce-base/libxfcegui4/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+ <use>
+ <flag name="glade">Build glade bindings</flag>
+ </use>
+</pkgmetadata>
diff --git a/xfce-base/metadata.xml b/xfce-base/metadata.xml
new file mode 100644
index 00000000000..e644786f8d3
--- /dev/null
+++ b/xfce-base/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The xfce-base category contains base XFCE packages.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie XFCE enthält die Basispakete des XFCE-Desktops.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría xfce-base contiene los paquetes base de XFCE.
+ </longdescription>
+ <longdescription lang="ja">
+ xfce-baseカテゴリーにはXFCEのコア・パッケージが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De xfce-base categorie bevat de basispakketten van XFCE.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm xfce-base chứa các gói XFCE cơ sở.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria xfce-base contiene i pacchetti essenziali di XFCE.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria xfce-base contém pacotes de base de XFCE.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria xfce-base zawiera podstawowe pakiety środowiska XFCE.
+ </longdescription>
+</catmetadata>
+
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
new file mode 100644
index 00000000000..4f013ead8fe
--- /dev/null
+++ b/xfce-base/thunar/Manifest
@@ -0,0 +1,2 @@
+DIST Thunar-1.6.10.tar.bz2 1948762 SHA256 7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a SHA512 56f9407907c85a631b390b6bf363ee863b5a126afc32e1b10e34434b997e82b86223737a0b0a1a8faf801258ad1cfa0585c9c3537c167f6968a2c4dac458395a WHIRLPOOL 813e3a1628227fbe27d221739e4946aa38b147ff4b165ff915b6a57b38ae544f54dc8facf19af0519fac5e903924459a34b6372c42985ed00e997e02434f4b71
+DIST Thunar-1.6.3.tar.bz2 1983127 SHA256 9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d SHA512 17ff9c416a11cef2def6c2f2e1623bcfe480131aa466d55c06f81772781178f6d4bab431d9906be58e391c86f2ab0c7096728961643e2091d6ab785188490382 WHIRLPOOL 68590950513fe60a1b03fea08b4fb6d5bb4494373b27076e524d12fd3af62cd81e57818f3df8b1e15c247aba038a5b4472e0222c07203b7826267c5ae7bc469f
diff --git a/xfce-base/thunar/metadata.xml b/xfce-base/thunar/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/thunar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/thunar/thunar-1.6.10-r1.ebuild b/xfce-base/thunar/thunar-1.6.10-r1.ebuild
new file mode 100644
index 00000000000..4337332cdcd
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.10-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit virtualx xfconf
+
+MY_P=${P/t/T}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/ http://thunar.xfce.org/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus debug exif libnotify pcre test udisks +xfce_plugins_trash"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30:=
+ >=x11-libs/gdk-pixbuf-2.14:=
+ >=x11-libs/gtk+-2.24:2=
+ >=xfce-base/exo-0.10:=
+ >=xfce-base/libxfce4ui-4.10:=
+ >=xfce-base/libxfce4util-4.10.1:=
+ >=xfce-base/xfconf-4.10:=
+ dbus? ( >=dev-libs/dbus-glib-0.100:= )
+ exif? ( >=media-libs/libexif-0.6.19:= )
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ pcre? ( >=dev-libs/libpcre-6:= )
+ udisks? ( virtual/libgudev:= )
+ xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10:= )"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/desktop-file-utils-0.20-r1
+ x11-misc/shared-mime-info
+ dbus? ( ${GVFS_DEPEND} )
+ udisks? (
+ virtual/udev
+ ${GVFS_DEPEND}[udisks,udev]
+ )
+ xfce_plugins_trash? ( ${GVFS_DEPEND} )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+REQUIRED_USE="xfce_plugins_trash? ( dbus )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable dbus)
+ $(use_enable udisks gudev)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ $(use_enable exif)
+ $(use_enable pcre)
+ )
+
+ use xfce_plugins_trash || XFCONF+=( --disable-tpa-plugin )
+
+ DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/xfce-base/thunar/thunar-1.6.10.ebuild b/xfce-base/thunar/thunar-1.6.10.ebuild
new file mode 100644
index 00000000000..e0e6d904228
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit virtualx xfconf
+
+MY_P=${P/t/T}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/ http://thunar.xfce.org/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus debug exif libnotify pcre test udisks +xfce_plugins_trash"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30:=
+ >=x11-libs/gdk-pixbuf-2.14:=
+ >=x11-libs/gtk+-2.24:2=
+ >=xfce-base/exo-0.10:=
+ >=xfce-base/libxfce4ui-4.10:=
+ >=xfce-base/libxfce4util-4.10.1:=
+ >=xfce-base/xfconf-4.10:=
+ dbus? ( >=dev-libs/dbus-glib-0.100:= )
+ exif? ( >=media-libs/libexif-0.6.19:= )
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ pcre? ( >=dev-libs/libpcre-6:= )
+ udisks? ( virtual/libgudev:= )
+ xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10:= )"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/desktop-file-utils-0.20-r1
+ x11-misc/shared-mime-info
+ dbus? ( ${GVFS_DEPEND} )
+ udisks? (
+ virtual/udev
+ ${GVFS_DEPEND}[udisks,udev]
+ )
+ xfce_plugins_trash? ( ${GVFS_DEPEND} )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+REQUIRED_USE="xfce_plugins_trash? ( dbus )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable dbus)
+ # no code uses this, it's all in libxfce4ui now
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11837
+ --disable-startup-notification
+ $(use_enable udisks gudev)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ $(use_enable exif)
+ $(use_enable pcre)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ use xfce_plugins_trash || XFCONF+=( --disable-tpa-plugin )
+
+ DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/xfce-base/thunar/thunar-1.6.3.ebuild b/xfce-base/thunar/thunar-1.6.3.ebuild
new file mode 100644
index 00000000000..ceea193badd
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit virtualx xfconf
+
+MY_P=${P/t/T}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/ http://thunar.xfce.org/"
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus debug exif libnotify pcre startup-notification test udisks +xfce_plugins_trash"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30
+ >=x11-libs/gdk-pixbuf-2.14
+ >=x11-libs/gtk+-2.24:2
+ >=xfce-base/exo-0.10
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/libxfce4util-4.10.1
+ >=xfce-base/xfconf-4.10
+ dbus? ( >=dev-libs/dbus-glib-0.100 )
+ exif? ( >=media-libs/libexif-0.6.19 )
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+ pcre? ( >=dev-libs/libpcre-6 )
+ startup-notification? ( x11-libs/startup-notification )
+ udisks? ( virtual/libgudev:= )
+ xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10 )"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/desktop-file-utils-0.20-r1
+ x11-misc/shared-mime-info
+ dbus? ( ${GVFS_DEPEND} )
+ udisks? (
+ virtual/udev
+ ${GVFS_DEPEND}[udisks,udev]
+ )
+ xfce_plugins_trash? ( ${GVFS_DEPEND} )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+REQUIRED_USE="xfce_plugins_trash? ( dbus )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable dbus)
+ $(use_enable startup-notification)
+ $(use_enable udisks gudev)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ $(use_enable exif)
+ $(use_enable pcre)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ use xfce_plugins_trash || XFCONF+=( --disable-tpa-plugin )
+
+ DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
new file mode 100644
index 00000000000..608a4b93ecf
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -0,0 +1,2 @@
+DIST xfce4-appfinder-4.10.1.tar.bz2 446043 SHA256 65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77 SHA512 5a9e1ac2d140549fa332bb8578cd12291a331ed017b72b0684aba9d36b16bf3231552a2d5f6aa5b0ccaf9fe2b899d42872f6726a80e4f68a80474092dd245a28 WHIRLPOOL 08284445624ab935ab38a12eb4d0faaf61fc717a3343b91ee3bf91002c282c1afd3f6ae5dcbba0ab04dba15b7ffa921ddcefe6f05cbdaeb724cca9e68a35c7a3
+DIST xfce4-appfinder-4.12.0.tar.bz2 459338 SHA256 2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf WHIRLPOOL e7d4ac9d25861a45d9b6ac94d66bf6631b7e7c2354d87a4bb7ce96e094f0dda61dbd88eb4edc9900733cb5488906a932e7ff521a2be48c76dc716579033692d4
diff --git a/xfce-base/xfce4-appfinder/metadata.xml b/xfce-base/xfce4-appfinder/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild
new file mode 100644
index 00000000000..0c8b6664622
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ >=x11-libs/gtk+-2.20:2
+ >=xfce-base/garcon-0.2
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/xfconf-4.10
+ !xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS )
+}
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
new file mode 100644
index 00000000000..b7244141195
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+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"
+
+pkg_setup() {
+ XFCONF=(
+ --enable-gtk3
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS )
+}
diff --git a/xfce-base/xfce4-meta/metadata.xml b/xfce-base/xfce4-meta/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfce4-meta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.10.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.10.ebuild
new file mode 100644
index 00000000000..23b2338326f
--- /dev/null
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The Xfce Desktop Environment (meta package)"
+HOMEPAGE="http://www.xfce.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="minimal +svg"
+
+RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
+ x11-themes/hicolor-icon-theme
+ >=xfce-base/xfce4-appfinder-4.10
+ >=xfce-base/xfce4-panel-4.10
+ >=xfce-base/xfce4-session-4.10
+ >=xfce-base/xfce4-settings-4.10
+ >=xfce-base/xfdesktop-4.10
+ >=xfce-base/xfwm4-4.10
+ !minimal? (
+ media-fonts/dejavu
+ virtual/freedesktop-icon-theme
+ )
+ svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
new file mode 100644
index 00000000000..cfabcfc631f
--- /dev/null
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The Xfce Desktop Environment (meta package)"
+HOMEPAGE="http://www.xfce.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="minimal +svg"
+
+RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
+ x11-themes/hicolor-icon-theme
+ >=xfce-base/xfce4-appfinder-4.12
+ >=xfce-base/xfce4-panel-4.12
+ >=xfce-base/xfce4-session-4.12
+ >=xfce-base/xfce4-settings-4.12
+ >=xfce-base/xfdesktop-4.12
+ >=xfce-base/xfwm4-4.12
+ !minimal? (
+ media-fonts/dejavu
+ virtual/freedesktop-icon-theme
+ )
+ svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
new file mode 100644
index 00000000000..596396646e5
--- /dev/null
+++ b/xfce-base/xfce4-panel/Manifest
@@ -0,0 +1,2 @@
+DIST xfce4-panel-4.10.1.tar.bz2 1061090 SHA256 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6 SHA512 0a115fcfa5cdf28158e7d56038a8669849494259c1c6e622614384179015edf868978c4226e13fd8b244ccb6b1a9798577eb38604b71c872bfb9229b87ccc531 WHIRLPOOL 2a27c20eeb7a2f965540997c94bdc2727f816f0956dd995faa1af583ae294152fb77b438e090f13324c69a303e8d90490097e2a1534b143757d31ab096c53c96
+DIST xfce4-panel-4.12.0.tar.bz2 1107470 SHA256 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0 SHA512 9b5d0d51ac2c312d54e8daeea95bd861891e652faeee8b4a7dbf4b33507b70bf7b4fbca7cb8f2d3573699ae940a14d5a9a41da24f324db256146d8b7db8519a8 WHIRLPOOL 5468a67b2c4fe1fcf82d3f38a0a0a057f3dac714354f2b2e8ce0c2a8654ac92cf4d0c40b0a0ec00957da2db67db3cec2017673bfc0eeaac69a98e2f92d31c3f1
diff --git a/xfce-base/xfce4-panel/metadata.xml b/xfce-base/xfce4-panel/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfce4-panel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild
new file mode 100644
index 00000000000..173dc4fd85e
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ >=x11-libs/cairo-1
+ >=x11-libs/gtk+-2.20:2
+ x11-libs/libX11
+ >=x11-libs/libwnck-2.31:1
+ >=xfce-base/exo-0.8
+ >=xfce-base/garcon-0.2
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/xfconf-4.10"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS THANKS )
+}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild
new file mode 100644
index 00000000000..6e10bf9cb6f
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ >=x11-libs/cairo-1
+ >=x11-libs/gtk+-2.20:2
+ >=x11-libs/gtk+-3.2:3
+ x11-libs/libX11
+ >=x11-libs/libwnck-2.31:1
+ >=xfce-base/exo-0.8
+ >=xfce-base/garcon-0.3
+ >=xfce-base/libxfce4ui-4.11
+ >=xfce-base/libxfce4util-4.11
+ >=xfce-base/xfconf-4.10"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --enable-gtk3
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS THANKS )
+}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
new file mode 100644
index 00000000000..71348ee33e5
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ >=x11-libs/cairo-1
+ >=x11-libs/gtk+-2.20:2
+ >=x11-libs/gtk+-3.2:3
+ x11-libs/libX11
+ >=x11-libs/libwnck-2.31:1
+ >=xfce-base/exo-0.8
+ >=xfce-base/garcon-0.3
+ >=xfce-base/libxfce4ui-4.11
+ >=xfce-base/libxfce4util-4.11
+ >=xfce-base/xfconf-4.10"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --enable-gtk3
+ $(xfconf_use_debug)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS THANKS )
+}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
new file mode 100644
index 00000000000..3d331dbf660
--- /dev/null
+++ b/xfce-base/xfce4-session/Manifest
@@ -0,0 +1,2 @@
+DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
+DIST xfce4-session-4.12.1.tar.bz2 1289284 SHA256 97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df WHIRLPOOL 6cf4e58782ee0cfb01ada620e58b71de5f235d2d1bcce625185e3c465dc8c356403956b88ac265f00bbf71cfbff72a2ad7e2ec3c711b4a5871b1d21d83bee56f
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
new file mode 100644
index 00000000000..feb020aaff0
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/501370
+http://bugzilla.xfce.org/show_bug.cgi?id=10679
+
+--- scripts/xflock4
++++ scripts/xflock4
+@@ -35,7 +35,8 @@
+ # else run another access locking utility, if installed
+ for lock_cmd in \
+ "xlock -mode blank" \
+- "slock"
++ "slock" \
++ "alock -bg blank -auth pam"
+ do
+ set -- $lock_cmd
+ if command -v -- $1 >/dev/null 2>&1; then
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-systemd.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-systemd.patch
new file mode 100644
index 00000000000..e174e40d035
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-systemd.patch
@@ -0,0 +1,400 @@
+http://pkgs.fedoraproject.org/cgit/xfce4-session.git/commit/xfce4-session-4.10.1-systemd.patch?id=9e8af8b3ee7e8e91817d087e80de29b1af6d4943
+
+diff --git a/configure.ac b/configure.ac
+index 46ff366..8feee0b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,7 +98,7 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
+
+ dnl Check for polkit / systemd integration
+ XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100],
+- [systemd], [Systemd support (through polit)])
++ [systemd], [Systemd support (through polkit)])
+
+ dnl Check for debugging support
+ XDT_FEATURE_DEBUG([xfsm_debug_default])
+@@ -202,10 +202,10 @@ echo " * Legacy session management: yes"
+ else
+ echo " * Legacy session management: no"
+ fi
+-if test x"$GNOME_KEYRING_FOUND" = x"yes"; then
+-echo " * Gnome Keyring support: yes"
++if test x"$SYSTEMD_FOUND" = x"yes"; then
++echo " * Systemd support (through polkit): yes"
+ else
+-echo " * Gnome Keyring support: no"
++echo " * Systemd support (through polkit): no"
+ fi
+
+ echo
+diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
+index 5472b33..ea706fd 100644
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -38,6 +38,8 @@ xfce4_session_SOURCES = \
+ xfsm-compat-gnome.h \
+ xfsm-compat-kde.c \
+ xfsm-compat-kde.h \
++ xfsm-consolekit.c \
++ xfsm-consolekit.h \
+ xfsm-dns.c \
+ xfsm-dns.h \
+ xfsm-error.c \
+@@ -67,10 +69,6 @@ if HAVE_SYSTEMD
+ xfce4_session_SOURCES += \
+ xfsm-systemd.c \
+ xfsm-systemd.h
+-else
+-xfce4_session_SOURCES += \
+- xfsm-consolekit.c \
+- xfsm-consolekit.h
+ endif
+
+ xfce4_session_CFLAGS = \
+diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
+index 4c483a7..329c4f6 100644
+--- a/xfce4-session/xfsm-shutdown.c
++++ b/xfce4-session/xfsm-shutdown.c
+@@ -63,6 +63,7 @@
+ #include <xfce4-session/xfsm-shutdown.h>
+ #include <xfce4-session/xfsm-compat-gnome.h>
+ #include <xfce4-session/xfsm-compat-kde.h>
++#include <xfce4-session/xfsm-consolekit.h>
+ #include <xfce4-session/xfsm-fadeout.h>
+ #include <xfce4-session/xfsm-global.h>
+ #include <xfce4-session/xfsm-legacy.h>
+@@ -70,8 +71,6 @@
+
+ #ifdef HAVE_SYSTEMD
+ #include <xfce4-session/xfsm-systemd.h>
+-#else
+-#include <xfce4-session/xfsm-consolekit.h>
+ #endif
+
+ static void xfsm_shutdown_finalize (GObject *object);
+@@ -98,9 +97,8 @@ struct _XfsmShutdown
+
+ #ifdef HAVE_SYSTEMD
+ XfsmSystemd *systemd;
+-#else
+- XfsmConsolekit *consolekit;
+ #endif
++ XfsmConsolekit *consolekit;
+ XfsmUPower *upower;
+
+ /* kiosk settings */
+@@ -139,10 +137,14 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
+ XfceKiosk *kiosk;
+
+ #ifdef HAVE_SYSTEMD
+- shutdown->systemd = xfsm_systemd_get ();
+-#else
+- shutdown->consolekit = xfsm_consolekit_get ();
++ shutdown->consolekit = NULL;
++ shutdown->systemd = NULL;
++ if (LOGIND_RUNNING())
++ shutdown->systemd = xfsm_systemd_get ();
++ else
+ #endif
++ shutdown->consolekit = xfsm_consolekit_get ();
++
+ shutdown->upower = xfsm_upower_get ();
+ shutdown->helper_state = SUDO_NOT_INITIAZED;
+ shutdown->helper_require_password = FALSE;
+@@ -162,10 +164,11 @@ xfsm_shutdown_finalize (GObject *object)
+ XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
+
+ #ifdef HAVE_SYSTEMD
+- g_object_unref (G_OBJECT (shutdown->systemd));
+-#else
+- g_object_unref (G_OBJECT (shutdown->consolekit));
++ if (shutdown->systemd != NULL)
++ g_object_unref (G_OBJECT (shutdown->systemd));
+ #endif
++ if (shutdown->consolekit != NULL)
++ g_object_unref (G_OBJECT (shutdown->consolekit));
+ g_object_unref (G_OBJECT (shutdown->upower));
+
+ /* close down helper */
+@@ -657,10 +660,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown,
+ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
+ else
+ #ifdef HAVE_SYSTEMD
+- return xfsm_systemd_try_restart (shutdown->systemd, error);
+-#else
+- return xfsm_consolekit_try_restart (shutdown->consolekit, error);
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_restart (shutdown->systemd, error);
++ else
+ #endif
++ return xfsm_consolekit_try_restart (shutdown->consolekit, error);
+ }
+
+
+@@ -678,10 +682,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown,
+ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
+ else
+ #ifdef HAVE_SYSTEMD
+- return xfsm_systemd_try_shutdown (shutdown->systemd, error);
+-#else
+- return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_shutdown (shutdown->systemd, error);
++ else
+ #endif
++ return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
+ }
+
+
+@@ -692,6 +697,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown,
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_suspend (shutdown->systemd, error);
++ else
++#endif
+ return xfsm_upower_try_suspend (shutdown->upower, error);
+ }
+
+@@ -703,6 +713,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown,
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_hibernate (shutdown->systemd, error);
++ else
++#endif
+ return xfsm_upower_try_hibernate (shutdown->upower, error);
+ }
+
+@@ -722,10 +737,14 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown,
+ }
+
+ #ifdef HAVE_SYSTEMD
+- if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
+-#else
+- if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
++ if (shutdown->systemd != NULL)
++ {
++ if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
++ return TRUE;
++ }
++ else
+ #endif
++ if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
+ return TRUE;
+
+ if (xfsm_shutdown_sudo_init (shutdown, error))
+@@ -753,10 +772,14 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown,
+ }
+
+ #ifdef HAVE_SYSTEMD
+- if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
+-#else
+- if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
++ if (shutdown->systemd != NULL)
++ {
++ if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
++ return TRUE;
++ }
++ else
+ #endif
++ if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
+ return TRUE;
+
+ if (xfsm_shutdown_sudo_init (shutdown, error))
+@@ -784,6 +807,12 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
+ return TRUE;
+ }
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_can_suspend (shutdown->systemd, can_suspend,
++ auth_suspend, error);
++ else
++#endif
+ return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
+ auth_suspend, error);
+ }
+@@ -804,6 +833,12 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
+ return TRUE;
+ }
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate,
++ auth_hibernate, error);
++ else
++#endif
+ return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
+ auth_hibernate, error);
+ }
+diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
+index 7bdd39d..f18fbf7 100644
+--- a/xfce4-session/xfsm-systemd.c
++++ b/xfce4-session/xfsm-systemd.c
+@@ -24,6 +24,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
++#include <libxfsm/xfsm-util.h>
+ #include <xfce4-session/xfsm-systemd.h>
+
+
+@@ -33,8 +34,12 @@
+ #define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
+ #define SYSTEMD_REBOOT_ACTION "Reboot"
+ #define SYSTEMD_POWEROFF_ACTION "PowerOff"
++#define SYSTEMD_SUSPEND_ACTION "Suspend"
++#define SYSTEMD_HIBERNATE_ACTION "Hibernate"
+ #define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
+ #define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
++#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
++#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
+
+
+
+@@ -93,6 +98,22 @@ xfsm_systemd_finalize (GObject *object)
+ }
+
+
++
++static gboolean
++xfsm_systemd_lock_screen (GError **error)
++{
++ XfconfChannel *channel;
++ gboolean ret = TRUE;
++
++ channel = xfsm_open_config ();
++ if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE))
++ ret = g_spawn_command_line_async ("xflock4", error);
++
++ return ret;
++}
++
++
++
+ static gboolean
+ xfsm_systemd_can_method (XfsmSystemd *systemd,
+ gboolean *can_method,
+@@ -205,6 +226,34 @@ xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
+
+
+ gboolean
++xfsm_systemd_try_suspend (XfsmSystemd *systemd,
++ GError **error)
++{
++ if (!xfsm_systemd_lock_screen (error))
++ return FALSE;
++
++ return xfsm_systemd_try_method (systemd,
++ SYSTEMD_SUSPEND_ACTION,
++ error);
++}
++
++
++
++gboolean
++xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
++ GError **error)
++{
++ if (!xfsm_systemd_lock_screen (error))
++ return FALSE;
++
++ return xfsm_systemd_try_method (systemd,
++ SYSTEMD_HIBERNATE_ACTION,
++ error);
++}
++
++
++
++gboolean
+ xfsm_systemd_can_restart (XfsmSystemd *systemd,
+ gboolean *can_restart,
+ GError **error)
+@@ -227,3 +276,39 @@ xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
+ SYSTEMD_POWEROFF_TEST,
+ error);
+ }
++
++
++
++gboolean
++xfsm_systemd_can_suspend (XfsmSystemd *systemd,
++ gboolean *can_suspend,
++ gboolean *auth_suspend,
++ GError **error)
++{
++ gboolean ret = FALSE;
++
++ ret = xfsm_systemd_can_method (systemd,
++ can_suspend,
++ SYSTEMD_SUSPEND_TEST,
++ error);
++ *auth_suspend = *can_suspend;
++ return ret;
++}
++
++
++
++gboolean
++xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
++ gboolean *can_hibernate,
++ gboolean *auth_hibernate,
++ GError **error)
++{
++ gboolean ret = FALSE;
++
++ ret = xfsm_systemd_can_method (systemd,
++ can_hibernate,
++ SYSTEMD_HIBERNATE_TEST,
++ error);
++ *auth_hibernate = *can_hibernate;
++ return ret;
++}
+diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
+index 8223622..c5e74b5 100644
+--- a/xfce4-session/xfsm-systemd.h
++++ b/xfce4-session/xfsm-systemd.h
+@@ -22,6 +22,8 @@
+ #ifndef __XFSM_SYSTEMD_H__
+ #define __XFSM_SYSTEMD_H__
+
++#define LOGIND_RUNNING() (access ("/run/systemd/seats/", F_OK) >= 0)
++
+ typedef struct _XfsmSystemdClass XfsmSystemdClass;
+ typedef struct _XfsmSystemd XfsmSystemd;
+
+@@ -42,6 +44,12 @@ gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd,
+ gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
+ GError **error);
+
++gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd,
++ GError **error);
++
++gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
++ GError **error);
++
+ gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd,
+ gboolean *can_restart,
+ GError **error);
+@@ -50,6 +58,16 @@ gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
+ gboolean *can_shutdown,
+ GError **error);
+
++gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd,
++ gboolean *can_suspend,
++ gboolean *auth_suspend,
++ GError **error);
++
++gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
++ gboolean *can_hibernate,
++ gboolean *auth_hibernate,
++ GError **error);
++
+ G_END_DECLS
+
+ #endif /* __XFSM_SYSTEMD_H__ */
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch b/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch
new file mode 100644
index 00000000000..a5e59f47f11
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch
@@ -0,0 +1,448 @@
+Patch from http://bugzilla.xfce.org/show_bug.cgi?id=9952 with modification
+to edit configure.ac (release tarball) instead of configure.ac.in (git)
+
+From 38afe446cdc889266f1e553952397cc4a876ecf8 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Mon, 7 Jul 2014 11:30:06 +0300
+Subject: [PATCH] Add suspend/hibernate to shutdown-helper
+
+Upower 0.99 dropped support for suspend/hibernate as an obsolete
+feature in this commit:
+http://cgit.freedesktop.org/upower/commit/?id=1ee642e705a63f5ad56a6b55e4bf5c4a64c959b8
+Add that functionality into the shutdown-helper so these features
+will work again. Additionally Upower is an optional build dependency
+and the minimum required is 0.9.7 to support FreeBSD 9 and 10.
+---
+ configure.ac.in | 30 ++++++++
+ xfce4-session/Makefile.am | 4 +-
+ xfce4-session/xfsm-shutdown.c | 167 +++++++++++++++++++++++++++++++++++++++++-
+ xfce4-session/xfsm-upower.c | 8 +-
+ xfce4-session/xfsm-upower.h | 4 +
+ xfsm-shutdown-helper/main.c | 26 +++++++
+ 6 files changed, 234 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 910fd35..b9c9a90 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,6 +96,10 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
+
++dnl Check for Upower
++XDT_CHECK_OPTIONAL_PACKAGE([UPOWER],[upower-glib], [0.9.7],
++ [upower],[Upower support])
++
+ dnl Check for polkit / systemd integration
+ XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100],
+ [systemd], [Systemd support (through polit)])
+@@ -157,6 +161,31 @@ if test "x$linux_ioprio_works" = "xyes"; then
+ [Defined if linux/ioprio.h not only exists, but works properly])
+ fi
+
++dnl Compile time default choice of backend
++AC_ARG_WITH([backend],
++ AS_HELP_STRING([--with-backend=<option>],
++ [Default backend to use linux, freebsd, openbsd]))
++# default to a sane option
++AC_CANONICAL_HOST
++if test x$with_backend = x; then
++ AS_CASE([$host],
++ [*-linux*], [with_backend=linux],
++ [*-*freebsd*], [with_backend=freebsd],
++ [*-openbsd*], [with_backend=openbsd])
++fi
++AC_DEFINE_UNQUOTED(BACKEND, "$with_backend", [backend])
++AC_SUBST(BACKEND, "$with_backend")
++
++if test x$with_backend = xlinux; then
++ AC_DEFINE(BACKEND_TYPE_LINUX, 1, [Linux suspend/hibernate backend])
++fi
++if test x$with_backend = xfreebsd; then
++ AC_DEFINE(BACKEND_TYPE_FREEBSD, 1, [FreeBSD suspend/hibernate backend])
++fi
++if test x$with_backend = xopenbsd; then
++ AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
++fi
++
+ dnl check for location Xfce glade files were installed to
+ XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
+ XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
+@@ -207,5 +236,6 @@ echo " * Gnome Keyring support: yes"
+ else
+ echo " * Gnome Keyring support: no"
+ fi
++echo " * Backend: ${with_backend}"
+
+ echo
+diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
+index 5472b33..6b5968e 100644
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -83,7 +83,8 @@ xfce4_session_CFLAGS = \
+ $(SYSTEMD_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+- $(PLATFORM_CFLAGS)
++ $(PLATFORM_CFLAGS) \
++ $(UPOWER_CFLAGS)
+
+ xfce4_session_LDFLAGS = \
+ -no-undefined \
+@@ -102,6 +103,7 @@ xfce4_session_LDADD = \
+ $(LIBWNCK_LIBS) \
+ $(SYSTEMD_LIBS) \
+ $(XFCONF_LIBS) \
++ $(UPOWER_LIBS) \
+ -lm
+
+ xfce4_session_DEPENDENCIES = \
+diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
+index 4c483a7..24b548e 100644
+--- a/xfce4-session/xfsm-shutdown.c
++++ b/xfce4-session/xfsm-shutdown.c
+@@ -57,6 +57,9 @@
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <libxfce4util/libxfce4util.h>
+ #include <gtk/gtk.h>
++#ifdef HAVE_UPOWER
++#include <upower.h>
++#endif
+
+ #include <libxfsm/xfsm-util.h>
+
+@@ -76,6 +79,8 @@
+
+ static void xfsm_shutdown_finalize (GObject *object);
+ static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
++static gboolean xfsm_shutdown_fallback_can_hibernate (void);
++static gboolean xfsm_shutdown_fallback_can_suspend (void);
+
+
+
+@@ -403,14 +408,16 @@ xfsm_shutdown_sudo_try_action (XfsmShutdown *shutdown,
+ g_return_val_if_fail (shutdown->helper_state == SUDO_AVAILABLE, FALSE);
+ g_return_val_if_fail (shutdown->helper_outfile != NULL, FALSE);
+ g_return_val_if_fail (shutdown->helper_infile != NULL, FALSE);
+- g_return_val_if_fail (type == XFSM_SHUTDOWN_SHUTDOWN
+- || type == XFSM_SHUTDOWN_RESTART, FALSE);
+
+ /* the command we send to sudo */
+ if (type == XFSM_SHUTDOWN_SHUTDOWN)
+ action = "POWEROFF";
+ else if (type == XFSM_SHUTDOWN_RESTART)
+ action = "REBOOT";
++ else if (type == XFSM_SHUTDOWN_SUSPEND)
++ action = "SUSPEND";
++ else if (type == XFSM_SHUTDOWN_HIBERNATE)
++ action = "HIBERNATE";
+ else
+ return FALSE;
+
+@@ -692,7 +699,19 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown,
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_UPOWER
++#if !UP_CHECK_VERSION(0, 99, 0)
+ return xfsm_upower_try_suspend (shutdown->upower, error);
++#endif /* UP_CHECK_VERSION */
++#endif /* HAVE_UPOWER */
++
++ if (shutdown->helper_state == SUDO_AVAILABLE)
++ {
++ xfsm_upower_lock_screen (shutdown->upower, "Suspend", error);
++ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SUSPEND, error);
++ }
++ else
++ return FALSE;
+ }
+
+
+@@ -703,7 +722,19 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown,
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_UPOWER
++#if !UP_CHECK_VERSION(0, 99, 0)
+ return xfsm_upower_try_hibernate (shutdown->upower, error);
++#endif /* UP_CHECK_VERSION */
++#endif /* HAVE_UPOWER */
++
++ if (shutdown->helper_state == SUDO_AVAILABLE)
++ {
++ xfsm_upower_lock_screen (shutdown->upower, "Hibernate", error);
++ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_HIBERNATE, error);
++ }
++ else
++ return FALSE;
+ }
+
+
+@@ -784,8 +815,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
+ return TRUE;
+ }
+
++#ifdef HAVE_UPOWER
++#if !UP_CHECK_VERSION(0, 99, 0)
+ return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
+ auth_suspend, error);
++#endif /* UP_CHECK_VERSION */
++#endif /* HAVE_UPOWER */
++
++ *can_suspend = xfsm_shutdown_fallback_can_suspend ();
++ return TRUE;
+ }
+
+
+@@ -804,8 +842,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
+ return TRUE;
+ }
+
++#ifdef HAVE_UPOWER
++#if !UP_CHECK_VERSION(0, 99, 0)
+ return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
+ auth_hibernate, error);
++#endif /* UP_CHECK_VERSION */
++#endif /* HAVE_UPOWER */
++
++ *can_hibernate = xfsm_shutdown_fallback_can_hibernate ();
++ return TRUE;
+ }
+
+
+@@ -816,3 +861,121 @@ xfsm_shutdown_can_save_session (XfsmShutdown *shutdown)
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+ return shutdown->kiosk_can_save_session;
+ }
++
++
++
++#ifdef BACKEND_TYPE_FREEBSD
++static gchar *
++get_string_sysctl (GError **err, const gchar *format, ...)
++{
++ va_list args;
++ gchar *name;
++ size_t value_len;
++ gchar *str = NULL;
++
++ g_return_val_if_fail(format != NULL, FALSE);
++
++ va_start (args, format);
++ name = g_strdup_vprintf (format, args);
++ va_end (args);
++
++ if (sysctlbyname (name, NULL, &value_len, NULL, 0) == 0) {
++ str = g_new (char, value_len + 1);
++ if (sysctlbyname (name, str, &value_len, NULL, 0) == 0)
++ str[value_len] = 0;
++ else {
++ g_free (str);
++ str = NULL;
++ }
++ }
++
++ if (!str)
++ g_set_error (err, 0, 0, "%s", g_strerror(errno));
++
++ g_free(name);
++ return str;
++}
++
++
++
++static gboolean
++freebsd_supports_sleep_state (const gchar *state)
++{
++ gboolean ret = FALSE;
++ gchar *sleep_states;
++
++ sleep_states = get_string_sysctl (NULL, "hw.acpi.supported_sleep_state");
++ if (sleep_states != NULL)
++ {
++ if (strstr (sleep_states, state) != NULL)
++ ret = TRUE;
++ }
++
++ g_free (sleep_states);
++
++ return ret;
++}
++#endif /* BACKEND_TYPE_FREEBSD */
++
++
++
++#ifdef BACKEND_TYPE_LINUX
++static gboolean
++linux_supports_sleep_state (const gchar *state)
++{
++ gboolean ret = FALSE;
++ gchar *command;
++ GError *error = NULL;
++ gint exit_status;
++
++ /* run script from pm-utils */
++ command = g_strdup_printf ("/usr/bin/pm-is-supported --%s", state);
++
++ ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error);
++ if (!ret)
++ {
++ g_warning ("failed to run script: %s", error->message);
++ g_error_free (error);
++ goto out;
++ }
++ ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS));
++
++out:
++ g_free (command);
++
++ return ret;
++}
++#endif /* BACKEND_TYPE_LINUX */
++
++
++static gboolean
++xfsm_shutdown_fallback_can_suspend (void)
++{
++#ifdef BACKEND_TYPE_FREEBSD
++ return freebsd_supports_sleep_state ("S3");
++#endif
++#ifdef BACKEND_TYPE_LINUX
++ return linux_supports_sleep_state ("suspend");
++#endif
++#ifdef BACKEND_TYPE_OPENBSD
++ return TRUE;
++#endif
++
++ return FALSE;
++}
++
++static gboolean
++xfsm_shutdown_fallback_can_hibernate (void)
++{
++#ifdef BACKEND_TYPE_FREEBSD
++ return freebsd_supports_sleep_state ("S4");
++#endif
++#ifdef BACKEND_TYPE_LINUX
++ return linux_supports_sleep_state ("hibernate");
++#endif
++#ifdef BACKEND_TYPE_OPENBSD
++ return FALSE;
++#endif
++
++ return FALSE;
++}
+diff --git a/xfce4-session/xfsm-upower.c b/xfce4-session/xfsm-upower.c
+index 57402ec..2960943 100644
+--- a/xfce4-session/xfsm-upower.c
++++ b/xfce4-session/xfsm-upower.c
+@@ -21,6 +21,7 @@
+
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
++#include <upower.h>
+
+ #include <libxfsm/xfsm-util.h>
+ #include <xfce4-session/xfsm-upower.h>
+@@ -283,14 +284,13 @@ xfsm_upower_try_method (XfsmUPower *upower,
+
+
+
+-static gboolean
++gboolean
+ xfsm_upower_lock_screen (XfsmUPower *upower,
+ const gchar *sleep_kind,
+ GError **error)
+ {
+ XfconfChannel *channel;
+ gboolean ret = TRUE;
+- GError *err = NULL;
+
+ g_return_val_if_fail (sleep_kind != NULL, FALSE);
+
+@@ -299,6 +299,9 @@ xfsm_upower_lock_screen (XfsmUPower *upower,
+ {
+ if (xfsm_upower_proxy_ensure (upower, error))
+ {
++#if !UP_CHECK_VERSION(0, 99, 0)
++ GError *err = NULL;
++
+ /* tell upower we're going to sleep, this saves some
+ * time while we sleep 1 second if xflock4 is spawned */
+ ret = dbus_g_proxy_call (upower->upower_proxy,
+@@ -312,6 +315,7 @@ xfsm_upower_lock_screen (XfsmUPower *upower,
+ g_warning ("Couldn't sent that we were about to sleep: %s", err->message);
+ g_error_free (err);
+ }
++#endif
+ }
+ else
+ {
+diff --git a/xfce4-session/xfsm-upower.h b/xfce4-session/xfsm-upower.h
+index a492f7d..4e6a53b 100644
+--- a/xfce4-session/xfsm-upower.h
++++ b/xfce4-session/xfsm-upower.h
+@@ -51,4 +51,8 @@ gboolean xfsm_upower_can_hibernate (XfsmUPower *upower,
+ gboolean *auth_hibernate,
+ GError **error);
+
++gboolean xfsm_upower_lock_screen (XfsmUPower *upower,
++ const gchar *sleep_kind,
++ GError **error);
++
+ #endif /* !__XFSM_UPOWER_HELPER_H__ */
+diff --git a/xfsm-shutdown-helper/main.c b/xfsm-shutdown-helper/main.c
+index 667f288..60c621b 100644
+--- a/xfsm-shutdown-helper/main.c
++++ b/xfsm-shutdown-helper/main.c
+@@ -57,6 +57,12 @@
+ #ifdef REBOOT_CMD
+ #undef REBOOT_CMD
+ #endif
++#ifdef UP_BACKEND_SUSPEND_COMMAND
++#undef UP_BACKEND_SUSPEND_COMMAND
++#endif
++#ifdef UP_BACKEND_HIBERNATE_COMMAND
++#undef UP_BACKEND_HIBERNATE_COMMAND
++#endif
+
+ #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define POWEROFF_CMD "/sbin/shutdown -p now"
+@@ -68,6 +74,18 @@
+ #define POWEROFF_CMD "/sbin/shutdown -h now"
+ #define REBOOT_CMD "/sbin/shutdown -r now"
+ #endif
++#ifdef BACKEND_TYPE_FREEBSD
++#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
++#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
++#endif
++#if BACKEND_TYPE_LINUX
++#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend"
++#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
++#endif
++#ifdef BACKEND_TYPE_OPENBSD
++#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
++#define UP_BACKEND_HIBERNATE_COMMAND "/dev/null"
++#endif
+
+
+ static gboolean
+@@ -143,6 +161,14 @@ main (int argc, char **argv)
+ {
+ succeed = run (REBOOT_CMD);
+ }
++ else if (strncasecmp (action, "SUSPEND", 7) == 0)
++ {
++ succeed = run (UP_BACKEND_SUSPEND_COMMAND);
++ }
++ else if (strncasecmp (action, "HIBERNATE", 9) == 0)
++ {
++ succeed = run (UP_BACKEND_HIBERNATE_COMMAND);
++ }
+
+ if (succeed)
+ {
+--
+2.0.0
+
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfce4-session/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
new file mode 100644
index 00000000000..5df211151ab
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EAUTORECONF=1
+inherit xfconf
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="http://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 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug nls 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.10.1
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/xfconf-4.10
+ !xfce-base/xfce-utils
+ systemd? ( >=sys-auth/polkit-0.100 )"
+RDEPEND="${COMMON_DEPEND}
+ x11-apps/xrdb
+ nls? ( x11-misc/xdg-user-dirs )
+ upower? (
+ systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+ !systemd? ( sys-power/upower-pm-utils )
+ )
+ xscreensaver? ( || (
+ >=x11-misc/xscreensaver-5.26
+ gnome-extra/gnome-screensaver
+ >=x11-misc/xlockmore-5.43
+ x11-misc/slock
+ x11-misc/alock[pam]
+ ) )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ PATCHES=(
+ "${FILESDIR}"/${P}-alock_support_to_xflock4.patch
+ "${FILESDIR}"/${P}-systemd.patch
+ )
+
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable systemd)
+ --with-xsession-prefix="${EPREFIX}"/usr
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+ xfconf_src_install
+
+ local sessiondir=/etc/X11/Sessions
+ echo startxfce4 > "${T}"/Xfce4
+ exeinto ${sessiondir}
+ doexe "${T}"/Xfce4
+ dosym Xfce4 ${sessiondir}/Xfce
+}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild
new file mode 100644
index 00000000000..eba4548fef0
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EAUTORECONF=1
+inherit xfconf
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug 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:=
+ !xfce-base/xfce-utils
+ !=xfce-base/libxfce4ui-4.12.0
+ 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
+ gnome-extra/gnome-screensaver
+ >=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 )"
+
+pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
+
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable policykit polkit)
+ --with-xsession-prefix="${EPREFIX}"/usr
+ $(xfconf_use_debug)
+ )
+
+ use upower && XFCONF+=( --enable-upower )
+
+ DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+ xfconf_src_install
+
+ local sessiondir=/etc/X11/Sessions
+ echo startxfce4 > "${T}"/Xfce4
+ exeinto ${sessiondir}
+ doexe "${T}"/Xfce4
+ dosym Xfce4 ${sessiondir}/Xfce
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
new file mode 100644
index 00000000000..70253d3e78e
--- /dev/null
+++ b/xfce-base/xfce4-settings/Manifest
@@ -0,0 +1,2 @@
+DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
+DIST xfce4-settings-4.12.0.tar.bz2 973324 SHA256 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856 WHIRLPOOL 52a66c1b99f67b1e92ccbc223535617a6edff67857032d7c19581fe38e4b5b7e2b32a42bb5263f92ec02596035dd76f6a8f6387f17e524b035def717eda373ff
diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
new file mode 100644
index 00000000000..358395412ea
--- /dev/null
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+ <use>
+ <flag name='libinput'>Enable libinput Xorg driver (<pkg>x11-drivers/xf86-input-libinput</pkg>) support</flag>
+ <flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+ <flag name='xklavier'>Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
new file mode 100644
index 00000000000..225f39107d3
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug libcanberra libnotify +xklavier"
+
+# <libxfce4ui-4.12 - bug 549780
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2.20:2
+ 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.8
+ >=xfce-base/libxfce4ui-4.10
+ <xfce-base/libxfce4ui-4.12
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/xfconf-4.10
+ libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+ xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=x11-proto/inputproto-1.4
+ x11-proto/xproto"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable libnotify)
+ $(use_enable xklavier libxklavier)
+ $(use_enable libcanberra sound-settings)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild
new file mode 100644
index 00000000000..21660f9dcdd
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug libcanberra libinput libnotify upower +xklavier"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.24
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2.20:2
+ 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.8
+ >=xfce-base/libxfce4ui-4.11
+ >=xfce-base/libxfce4util-4.11
+ >=xfce-base/xfconf-4.10
+ libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+ libinput? ( x11-drivers/xf86-input-libinput )
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+ xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=x11-proto/inputproto-1.4
+ x11-proto/xproto"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable upower upower-glib)
+ $(use_enable libinput xorg-libinput)
+ $(use_enable libnotify)
+ $(use_enable xklavier libxklavier)
+ $(use_enable libcanberra sound-settings)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
new file mode 100644
index 00000000000..de0518d8cb2
--- /dev/null
+++ b/xfce-base/xfconf/Manifest
@@ -0,0 +1,2 @@
+DIST xfconf-4.10.0.tar.bz2 517425 SHA256 175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576 SHA512 273820b358611681e634c6a8f107f9812197bd1e9162e987d0df61cbba5eb89be5e30b88a827a1538620b7ec58f0fa0619389a76aa8afc9f8483f64795308ed9 WHIRLPOOL 8c3316a590ad4db25233e48d1401341d5b136add7324a9f1bf524e4925aa23d56965cfed26eb41b92fbbc2d43b04e81a8c4db329a659b6f46b0ee5075b1a02bf
+DIST xfconf-4.12.0.tar.bz2 542544 SHA256 9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156 SHA512 60cc37a7207b0486f7f2de665870facf8e339241df344d7540082f3db447b3ac88bddd306d6a09a3868878cb477d1696491c71470052ef56cb649d773bd55b56 WHIRLPOOL 73241764a03c865c3bcda97a481e4ed9c6bfd8a3fdfd1a614291abad32f11157ba50a14d0ef918ad3c397fdd015d3dcf0cd07e24e43fbdd5125d5c273d536c16
diff --git a/xfce-base/xfconf/metadata.xml b/xfce-base/xfconf/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfconf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfconf/xfconf-4.10.0.ebuild b/xfce-base/xfconf/xfconf-4.10.0.ebuild
new file mode 100644
index 00000000000..b4da4705343
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.10.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A simple client-server configuration storage and query system for the Xfce desktop environment"
+HOMEPAGE="http://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 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+IUSE="debug perl"
+
+RDEPEND=">=dev-libs/dbus-glib-0.98
+ >=dev-libs/glib-2.24
+ >=xfce-base/libxfce4util-4.10
+ perl? ( dev-perl/glib-perl )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+ perl? (
+ dev-perl/ExtUtils-Depends
+ dev-perl/extutils-pkgconfig
+ )"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable perl perl-bindings)
+ $(xfconf_use_debug)
+ $(use_enable debug checks)
+ --with-perl-options=INSTALLDIRS=vendor
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
+
+src_prepare() {
+ # http://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
+ xfconf_src_prepare
+}
+
+src_compile() {
+ emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ xfconf_src_install
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+}
diff --git a/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
new file mode 100644
index 00000000000..0d6771f7d29
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A simple client-server configuration storage and query system for the Xfce desktop environment"
+HOMEPAGE="http://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 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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
+ )"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable perl perl-bindings)
+ $(xfconf_use_debug)
+ $(use_enable debug checks)
+ --with-perl-options=INSTALLDIRS=vendor
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
+
+src_prepare() {
+ # http://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
+ xfconf_src_prepare
+}
+
+src_compile() {
+ emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ xfconf_src_install
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
new file mode 100644
index 00000000000..097340fc7be
--- /dev/null
+++ b/xfce-base/xfdesktop/Manifest
@@ -0,0 +1,3 @@
+DIST xfdesktop-4.10.2.tar.bz2 1144561 SHA256 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d SHA512 274e61fc08ab7738584a27cabce897bd3692200ffe88ad5542bf3c3d6fba128166a499b8aca2b571501d9c66cafa1b3af6a9d52638e20dee7dc79dc5ea48544c WHIRLPOOL 5f3b0ffcc7baf2cbc0d864038f38691f8ae60f60288ae558754d0a503373fd31ba49c605ae512c51e78614eaacb4e3c414f07bd1d46dcd151e10154486325e9f
+DIST xfdesktop-4.12.2.tar.bz2 1419922 SHA256 c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225 SHA512 b83f3d632b47593a6a600f508c06a097e77794cae8caa6e9c5c86300d1ebdb12967bdbd6638179c8b41855216ab534db2fae7f3bba2bda18e8fb8fb7c6966121 WHIRLPOOL e610ea2879834052623c2d984baacd803ec8e7de0a212676f25b776f1c417f4c244580f42f2fefb4346d4fc7b597d7bef63e4dace7b2ff61a8f0cc6d43d222a5
+DIST xfdesktop-4.12.3.tar.bz2 1420704 SHA256 a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac SHA512 e8c89640722d3dfb2c5aae09779f81e5e2a6e157cc4756a46139547bd1a5b1977fa828f68e8ea61d6c9483c35a9303169fc33cbeacde06f7e95e19c65ce54878 WHIRLPOOL ce6fbfa82b9ac753b640035c458c2d81cea76500c6905933c343b061c5f66192926dcc47baa0f72f2a55579212cc0a297538f5f1d913b026f0d5b88f4211e9d8
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch b/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch
new file mode 100644
index 00000000000..52afb020f5b
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch
@@ -0,0 +1,31 @@
+From 71c8754d9978895542cf13eba8958df078a91a6c Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch <thad.fisch@gmail.com>
+Date: Sun, 29 Mar 2015 18:36:47 +0200
+Subject: [PATCH] Fix build error (Bug #11778)
+
+---
+ src/xfdesktop-icon-view.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
+index adff45c..30914c4 100644
+--- a/src/xfdesktop-icon-view.c
++++ b/src/xfdesktop-icon-view.c
+@@ -1640,6 +1640,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
+
+ action = gdk_drag_context_get_selected_action(context);
+
++#ifdef ENABLE_FILE_ICONS
+ if(action == GDK_ACTION_ASK) {
+ xfdesktop_dnd_menu(icon_view->priv->manager, icon_on_dest,
+ context, &action, row, col, time_);
+@@ -1649,6 +1650,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
+ return ret;
+ }
+ }
++#endif
+
+ for(l = icon_view->priv->selected_icons; l; l = l->next) {
+ if(xfdesktop_icon_do_drop_dest(icon_on_dest,
+--
+2.1.4
diff --git a/xfce-base/xfdesktop/metadata.xml b/xfce-base/xfdesktop/metadata.xml
new file mode 100644
index 00000000000..41d08647b7f
--- /dev/null
+++ b/xfce-base/xfdesktop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+ <use>
+ <flag name='thunar'>Build support for desktop icons (for example, launchers and folders)</flag>
+ </use>
+</pkgmetadata>
diff --git a/xfce-base/xfdesktop/xfdesktop-4.10.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.10.2.ebuild
new file mode 100644
index 00000000000..5e55a43af82
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.10.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify thunar"
+
+RDEPEND=">=dev-libs/glib-2.20
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libSM
+ >=x11-libs/libwnck-2.30:1
+ x11-libs/libX11
+ >=xfce-base/exo-0.8
+ >=xfce-base/garcon-0.2
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/xfconf-4.10
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+ thunar? (
+ >=xfce-base/thunar-1.6[dbus]
+ >=dev-libs/dbus-glib-0.100
+ )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable thunar file-icons)
+ $(use_enable thunar thunarx)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild
new file mode 100644
index 00000000000..9c43444db5a
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify +thunar"
+
+# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
+RDEPEND=">=x11-libs/cairo-1.6:=
+ >=dev-libs/dbus-glib-0.100:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ >=x11-libs/libwnck-2.30:1=
+ x11-libs/libX11:=
+ >=xfce-base/exo-0.8:=
+ >=xfce-base/garcon-0.3:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/libxfce4util-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ thunar? (
+ >=dev-libs/glib-2.38:=
+ >=xfce-base/thunar-1.6:=[dbus]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable thunar file-icons)
+ $(use_enable thunar thunarx)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild
new file mode 100644
index 00000000000..ae77116f7d8
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify +thunar"
+
+# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
+RDEPEND=">=x11-libs/cairo-1.6:=
+ >=dev-libs/dbus-glib-0.100:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ >=x11-libs/libwnck-2.30:1=
+ x11-libs/libX11:=
+ >=xfce-base/exo-0.8:=
+ >=xfce-base/garcon-0.3:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/libxfce4util-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ thunar? (
+ >=dev-libs/glib-2.38:=
+ >=xfce-base/thunar-1.6:=[dbus]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable thunar file-icons)
+ $(use_enable thunar thunarx)
+ $(use_enable libnotify notifications)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
new file mode 100644
index 00000000000..2db0ef9f70f
--- /dev/null
+++ b/xfce-base/xfwm4/Manifest
@@ -0,0 +1,2 @@
+DIST xfwm4-4.10.1.tar.bz2 1093825 SHA256 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 SHA512 dad7cdb929b60cdee539dd96e0cc5fb5c71ab13163469b075164b4e54f1b7d72b8e84423aa533d6619902e269bd3d8070dac835729cf22ecbdbecffa36ce4004 WHIRLPOOL 582526f987df98ff3fa5c49e5acbb1e097e4b94fdd0494e6726542879feb3ede8bad34de10c86e343f4daf8b1fd3c8f5b966deb87e6091c3c047ee4994e8828f
+DIST xfwm4-4.12.3.tar.bz2 1191929 SHA256 f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac SHA512 96fcc76fc640027883a7a3373836565987b1d3d4e61fb40aa7e2f990a8140d92cf66171fb4517368faba45c9083a3ad19f589d59b07a55c3417aaaca87e408d7 WHIRLPOOL 0fd8e058694cb2f6486bc59443e00d8ed42ebd9dabe39775451d94c14c7e2ea87a520edea26e3bc7033fa1d95aa0ca1a6b2045eca9a1c9d8ecfb67f1ef88b0a8
diff --git a/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch b/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
new file mode 100644
index 00000000000..98de1cab3f6
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
@@ -0,0 +1,17 @@
+diff -ur xfwm4-4.10.1/src/events.c b/src/events.c
+--- xfwm4-4.10.1/src/events.c 2014-10-31 14:19:18.012757936 -0600
++++ b/src/events.c 2014-10-31 14:18:54.901758349 -0600
+@@ -888,6 +888,13 @@
+ {
+ state = ev->state & MODIFIER_MASK;
+ win = ev->subwindow;
++ if (!win) {
++ Window root_ret;
++ int rx,ry,wx,wy;
++ unsigned int mask_ret;
++ XQueryPointer(display_info->dpy, ev->window,
++ &root_ret, &win, &rx, &ry, &wx, &wy, &mask_ret);
++ }
+ screen_info = c->screen_info;
+
+ if ((ev->button == Button1) && (state) && (state == screen_info->params->easy_click))
diff --git a/xfce-base/xfwm4/metadata.xml b/xfce-base/xfwm4/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /dev/null
+++ b/xfce-base/xfwm4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/xfce-base/xfwm4/xfwm4-4.10.1.ebuild b/xfce-base/xfwm4/xfwm4-4.10.1.ebuild
new file mode 100644
index 00000000000..ded9c9442ca
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.10.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug startup-notification +xcomposite"
+
+RDEPEND=">=dev-libs/glib-2.20
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/pango
+ >=x11-libs/libwnck-2.30:1
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/xfconf-4.10
+ startup-notification? ( x11-libs/startup-notification )
+ xcomposite? (
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable startup-notification)
+ --enable-xsync
+ --enable-render
+ --enable-randr
+ $(use_enable xcomposite compositor)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
new file mode 100644
index 00000000000..a4c9161d721
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug dri startup-notification +xcomposite"
+
+RDEPEND="dev-libs/dbus-glib:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/pango:=
+ >=x11-libs/libwnck-2.30:1=
+ >=xfce-base/libxfce4util-4.10:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ startup-notification? ( x11-libs/startup-notification:= )
+ xcomposite? (
+ x11-libs/libXcomposite:=
+ x11-libs/libXdamage:=
+ x11-libs/libXfixes:=
+ )"
+# libdrm: only headers are used
+# libICE/liBSM: not really used anywhere but checked by configure
+# https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ x11-libs/libICE
+ x11-libs/libSM
+ xfce-base/exo
+ virtual/pkgconfig
+ dri? ( >=x11-libs/libdrm-2.4 )"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable dri libdrm)
+ $(use_enable startup-notification)
+ --enable-xsync
+ --enable-render
+ --enable-randr
+ $(use_enable xcomposite compositor)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+ PATCHES=(
+ "${FILESDIR}/xfwm4-4.12-touchscreen-subwindow-fix.patch"
+ )
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.12.3.ebuild b/xfce-base/xfwm4/xfwm4-4.12.3.ebuild
new file mode 100644
index 00000000000..3c3248ee4a6
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.12.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug dri startup-notification +xcomposite"
+
+RDEPEND="dev-libs/dbus-glib:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/pango:=
+ >=x11-libs/libwnck-2.30:1=
+ >=xfce-base/libxfce4util-4.10:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ startup-notification? ( x11-libs/startup-notification:= )
+ xcomposite? (
+ x11-libs/libXcomposite:=
+ x11-libs/libXdamage:=
+ x11-libs/libXfixes:=
+ )"
+# libdrm: only headers are used
+# libICE/liBSM: not really used anywhere but checked by configure
+# https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ x11-libs/libICE
+ x11-libs/libSM
+ xfce-base/exo
+ virtual/pkgconfig
+ dri? ( >=x11-libs/libdrm-2.4 )"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable dri libdrm)
+ $(use_enable startup-notification)
+ --enable-xsync
+ --enable-render
+ --enable-randr
+ $(use_enable xcomposite compositor)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+}