Apply terminateServer patch from bug 290034.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 37 insertions, 15 deletions

diff --git a/x11-misc/wdm/ChangeLog b/x11-misc/wdm/ChangeLog
index 5ceac99d866c..f645b4cc79e9 100644
--- a/x11-misc/wdm/ChangeLog
+++ b/x11-misc/wdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/wdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.38 2010/03/13 13:24:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.39 2010/06/06 14:01:55 ssuominen Exp $
+
+*wdm-1.28-r3 (06 Jun 2010)
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +wdm-1.28-r3.ebuild,
+  +files/wdm-1.28-terminateServer.patch:
+  Apply terminateServer patch from bug 290034.
 
   13 Mar 2010; Markos Chandras <hwoarang@gentoo.org> wdm-1.28-r1.ebuild,
   wdm-1.28-r2.ebuild:
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 0095c5fde02a..ed756e5e0e8d 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -1,7 +1,8 @@
+AUX wdm-1.28-terminateServer.patch 417 RMD160 62fb3d00507d75d0ca6f3436b36dbadb1a869baa SHA1 29e3910ec00f6bbede7bfb86850ef47eb1bf583d SHA256 3e6d5507dbd9aeebf698725c57386e0c65d236ae79c037f3e62311da88278bb1
 AUX wdm-include 174 RMD160 e96c92b0ad462cf92e5bca0b97a41aaa41b9ac2f SHA1 3d06e77f864465d1282f316a565a0b810cd5ca6d SHA256 5fef4f1719b6b43a2707c89abedd3fe256ecb26ae0cdca81ba4361a9a5b10db6
 AUX wdm-include.1 174 RMD160 f41b0e3d4cc295212fd70863ffaec1a1d34768d8 SHA1 beb89e9116aafe81165b1f46dc1c2a0ee2aa6f31 SHA256 351e55f39d90a4b25369b99fe0444fc6e9eb607fabedf70c8c43cd6192f75067
 DIST wdm-1.28.tar.bz2 381522 RMD160 4b027685dc5844578081e80a543e07ece2f87707 SHA1 805031e50e12044b367210e9aabffe1ffc7c4833 SHA256 8a5cde0a4988d557d48bb7470f14f416d0b8ff6e20d7061643e6143f7b2be2c4
 EBUILD wdm-1.28-r1.ebuild 967 RMD160 7349c75fb36604ad74cb2773180b3b9582fd7bdf SHA1 b45fdd4d6c0cf6e9786520f88764a0961e4bd1f5 SHA256 2e9756c5e28a4ba915536c2e01b8af2e89ffc1bd0ccbe798f0acfcef6de5fcc4
-EBUILD wdm-1.28-r2.ebuild 1057 RMD160 78d0c12e25b151f1decd9061f1a4fa1ef663e687 SHA1 0252c87985fc89508c72d051e84185b97a6b5349 SHA256 138a480a1ef6ca32556b6fa8be11a0afaff31dc6ba989c1344ec94196ee5bfa4
-MISC ChangeLog 4480 RMD160 afffa6aa62d23d221369dfd6cce1aac73b52ad29 SHA1 9f3d83fc8e477b3dadc0f7423ec4e6d34c3bfbb0 SHA256 14dd9cfa234f701627f866202635272ace173c94bfb0b6792d0fd09b8ed33de6
+EBUILD wdm-1.28-r3.ebuild 1083 RMD160 0fa120d433d7054ec58214ed11d327e8199c3e27 SHA1 4169962fb3c4d0bbd91ba93766ece51f03e9f571 SHA256 c063d5c5cb95c8f40ddb48ee3d6a71b150645ebe9edb375a8952e6e124a05b8c
+MISC ChangeLog 4673 RMD160 540e5d344f7d9bde164127ead98a961cbbaf13a3 SHA1 dbb8dd6acf443b13f68fe9cb83c0350dd5f4303f SHA256 b7201f51e433804259af71ee6a41df7212aace7f4d575703832b109f9f40303c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/wdm/files/wdm-1.28-terminateServer.patch b/x11-misc/wdm/files/wdm-1.28-terminateServer.patch
new file mode 100644
index 000000000000..3e167bd818e5
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-terminateServer.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/290034
+
+--- configs/wdm-config.in
++++ configs/wdm-config.in
+@@ -21,6 +21,7 @@
+ DisplayManager*session:         @DMDIR@/Xsession
+ DisplayManager*authComplain:    false
+ DisplayManager*wdmLogin:        @exec_prefix@/bin/wdmLogin
++DisplayManager*terminateServer: true
+ !
+ ! display screen background--if not set or set to none, then the
+ !                            background is not set by wdm.
diff --git a/x11-misc/wdm/wdm-1.28-r2.ebuild b/x11-misc/wdm/wdm-1.28-r3.ebuild
index f820a89c64c7..8dd1601491ef 100644
--- a/x11-misc/wdm/wdm-1.28-r2.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.28-r2.ebuild,v 1.9 2010/03/13 13:24:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.28-r3.ebuild,v 1.1 2010/06/06 14:01:55 ssuominen Exp $
 
-inherit pam
+EAPI=2
+inherit eutils pam
 
 DESCRIPTION="WINGs Display Manager"
 HOMEPAGE="http://voins.program.ru/wdm/"
@@ -13,29 +14,31 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="truetype pam selinux"
 
-RDEPEND=">=x11-wm/windowmaker-0.70.0
+COMMON_DEPEND=">=x11-wm/windowmaker-0.70.0
 	truetype? ( x11-libs/libXft )
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXpm
 	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext"
-RDEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	pam? ( >=sys-auth/pambase-20080219.1 )"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-terminateServer.patch
+}
+
+src_configure() {
 	econf \
 		--exec-prefix=/usr \
 		--with-wdmdir=/etc/X11/wdm \
-		$(use_enable pam)\
-		$(use_enable selinux) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable pam) \
+		$(use_enable selinux)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}/etc/pam.d/wdm"
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"/etc/pam.d/wdm
 	pamd_mimic system-local-login wdm auth account password session
 }