Allow stable drivers for 1.10, drop virtualbox from 1.11, bug #387121

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

4 files changed, 20 insertions, 13 deletions

diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog
index bbe6640d90b5..384ace2a1de3 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.56 2011/08/29 05:48:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.57 2011/10/14 21:45:01 chithanh Exp $
+
+  14 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-drivers-1.10.ebuild, xorg-drivers-1.11.ebuild:
+  Allow stable drivers for 1.10, drop virtualbox from 1.11, bug #387121
 
   29 Aug 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 61d4fb8e96b8..5ec54dd3fcfd 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,5 +1,5 @@
-EBUILD xorg-drivers-1.10.ebuild 5784 RMD160 9ee327d7acb2441de610faf82cbe15a62b8aba99 SHA1 c38babdcc62f95690e99caae82ff29905319d56f SHA256 aa3b38bc36459b53df16cc88964fda72d33925244ff6aeb2cae418671b2d08f3
-EBUILD xorg-drivers-1.11.ebuild 6026 RMD160 9c5a75e718fb758c82e098c0e9b1946517eb73bb SHA1 6d41fb638baefdb73706c324004c44940559f2d3 SHA256 79732c99cca198a3f27a8fd26b88bea3c07060e76b18a25b371f79ff5c6bf47f
+EBUILD xorg-drivers-1.10.ebuild 6017 RMD160 1ad9cb0c6d8eb8ba851a8ba524f5451966cc2a17 SHA1 4dfb28cc9a18b2a406dfe1b295db37026ccbc318 SHA256 a7a7622f0208715e473464b4d9a5e093981fb8e2797d58f67104e6d832bba8b6
+EBUILD xorg-drivers-1.11.ebuild 5934 RMD160 4660faba6e9367e2091cd649a5cf511f58fe640f SHA1 88b81453de8ef3f495ce82f0b0a1ecaa4960ca74 SHA256 717fe98c5a3ddae7620e7cfc7816519ef94abd3ac3dc3f212795ca2faa724e3e
 EBUILD xorg-drivers-1.9.ebuild 5826 RMD160 f1bb74626420e7faf8f340ed9753ac5bdac9af84 SHA1 008b1cbb5379c511c5824beff30cb47a3d855dea SHA256 2db24855620c629fd1ee23d7ab88ca6424f4fc1c5bb5d166f774d3011979621d
-MISC ChangeLog 7522 RMD160 0c5accca2567c03e31d02383bcff92f0903c933d SHA1 f2935cfdd4ef2dd799e5285ac6a3a1420bf91a74 SHA256 fd2cc890e79f425ccaa7aecb822a710c512ef936b0368397c028c27a66a6859f
+MISC ChangeLog 7718 RMD160 9a62d2392c526bdc5e45eb292f87b86d2ac72fd3 SHA1 029253798152efc8e8400b2c9a13a9c47526b062 SHA256 bcee8f98c0a17fe8a7d9a94896fc780fe67241bec20182fa99329ed29d596ef4
 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 8229d0d38dc7..66d2fb3b1132 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.12 2011/08/29 05:48:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild,v 1.13 2011/10/14 21:45:01 chithanh Exp $
 
 EAPI=4
 
@@ -15,10 +15,15 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
+	input_devices_elographics
 	input_devices_evdev
+	input_devices_fpit
+	input_devices_hyperpen
 	input_devices_joystick
 	input_devices_keyboard
 	input_devices_mouse
+	input_devices_mutouch
+	input_devices_penmount
 	input_devices_tslib
 	input_devices_virtualbox
 	input_devices_vmmouse
@@ -84,10 +89,15 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 PDEPEND="
 	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
 	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
+	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_hyperpen?    ( x11-drivers/xf86-input-hyperpen )
 	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_mutouch?     ( x11-drivers/xf86-input-mutouch )
+	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_virtualbox?  ( x11-drivers/xf86-input-virtualbox )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
@@ -144,11 +154,6 @@ PDEPEND="
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
-	!<x11-drivers/xf86-input-elographics-1.3.0
-	!<x11-drivers/xf86-input-fpit-1.4.0
-	!<x11-drivers/xf86-input-hyperpen-1.4.1
-	!<x11-drivers/xf86-input-mutouch-1.3.0
-	!<x11-drivers/xf86-input-penmount-1.5.0
 	!x11-drivers/xf86-video-cyrix
 	!x11-drivers/xf86-video-impact
 	!x11-drivers/xf86-video-nsc
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild
index f9088f428b73..bccd48f44429 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.11.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.11.ebuild,v 1.2 2011/06/29 12:54:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild,v 1.3 2011/10/14 21:45:01 chithanh Exp $
 
 EAPI=4
 
@@ -25,7 +25,6 @@ IUSE_INPUT_DEVICES="
 	input_devices_mutouch
 	input_devices_penmount
 	input_devices_tslib
-	input_devices_virtualbox
 	input_devices_vmmouse
 	input_devices_void
 	input_devices_synaptics
@@ -99,7 +98,6 @@ PDEPEND="
 	input_devices_mutouch?     ( x11-drivers/xf86-input-mutouch )
 	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
-	input_devices_virtualbox?  ( x11-drivers/xf86-input-virtualbox )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )