Version bump. Introduce USE="xscreensaver" for programs listed in the xflock4 script (for X screen locking).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 80 insertions, 9 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 40f04584ac11..d2cf1dadd9e3 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.156 2012/04/14 09:29:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.157 2012/04/20 20:15:55 ssuominen Exp $
+
+*xfce4-session-4.9.2 (20 Apr 2012)
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-session-4.9.2.ebuild:
+  Version bump. Introduce USE="xscreensaver" for programs listed in the xflock4
+  script (for X screen locking).
 
 *xfce4-session-4.9.1 (14 Apr 2012)
 
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 9dd6ec4062bc..21d2013d195b 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -6,21 +6,23 @@ DIST xfce4-session-4.8.2.tar.bz2 1607774 RMD160 43bbbe64a99efbd655ce5949b0402b0b
 DIST xfce4-session-4.8.3.tar.bz2 1594643 RMD160 fe0f3e7c59a0e7e7ac5a1d23cde48b0bb06290ee SHA1 8b5e525005978cffb45a921f687e57a9ade70043 SHA256 f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338
 DIST xfce4-session-4.9.0.tar.bz2 1254255 RMD160 e577f4fbeac0bc071559b28b5d745c53a7ebbde5 SHA1 959043880602a593807d5d8ab16c6a3d7b40b971 SHA256 28393d4876d574653473e7ac6ade5fcef3965da88e5d9283267557f5d6de8ffd
 DIST xfce4-session-4.9.1.tar.bz2 1255351 RMD160 53b71cdb3b8988ba5db07404f9391e83edbff0ed SHA1 5d97dee614b661751c2f5862711ff355f67f7207 SHA256 2d96db718ec4521d9fe2e82223a50a64788cbc0cf2c8b213e7f52ebbec657e81
+DIST xfce4-session-4.9.2.tar.bz2 1256366 RMD160 0eed46ced553e9e8ccfe37cd5950df664e482212 SHA1 657b22f61e09dee8c7c629d97ad3850df713869d SHA256 a7a3343ea25c6ea8c2a987a1189268a9467408218720ebfebd0f428a11c35567
 EBUILD xfce4-session-4.8.2.ebuild 1633 RMD160 71b02cc238c60ee10fddc75e58722f0897220147 SHA1 f6f62b6aa54bcf3c9a5ae8081227ef7ce64c21b1 SHA256 dcfffb738a97d274ef1dc1bc1458540b408931dff66a0c578f8c71d26cf85681
 EBUILD xfce4-session-4.8.3-r1.ebuild 1744 RMD160 c32f748b2e480800560c9aea3518d07e4d9dcf3c SHA1 0ca49ae925a8ce34ed940d973384929e94b0ba02 SHA256 d0c79ad54269208f0c2dfbe5fa9f5e630ccdcd69a2669486d8af43a94187a109
 EBUILD xfce4-session-4.8.3.ebuild 1650 RMD160 36ad371392f550d9428c60cde94e76bd09807b56 SHA1 075ca5d06969adab115f85cc3ac59ff912ff0694 SHA256 c22798e6f2235acbe8e9c9406cc1d28919fed1275eb3b8ddfb425c8b7e3940aa
 EBUILD xfce4-session-4.9.0-r1.ebuild 1471 RMD160 7db20caf306bd59c4b52a29e8795011bca0b9f09 SHA1 3ddd1e620efca038132272bb84473b462e24e5b5 SHA256 a59a0360490e5e062625ba5ab22afcaf9192913dc706b4ae7513858bd591eb8b
 EBUILD xfce4-session-4.9.1.ebuild 1468 RMD160 6f1b892bcf3d4ae480f841abf88d67914a708f0b SHA1 1f8d69fdb54408c973282d5408cc8fabc804e2b5 SHA256 31f9d2e569e798ca6170bd342d7b9ffd8a920eb64a7071f122ec002793984ab0
