Introduce USE="gdm" which will select gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm. This behavior should be matching xfce-extra/xfswitch-plugin.

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

4 files changed, 150 insertions, 17 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index f8a0b0c2e894..7ea2cf282d51 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.307 2012/01/28 06:27:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.308 2012/04/21 00:47:35 ssuominen Exp $
+
+*xscreensaver-5.15-r1 (21 Apr 2012)
+
+  21 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xscreensaver-5.15-r1.ebuild, metadata.xml:
+  Introduce USE="gdm" which will select gdmflexiserver from gnome-base/gdm
+  instead of x11-misc/lightdm. This behavior should be matching
+  xfce-extra/xfswitch-plugin.
 
   28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   -xscreensaver-5.14.ebuild, -files/xscreensaver-5.14-gentoo.patch:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 1fc69da29da8..b187d4b5644d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX xscreensaver-5.05-interix.patch 1033 RMD160 8246ead601e80f89e535ffad6b6d3298c7f96eab SHA1 b3e5168c1cb204032c5af4a7631dc08222b0eee5 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27
 AUX xscreensaver-5.15-gentoo.patch 3002 RMD160 83d0aa8101828a0884a01553db9c4ef5c16ca5f1 SHA1 cac280d34ed8a66660ca2b30ce5b97aa801d314b SHA256 f81bde587499a82778fd396220eb4b4c8453213a7ba94dd4255624b9fd8d45a9
 DIST xscreensaver-5.15.tar.gz 5977594 RMD160 58c7d4fae709b6500001df53e8ce27c48ae8a5b9 SHA1 b5ce7caa19f4d57c3bac83377a36dddbe7095052 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d
+EBUILD xscreensaver-5.15-r1.ebuild 3186 RMD160 0a4a34dd7e7b36980efe5e1e733dd28272909363 SHA1 aada8286dc07fbc217fa5a2db8b528ee70931904 SHA256 98a40ee62992f04f2db390e5faabb57dd51ff27bdf67c6b0eee7436dea2bdc9e
 EBUILD xscreensaver-5.15.ebuild 3149 RMD160 60e9b565f6782ba7136f851749dcfb0e707ab69f SHA1 9b81ca48c57543c6391b68ed3a3d65da00957e9d SHA256 eda44769e084e5e710e3efa9825926b9a52df81f674f420e63bc1a3ffa2ea5ed
-MISC ChangeLog 49346 RMD160 c2622d97de3672d079ca9c40bf27569e014a95f7 SHA1 80e063a9f4aba7595f9d0b5e94b1c681ba1e6393 SHA256 149261f40cfabe808bfb589ad6fe5d65be1510056bfb9f111cc8190a93d046da
-MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
+MISC ChangeLog 49653 RMD160 e5c303de9b0fa11eba86bf7a061a5a9e4526164c SHA1 5f5e6fa471ce15405acb618cb0841db6bdb0d144 SHA256 beff899cf329fa03e9147a89ae2ed2557f6741facd7048c2956f620406aa004d
+MISC metadata.xml 581 RMD160 59f02286011f08757249d83d68ecf128042b0f1b SHA1 a70099ecb9e83c578cc37cf6957b3fd6e5dd4b1f SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPI5S1AAoJEEdUh39IaPFNDPcH/ilYq7sacOlHSIMSREf0JQnd
-+u+UHNllYJP01p1s+dC97n1bxRlJ/HZZPNBhSo5jlgpfJ+4G1f3BuZvo530YjWiA
-LI/pnOxCLPnMDVkje21Mpyl3gsDZIxwUj0zaOZYR7b9PegfGxxVuMNXmn9Pcp17S
-bqN6USSHW7TlKKKnBUUXZJrbqZvR8V9Mb5wJQ2r+pVzuCg6PfD96zvCiGFKE3sSb
-Or4GtpZOlSAml6W+r1aR+eU5twXz8zS9Rx0r2ruw8kjL6qKz4B2f1e4flxUS73h2
-4uv0jeEL/zSm6fV6BJbkTZ1y12oHBSIQpOH098F01kEYEAMieZOTTMEgvISSCS4=
-=w5+E
+iQEcBAEBAgAGBQJPkgNIAAoJEEdUh39IaPFNtTUH/0SbhoX/QxIaR/NBf6guih5p
+pe3X/2DW9xWSGOzU2W5edBwbJ6jL/Z0kwO3738GVTSD0l6omHHN6aQj1ZK+H8z98
+LWG/rfMztpksaP/tD43c+aFQPFiVatSM8BfnonoYj8EjajNyvrDrEJX7lV5/55pv
+2eWOZq5Z0XBh+47BWXvRIrF2pOObnKA0FNTgTk3Rx2dGcOf5SaLv/tXyBywwofRl
+5HGWPC+S8wLwPT09LKyG5cqZMw7uWzyQPJZiFD2IYdyp9FZHOoQv1iiwvQTFRqtK
+vv1VXt1tTLRHR/K7u/9NPdfD4wFU4jegGY8WJrWW2AWFR4vYmOcnBb9gvUeI0No=
+=vNg8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index a5f00973afc3..2e1f1016e536 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -2,12 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
-  <maintainer>
-    <email>jwz@jwz.org</email>
-    <name>Jamie Zawinski</name>
-    <description>Upstream, add to bugzilla as CC for bugs.</description>
-  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>jwz@jwz.org</email>
+      <name>Jamie Zawinski</name>
+    </maintainer>
+  </upstream>
   <use>
-    <flag name="new-login">Enable New Login button using gdmflexiserver (<pkg>gnome-base/gdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
+    <flag name='gdm'>Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+    <flag name='new-login'>Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild
new file mode 100644
index 000000000000..b1ee3def3b9e
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild,v 1.1 2012/04/21 00:47:35 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login opengl pam +perl suid xinerama"
+
+COMMON_DEPEND="dev-libs/libxml2
+	>=gnome-base/libglade-2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? ( virtual/opengl )
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/bc
+	sys-devel/gettext
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+REQUIRED_USE="gdm? ( new-login )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.15-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch
+
+	eautoconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset LINGUAS #113681
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-locking \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-dpms-ext \
+		$(use_with xinerama xinerama-ext) \
+		--with-xinput-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		$(use_with pam) \
+		--without-kerberos \
+		$(use_with new-login login-manager) \
+		--with-gtk \
+		$(use_with opengl gl) \
+		--without-gle \
+		--with-pixbuf \
+		$(use_with jpeg) \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		$(use_with suid setuid-hacks)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}