summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-02-06 23:29:12 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-02-06 23:29:12 +0000
commit9f70ce0414efb684adce35538552ae659419b0ec (patch)
treeb0bbbe25893212c10d4555622e2a42248194fe92 /x11-misc
parentMark 2.12.2 stable on ia64 (diff)
downloadhistorical-9f70ce0414efb684adce35538552ae659419b0ec.tar.gz
historical-9f70ce0414efb684adce35538552ae659419b0ec.tar.bz2
historical-9f70ce0414efb684adce35538552ae659419b0ec.zip
Block x11-misc/xkeyboard-config.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xkbdata/ChangeLog5
-rw-r--r--x11-misc/xkbdata/Manifest12
-rw-r--r--x11-misc/xkbdata/xkbdata-1.0.1.ebuild5
3 files changed, 17 insertions, 5 deletions
diff --git a/x11-misc/xkbdata/ChangeLog b/x11-misc/xkbdata/ChangeLog
index 7f6fdb6c4545..200d4f76b387 100644
--- a/x11-misc/xkbdata/ChangeLog
+++ b/x11-misc/xkbdata/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xkbdata
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.16 2006/01/31 13:50:07 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.17 2006/02/06 23:29:12 spyderous Exp $
+
+ 06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; xkbdata-1.0.1.ebuild:
+ Block x11-misc/xkeyboard-config.
31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> xkbdata-1.0.1.ebuild:
Unstable on hppa.
diff --git a/x11-misc/xkbdata/Manifest b/x11-misc/xkbdata/Manifest
index 1232ad99b4a8..56021cef3267 100644
--- a/x11-misc/xkbdata/Manifest
+++ b/x11-misc/xkbdata/Manifest
@@ -1,4 +1,12 @@
-MD5 225c101bd7808bfd4e980b22f0dabd64 ChangeLog 2214
+MD5 fb4a67e550b1223c77bc337a67e3e07c ChangeLog 2327
+RMD160 d8663c908432ad38e4ee7c0e6c085dfa42a9881b ChangeLog 2327
+SHA256 a62d00c81130e9b180d4f6ab71f50414d6ba7f62f5799d6935625bd1d6882225 ChangeLog 2327
MD5 1206c10b4d50fcf26e3b26e48d8d3dad files/digest-xkbdata-1.0.1 66
+RMD160 531f80fbeab7d709dd3feab879221129a2ad0658 files/digest-xkbdata-1.0.1 66
+SHA256 fce2e607141e83309e4f567378b9fe66bf0108cf8619803fcab50e42f7c36d9a files/digest-xkbdata-1.0.1 66
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 c10bf1c929ae58f21e153ec11c2db61a xkbdata-1.0.1.ebuild 673
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 105a83d0563e5e1b21974cc11ee3415f xkbdata-1.0.1.ebuild 701
+RMD160 ca0a5397e32649076b84304bc9e1ace15c3770bb xkbdata-1.0.1.ebuild 701
+SHA256 c7671ad8ba3fb1f0a0659e753c49cf93f1487a717e1452b4bbb0e8fdc3744f1d xkbdata-1.0.1.ebuild 701
diff --git a/x11-misc/xkbdata/xkbdata-1.0.1.ebuild b/x11-misc/xkbdata/xkbdata-1.0.1.ebuild
index db370e572c76..0760eb20b0c4 100644
--- a/x11-misc/xkbdata/xkbdata-1.0.1.ebuild
+++ b/x11-misc/xkbdata/xkbdata-1.0.1.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/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.3 2006/01/31 13:50:07 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.4 2006/02/06 23:29:12 spyderous Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -9,7 +9,8 @@ inherit x-modular multilib
DESCRIPTION="X.Org xkbdata data"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-apps/xkbcomp"
+RDEPEND="x11-apps/xkbcomp
+ !x11-misc/xkeyboard-config"
DEPEND="${RDEPEND}"
src_install() {