Fix building against xorg-server-1.14, bug #460754.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

19 files changed, 158 insertions, 248 deletions

diff --git a/x11-drivers/xf86-video-dummy/ChangeLog b/x11-drivers/xf86-video-dummy/ChangeLog
index 948486e1e840..3f3a38ec314d 100644
--- a/x11-drivers/xf86-video-dummy/ChangeLog
+++ b/x11-drivers/xf86-video-dummy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-dummy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.99 2013/02/27 05:41:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.100 2013/03/08 20:56:28 chithanh Exp $
+
+*xf86-video-dummy-0.3.6-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch,
+  +xf86-video-dummy-0.3.6-r1.ebuild,
+  -files/xf86-video-dummy-0.3.5-dga-support.patch,
+  -xf86-video-dummy-0.3.4.ebuild, -xf86-video-dummy-0.3.5-r1.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   27 Feb 2013; Zac Medico <zmedico@gentoo.org> xf86-video-dummy-0.3.6.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index f3056564ebdf..b31ddd54eca4 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX xf86-video-dummy-0.3.5-dga-support.patch 1486 SHA256 5e435d4044eabafee0e05fcffaace6cfffcc24e8de3c567440c1d103ca6ffac3 SHA512 b1de322387d1f305765f78deece5fa100d89b95f751e57c903e45221f6872f73187db492966c4540e02b526e37c8db90d84ab69c5aa81baf3126f3d18cbbc216 WHIRLPOOL 44372293f9687fdad9b29a35cb9f94ff7189f28c5f58efa4384dc17ccc1c0f2c669291906a242bec19cb3e728f39d42e1bcf17fc0d794e476aae47a3b895a250
-DIST xf86-video-dummy-0.3.4.tar.bz2 255658 SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc SHA512 976c486dcbc0b700e4e186f3dc2d45851fcdfbc7600baf99805199c3c906fba1f39c77836b75ca4333d6b02bf89250f6f90580c96a1718322ddc035e92dc62f2 WHIRLPOOL b3ee2c6c4c1c00b4d225a28d96dbbf715d19833ea03ea84d52ab93d7fe4e182dad21745ad9283fcc8dac2010c2972d90eaaff6cc46f2a25c5c516e27b3008fd2
-DIST xf86-video-dummy-0.3.5.tar.bz2 274761 SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f SHA512 99637074e7ef19d0b72298c5f0c8e571e1ec1fcf832f89d5c6f7ea23cd96dbed0590a42fe9e7d7f85bc4a700980df8091bb0b4e0a38992e2cabb90028c433f9b WHIRLPOOL 2aa3acda827f514135ad6802a0c0ac6e3a0b8db5a240c13cff6155ae03a1072207dbd1e88eb524065e8c03c3dc8633053904126c2615b1a174fc496a7ae28818
+AUX xf86-video-dummy-0.3.6-remove-mibstore_h.patch 864 SHA256 06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb SHA512 c141a4f316b67f06d07318af312c2a37c764b34ea6fdd17413a2e08e4f2e4e817499bea3bbbbf894fc4c08e74f721e3c640a300a8eb052b5b733b5142392c2ac WHIRLPOOL 028306b87cd4910b7ad94d2d8fcf664f0678ad81615f2ff193884f7921c66f8b14fdb2efaae586a109dfdab34f47b015d120c40faf42e908d6bb1ef87bc09eeb
 DIST xf86-video-dummy-0.3.6.tar.bz2 285892 SHA256 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798 SHA512 3a530083d591ebde37b58a329d9a6ed4955d09d8f3f7fb566840681f2588aa752014c8753f411aec0410a2704b3b55729868a27aee138df42eb7d7bb5a5a52c5 WHIRLPOOL 4475426b4469968ad63f830a66cc44452f39194c0abcaf9b54e527fe8c560f6dc7b38030a5f1dd95ecec9e82f291bcb3bde3820c1506f2bcdce60d1e352e6ec4
