Support x11-misc/alock in the xflock4 script wrt #501370 by Jesús Guerrero

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 97 insertions, 15 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index c073dc8ca694..0ba02bdfab27 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.188 2014/01/28 14:17:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.189 2014/03/05 11:50:18 ssuominen Exp $
+
+*xfce4-session-4.10.1-r1 (05 Mar 2014)
+
+  05 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfce4-session-4.10.1-alock_support_to_xflock4.patch,
+  +xfce4-session-4.10.1-r1.ebuild:
+  Support x11-misc/alock in the xflock4 script wrt #501370 by Jesús Guerrero
 
   28 Jan 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-session-4.10.1.ebuild:
   Stable for x86, wrt bug #496018
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 7d50813ca8f9..9504cc03381c 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -2,26 +2,22 @@
 Hash: SHA256
 
 AUX xfce4-session-4.10.0-multiple-interactive-session-save.patch 6032 SHA256 b74af07a4182c65cde629d2a71cded4ec1a7fddf39d20d6c8d5b1f104052edfd SHA512 aa648f157d9efad1fc9d3d12db2bc571693f158584e509734330f7a72ae866c20d53e60649e056adbc1e6302f49d50bbbf4c97b87391dbd178a82c263b6fc556 WHIRLPOOL 03998921080a92380d022e268080d7a05ad73adaf46d94156db0f1a0d71707b7139061f0b781bdf51dbe99af27a489051e3f1f2cf609aaebfbfa2fa0ef2c0eb1
+AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 367 SHA256 2be32b49b268649e509b99e8d93a3d4e57665cbe8e03693bc85f88ea088e0650 SHA512 8ee765241997cbf32c08e9597d42ee666400fb27792a8716f59aa91daba7476e1de679e4c9254653cf9b14d95fc293f22d02e99ef3288287113a72407e513975 WHIRLPOOL b4b440c393c6175c9555d4df5d3eb4e730512c41fd83d291df2817206225efabc8db752887bd3316ae7fc915158a513202fa592536b78d52c4c40bbff7aa7ae8
 DIST xfce4-session-4.10.0.tar.bz2 1257385 SHA256 bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce SHA512 d8d8d7c6c764182e8477d87d3c0d30ea4988e34c3411ffa15901b07738671960c1e62c02c05c45724890cec063f1a5aeeb04ab8b48992917ebfe1975165e969c WHIRLPOOL 21919865dbd9ef9bf3782586d6f2e089860cd21c3a4caad48e75afb0cb139119a8d7c151975466a9b3fd6cb57fc7711f2ec5dad142bc1c14287758577e8081f8
 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
 EBUILD xfce4-session-4.10.0-r1.ebuild 1859 SHA256 3472930ef687778175aa77d2bcdf2f1cc228fc73b74004fc2d346654d93a04db SHA512 647a86b7cfb3fc2912754ce3aee50a1f487533df47bb0a329d730fe814ba6f35877dd91f86128d1bfdb7ab24ff307b84f0212a8bf0404e561652a518be38f899 WHIRLPOOL 91d431b63a7f4da635c425be0ed8a433bd577c38eccdb3bb13429c609a302c9568c66fbb43626b57642138c9c60181e6e3db4255b5c8c4c08d47a0df286c36a8
+EBUILD xfce4-session-4.10.1-r1.ebuild 1727 SHA256 9eb28fecaf500b3987dabc52a061bbfcdb08d9c42a8d58f6d2ed908fb1555bfb SHA512 dfd809cf6062fca5515e919cae07c2ff8fdd54d4cf1607c22cc97e4d84812719c730d006c0e31ebfe9f947c6bd1fde33921d27f39caa8bb55f7b84a70c484810 WHIRLPOOL bab8398efc5f28532500016373acce7b6148aac3fe0bf6a4d83c70acb61f5b3b5577b713e25669fb520065f6edb4ab4a601e5cfc98e179244aac72f565002706
 EBUILD xfce4-session-4.10.1.ebuild 1637 SHA256 13ce6cebe64c14742061572e204cfb58213336325feefa07781a7d0ab058cf19 SHA512 7f18f1e79d87ad1616ba6c73907d56443fca0b076697c00e9f7e841da855d7d3a7c7ff04a65697bf2351f64647c1879381849aea4b15d2cb6b2c5c08ea2d9286 WHIRLPOOL a9b7e4229823b9e5390625180283587afb520f8af5d1665d2284f9fbbf05cc874a1d2e169c86fb2f19ffd6345f437604b71dc42e3e6411f7a26c0db2688b53ec
