gentoo resync : 10.04.2018

3 files changed, 81 insertions, 3 deletions

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 78a88d997757..5ad261e60654 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,6 +3,7 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
-EBUILD xfce4-session-4.12.1-r1.ebuild 1906 BLAKE2B e2ed3718c176ae8ee61e3ee2d3b79a5b4cf1dda252a8e76e8808eaf063e959d7f58a23dc5058f4db09705bcc03e57dd299db1ef6299dc4b1b5d9a33b49a506e5 SHA512 5d6bd2d39c26b21d21942ce5c247e559d1cefa69903e998e2a20432eb257c27d84a75ca9edf3bf46f5e486f4720308c131cfcc67a66ee0b12a1caf6da078aae4
+EBUILD xfce4-session-4.12.1-r1.ebuild 1907 BLAKE2B 71cc1a811ca6c1eebad8598743fa1b78ef2a013b877e018fc034be9cbbd269637002b7d1639fc4c10bc4a8bf6d8477956c5c70118e05bae144c2440b5461b46f SHA512 dd2555e54e6c8d24e30e2889eefda9402b6a540bcc01347a3bc3f96bc0930f255b85e5a0332e5b72757e27122a68802ae5175e741f86cc238720e522431e3698
+EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B d5ad58e4c6003ec6f76539196f46b8e1ed5e56f5292f2d08c99ac45e09ecf5abbd3339b10f36af84ec3643b83e9ce2536f39f8be152d4f0a22d2513b1c393644 SHA512 c97415b3f4dcb3eb0aa59e0c48c69301e23a8bda51295ca2db6ef5ab3c44500c681ddb33f49ec5c42b3a04719d0d0cfd4b00161541bf18dc8c6936ecb405429a
 EBUILD xfce4-session-4.13.0-r1.ebuild 1833 BLAKE2B dd046f6f515a107bfc74fe19403c57f91f7db6e8a7e9a5a93fda610052e1f6943b3123ab723adbbb3965846257f44dd870d958dad96cfd8feda3582adaeb01e5 SHA512 92a5933023c5f6a3243f7cd845a1c4f14c6da4fa1aaae4a6f9fdd52eaca9d10226744ae4b5679c2c824b6d57f895c7add1c2dc1e32fd4a57340a05f856d95c33
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
index 840196ac61a5..a34ac02f6aea 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug nls policykit systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
new file mode 100644
index 000000000000..19efc8cad645
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="nls policykit systemd upower +xscreensaver"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	x11-apps/iceauth
+	x11-libs/libSM:=
+	>=x11-libs/libwnck-2.30:1=
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/xfconf-4.10:=
+	policykit? ( >=sys-auth/polkit-0.102:= )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	!systemd? ( upower? ( sys-power/pm-utils ) )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.26
+		x11-misc/light-locker
+		>=x11-misc/xlockmore-5.43
+		x11-misc/slock
+		x11-misc/alock[pam]
+	) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="systemd? ( policykit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
+	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+	)
+	use upower && myconf+=( --enable-upower )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	local sessiondir=/etc/X11/Sessions
+	echo startxfce4 > "${T}"/Xfce4 || die
+	exeinto ${sessiondir}
+	doexe "${T}"/Xfce4
+	dosym Xfce4 ${sessiondir}/Xfce
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}