-EBUILD xf86-video-dummy-0.3.4.ebuild 589 SHA256 48e3d492fac1047772d5144d7adbc61529c8b5cf9efcd36104d24283536c17ed SHA512 442b2bb9e22a8a7f9b4d75408ed4ebe724121145ae839bc331c16ac2229d170e178d495e8ba77cd852ac581c5dd03a071a905bfd215778c72868f742b85a2eab WHIRLPOOL 076a95d0e323ec32cea1442fb2e2202da6e9ab36c68f2f82f9db28496599107e2678a7f66daee0a4a8e0e836d7e0ce9d138c68f53c7b2320e81d832482076577
-EBUILD xf86-video-dummy-0.3.5-r1.ebuild 643 SHA256 b01dd81c84ea9ff85f527dba55335fc33f03db517237f2991bde83fd5489a152 SHA512 83da6a492ea4496f5ddcb3cd07a9f6c02f2c4b851ffeb2b471d9b19b5613a7f044fc6c1729e9ef8bf470fa4ae42cdbcec0db65f0aa976ee7c48e56fa1641cde4 WHIRLPOOL 49fa171f34bc1524522fb63652a3997c299ead724b70a6381ba38f54f28652ea547e83ee13aaa4398e2a1233a69bbd56b1576e306e015b011aa8375b916f216f
+EBUILD xf86-video-dummy-0.3.6-r1.ebuild 701 SHA256 89ae1f40304b8953f0fbeca04365b02ea6335ef5e375af0dfb2a0613f18ba1dc SHA512 90bb93cc82cc425c65074aef3d86d1ed6a075568cf5a45d263a5373c15e0f7e41460dc33fab2d0a82225c89cdfb76487d0bf5552c81fcf670113f623043aea2e WHIRLPOOL 2fb900012482b5a326f07a3d2133a787921102ae76abe2da61f758755108f7327170b2c7812c6fd4238e0b682289424f6fe24682f48ca59ffe878e4926202898
 EBUILD xf86-video-dummy-0.3.6.ebuild 630 SHA256 6dc3c0be71eb9816b25ccf37890bac9b5abce33187264c390282ef4c61d4187c SHA512 fdef2dc79efb1020c03a02f29c23f29b57903ba8b2ba167028860aaafd0e0a7bac9ea1d71c7413d7a83dcb44c9268874cfb947ea3fd19a64cdeac0f52c661dd0 WHIRLPOOL de5d5f5896f53e16f4b6d570dbd672b4c578ee72f5102f91573bd241c8e793eddbed17c0d4288c37b8279720563efb76a1d00db4a30df93d0b229191e36addcb
