summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-04-04 14:06:09 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-04-04 14:06:09 +0000
commit93bb325972f522e0efe519d391f368f67e4baf66 (patch)
tree11e02b426fa2bb17591f43fb5126c38e5b028d66
parentnet-dns/djbdns: Rev bump wrt bug 241158. Update maintainer info. (diff)
downloadhistorical-93bb325972f522e0efe519d391f368f67e4baf66.tar.gz
historical-93bb325972f522e0efe519d391f368f67e4baf66.tar.bz2
historical-93bb325972f522e0efe519d391f368f67e4baf66.zip
Block xf86-input-joystick until there is a 1.10 compatible release.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
-rw-r--r--x11-base/xorg-drivers/ChangeLog6
-rw-r--r--x11-base/xorg-drivers/Manifest4
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.10.ebuild5
3 files changed, 9 insertions, 6 deletions
diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog
index a5dbd7954c64..9e4f663c1da6 100644
--- a/x11-base/xorg-drivers/ChangeLog
+++ b/x11-base/xorg-drivers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-drivers
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.44 2011/03/30 20:07:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.45 2011/04/04 14:06:09 chithanh Exp $
+
+ 04 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-drivers-1.10.ebuild:
+ Block xf86-input-joystick until there is a 1.10 compatible release.
*xorg-drivers-1.10 (30 Mar 2011)
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 49ca00ce1f44..a7dec68389a7 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,5 +1,5 @@
-EBUILD xorg-drivers-1.10.ebuild 5920 RMD160 144fc55ced698666f9c78c71fe5356e2d88dbfa4 SHA1 bceaf11d64cde90f2dd43c509c427267c8212776 SHA256 c07b140385d99cdcca510e80025b3425eba689287490395adecc36e593d1af47
+EBUILD xorg-drivers-1.10.ebuild 5866 RMD160 e402c7260d4de74024fad3ab3ff8c569f50e8215 SHA1 125fd89ed9229815f5b742fbb4f9ed86a63ec9ba SHA256 e2b288af2da7629bb202c47d9706f2445534890b311378e56629d6dc3fae6896
EBUILD xorg-drivers-1.7.ebuild 5438 RMD160 4a7e041c24c5ff6e2ac97305a9ddd9e4381e855a SHA1 6d7c46bef3b0993b43575bd0332e76906ea399d0 SHA256 f8314fd84110a1e604909f4c51be867bcad9cf837ab1ba7aaacf6c588cb2418c
EBUILD xorg-drivers-1.9.ebuild 5826 RMD160 f1bb74626420e7faf8f340ed9753ac5bdac9af84 SHA1 008b1cbb5379c511c5824beff30cb47a3d855dea SHA256 2db24855620c629fd1ee23d7ab88ca6424f4fc1c5bb5d166f774d3011979621d
-MISC ChangeLog 5803 RMD160 83ef01849b634a350d2070305be5f16b27af98da SHA1 6a09575a461b22b0908c0071a32f80a75ff09fef SHA256 359c0cd8671fa66ff0e4f02b3a8a394adbcf0ed9f34a57166338c03074235240
+MISC ChangeLog 5971 RMD160 9fd48f740cced2e7072d5df63d8eeec57b1c122f SHA1 056c6082451e73dd4987ba62762f2e5ade5b582c SHA256 71119f958d9ec3596194ae64cdba124c71dd9defb07ddf7228c9b02b5b5cea01
MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
index 87894bb8dd82..a29c8720d157 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild,v 1.1 2011/03/30 20:07:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild,v 1.2 2011/04/04 14:06:09 chithanh Exp $
EAPI=4
@@ -18,7 +18,6 @@ IUSE_INPUT_DEVICES="
input_devices_elographics
input_devices_evdev
input_devices_fpit
- input_devices_joystick
input_devices_keyboard
input_devices_mouse
input_devices_penmount
@@ -90,7 +89,6 @@ PDEPEND="
input_devices_elographics? ( x11-drivers/xf86-input-elographics )
input_devices_evdev? ( x11-drivers/xf86-input-evdev )
input_devices_fpit? ( x11-drivers/xf86-input-fpit )
- input_devices_joystick? ( x11-drivers/xf86-input-joystick )
input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
input_devices_mouse? ( x11-drivers/xf86-input-mouse )
input_devices_penmount? ( x11-drivers/xf86-input-penmount )
@@ -151,6 +149,7 @@ PDEPEND="
!x11-drivers/xf86-input-citron
!x11-drivers/xf86-input-hyperpen
+ !x11-drivers/xf86-input-joystick
!x11-drivers/xf86-input-mutouch
!x11-drivers/xf86-video-cyrix
!x11-drivers/xf86-video-impact