Version bump. Drop some old versions.

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

8 files changed, 17 insertions, 287 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index be81b7bc75bb..4fa14f305eb9 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/xf86-video-ati
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.207 2013/10/08 05:05:45 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.208 2014/01/26 17:29:30 chithanh Exp $
+
+*xf86-video-ati-7.3.0 (26 Jan 2014)
+
+  26 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-video-ati-7.3.0.ebuild, -files/xf86-video-ati-6.14.3-pcitag.patch,
+  -files/xf86-video-ati-6.14.3-xorg-server-1.12.patch,
+  -files/xf86-video-ati-7.0.0-r300-ring-count.patch,
+  -xf86-video-ati-6.14.3-r1.ebuild, -xf86-video-ati-7.0.0-r1.ebuild,
+  -xf86-video-ati-7.0.0.ebuild, -xf86-video-ati-7.1.0.ebuild:
+  Version bump. Drop some old versions.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xf86-video-ati-7.2.0.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
deleted file mode 100644
index 96b2b815e7c2..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 89452c08048c98fb5cc3dc551b3824be40d52cf2 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Tue, 08 Nov 2011 10:23:11 +0000
-Subject: UMS: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS (bug #42690)
-
-Should fix https://bugs.freedesktop.org/show_bug.cgi?id=42690 .
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/radeon.h b/src/radeon.h
-index da95f8b..34f6f53 100644
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -792,7 +792,9 @@ struct radeon_accel_state {
- typedef struct {
-     EntityInfoPtr     pEnt;
-     pciVideoPtr       PciInfo;
-+#ifndef XSERVER_LIBPCIACCESS
-     PCITAG            PciTag;
-+#endif
-     int               Chipset;
-     RADEONChipFamily  ChipFamily;
-     RADEONErrata      ChipErrata;
-diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 293897a..a9abd66 100644
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -3023,9 +3023,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
-+#ifndef XSERVER_LIBPCIACCESS
-     info->PciTag  = pciTag(PCI_DEV_BUS(info->PciInfo),
- 			   PCI_DEV_DEV(info->PciInfo),
- 			   PCI_DEV_FUNC(info->PciInfo));
-+#endif
-     info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL;
-     info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n", 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
deleted file mode 100644
index 43fa945f9aea..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Mon, 13 Feb 2012 09:43:58 +0000
-Subject: Handle new xorg_list API.
-
-Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/configure.ac b/configure.ac
-index 29f129a..0083325 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- 	      [#include "xorg-server.h"])
- 
- AC_CHECK_HEADERS([list.h],
--		 [], [],
-+		 [have_list_h="yes"], [have_list_h="no"],
- 		 [#include <X11/Xdefs.h>
- 		  #include "xorg-server.h"])
- 
-+if test "x$have_list_h" = xyes; then
-+    AC_CHECK_DECL(xorg_list_init,
-+		  [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
-+		  [#include <X11/Xdefs.h>
-+		   #include "xorg-server.h"
-+		   #include "list.h"])
-+fi
-+
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
- AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
-diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
-index 835575f..cf905a1 100644
---- a/src/radeon_dri2.c
-+++ b/src/radeon_dri2.c
-@@ -40,6 +40,13 @@
- 
- #if HAVE_LIST_H
- #include "list.h"
-+#if !HAVE_XORG_LIST
-+#define xorg_list			list
-+#define xorg_list_init			list_init
-+#define xorg_list_add			list_add
-+#define xorg_list_del			list_del
-+#define xorg_list_for_each_entry	list_for_each_entry
-+#endif
- #endif
- 
- #ifdef RADEON_DRI2
-@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
- 
-     Bool valid;
- 
--    struct list link;
-+    struct xorg_list link;
- } DRI2FrameEventRec, *DRI2FrameEventPtr;
- 
- typedef struct _DRI2ClientEvents {
--    struct list   reference_list;
-+    struct xorg_list   reference_list;
- } DRI2ClientEventsRec, *DRI2ClientEventsPtr;
- 
- #if HAS_DEVPRIVATEKEYREC
-@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
-     dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
- 
- static int
--ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
-+ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
- {
-     DRI2ClientEventsPtr pClientPriv;
-     pClientPriv = GetDRI2ClientEvents(client);
-@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
-         return BadAlloc;
-     }
- 
--    list_add(entry, &pClientPriv->reference_list);
-+    xorg_list_add(entry, &pClientPriv->reference_list);
-     return 0;
- }
- 
- static void
--ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
-+ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
- {
-     DRI2ClientEventsPtr pClientPriv;
-     pClientPriv = GetDRI2ClientEvents(client);
-@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
-     if (!pClientPriv) {
-         return;
-     }
--    list_del(entry);
-+    xorg_list_del(entry);
- }
- 
- static void
-@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
- 
-     switch (pClient->clientState) {
-     case ClientStateInitial:
--        list_init(&pClientEventsPriv->reference_list);
-+        xorg_list_init(&pClientEventsPriv->reference_list);
-         break;
-     case ClientStateRunning:
-         break;
-@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
-     case ClientStateRetained:
-     case ClientStateGone:
-         if (pClientEventsPriv) {
--            list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
-+            xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
-                 ref->valid = FALSE;
-             }
-         }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-7.0.0-r300-ring-count.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-7.0.0-r300-ring-count.patch
deleted file mode 100644
index 22ec0a6d1929..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-7.0.0-r300-ring-count.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 793e1b0ea579cce7489aee57a95f20384d6ecce8 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher@gmail.com>
-Date: Thu, 06 Dec 2012 14:21:19 +0000
-Subject: radeon: fix ring count in R300PrepareTexturedVideo
-
-Fixes:
-https://bugs.freedesktop.org/show_bug.cgi?id=31364
-
-Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
----
-diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index d30f734..c1bdc65 100644
---- a/src/radeon_textured_videofuncs.c
-+++ b/src/radeon_textured_videofuncs.c
-@@ -1686,7 +1686,7 @@ R300PrepareTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
- 	}
- 
- 	if (pPriv->is_planar) {
--	    BEGIN_RING(2*needgamma ? 28 + 33 : 33);
-+	    BEGIN_RING(2 * (needgamma ? (28 + 33) : 33));
- 	    /* 2 components: same 2 for tex0/1/2 */
- 	    OUT_RING_REG(R300_RS_COUNT,
- 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
-@@ -1910,7 +1910,7 @@ R300PrepareTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
- 							  R300_ALU_ALPHA_SEL_C(R300_ALU_ALPHA_0_0)));
- 	    }
- 	} else {
--	    BEGIN_RING(2*needgamma ? 28 + 31 : 31);
-+	    BEGIN_RING(2 * (needgamma ? (28 + 31) : 31));
- 	    /* 2 components */
- 	    OUT_RING_REG(R300_RS_COUNT,
- 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
deleted file mode 100644
index fefa97fc6a2f..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
+++ /dev/null
@@ -1,31 +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-ati/xf86-video-ati-6.14.3-r1.ebuild,v 1.1 2012/03/18 23:26:25 chithanh Exp $
-
-EAPI=4
-
-XORG_EAUTORECONF=yes
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[video_cards_radeon]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.3-xorg-server-1.12.patch
-	"${FILESDIR}"/${PN}-6.14.3-pcitag.patch
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-dri
-		--enable-kms
-		--enable-exa
-	)
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0-r1.ebuild
deleted file mode 100644
index ccea7c82ab94..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-ati/xf86-video-ati-7.0.0-r1.ebuild,v 1.1 2013/01/08 17:33:58 chithanh Exp $
-
-EAPI=4
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
-	udev? ( virtual/udev )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-r300-ring-count.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
deleted file mode 100644
index f699c16e1910..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-ati/xf86-video-ati-7.0.0.ebuild,v 1.11 2013/01/31 14:16:24 chithanh Exp $
-
-EAPI=4
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
-	udev? ( virtual/udev )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.3.0.ebuild
index 8ece67e9022e..915190b51b6d 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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-ati/xf86-video-ati-7.1.0.ebuild,v 1.3 2013/04/20 20:21:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.3.0.ebuild,v 1.1 2014/01/26 17:29:30 chithanh Exp $
 
 EAPI=5
 
@@ -10,10 +10,10 @@ inherit linux-info xorg-2
 DESCRIPTION="ATI video driver"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="glamor udev"
+IUSE="+glamor udev"
 
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
+RDEPEND=">=x11-libs/libdrm-2.4.46[video_cards_radeon]
+	glamor? ( >=x11-libs/glamor-0.6 )
 	udev? ( virtual/udev )"
 DEPEND="${RDEPEND}"