-MISC ChangeLog 20580 RMD160 d1519aabf0f9845ad085ea72ca4dc90a1b36defe SHA1 cfe2392397d325ad2e7352b2a4f38b01cb5ad4ae SHA256 3936e79a381226f6f90bead09ecc4b42bca29bfa6ae0cb9564b99938b3997eb9
+EBUILD xfce4-session-4.9.2.ebuild 1775 RMD160 4668826dc02e48da877afa2efe0ce46d748c82c9 SHA1 ca5cde3f2c7fdfbeb635e0cefa3944a05e73bc5c SHA256 613ee6d0f1ed7301cd0943fa06462165319c106ef6e34bac1c08a8480b5c2428
+MISC ChangeLog 20815 RMD160 7ba3f5cc6ca85f0e4fd86c996e882da1b839d059 SHA1 a49383fbaaa3b43732e049fd513047678eafcb45 SHA256 9227b500cfb5197848fe40f35c7c00ec118a9dca2e422205f9cf888a8e608dc9
 MISC metadata.xml 390 RMD160 60014a1bb67add6ba335edff1c52cd9a1e39ec3f SHA1 a929c70f63bb91baa9dccb456ec26f5586fa1a4c SHA256 1d122a4418cea15fd68cb18d3c1b6db5120ac2109f228fbf6805967d9cb1431c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPiUNJAAoJEEdUh39IaPFNOjIH/3IgZX+mQuhC+SaFazR/mydv
-VNQwenyCyzqXwvJswL6GtEG8/B8IpTew1HsKWrx5esEkXWtd8Rjnu6JRtfEjOgQE
-kFmDs87PNVObO94BqXmshRIJre16Y47wbFITAzBXLt7LFD6kO82MN3fKL82yHEuy
-/hJuxfzXkt5i54s7ypVEbKeTUhSr+zZNjxErkeHB5E9QRfOlaoKfJ17Un3pFxucj
-sYk/AwK0r7+a9LeZtJyilYFQSDMh3nDhRdviHVxLR2gsYcU93UcoF6XsCrIxsyOb
-39ZNdDJ98/sovYGcLDKDiglJzD1fWlxcjNgtT1njXxNwwCyx6XGqsZG7abGVlAo=
-=yZcA
+iQEcBAEBAgAGBQJPkcOdAAoJEEdUh39IaPFN9KkH/R2o//AlHOiaxe+R3g0zHHQ0
+aS07lEkZ1WXkh00CQPUt9xBF9r8i1VH5Y/96BDYj6lwoK3I1rPttodKGFpmceHws
+r1nOuH6QAZp1+8o45lOGWYKDmA7cEwY7uQkPkDCvykQjxFINBItK4JQLXXcuqe98
+P2qVvqGU5fRHnnYn0X0RnehZqeW0U2orJCdkyaQ4A2AzGxL7weZKf9hC1c7t+9GM
+/0874D8tcGyFc2uAu5choFdJedpcAdXdKKt46x1HSx8GWa13NC3DRKIQr2NLMAaS
+IT+7Pprf2DgcqJcinFEO/CuYaWcAUBr0WCSPi3REeZtk+Jmo1bm813GA0NaH1RQ=
+=iYNh
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild
new file mode 100644
index 000000000000..f8a7129391d8
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 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.9.2.ebuild,v 1.1 2012/04/20 20:15:55 ssuominen Exp $
+
+EAPI=4
+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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit debug gnome-keyring policykit udev +xscreensaver"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
+	x11-apps/iceauth
+	x11-libs/libSM
+	>=x11-libs/libwnck-2.22:1
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.9.1
+	>=xfce-base/libxfce4ui-4.9.2
+	>=xfce-base/xfconf-4.9.1
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 )
+	!xfce-base/xfce-utils"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	x11-misc/xdg-user-dirs
+	consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-40 ) )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+	udev? ( >=sys-power/upower-0.9.15 )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.15
+		gnome-extra/gnome-screensaver
+		>=x11-misc/xlockmore-5.38
+		>=x11-misc/slock-1
+		) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(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
+}