Bump. Mostly minor fixes.

Package-Manager: portage-2.1.5.2

16 files changed, 251 insertions, 7 deletions

diff --git a/x11-drivers/xf86-input-elo2300/ChangeLog b/x11-drivers/xf86-input-elo2300/ChangeLog
index da5e37779fb8..d0f72b702679 100644
--- a/x11-drivers/xf86-input-elo2300/ChangeLog
+++ b/x11-drivers/xf86-input-elo2300/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-elo2300
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elo2300/ChangeLog,v 1.31 2008/02/24 02:15:46 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elo2300/ChangeLog,v 1.32 2008/06/06 21:49:52 dberkholz Exp $
+
+*xf86-input-elo2300-1.1.2 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-Check-for-XINPUT-ABI-3.patch,
+  +xf86-input-elo2300-1.1.2.ebuild:
+  Bump. Mostly minor fixes.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch b/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch
new file mode 100644
index 000000000000..77844ac053ef
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch
@@ -0,0 +1,28 @@
+From cc77936174d60ae25aab137225190dc6d31eba92 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon, 26 May 2008 22:06:23 +0930
+Subject: [PATCH] Check for XINPUT ABI 3.
+
+---
+ src/elo.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/elo.c b/src/elo.c
+index 5ed67f0..8382313 100644
+--- a/src/elo.c
++++ b/src/elo.c
+@@ -309,7 +309,10 @@ DeviceInit( DeviceIntPtr dev )
+ 	 * Device reports motions on 2 axes in absolute coordinates.
+ 	 * Device may reports touch pressure on the 3rd axis.
+ 	 */
+-	if (InitValuatorClassDeviceStruct (dev, priv->axes, xf86GetMotionEvents,
++	if (InitValuatorClassDeviceStruct (dev, priv->axes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++                    xf86GetMotionEvents,
++#endif
+ 									local->history_size, Absolute) == FALSE)
+ 	{
+ 		ErrorF ("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
+-- 
+1.5.5.1
+
diff --git a/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild
new file mode 100644
index 000000000000..a460b97597ff
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild,v 1.1 2008/06/06 21:49:52 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for elo2300 input devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/0001-Check-for-XINPUT-ABI-3.patch"
diff --git a/x11-drivers/xf86-input-elographics/ChangeLog b/x11-drivers/xf86-input-elographics/ChangeLog
index 2cdd0c75190d..34740cae419b 100644
--- a/x11-drivers/xf86-input-elographics/ChangeLog
+++ b/x11-drivers/xf86-input-elographics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-elographics
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/ChangeLog,v 1.32 2008/03/24 04:05:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/ChangeLog,v 1.33 2008/06/06 21:50:27 dberkholz Exp $
+
+*xf86-input-elographics-1.2.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-Check-for-XINPUT-ABI-3.patch,
+  +xf86-input-elographics-1.2.1.ebuild:
+  Bump. Mostly minor fixes.
 
 *xf86-input-elographics-1.2.0 (24 Mar 2008)
 
diff --git a/x11-drivers/xf86-input-elographics/files/0001-Check-for-XINPUT-ABI-3.patch b/x11-drivers/xf86-input-elographics/files/0001-Check-for-XINPUT-ABI-3.patch
new file mode 100644
index 000000000000..8b1a8b19a63d
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/files/0001-Check-for-XINPUT-ABI-3.patch
@@ -0,0 +1,28 @@
+From 5b62ac1efec42ad725733d8acaf1c2450224a9d0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon, 26 May 2008 22:06:55 +0930
+Subject: [PATCH] Check for XINPUT ABI 3.
+
+---
+ src/xf86Elo.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/xf86Elo.c b/src/xf86Elo.c
+index 2a76849..c107927 100644
+--- a/src/xf86Elo.c
++++ b/src/xf86Elo.c
+@@ -1340,7 +1340,10 @@ xf86EloControl(DeviceIntPtr	dev,
+        * max and min values scaled from the approximate size of the
+        * screen to fit one meter.
+        */
+-      if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
++      if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++                  xf86GetMotionEvents,
++#endif
+ 					local->history_size, Absolute) == FALSE) {
+ 	ErrorF("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
+ 	return !Success;
+-- 
+1.5.5.1
+
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.1.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.1.ebuild
new file mode 100644
index 000000000000..3278e4a221fd
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.1.ebuild,v 1.1 2008/06/06 21:50:27 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="Elographics input driver"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/0001-Check-for-XINPUT-ABI-3.patch"
diff --git a/x11-drivers/xf86-input-keyboard/ChangeLog b/x11-drivers/xf86-input-keyboard/ChangeLog
index e5cfaa784a35..4250c2809a8e 100644
--- a/x11-drivers/xf86-input-keyboard/ChangeLog
+++ b/x11-drivers/xf86-input-keyboard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-keyboard
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.53 2008/03/24 04:07:06 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.54 2008/06/06 21:51:03 dberkholz Exp $
+
+*xf86-input-keyboard-1.3.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-input-keyboard-1.3.1.ebuild:
+  Bump. Mostly minor fixes.
 
 *xf86-input-keyboard-1.3.0 (24 Mar 2008)
 
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.1.ebuild
new file mode 100644
index 000000000000..55f47f944c64
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.1.ebuild,v 1.1 2008/06/06 21:51:03 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER="4"
+
+inherit x-modular
+
+DESCRIPTION="Keyboard input driver"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.3.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-cirrus/ChangeLog b/x11-drivers/xf86-video-cirrus/ChangeLog
index c6a6b7d890cd..616cf6fcc924 100644
--- a/x11-drivers/xf86-video-cirrus/ChangeLog
+++ b/x11-drivers/xf86-video-cirrus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-cirrus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.25 2008/02/24 02:28:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.26 2008/06/06 21:51:30 dberkholz Exp $
+
+*xf86-video-cirrus-1.2.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-cirrus-1.2.1.ebuild:
+  Bump. Mostly minor fixes.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild
new file mode 100644
index 000000000000..8f05f099f0e2
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild,v 1.1 2008/06/06 21:51:30 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Cirrus Logic video driver"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sh ~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-neomagic/ChangeLog b/x11-drivers/xf86-video-neomagic/ChangeLog
index 4e861814a810..8f1ff254e4d0 100644
--- a/x11-drivers/xf86-video-neomagic/ChangeLog
+++ b/x11-drivers/xf86-video-neomagic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-neomagic
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.23 2008/02/24 02:33:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.24 2008/06/06 21:51:55 dberkholz Exp $
+
+*xf86-video-neomagic-1.2.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-neomagic-1.2.1.ebuild:
+  Bump. Mostly minor fixes.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild
new file mode 100644
index 000000000000..4a0fc2dcf557
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild,v 1.1 2008/06/06 21:51:55 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Neomagic video driver"
+KEYWORDS="~amd64 ~ia64 ~sh ~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/xf86dgaproto
+	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3virge/ChangeLog b/x11-drivers/xf86-video-s3virge/ChangeLog
index 74f64b04374c..e853d283b9b9 100644
--- a/x11-drivers/xf86-video-s3virge/ChangeLog
+++ b/x11-drivers/xf86-video-s3virge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-s3virge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/ChangeLog,v 1.25 2008/02/24 02:36:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/ChangeLog,v 1.26 2008/06/06 21:52:23 dberkholz Exp $
+
+*xf86-video-s3virge-1.10.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-s3virge-1.10.1.ebuild:
+  Bump. Mostly minor fixes.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild
new file mode 100644
index 000000000000..23e1a58e8da1
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild,v 1.1 2008/06/06 21:52:23 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="S3 ViRGE video driver"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~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-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index b56cb6d0b934..ba94a325aea3 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-savage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.39 2008/02/24 02:36:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.40 2008/06/06 21:52:52 dberkholz Exp $
+
+*xf86-video-savage-2.2.1 (06 Jun 2008)
+
+  06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-savage-2.2.1.ebuild:
+  Bump. Mostly minor fixes.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
new file mode 100644
index 000000000000..8b26d13d1e77
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild,v 1.1 2008/06/06 21:52:52 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER="4"
+
+inherit x-modular
+
+DESCRIPTION="S3 Savage video driver"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+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
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}