Version bump.

(Portage version: 2.1.11.55/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 17 insertions, 147 deletions

diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog
index 814ad9feba9a..70ca2a1f4939 100644
--- a/x11-drivers/xf86-video-openchrome/ChangeLog
+++ b/x11-drivers/xf86-video-openchrome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-openchrome
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.68 2012/11/18 12:18:23 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.69 2013/03/28 12:26:05 chithanh Exp $
+
+*xf86-video-openchrome-0.3.2 (28 Mar 2013)
+
+  28 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-video-openchrome-0.3.2.ebuild,
+  -files/xf86-video-openchrome-0.2.906-xorg-1.12.patch,
+  -xf86-video-openchrome-0.2.905.ebuild, -xf86-video-openchrome-0.2.906.ebuild,
+  -xf86-video-openchrome-0.3.0.ebuild:
+  Version bump.
 
   18 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-openchrome-0.3.1.ebuild:
diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
deleted file mode 100644
index 1c39353fb231..000000000000
--- a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675407
-
-
-Deal with X 1.12 by calling vgaHWSetStdFuncs().
-
-Thanks to Leon Winter for testing the initial patch and proposing a
-working one.
-
-Signed-off-by: Cyril Brulebois <kibi@debian.org>
---- a/src/via_driver.c
-+++ b/src/via_driver.c
-@@ -997,6 +997,11 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
-     }
- 
-+    hwp = VGAHWPTR(pScrn);
-+
-+    /* Needed with X 1.12 */
-+    vgaHWSetStdFuncs(hwp);
-+
-     if (pVia->Chipset == VIA_CLE266)
-         ViaDoubleCheckCLE266Revision(pScrn);
- 
-@@ -1012,8 +1017,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
-     struct pci_device *vgaDevice = viaPciDeviceVga();
- #endif
- 
--    hwp = VGAHWPTR(pScrn);
--
-     switch (pVia->Chipset) {
-         case VIA_CLE266:
- #ifdef XSERVER_LIBPCIACCESS
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild
deleted file mode 100644
index 97c54f085f44..000000000000
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild
+++ /dev/null
@@ -1,51 +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-openchrome/xf86-video-openchrome-0.2.905.ebuild,v 1.4 2012/04/05 20:35:21 phajdan.jr Exp $
-
-EAPI=4
-XORG_DRI="dri"
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for VIA/S3G cards"
-HOMEPAGE="http://www.openchrome.org"
-SRC_URI="http://www.openchrome.org/releases/${P}.tar.bz2"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-IUSE="debug viaregtool"
-
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="
-	${RDEPEND}
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-libs/libXvMC
-	x11-libs/libdrm
-"
-
-DOCS=( ChangeLog NEWS README )
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable debug xv-debug)
-		$(use_enable viaregtool)
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	elog "Supported chipsets:"
-	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
-	elog "PM800/PM880/CN400 (VT3259), VM800/CN700/P4M800Pro (VT3314),"
-	elog "CX700 (VT3324), P4M890 (VT3327), K8M890 (VT3336),"
-	elog "P4M900/VN896 (VT3364), VX800 (VT3353), VX855 (VT3409), VX900"
-	elog
-	elog "The driver name is 'openchrome', and this is what you need"
-	elog "to use in your xorg.conf (and not 'via')."
-	elog
-	elog "See the ChangeLog and release notes for more information."
-}
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
deleted file mode 100644
index 723e0f29e451..000000000000
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
+++ /dev/null
@@ -1,55 +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-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.4 2012/07/17 16:32:06 jer Exp $
-
-EAPI=4
-XORG_DRI="dri"
-inherit eutils xorg-2
-
-DESCRIPTION="X.Org driver for VIA/S3G cards"
-HOMEPAGE="http://www.openchrome.org"
-SRC_URI="http://www.openchrome.org/releases/${P}.tar.bz2"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-IUSE="debug viaregtool"
-
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="
-	${RDEPEND}
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-libs/libXvMC
-	x11-libs/libdrm
-"
-
-DOCS=( ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xorg-1.12.patch
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable debug xv-debug)
-		$(use_enable viaregtool)
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	elog "Supported chipsets:"
-	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
-	elog "PM800/PM880/CN400 (VT3259), VM800/CN700/P4M800Pro (VT3314),"
-	elog "CX700 (VT3324), P4M890 (VT3327), K8M890 (VT3336),"
-	elog "P4M900/VN896 (VT3364), VX800 (VT3353), VX855 (VT3409), VX900"
-	elog
-	elog "The driver name is 'openchrome', and this is what you need"
-	elog "to use in your xorg.conf (and not 'via')."
-	elog
-	elog "See the ChangeLog and release notes for more information."
-}
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.0.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.2.ebuild
index 28e676e791a3..b65064de2330 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.0.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# 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-openchrome/xf86-video-openchrome-0.3.0.ebuild,v 1.1 2012/07/27 01:42:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.2.ebuild,v 1.1 2013/03/28 12:26:05 chithanh Exp $
 
-EAPI=4
-XORG_DRI="dri"
+EAPI=5
+XORG_DRI="always"
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for VIA/S3G cards"
@@ -26,14 +26,13 @@ DEPEND="
 
 DOCS=( ChangeLog NEWS README )
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_prepare() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)
 		$(use_enable debug xv-debug)
-		$(use_enable dri)
 		$(use_enable viaregtool)
 	)
+	xorg-2_src_prepare
 }
 
 pkg_postinst() {