Fix build with newer xorg-server. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

6 files changed, 56 insertions, 33 deletions

diff --git a/x11-drivers/xf86-video-s3/ChangeLog b/x11-drivers/xf86-video-s3/ChangeLog
index 1070c8a4d1b3..d570a19388b5 100644
--- a/x11-drivers/xf86-video-s3/ChangeLog
+++ b/x11-drivers/xf86-video-s3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-s3
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/ChangeLog,v 1.58 2012/12/30 14:49:59 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/ChangeLog,v 1.59 2014/05/27 12:41:15 chithanh Exp $
+
+*xf86-video-s3-0.6.5-r1 (27 May 2014)
+
+  27 May 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-s3-0.6.5-mibstore_h.patch, +xf86-video-s3-0.6.5-r1.ebuild,
+  -xf86-video-s3-0.6.3.ebuild, -xf86-video-s3-0.6.4.ebuild,
+  xf86-video-s3-0.6.5.ebuild:
+  Fix build with newer xorg-server. Remove old.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-s3-0.6.5.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-s3/Manifest b/x11-drivers/xf86-video-s3/Manifest
index e8dd59b8afaf..f44f7717d94e 100644
--- a/x11-drivers/xf86-video-s3/Manifest
+++ b/x11-drivers/xf86-video-s3/Manifest
@@ -1,8 +1,6 @@
-DIST xf86-video-s3-0.6.3.tar.bz2 277148 SHA256 ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144 SHA512 01eed1491dd6157bf42d91973f4a8f05b030c69915212a8a95d41922a2e9c056bb5e1122ed15e089fb5d443f9b543370c499696bec8d6f44ae2306a8045bf194 WHIRLPOOL 5d394dcbfda43088d612276a6b52aa2028e930abf0f1098cf00e0891e28a80bf7e2a6b7bf5d054e0c167d967f2c981741d6f39e0faf7799afb5f1e46697e5257
-DIST xf86-video-s3-0.6.4.tar.bz2 324946 SHA256 1b5f6c4cd02ab13a7d2d0ebb45a7b463650a0187a75e4516a16edb738ce909ff
+AUX xf86-video-s3-0.6.5-mibstore_h.patch 914 SHA256 daaac979b7591b28f8f7e66a2f29e73f434873f962445e49fe5aa637dddcb251 SHA512 1ce8aee76a746f115ad3296bf7d76360d2693602f41631deac3a56ab87478f2a843afa15a0cb28f6b8975589fcc387ab26c82f9f59a125a19bf0aa19c3fde4ec WHIRLPOOL 966bafd8459a684bb5a7e652a1b546ed7889e3bb85c5f2abaa9b45be5507e7e92c882b126e753406b7b76d61269683123b1af390b8f8af3ed4f0bf76876fe892
 DIST xf86-video-s3-0.6.5.tar.bz2 325582 SHA256 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39 SHA512 bd7d93008dae33b0b7943b2c81de5f39b1d8224ccebd0cdb9e8d22e7ea7fb0981adf6afd44e24162fa8a076d3e250f93316fd3a25cada2d65166a6bc4d13c267 WHIRLPOOL ccf8ee402ad18c229c890704177b72db80fbc651279bf1da6a3be40a7e71ba07903b5ef5fc05c6e4f5146f5517081aae421bb8ed13c161861bdf532895796bc0
