Fix build with newer xorg-server. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 52 insertions, 27 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/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