-MISC ChangeLog 25048 SHA256 673b0c7cab8940c6b31da656572255918994f7e7c2a02db02f066a8c5512c6c0 SHA512 dee37e905d7787bae30930db59f08e80a3d6acde71f15f71340bf3672cd67c15da160221c48ffb42c12e411b70f083235209ed95c0f93873a5219b73c246a388 WHIRLPOOL 42cbf935c802fe06b0eaaf3edd5f37996a913bdf0bf820f22221bc4b6237352ac59ca443a71b494acc1d2ec6ab8578ca541426994a979247f9c8e119e6713ba3
+MISC ChangeLog 25324 SHA256 db626786ce7567ac85756d5e4d918178517c25bbf25784b1886c0027e5bf5d69 SHA512 52c439622af85adcb89dba8dffe7e04624c167a103c2bf8448e05d25f103a9ede3f66699f51d737a55f6d7410addc55f9fbb367d2685221e2a77f51ebb617a30 WHIRLPOOL 5bd7bfbc98607494cba8fd2fc2db3a86860c476e016b966f12ab65798600006b95c97cd59e15ba8fa604aec384c9553eed0df8ab48b897002b97cc5f78197ffb
 MISC metadata.xml 390 SHA256 1d122a4418cea15fd68cb18d3c1b6db5120ac2109f228fbf6805967d9cb1431c SHA512 662e0dc55e20f785d376ce74919c280af92ddd43b61eca9eb364e736b76c854427b8d87e392eaa54576073c44f074939789d86b28cbf4eb5515ba1f1f4b8554e WHIRLPOOL 95207640f5dad56c4129aaa9c947e668f4b8617919e27b1471be644fc6f56fed264740f37b92e63a8af0594ee63b0089a37d33c81496a0b7679be8389ba0a3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS57vxAAoJELp701BxlEWf0U8P+waN8/xoxbZbLy9LhpQDddRs
-6ob0LamIL0FwK4my7M9ReZ2lugV35ooa7iC1+DycS7N6K7ucOpnGwBHL7LL4P8dp
-QLWJFVt373HBupQAEzvKa6GutkFkOYMjcloyCxtGfFYmNE3TmkaN3DtvBCdHCURH
-Z7xlZ0KtPDYdvmmoH/YiA1D+Lj8C+WfKZ/AeqQHZAAL5LUkPu5Q0dvJNG4KchS8I
-LUv/cYJ4CeEYuAgtnOyBGKDDJ9v5ea4DnbZ9J8pdA58O990QFDDgiqVItj5ybBPo
-QibAQkjzxHFglqUUC23Usqf179nkYg4wdRqlAPE7HkQzxL/66HS36kqbHciOJ0ef
-yLCLDjajwncGRIl5wjTSMYoFCTngqCCHn63OmrwupjR6RxEMveyWuTO1Izrad/f6
-/tYpoTgJH3R3tPGWX+3my2mesvQHK5EUKXIeXEluxpkBfAZj/cawAYcRukE3pN7A
-RkB58YHwxR5yNBriZYB89Zorj3ePIenhyoao2AbVpYyDjP+VW22hFJ05hSO28JYY
-wF1LZWuqeD5i17+C7TDjVxgyOr0bdInU5m4iFCg3u7Uk7Beoi/ezMRiBXz0VO0hM
-P2oy2SMZ2QDGBWT59pXrbacWZGSw/GixR6NQz+VR6T0vxKsgwJnegrLzW6fateE/
-E2TezozkqJ31dIVC+xI8
-=xH67
+iQEcBAEBCAAGBQJTFw7AAAoJEEdUh39IaPFNJBIH/11WHRfXWAZ8GEJXhXg+wYql
+OmHb2ld5I6wE2oDm+211uF+nx92b8IfCdwPsHlQf4X9RckHFkMg0HbtuypDV4cYc
+LRpTUysapFeWM/tOMYYqHEFPLEdPqUbdDroqYC0NaEYZKJYaQNzQqa8flq6ez0Ad
+4qlMHZcOpE9OKvOD63tVIJxRqxBENI3hpfVFHpqi/0ZRejp3X8nB1ZhmIeEutEA6
+rMbhlXG83wjqmtM7p0MZAasFSxNjplU0Onttwi2F6jsfCZ/prTzz8ZI0zBzhRicp
+FyrrKty5yfs1Bu04Tbox1e5WLkVCWVzsJ05hsQqHjs7HW0pG6oHqpIwAevbdWRU=
+=lOsa
 -----END PGP SIGNATURE-----
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 000000000000..feb020aaff03
--- /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/xfce4-session-4.10.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
new file mode 100644
index 000000000000..a7f16f87eb06
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.1 2014/03/05 11:50:18 ssuominen Exp $
+
+EAPI=5
+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 systemd udev +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
+	x11-misc/xdg-user-dirs
+	udev? ( >=sys-power/upower-0.9.20 )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.26
+		gnome-extra/gnome-screensaver
+		>=x11-misc/xlockmore-5.43
+		x11-misc/slock
+		x11-misc/alock
+		) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-alock_support_to_xflock4.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
+}