-EBUILD xf86-video-s3-0.6.3.ebuild 593 SHA256 0967610eafcd6a7f609316b81f0c8017ded2a69046c12ce31b6ef3f54a6f3d98 SHA512 3ca5a20c54cef0a44215822c392833f1e2ac2a2d5bcd7038cbb724fa46966e307ef918e18e5ffc66e35d09c11807daffdfe0a4d6f6d708d1999e739afa869986 WHIRLPOOL 4dc3747d00020bc2e9d9b9ba69a6ee17d6469554bc6e4a9f4d47f010a41b82cd3e9fc23e4b246ab4a8b8eaa7932d27cbf149f2f0ebff89ad623077762bab403e
-EBUILD xf86-video-s3-0.6.4.ebuild 427 SHA256 626f01fb4c5d184a0ae5157e6fb08b33949bd0102677983231496c019ab929b0 SHA512 80f6c6e4d162336493b6e2cdcb462401aeaeebc3f470e9cbf09ba51b3ed758efbae7bddc4d455de54e5c7cf207897503b2e9be6d3f7814645970fcc0596f90f8 WHIRLPOOL 6976e7a025308427b3e1eac152651537d586d2366d9b802b747bf88f19e8ba34a53ececf96cedc905c1437d7b734823fc35e3eb1c8ca201f39387c5f79248b58
-EBUILD xf86-video-s3-0.6.5.ebuild 423 SHA256 5726c6f30bea4cb673aaf06dcc78ffe8e74e3ac85cae28d45d3edcd99b33d144 SHA512 f7d4925690283ffa9c893c429d229f8438c51f936e9ccbb3cff7073aa80d50619ac0629ca31e9cb03c51633f58369bdedd5ef11b29f073e23ecd13091d1d4611 WHIRLPOOL b9f18e6157dc229c9299f7ad80ee8f1770a02705e6cae5c53419de1edf0c7558c5d02596b4bfcfb228f0345ed3624b3f1514aae70ee52aa34259929f7396c798
-MISC ChangeLog 7442 SHA256 29f39c07128cd46c0d030fe1628b0eb25232f027de7a6b1f51eedab937e2e114 SHA512 2a3282f3d38a0478acd3015173381b43d9a9a0ec15869f057f8619d2acd8c02700d182ff4573e2e2a1fff4189668be6a3ff4bae8c480a72d55fa4398b0ab87e3 WHIRLPOOL 28ca584c4195e5269a5b58cb98570db6d0c8a42c78ccbdd72a99a235bdb6d82b85f4d285fd81248f58e90f1730c3b33228292573ace2b5fc251fb3dffda7b0b7
+EBUILD xf86-video-s3-0.6.5-r1.ebuild 486 SHA256 b73fe11e6c237858c6e960650bbf0079549fd2d316402194e46ae50648657c53 SHA512 b5f9dc1c48cb54e6bb20b7fc2c7caa63b0cf99179885dda1fcc96f5d914347c4bfcf06c80e64409143cf5b420b73e21161057d8cf277d8b7da45154162cfff07 WHIRLPOOL 3e01c534733e7262ce8c107d30e899ca5eb64b648f1361ff70666879932b5800d75b1c5e633f32124eb86b8ded45928c16b26816b5725ce58c6edbd08cbfff74
+EBUILD xf86-video-s3-0.6.5.ebuild 428 SHA256 564fe77b8c612ef2a03b397d505e49ffaa8fbb697b38c63ebc08e3d35bcbaa41 SHA512 cd981c56605d3fa7de493d8a75a4fb9fe758215da8e85215b205bd75108b81a4e80c87c513368f5123a365ef55e033ff6030f2f0136e4808a26d39c1ad9b33e9 WHIRLPOOL 2c5a1bc0ef38a2182bbd015ca085e68696bde372b3c4724a7a604531245d1483a1b349168e464a5abc20229a889fb1abf6aee5e4199ece4a53be218a047f13be
+MISC ChangeLog 7773 SHA256 ff7e5b189085cf7b1b49d86b2aea02aa0a8df5c3a7c2ed379edbc5bbd29ec43a SHA512 7fda6cf44b5a53cf177a4208fa2740f4efe9b49428b0e517cd732f2d96f1697161ebc6d618cc2984cbe5eae3cce096579db6d66cf41ddab2458e3514bc35539d WHIRLPOOL 6f4785e3e2762fd2cb9aff5f1c671234599babc7b605ad8058f281a51465f7a9a90854f0c335449fa9eedc2c62759b32dbec8c78c19f588eba7a83d54582122f
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch b/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch
new file mode 100644
index 000000000000..95f20ca4b83f
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch
@@ -0,0 +1,32 @@
+From ed0fbfd27609e897c42d7ab316481a9504746233 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue, 07 Jan 2014 21:28:58 +0000
+Subject: Remove mibstore.h
+
+As it was done in numerous other drivers. Fixes compile error.
+
+Tested-by: Trevor Woerner <trevor.woerner@linaro.org>
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/src/s3_driver.c b/src/s3_driver.c
+index 61242ad..85763ba 100644
+--- a/src/s3_driver.c
++++ b/src/s3_driver.c
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"
+@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	fbPictureInit (pScreen, 0, 0);
+ 	S3DGAInit(pScreen);
+ 
+-        miInitializeBackingStore(pScreen);
+         xf86SetBackingStore(pScreen);
+ 
+ 	/* framebuffer manager setup */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild
deleted file mode 100644
index a10c10330599..000000000000
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild,v 1.5 2009/12/15 15:42:27 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for s3 cards"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
index bc70fdcff451..d4cad7bb3dd8 100644
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild,v 1.6 2012/08/26 20:00:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild,v 1.1 2014/05/27 12:41:15 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for s3 cards"
 
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
index c0d7cf7113b4..efd9daf16f6d 100644
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild,v 1.6 2012/12/30 14:49:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild,v 1.7 2014/05/27 12:41:15 chithanh Exp $
 
 EAPI=4
 inherit xorg-2