summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-02-17 03:40:42 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-02-17 03:40:42 +0000
commit52f4674f5e4fb24e6f417587fdf8429e3d09518c (patch)
treef6c0040b58d798fe630c0b21c3f02f86c44fa2ed /x11-misc
parentversion bump (diff)
downloadgentoo-2-52f4674f5e4fb24e6f417587fdf8429e3d09518c.tar.gz
gentoo-2-52f4674f5e4fb24e6f417587fdf8429e3d09518c.tar.bz2
gentoo-2-52f4674f5e4fb24e6f417587fdf8429e3d09518c.zip
Remove REQUIRED_USE to prevent conflict with package.use.force of USE flags new-login and gdm for arm, ppc64
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog8
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.20.ebuild6
2 files changed, 8 insertions, 6 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7274875b1705..5891fc74b7bb 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
# 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.325 2012/12/16 19:56:05 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.326 2013/02/17 03:40:42 ssuominen Exp $
+
+ 17 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.20.ebuild:
+ Remove REQUIRED_USE to prevent conflict with package.use.force of USE flags
+ new-login and gdm for arm, ppc64
16 Dec 2012; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.20.ebuild:
alpha/ia64/sh/sparc stable wrt #439146
diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
index 1bd396801de3..e8740c25b573 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.9 2012/12/16 19:56:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.10 2013/02/17 03:40:42 ssuominen Exp $
EAPI=4
inherit autotools eutils flag-o-matic multilib pam
@@ -56,8 +56,6 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xf86vidmodeproto
xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="gdm? ( new-login )"
-
src_prepare() {
if use new-login && ! use gdm; then #392967
sed -i \