-MISC ChangeLog 12504 SHA256 641ae53fc97e6c3748bf3924e38c3785920a7563bd2b755a82203b8aa3696e3c SHA512 1d173aa945ca340995f3b674e72cf09f63bb0296938f7095d26b9f03fc5bbd8eabd99b3851d6bac507755a8edfb5cb31904f23dd1a6db4852123a48d9f97a4b7 WHIRLPOOL 5c18b1a97331997a56a2d869d9ee0791359fda716340136ed161ab726dca5af776a44a13f76e7bf70b2cb4cad751c43df26744af056307ae4a0a6e4238bf12f5
+MISC ChangeLog 12886 SHA256 38704e1c4676dc00ed75343dbe6efad044163c592ed59f3c37136d3b97b309de SHA512 7b719011dac2d3f678d12943d9b05e86b0dca26ed0a6b927673250b5b84fa22ed1a20ebb6a2591eea966594747012547600d9d3d14afba0f2e5eefc2204643ec WHIRLPOOL 9c465710c71afe539bb6d56184b65d120aa82139c5a9872b5df8b37788a4c499ad06e585db23602cd0a90617b8bce6e319a2ee606dd9669b3b03dea1ce088c3d
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEtnIIACgkQ/ejvha5XGaN89gCg6vYSvn+tF45wTrAnTZJ/1NwY
-TVsAnR5/W1Hn0BtlZvEpWacK0Vllgbts
-=9ffK
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
deleted file mode 100644
index e4a848e69a95..000000000000
--- a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 02918fd53434a23a72fe878a90f4ec48ef0e0416 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 09 Jan 2012 09:00:40 +0000
-Subject: Don't use XFreeXDGA to determine DGA support
-
-If our server supports DGA and we want to build the dummy driver without it,
-XFreeXDGA will be defined by the server and will be picked up rather than
-our configuration option.  This change forces us to honor our configuration
-hoice.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index d92e22a..6861485 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- 
- if test "x$DGA" = xyes; then
- 	XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
--	AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
-+	AC_DEFINE(USE_DGA, 1, [Support DGA extension])
- fi
- AC_SUBST([DGA])
- AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
-diff --git a/src/dummy_driver.c b/src/dummy_driver.c
-index 041ca96..6533b27 100644
---- a/src/dummy_driver.c
-+++ b/src/dummy_driver.c
-@@ -45,7 +45,7 @@
- #include <X11/Xproto.h>
- #include "scrnintstr.h"
- #include "servermd.h"
--#ifdef XFreeXDGA
-+#ifdef USE_DGA
- #define _XF86DGA_SERVER_
- #include <X11/extensions/xf86dgaproto.h>
- #endif
-@@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     xf86SetBlackWhitePixels(pScreen);
- 
--#ifdef XFreeXDGA
-+#ifdef USE_DGA
-     DUMMYDGAInit(pScreen);
- #endif
-     
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
new file mode 100644
index 000000000000..4b0b46ef3000
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
deleted file mode 100644
index 8432b014b5dd..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild,v 1.8 2011/02/14 23:56:24 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild
index d69b88d05e91..453d952c3220 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild,v 1.8 2012/08/26 19:41:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild,v 1.1 2013/03/08 20:56:28 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
@@ -16,13 +16,13 @@ DEPEND="${RDEPEND}
 		x11-proto/xf86dgaproto
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dga)
 	)
 	xorg-2_pkg_setup
 }
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dga-support.patch
-)
diff --git a/x11-drivers/xf86-video-fbdev/ChangeLog b/x11-drivers/xf86-video-fbdev/ChangeLog
index dc66062c19a1..5da653f88b65 100644
--- a/x11-drivers/xf86-video-fbdev/ChangeLog
+++ b/x11-drivers/xf86-video-fbdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-fbdev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.85 2013/01/04 17:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.86 2013/03/08 20:56:46 chithanh Exp $
+
+*xf86-video-fbdev-0.4.3-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch,
+  +xf86-video-fbdev-0.4.3-r1.ebuild, -xf86-video-fbdev-0.4.2.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   04 Jan 2013; Jeroen Roovers <jer@gentoo.org> xf86-video-fbdev-0.4.3.ebuild:
   Stable for HPPA (bug #440872).
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index 7e9b757669aa..3f8dc77df003 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST xf86-video-fbdev-0.4.2.tar.bz2 263094 SHA256 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5 SHA512 bb98b710245806fe02f8247149e9e472903efa8c077be749051aebf7410b1c86653a81c168882b406a9ee647d3cc4f4eaa463e800517dcfc5a0bd7218b3ece7f WHIRLPOOL 1661b7e3b989753d8b436c8a24923cee4637ff1300ddd60c02a65ea533ed5ec8c895cbbe667d92a9a722b92bd164f678faf6c267da86a3052bc3217d4903be9a
+AUX xf86-video-fbdev-0.4.3-remove-mibstore_h.patch 712 SHA256 4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321 SHA512 5e26f59cdf4b1d2fbd807a5f3612f303b87f01dc220a5c7963bf906eae833e4d88c2787f2e01ed9fd1a355a4cdd38a5aee79e3923508d2558f6ff64255c51fcb WHIRLPOOL 0a9e5ccb9c986a8ec5cc72d878f3fba7a15f565b005d99945d7813aea92f1a4eec63222827a76265e3bbb9a892c1b1058c0f07a3890e2c79968a50cb0f13b6be
 DIST xf86-video-fbdev-0.4.3.tar.bz2 289056 SHA256 ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831 SHA512 0e29c3aab44246f53cdd74cc3236ebc705f0aedd496803f91e83c12dc2e31c52aac9bd86061667fb827b822a70262dd340153bafce706669b49fb1bf00d2e844 WHIRLPOOL f26f7dece499d5a091aebcdc9f895f0afe1f393bad2d6f15816f5c79df8dcb8812d2f174da8e8390139d0c5069634ae99a24471d50d3dc2ad8dfd9273dada4ba
-EBUILD xf86-video-fbdev-0.4.2.ebuild 573 SHA256 9cfd57505f7250ec980aa6105a551dfb560d4c48d8d3bdcd7779f4ffd8396152 SHA512 8ffcbe4f624187726ec87e5f932aa727036989bcc02cd46954ffb6c156780c8ebb66b1e4a1699f2d293b88de0c78ad01e98dd74256761004c7e2a14cb4f76200 WHIRLPOOL 83b225a7fe96634390d0f66f4f7c2939c23bcf6cf978efae9691e85f9ec76c67a6d2adee8a3103169b6489fea8020902d75bb85426758acdfc2b79edb0fcb406
+EBUILD xf86-video-fbdev-0.4.3-r1.ebuild 642 SHA256 77170c70accbe812ec0877befde4857111e64165b9b4189972835560c4f90f19 SHA512 d11a13e33ef76e17adc99e08f984d16113cbb587939b05b014c2d215b9c37c6a700c78af85d639da7cd439bf64faa411c8b978d13b4f37bacb8bb9122fb1ad22 WHIRLPOOL 16007fb2dc2f58fdb70f33b8f4403e51d30a02afd75063b04c5f4893858f1841fba9d4749eaf3eaaf710d5489effb42ef4a3aff56dbff853b14dfd87e5d40ce5
 EBUILD xf86-video-fbdev-0.4.3.ebuild 568 SHA256 2e152a760dc6a4936ff8ed3b4c1140152fc9a666e8f57b85b44b9f8b6944bfe3 SHA512 4f3aa4add961340d41b4272d809da292af8e49eb0c458e023d318c58589c35fb0025f9211456347bdc33ac30757e9578ee261584cd4db1f5bbd2a35be459d159 WHIRLPOOL b1f8093063edda519cf8c2d39638a65d9b37bd09c27168199e6a347dfbc492c824de771487f67802aa2129ec03951681c97664f62aae0202807a7086feb728bc
-MISC ChangeLog 10824 SHA256 b4d206c6f022265d89d2c03eec7f810185041aa2123790923e2c683dce1727a4 SHA512 c7274db0e6a557166bfd860632be7c29ad093bf6b832d14ff3d3c30d1a211ef54b6426d8be5cc30766377a5d253f522a5b93cfbc1911722a565f90bb7bf43c5d WHIRLPOOL 08500c29d6e1022138eea986e9d07e79d2eba0fe416ebade996430243ffad5c6aa7710615abdb8ef841eef8a0b26d47be4e389f193eda35aef48337c8613a6da
+MISC ChangeLog 11121 SHA256 069ec18138930f4ee4277d083d37f06a1e1eddfff72ea14f4efeeb5aa099a8f5 SHA512 a0a4dfa44381b103928c13d855f64a2a8599fa39fef7e9dc78f3f754f2d8a40225a44049a5a9d2096c1df9f01d23375c7b59d5ad831d28e1e441f5281509f735 WHIRLPOOL 26995d34729e70fa63890b87ac7f02f3f6b4605d0e762f7c5c248b14e54657cc1d364a5f1c413997453db03436ea18f08bcb40eb830593999b2cc1c103139a28
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDnF6MACgkQVWmRsqeSphN/5wCeIr6wMUT719tMudUv5shTt7PU
-TnEAoIAeCrnr1GbuNEeQ4Huc/LPUZXTH
-=S8Ll
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch b/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch
new file mode 100644
index 000000000000..138d5bc2a168
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.2.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild
index 0ee95c8c4c2b..ca03c4f15b90 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.2.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.2.ebuild,v 1.10 2012/05/16 00:47:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild,v 1.1 2013/03/08 20:56:46 chithanh Exp $
 
-EAPI=3
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server"
@@ -17,3 +17,7 @@ DEPEND="${RDEPEND}
 	x11-proto/renderproto
 	x11-proto/videoproto
 	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-vesa/ChangeLog b/x11-drivers/xf86-video-vesa/ChangeLog
index 99899fc89215..ec70bd26f160 100644
--- a/x11-drivers/xf86-video-vesa/ChangeLog
+++ b/x11-drivers/xf86-video-vesa/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-drivers/xf86-video-vesa
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/ChangeLog,v 1.64 2012/12/30 14:51:46 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/ChangeLog,v 1.65 2013/03/08 20:57:01 chithanh Exp $
+
+*xf86-video-vesa-2.3.2-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch,
+  +xf86-video-vesa-2.3.2-r1.ebuild,
+  -files/xf86-video-vesa-2.3.0-pci-domains.patch,
+  -files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch,
+  -xf86-video-vesa-2.3.0-r1.ebuild, -xf86-video-vesa-2.3.0.ebuild,
+  -xf86-video-vesa-2.3.1.ebuild, xf86-video-vesa-2.3.2.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-vesa-2.3.2.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 892291855cd7..fcf9d1ecd530 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,11 +1,6 @@
-AUX xf86-video-vesa-2.3.0-pci-domains.patch 2083 SHA256 eae65b6b852cb498557c5fab1231522ae7b1f1a955d5374f338e1e4763088c6a SHA512 525061c818e93f7074aab93221bc4f94970fac2fc61b51f775fbd50e6556485c20b81e22fcc68342244784cf27bdc7061c0770ae832ea366968b41fbd0895cb6 WHIRLPOOL 048a6c831832f0281e3523ae7234a7d71e3018b13497cb883394a04516d08230929b2925bd0c3af8fda43b9644b456f95856f81e5bf9f27b997b3a677572840c
-AUX xf86-video-vesa-2.3.0-xorg-server-1.12.patch 899 SHA256 cfc8b35a0fa674ab99e3d77f19e53884c882a842c6fe1dbf40a19761ddb9686a SHA512 7bcdfd7f0b02d58fd3bda612c5dbc477ae11c6f13edf49abe3e171daa28e5855f79354421ed7ec0856320a7839724648ffcf28710c457ac485ada184ba856501 WHIRLPOOL 95d91dea44ff24c831f7fbf6d37e71ee9dc4a91c34b0619a0dd6e47ddf47e5602de710974a0476aaebc3b2ea74cc6f28f2f8bef0c15489df39d7ac8daf04e884
-DIST xf86-video-vesa-2.3.0.tar.bz2 264539 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a SHA512 c0a16ceed577b7240c8efb10388562a8ceee1d6eb200852dc045682c4aa950eb96a9746631b42bdba44a60b12866d4a70d34132d1e36a917d057bc3131eccb5a WHIRLPOOL a9428be96b8a7fe4deadca4dd8a629dbb5d07cd48b10b8a6332c8ab4ae55f21dfb96b5176c80d4593a3ae59f7824bc4d477c4640fe1d4696231a02d12ad7d1ca
-DIST xf86-video-vesa-2.3.1.tar.bz2 287818 SHA256 e4a1038d5bc8884de461737f68f963651ef91137976388e1db4efc3991d01573 SHA512 2cff0b94b99a8f5521654946eb102beffe1d0ba2b5f088d284554f31f9361f5552001f88b86c5c66e4389b5537e5fc601f749346072668c56f45c26ec8d1eb43 WHIRLPOOL f29effdcb8f54cdb8c4ae09a8ad962396a404aad5afc2fc0b28c8ea9b56cd188cf3ce986271585ca8b27b14b6f6ddcf1e9f03357a83babf94a084f3a2570f590
+AUX xf86-video-vesa-2.3.2-remove-mibstore_h.patch 839 SHA256 5e759aa6e396c30d8e010564fee874c4ea24913e6bbc65b06d4cd2d2e76b6ddd SHA512 73fb0490fa25777558c15715eb3bc67c8fe3fddeb8ea4ed35ff83a9be8543b84f6f17f0ab584fc7831e4f18ce8d6105c9586a8b7e236453f0b43e962dcff3679 WHIRLPOOL 41a63ccf6a2a7a60f3424fef57eacd8ac39c70fc8a69d9daf5a64ca837199c69870fc73d0c325c420d875ebda92949210e8c94bee9f7d92b218ab73459ed3d16
 DIST xf86-video-vesa-2.3.2.tar.bz2 298186 SHA256 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 SHA512 5da0da391fe5d3a5a88e36dcf0b75435b6c1b7389425da253633a293f3eeb0dc91760d0e66b3e98e227dabfa888dbf085fcc5fd973381da4df01ed81c8db288e WHIRLPOOL e922674447cc937604794380e0dc7997025781e3d815d6cf8f72d101ba452bee6a1671a709afd0652f239f407494a4f13f784bfb48b02fa0eac97e06ad409a96
-EBUILD xf86-video-vesa-2.3.0-r1.ebuild 533 SHA256 21d6e465e590f09cc4099e878d62f0597005f0f3330775b44e18ea6aa04aa8cd SHA512 ad7a259c39cef94d85d368fabbbddfeae87d4744f62461e8a1645195d6792936f4bad33e0432845e4caea7e72e0ee0cd80593aa6ebf23ed53f0d5dc2caff4e61 WHIRLPOOL c3639834c9432ecaf1f83f457f53e0d19b78f5fd3ab4a46285a5633c0e187d520daaa9149253520ac36fa97c7a1fac45720fb57efef8df39bd965fb25681bbb8
-EBUILD xf86-video-vesa-2.3.0.ebuild 510 SHA256 2a74744da9b0adaa126123c52057457e6980e6b7b77f3c2ec93b136959c7172c SHA512 9bcea8ef1af99b48b416a82da8d74d0ba6ef1d1d7dd5278ba6ee767199bee0d2df7fdf968ea7a75fa2823871f07317a6a9bfba37fa8f27198d0e1e9a4004d78e WHIRLPOOL 63aa7cf77875251a6db25374b2c3c6b0b0da57cb8fbb0213f7b68843cda6e1618a662c1a49ab87d3678c792606eb8940fff94b5548e1d962b6d6cb5928581a24
-EBUILD xf86-video-vesa-2.3.1.ebuild 464 SHA256 17e73f244519127cb0b32d9748e2635270ba3c67cbd40e83e0fbde984e72ddd4 SHA512 061d7896ca79b00e135442fd75f4e52f181754c3fdb54138af812edd6b6a275e64c64f3bab608cfcf0b9b00f9c0a066f6cc00d7f23b68597dd13ed8e1c68a561 WHIRLPOOL ee6ed3fade5c9f23f998481b846705ad9258cc9bfa4272e0255cc3b0cc5e542c1a74eacbad7a5fc242b7ec11c9fd54a7b84131265dd0da01c1bf1d83c9fe79da
-EBUILD xf86-video-vesa-2.3.2.ebuild 459 SHA256 36646731af10d8beed2963b73254546211f9944c5d092de5221a2e26ec013a85 SHA512 5ed05149455ec964cd41de3b5318c0b5b315c7ca5beb00ccd8074a5046dad66dbf2c8ca2db912bd876043f34ed3e9c24eb16906df2539932b63555d86f3f2f7c WHIRLPOOL 934b694c699847d128ce389fc72ceb8dca8ef07e21541b4fdf57d029714bd36e62deaf01842e9a3fa625e54bf69ec35c5501385c220bc8fb84744b9db49d09a0
-MISC ChangeLog 9064 SHA256 29fafcbcf9fe2bc8a2f79a8d660b6e3203611dc8af193dddf1cb353a6836b630 SHA512 a636a58c18b63a69ea936436b4337dbe37a4c9bb69709dd3023a158fecddb87ece80575f4c4b8a41a3b503621e65ce406457e1e39efa5bbd566ad701af402814 WHIRLPOOL a64edb21766695805c01a5084e8b06098feb5c0e6dd2ffd91e6effec35cba50d9f349decfde81d64bd69e3bc5da82b99daa05712dbfd3ccd5a3e88b2b5252b2a
+EBUILD xf86-video-vesa-2.3.2-r1.ebuild 528 SHA256 ab49d34343dec5a2b9645cde9cef62ef9b5e539aa7cb49c688a47fdbb753be99 SHA512 78aa67642408ad33e9af46f5f91bf04f301f34529187bd78e7d94ba0b4b4bb74a1d95ff760addea9039259d7fa8b7ff7f443cb5dc0c200edaae6700e2ccca4a3 WHIRLPOOL 088744a7d978433d7849b9584b520d6a2be2889d2f972e16f3bfc6482939a06ed08c2c3808c713181abd0b60b0416887a99211e36ea14bf60dda4206d0c45bbf
+EBUILD xf86-video-vesa-2.3.2.ebuild 464 SHA256 6fb74b34aac0645d345b28ae1e1b5521779c43807616bbd8afd60531435fe899 SHA512 88412decae08cc2e20e5d683a8f5598f8db354a354750a72b89989cce804047840e587730c321489310c0f84801d077ab858cc8418b9c74731c2094503a94d86 WHIRLPOOL b862dc8d2f4715900e78f428678715a4ca4c2cae14f6c4da62beca990637ad4e6a6878d11e30a0f0ab1b3e1f493f0b31575b5d75a8186605acdb370ef3790065
+MISC ChangeLog 9561 SHA256 f37b6a3dd73e764e515bd043871b2139534eb6f1a8e1e58299fcc8d103f26b55 SHA512 3ad756d457a8aac893a6661330e7781e883a754e9c25d6bfb74c2d77aeeafb593f68dee8b3eda1686ecfaef775829b72cb97547e807dc6555420b0d36eb6076e WHIRLPOOL de621d964863a48456ce387b1990048480d11f170a31394377d696169b947fd345f144e44f53ffa1151cb6e1906d295cc8cb3b3c1060afdd4f1ae881702d02e4
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
deleted file mode 100644
index 645fbc160d6f..000000000000
--- a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 08:33:07 +0000
-Subject: Build fix for ABI Version 12
-
-ABI Version 12 removes support for multiple PCI domains.  If you need to
-use this driver on a system with more than one PCI domain, you should
-either port this driver to using libpciaccess directly or stick with an
-older server.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 1136ac3..5a0120c 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
- 				    & pVesa->base);
-     }
-     else
--	pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
--					  pScrn->memPhysBase, pVesa->mapSize);
-+	(void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
-+	                             pVesa->mapSize,
-+	                             PCI_DEV_MAP_FLAG_WRITABLE,
-+	                             & pVesa->base);
- 
-     if (pVesa->base) {
- 	if (pVesa->mapPhys != 0xa0000)
--	    pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
--						 pVesa->pciInfo,
--						 0xa0000, 0x10000);
-+	    (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
-+	                                 PCI_DEV_MAP_FLAG_WRITABLE,
-+	                                 & pVesa->VGAbase);
- 	else
- 	    pVesa->VGAbase = pVesa->base;
- 
-@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
-     if (pVesa->mapPhys != 0xa0000) {
- 	(void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
- 				      pVesa->mapSize);
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
-+	                               0x10000);
-     }
-     else {
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
-+	                               pVesa->mapSize);
-     }
- #else
-     xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
deleted file mode 100644
index 697dc278ec9e..000000000000
--- a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 463886df688d3521afc47ec88f9aaf67e924ec7f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 08:15:03 +0000
-Subject: Build fix for ABI Version 12
-
-ABI Version 12 removes support for multiple PCI domains.  If you need to
-use this driver on a system with more than one PCI domain, you should
-either port this driver to using libpciaccess directly or stick with an
-older server.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 61d3550..1136ac3 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
-     }
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pVesa->ioBase = pScrn->domainIOBase;
-+#else
-+    pVesa->ioBase = 0;
-+#endif
- 
-     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
- 		   "virtual address = %p,\n"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch
new file mode 100644
index 000000000000..3ae6a98e800d
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch
@@ -0,0 +1,31 @@
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
deleted file mode 100644
index 91a6081bfd84..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild,v 1.1 2012/03/18 16:08:30 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-xorg-server-1.12.patch
-	"${FILESDIR}"/${PN}-2.3.0-pci-domains.patch
-)
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
deleted file mode 100644
index 7c940a6b629a..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.5 2011/02/12 19:38:13 armin76 Exp $
-
-inherit x-modular
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild
index d1e7c7b6a158..fd632e1d585c 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild,v 1.6 2012/10/10 14:45:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild,v 1.1 2013/03/08 20:57:01 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99
 	>=x11-libs/libpciaccess-0.12.901"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
index 6b66430176a0..af97f1a52b5a 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.6 2012/12/30 14:51:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.7 2013/03/08 20:57:01 chithanh Exp $
 
 EAPI=4
 inherit xorg-2