summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-05-27 08:42:59 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-05-27 08:42:59 +0000
commitc9541d4ed28e2b0623c529b37f3034ec20340d16 (patch)
treec8e57e3160df941262e04bb845898d44e80826cf /x11-apps/xinit
parentDrop useless text in die messages. (diff)
downloadgentoo-2-c9541d4ed28e2b0623c529b37f3034ec20340d16.tar.gz
gentoo-2-c9541d4ed28e2b0623c529b37f3034ec20340d16.tar.bz2
gentoo-2-c9541d4ed28e2b0623c529b37f3034ec20340d16.zip
Update the deps on xorg-server to be rather blocker than dep. Drop s390 keyword since xorg-server we want dont have it.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps/xinit')
-rw-r--r--x11-apps/xinit/ChangeLog9
-rw-r--r--x11-apps/xinit/xinit-1.2.1-r2.ebuild (renamed from x11-apps/xinit/xinit-1.2.1-r1.ebuild)6
2 files changed, 11 insertions, 4 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 1aeab2a82a41..3241dbce76b1 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.181 2010/04/13 10:05:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.182 2010/05/27 08:42:59 scarabeus Exp $
+
+*xinit-1.2.1-r2 (27 May 2010)
+
+ 27 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -xinit-1.2.1-r1.ebuild, +xinit-1.2.1-r2.ebuild:
+ Update the deps on xorg-server to be rather blocker than dep. Drop s390
+ keyword since xorg-server we want dont have it.
*xinit-1.2.1-r1 (13 Apr 2010)
diff --git a/x11-apps/xinit/xinit-1.2.1-r1.ebuild b/x11-apps/xinit/xinit-1.2.1-r2.ebuild
index 906bc4c33932..31bea3e5e198 100644
--- a/x11-apps/xinit/xinit-1.2.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r1.ebuild,v 1.1 2010/04/13 10:05:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r2.ebuild,v 1.1 2010/05/27 08:42:59 scarabeus Exp $
EAPI="2"
@@ -9,12 +9,12 @@ inherit x-modular pam
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="+minimal pam"
RDEPEND="
+ !<x11-base/xorg-server-1.8.0
x11-apps/xauth
- >=x11-base/xorg-server-1.8.0
x11-libs/libX11
"
DEPEND="${RDEPEND}"