Version bump. Remove old.

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

9 files changed, 18 insertions, 195 deletions

diff --git a/x11-drivers/xf86-video-cirrus/ChangeLog b/x11-drivers/xf86-video-cirrus/ChangeLog
index 989324f49f78..58cd59e77f92 100644
--- a/x11-drivers/xf86-video-cirrus/ChangeLog
+++ b/x11-drivers/xf86-video-cirrus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-drivers/xf86-video-cirrus
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.52 2012/12/30 14:46:38 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.53 2013/01/08 17:49:25 chithanh Exp $
+
+*xf86-video-cirrus-1.5.2 (08 Jan 2013)
+
+  08 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-video-cirrus-1.5.2.ebuild,
+  -files/xf86-video-cirrus-1.3.2-pcitag-declare.patch,
+  -files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch,
+  -files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch,
+  -xf86-video-cirrus-1.3.2-r1.ebuild, -xf86-video-cirrus-1.3.2.ebuild,
+  -xf86-video-cirrus-1.4.0.ebuild, -xf86-video-cirrus-1.5.0.ebuild,
+  xf86-video-cirrus-1.5.1.ebuild:
+  Version bump. Remove old.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-cirrus-1.5.1.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch
deleted file mode 100644
index 9ea84f52ed3e..000000000000
--- a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 05fd00f46eb3be46d669921d11dff6fe8a5bb60b Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:58:41 +0000
-Subject: pciTag was removed from xorg-server, so provide it in-driver until this is updated to use libpciaccess
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
-index f0f5cf8..fa60a19 100644
---- a/src/cir_pcirename.h
-+++ b/src/cir_pcirename.h
-@@ -34,6 +34,28 @@ enum region_type {
-     REGION_IO 
- };
- 
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch
deleted file mode 100644
index 3823fdda4c3d..000000000000
--- a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d9c9cc333e8a67749c20b3b30129f4d2297a3e0a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 31 Oct 2011 03:34:47 +0000
-Subject: Build fix for older servers (error: conflicting types for 'pciTag')
-
-/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
-
-Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
-index fa60a19..669b8fe 100644
---- a/src/cir_pcirename.h
-+++ b/src/cir_pcirename.h
-@@ -34,6 +34,10 @@ enum region_type {
-     REGION_IO 
- };
- 
-+#include "xf86Module.h"
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-+
- #if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
- #define PCI_DOM_MASK    0x01fful
- #else
-@@ -55,6 +59,7 @@ pciTag(int busnum, int devnum, int funcnum)
- 
- 	return tag;
- }
-+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
- 
- #ifndef XSERVER_LIBPCIACCESS
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch
deleted file mode 100644
index c2bf2d0cf8ba..000000000000
--- a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9fcfd1aa760023e449cbb8c1eebd0bb570a6aacb Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 07:12:15 +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/alp_driver.c b/src/alp_driver.c
-index edcaef3..e773471 100644
---- a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -480,7 +480,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-diff --git a/src/cir.h b/src/cir.h
-index 64531f5..861966d 100644
---- a/src/cir.h
-+++ b/src/cir.h
-@@ -21,7 +21,7 @@ typedef struct {
- 	CARD32			properties;
- 	pciVideoPtr		PciInfo;
- 	PCITAG			PciTag;
--	IOADDRESS		PIOReg;
-+	unsigned long		PIOReg;
-     union {
- 	struct lgRec		*lg;
- 	struct alpRec		*alp;
-diff --git a/src/lg_driver.c b/src/lg_driver.c
-index 0f9f1f6..fc864f8 100644
---- a/src/lg_driver.c
-+++ b/src/lg_driver.c
-@@ -372,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild
deleted file mode 100644
index 52eee8f78150..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,19 +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-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild,v 1.1 2012/03/18 15:42:58 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2-xorg-server-1.12.patch
-	"${FILESDIR}"/${PN}-1.3.2-pcitag-declare.patch
-	"${FILESDIR}"/${PN}-1.3.2-pcitag-redefine.patch
-)
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild
deleted file mode 100644
index c4a64a048365..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.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-cirrus/xf86-video-cirrus-1.3.2.ebuild,v 1.5 2009/12/15 15:32:22 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Cirrus Logic video driver"
-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-cirrus/xf86-video-cirrus-1.4.0.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
deleted file mode 100644
index c39d9788247b..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
+++ /dev/null
@@ -1,13 +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-cirrus/xf86-video-cirrus-1.4.0.ebuild,v 1.6 2012/08/26 19:54:39 armin76 Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
index d6d3f2e72c58..6d5b67d2f3e3 100644
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.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-cirrus/xf86-video-cirrus-1.5.1.ebuild,v 1.6 2012/12/30 14:46:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild,v 1.7 2013/01/08 17:49:25 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.0.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild
index a668a0e8a85f..c5ae01a201cb 100644
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.0.ebuild
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.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-cirrus/xf86-video-cirrus-1.5.0.ebuild,v 1.1 2012/07/05 15:57:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild,v 1.1 2013/01/08 17:49:25 chithanh Exp $
 
 EAPI=4
 inherit xorg-2