diff options
| -rw-r--r-- | x11-base/xorg-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-drivers/Manifest | 14 | ||||
| -rw-r--r-- | x11-base/xorg-drivers/xorg-drivers-1.10.ebuild | 7 |
3 files changed, 11 insertions, 16 deletions
diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog index 9e4f663c1da6..d2f45781e8a4 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.45 2011/04/04 14:06:09 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.46 2011/04/20 21:40:54 chithanh Exp $ + + 20 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xorg-drivers-1.10.ebuild: + Allow xf86-input-joystick back in, bug #361649. Drop extra '!' 04 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> xorg-drivers-1.10.ebuild: diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index effba88ca844..71e23a467de4 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -EBUILD xorg-drivers-1.10.ebuild 5866 RMD160 e402c7260d4de74024fad3ab3ff8c569f50e8215 SHA1 125fd89ed9229815f5b742fbb4f9ed86a63ec9ba SHA256 e2b288af2da7629bb202c47d9706f2445534890b311378e56629d6dc3fae6896 +EBUILD xorg-drivers-1.10.ebuild 5919 RMD160 428c328bc297536241991d5bc624533a5c00ccc4 SHA1 894d5ab2603bc0a19f47aae89ddafc7fa035d0e1 SHA256 3894b571d95417ce2386269b4c06f6778a0a15aa67807731eb84d5cf491f72a3 EBUILD xorg-drivers-1.9.ebuild 5826 RMD160 f1bb74626420e7faf8f340ed9753ac5bdac9af84 SHA1 008b1cbb5379c511c5824beff30cb47a3d855dea SHA256 2db24855620c629fd1ee23d7ab88ca6424f4fc1c5bb5d166f774d3011979621d -MISC ChangeLog 5971 RMD160 9fd48f740cced2e7072d5df63d8eeec57b1c122f SHA1 056c6082451e73dd4987ba62762f2e5ade5b582c SHA256 71119f958d9ec3596194ae64cdba124c71dd9defb07ddf7228c9b02b5b5cea01 +MISC ChangeLog 6134 RMD160 07081fb8815ac76cd797437b7e4b3adc56f45c1c SHA1 eed22e1f319cda967f0a0db77776c6fce719d6d4 SHA256 a4d5dc7722cce773650832cf89bcd61fde2a87679d1e463c6845915964af0d5b MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk2nGhcACgkQVWmRsqeSphOUMACfRVdyG1nGWEsAVjP3pdkMk6KE -R/MAn2YhRzu6SRkIFRun5aGsgPIe8G38 -=KBDi ------END PGP SIGNATURE----- diff --git a/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild index a29c8720d157..83febc29b544 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.2 2011/04/04 14:06:09 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild,v 1.3 2011/04/20 21:40:54 chithanh Exp $ EAPI=4 @@ -18,6 +18,7 @@ IUSE_INPUT_DEVICES=" input_devices_elographics input_devices_evdev input_devices_fpit + input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_penmount @@ -89,6 +90,7 @@ 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 ) @@ -132,7 +134,7 @@ PDEPEND=" video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) - video_cards_suncg6? ( !x11-drivers/xf86-video-suncg6 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) @@ -149,7 +151,6 @@ 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 |