summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-09 06:08:56 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-09 06:08:56 +0000
commit5fdcdb942aae8b6d2ca09967a12d4624003ee305 (patch)
treea686d77b89156b3ec697a0d5a8ed2551897fb3e7
parentPinpoint virtual/x11 version to less than 7. (diff)
downloadhistorical-5fdcdb942aae8b6d2ca09967a12d4624003ee305.tar.gz
historical-5fdcdb942aae8b6d2ca09967a12d4624003ee305.tar.bz2
historical-5fdcdb942aae8b6d2ca09967a12d4624003ee305.zip
Pinpoint virtual/x11 version to less than 7.
Package-Manager: portage-2.1.1_pre2-r6
-rw-r--r--kde-base/kdm/ChangeLog6
-rw-r--r--kde-base/kdm/kdm-3.5.2-r1.ebuild4
-rw-r--r--kde-base/kdm/kdm-3.5.3-r2.ebuild4
-rw-r--r--kde-base/kxkb/ChangeLog6
-rw-r--r--kde-base/kxkb/kxkb-3.5.2.ebuild4
-rw-r--r--kde-base/kxkb/kxkb-3.5.3.ebuild4
6 files changed, 18 insertions, 10 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index fa5da57eb1d4..5d12e6137b33 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdm
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.63 2006/07/01 04:18:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.64 2006/07/09 06:07:55 flameeyes Exp $
+
+ 09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kdm-3.5.2-r1.ebuild,
+ kdm-3.5.3-r2.ebuild:
+ Pinpoint virtual/x11 version to less than 7.
01 Jul 2006; Daniel Black <dragonheart@gentoo.org> Manifest:
removed stray kdm-3.5.2-r1.ebuild.orig ended up in manifest. Thanks to Bread
diff --git a/kde-base/kdm/kdm-3.5.2-r1.ebuild b/kde-base/kdm/kdm-3.5.2-r1.ebuild
index b9de91c9efe8..f483adb6542a 100644
--- a/kde-base/kdm/kdm-3.5.2-r1.ebuild
+++ b/kde-base/kdm/kdm-3.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.2-r1.ebuild,v 1.5 2006/06/28 02:25:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.2-r1.ebuild,v 1.6 2006/07/09 06:07:55 flameeyes Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -24,7 +24,7 @@ DEPEND="pam? ( kde-base/kdebase-pam )
$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
# Requires the desktop background settings and kdm kcontrol modules
RDEPEND="${DEPEND}
- || ( x11-apps/xinit virtual/x11 )
+ || ( x11-apps/xinit <virtual/x11-7 )
kde-base/kdepasswd"
diff --git a/kde-base/kdm/kdm-3.5.3-r2.ebuild b/kde-base/kdm/kdm-3.5.3-r2.ebuild
index fbc7eee32db4..b3e6fe17f8dc 100644
--- a/kde-base/kdm/kdm-3.5.3-r2.ebuild
+++ b/kde-base/kdm/kdm-3.5.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.3-r2.ebuild,v 1.2 2006/06/28 02:25:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.3-r2.ebuild,v 1.3 2006/07/09 06:07:55 flameeyes Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -24,7 +24,7 @@ DEPEND="pam? ( kde-base/kdebase-pam )
$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
# Requires the desktop background settings and kdm kcontrol modules
RDEPEND="${DEPEND}
- || ( x11-apps/xinit virtual/x11 )
+ || ( x11-apps/xinit <virtual/x11-7 )
kde-base/kdepasswd"
src_unpack() {
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 9a639fb8069c..8d3c847fb7b4 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kxkb
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.61 2006/06/27 08:29:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.62 2006/07/09 06:08:56 flameeyes Exp $
+
+ 09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kxkb-3.5.2.ebuild,
+ kxkb-3.5.3.ebuild:
+ Pinpoint virtual/x11 version to less than 7.
27 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kxkb-3.5.2.ebuild:
Backport the autoconf to current stable, to avoid a new version to go stable
diff --git a/kde-base/kxkb/kxkb-3.5.2.ebuild b/kde-base/kxkb/kxkb-3.5.2.ebuild
index 7db9d274040b..769d3ba68e44 100644
--- a/kde-base/kxkb/kxkb-3.5.2.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.2.ebuild,v 1.15 2006/06/27 08:29:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.2.ebuild,v 1.16 2006/07/09 06:08:56 flameeyes Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -18,7 +18,7 @@ RDEPEND="${RDEPEND}
|| ( (
|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
- ) virtual/x11 )"
+ ) <virtual/x11-7 )"
KMEXTRACTONLY="${KMEXTRACTONLY}
kdm/configure.in.in"
diff --git a/kde-base/kxkb/kxkb-3.5.3.ebuild b/kde-base/kxkb/kxkb-3.5.3.ebuild
index b6d927214dc6..253a17e815be 100644
--- a/kde-base/kxkb/kxkb-3.5.3.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.3.ebuild,v 1.3 2006/06/26 05:31:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.3.ebuild,v 1.4 2006/07/09 06:08:56 flameeyes Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -18,7 +18,7 @@ RDEPEND="${RDEPEND}
|| ( (
|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
- ) virtual/x11 )"
+ ) <virtual/x11-7 )"
KMEXTRACTONLY="${KMEXTRACTONLY}
kdm/configure.in.in"