summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-02-07 00:08:21 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-02-07 00:08:21 +0000
commit46f2c9b726a90f533ad35ae3af11a49c83a4f59f (patch)
tree8e573ef851b841cb667c8ba1fe810a07a8487b80 /x11-base/xorg-x11
parentAlso make the xorg rules symlink. (diff)
downloadhistorical-46f2c9b726a90f533ad35ae3af11a49c83a4f59f.tar.gz
historical-46f2c9b726a90f533ad35ae3af11a49c83a4f59f.tar.bz2
historical-46f2c9b726a90f533ad35ae3af11a49c83a4f59f.zip
Revert that, the default doesn't match xkeyboard-config's default.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/Manifest12
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild3
3 files changed, 12 insertions, 9 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6143064595c9..f5624ba1fa7c 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.517 2006/02/06 23:41:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.518 2006/02/07 00:08:21 spyderous Exp $
+
+ 07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-7.0-r1.ebuild:
+ Revert that, the default doesn't match xkeyboard-config's default.
06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index d335a626d501..e37cb5f5b9e1 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 a7cc48b86b28f1c0107268e8f83781dc ChangeLog 115203
-RMD160 389e72582afd438314f1e85c6144928c3382e98a ChangeLog 115203
-SHA256 357fded6c6c1d3184bd1a9197bdc4df16785261ea9ef10ae8430cb9317a90b05 ChangeLog 115203
+MD5 ea064627936cf18e7e5d25399494a970 ChangeLog 115354
+RMD160 d8d09ff68a5a6b696a549eb33784576554ac4d4f ChangeLog 115354
+SHA256 ad38e1c2938ccafcec081b31cd5faee6df61c7c7249100537419e9476529583d ChangeLog 115354
MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
@@ -28,9 +28,9 @@ SHA256 8318e0d8d3ae52fd2206ca57e83217d43c052716d5ae317d434f4926f4aa48c0 xorg-x11
MD5 fd0a1f5519f3c1704de9c3744b7670ec xorg-x11-6.8.99.15-r4.ebuild 54157
RMD160 aa87ce403b2398d82061197321a41f3c26cffc22 xorg-x11-6.8.99.15-r4.ebuild 54157
SHA256 a776983eb4bd04de304af15a6bfb3a68ee558d48a164a26fd8aaadbb47d4be93 xorg-x11-6.8.99.15-r4.ebuild 54157
-MD5 76a7db462642817b598647fa337cb0b0 xorg-x11-7.0-r1.ebuild 17295
-RMD160 f4e191c4263c44b8c4d4ac91e8089c8d59dfe5a2 xorg-x11-7.0-r1.ebuild 17295
-SHA256 9e0237f480ba3bb900d10a51180105c4d0069fe61a9d239ef7f96c6deb73b8fd xorg-x11-7.0-r1.ebuild 17295
+MD5 6efaf027be332ece06a0f5a0079733a5 xorg-x11-7.0-r1.ebuild 17253
+RMD160 41530dfb309d4dcff577cd6c5735c2472e39b13a xorg-x11-7.0-r1.ebuild 17253
+SHA256 3d93308fcc333d481840644e9c46d4509bbe18a09eb02c4be8ab7e29f65636b5 xorg-x11-7.0-r1.ebuild 17253
MD5 b8256074d549617ad13279d98fdaafb9 xorg-x11-7.0.ebuild 3726
RMD160 04a4b2ec7794ef3f67a122e82a870d7487d8a8bc xorg-x11-7.0.ebuild 3726
SHA256 4cf8b8fdb8e6391a98d099aa26ca3ce10155e1a3b869b4fd5226c71e25a6a4b7 xorg-x11-7.0.ebuild 3726
diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
index 9bc54ed416b1..d059163758f3 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0-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/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.9 2006/02/06 23:41:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.10 2006/02/07 00:08:21 spyderous Exp $
inherit eutils
@@ -465,7 +465,6 @@ pkg_preinst() {
mkdir -p "${IMAGE}/etc/X11"
sed "/ModulePath/d" ${XORGCONF} > ${IMAGE}${XORGCONF}
sed -i "/RgbPath/d" ${IMAGE}${XORGCONF}
- sed -i "/XkbRules/d" ${IMAGE}${XORGCONF}
fi
}