Version bump. Drop some old versions.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

9 files changed, 20 insertions, 318 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/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 890f4b2191b7..ce6958b7515f 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,38 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX xf86-video-ati-6.14.3-pcitag.patch 1450 SHA256 05d7407da399a7cc0cfb98f5a8977384754075f2d03b17b3ef5c9d7aad297b1e SHA512 4d2dc6b6b155b542e06e8273c10542834579cb6dd40fa7aee69d91af1707bd99af20e6cd3ca1370c61d58a6d087ce5bf8d54126ee31e7601e3b707c5875efa01 WHIRLPOOL 485792b9f613c2ca097b911089b61b47ff28846615e82d0a52ea7cde870b0846334e8f2583190b95288ff775893ec3b9ef96e07de5735724b920ec0055563dfe
-AUX xf86-video-ati-6.14.3-xorg-server-1.12.patch 3637 SHA256 9829b065815b85a805fc537e5e3cab6a4f0f523f5334493619b791c7622d8102 SHA512 2c72bcdb460dc302a15b9e62f232e8d490846f0f086c195ccf1e05cdd3a036b04b7724ccdead1fdd682f97effd12644129b1d1a5f2d61bf6931c41ee12fcc0ba WHIRLPOOL 98725036e468f356521160d9076514db9c45d35a39088a75c8d1f6149e825879e5486b121196ebbb6e2c013be3b1444eed031b690c1da455a218ec6c7f8ec149
-AUX xf86-video-ati-7.0.0-r300-ring-count.patch 1254 SHA256 a1b51e8351bf8888377aa6fd57ea53e03c578d7c92cee334da0dd881f6ffea2f SHA512 81ab5cb1ce5e2df7db4ca949254f097f3ee23b3d9de80c58182eec89c27ff2e9ff4697525400824619d54785ce56deb6a76a6dea2be68c91f5c246a3e7c2db46 WHIRLPOOL 01ba23b18961c792acbaa476335e09adbec3f434be9249d4e47dd72cebff81fdbff39c63c5d6c31a055d411121854fa682fa02f768b97490487ba7e8f401d3c8
 DIST xf86-video-ati-6.13.2.tar.bz2 985673 SHA256 d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee SHA512 d97ad3429a5e468eef7f0ed2e48a1ff7b839df23cea3bcac5cd4916e590fefebf4bd5cf79f0482d42380db21e8f607ede9d289d25ed67e5312fca076a6350eb0 WHIRLPOOL a41e072edc99c7a0e113ab155a71d0c0a9152efc7ae53aeec62e029c5cb44096405961ff814d40fd7d75e0da2e02258888a35f001578d3864769a7f3fe7726ba
-DIST xf86-video-ati-6.14.3.tar.bz2 1113119 SHA256 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4 SHA512 aa2bf48a88b83e5267c774c25014dee2dbf81e4e9c8390c4bae644d11c079fe8d12fedec47af369a5ede56326aa94c8d7d100de93e58b2332ff4a8728976e49f WHIRLPOOL 3f60af1e13cfa49d35a34e2eebafb25d20d94d20cfe2ac74711a090ec39647a5007378686e5a6cb59c9cb81b6ae9646b8640bf5726301470220e9328713100f2
 DIST xf86-video-ati-6.14.6.tar.bz2 1139495 SHA256 aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36 SHA512 7ed64bb3596703f7c575aec37a6918bac251819fe638acc66a29aab7648d8a81dedd8d416f970faa1f757fa8e9e3ccdc43e4499d06271cc2751288040d1d957e WHIRLPOOL 9b72e873c3108daeb10cfc68523eb9bc2c12f5525096f9a2639a7dbeb58fd2912b474b8820172ffc9351458d2e046b43e0d064bb4f4189bb99b06a995f3204e8
-DIST xf86-video-ati-7.0.0.tar.bz2 775854 SHA256 c0acc81386425651aae5dfe02d89f935bb63b2a62104da0d88deac3c773ea10e SHA512 f82da3445684aba7f158961fc9882e777c0661ba161a4b923bdf8d3b70a8a16bca08de87af6c7f3943fa6a4308e2aa0ea42b8749a19b52374c1599d669b9512c WHIRLPOOL 4e27614e451fdf5a479695ffe207eb86ea52e45ddfbe5835a5c9912cd58c70968bc118f0586de2f7629183eed1810a70f9bc079763db065f0dc15ae33cd62347
-DIST xf86-video-ati-7.1.0.tar.bz2 804531 SHA256 c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd SHA512 eff193b51db162d498b41ebc5b78fbfbcbedbfb2041dcd710ced2f41cee4a039de26ca646dedd65b3cefc9157abfb37a118e3ae2f2e034280e351a00e45db805 WHIRLPOOL d2b1bd7a140fecddc246a6d94f1f6f93fb36ad1d78d447da4f7745060fb4f42fd09b0d85fccb1a7f5b490ce77fd22d3c649982bcb0a06228db2a9b9aa1d8e3d3
 DIST xf86-video-ati-7.2.0.tar.bz2 824613 SHA256 f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 SHA512 51d611d0d237cd8a61761c7db1b597732fe6fd3a4020cf2a9329984b05ba5f945f92a7caeaf8b2ff27a6098218e399c48addabf28908f60e70ff23bf9c27e675 WHIRLPOOL e4be92f2e491ded13f72535ccf2f67ef9bb6f4ff3b0283d55fbc5346e67565311e982a3c799b13bf509efca31b5cb1566c4d9231cf8b076ff05b902e10b9b314
+DIST xf86-video-ati-7.3.0.tar.bz2 816346 SHA256 107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe SHA512 185fd0714cae2b5fd29be201dd272f58964303c1bd3e006bfd85e7b260afc0787ee4eb3954fb8452e8876f0094ac8b0be67ebeb29e1b768937afeeecdad3dc32 WHIRLPOOL f70b29c585f4b51aa487173a14050a0bd5772143884d3bc3ef5be00fd3701a4c95ea83079ac045f3c215a0f1c41d8cc83f0db60a151da9b624c4808efbcac19e
 EBUILD xf86-video-ati-6.13.2.ebuild 761 SHA256 94f2fa9d736c4be35f7a092855838830b64443c20f11e0ab18c58567a7a22dc2 SHA512 ec2a57e96ec31ab0adfe10e6a302607e49fe9156077801ed497747e5916e959d06abaa4c5d9ec06d149b3c4095a4dde900737802dc0e054780f425a8f7248323 WHIRLPOOL 3eece809b66129b7f981a63b3205d9ee3c4e00bf244ca7fb7f6de0ee1569baeb4bc9b9934e2315bd5a82a107442ab9358e539c3fce532cebe5a54c68fb0d5ae8
-EBUILD xf86-video-ati-6.14.3-r1.ebuild 690 SHA256 eb2f5e17498ea861419554e73dad14fc84d5e65e5514af937395220e8124c7f9 SHA512 7933e9321ce37b2c2294a3f8713f27f54b32987b35408f46d36dc12eb7851f6765d8bee633b5d48db2d98b80d0ba7e72c0b05f650966a246604fde80784d0c51 WHIRLPOOL f6dfa15e4467c54d6f22ef955b0964d7a50751ee97d86e5cfdf177f29aa1d79f311d932d465786d1903e853453dd2cd9459f7ecbf94d58eea7621840c6cbfd3b
 EBUILD xf86-video-ati-6.14.6-r1.ebuild 763 SHA256 f1ed4a2aeb86c1ed4163d128727f11b5ad925ec6de404a477651a1e09fa9d6dd SHA512 7f7f8ec188a7b5fc82e72281eedfee1520de1df0203a485951a80b943c9342db66601a1ddc8825544630bf11bc7045be7e5100de1dfec2b3702a676adb88795c WHIRLPOOL 1d07997a0e77627efb9d4ba99858256b253a4661b80f33857772b51a3cd90c5b87b0ab5c9d96f8f39245929c56626ce8fee72a5c7d57373e5d6cd1716d757753
-EBUILD xf86-video-ati-7.0.0-r1.ebuild 688 SHA256 118481939e504c21dff4cadad4f4e70d628b6b0738d44a71c8d5a3e738dd82f7 SHA512 e1578c7d6b0e843dfbbe7efd7966264fd535c09a5cefa92bf0e6c540b4c5fe1d250f32dbd07fda3efef82bcfb5b6e6c6c2adfb15dfac28a6e1a4a4ce471ae52c WHIRLPOOL be09347c08c6dfbcad3b6497a0fadf15d79417c1a4adca92985d48d2977ef784ae5916229d3b6f87da77b6794b0f3f1be984e4f180c2427c21ba829f5c991ae4
-EBUILD xf86-video-ati-7.0.0.ebuild 624 SHA256 aa084667c43bc33e9db1394869ed67adf1f1f4076e0319fdd679d0c46a6ab053 SHA512 8f0a3ebc4163b1723534545c2ab02b59e6c634dc7f333588eb9993f2d3d825022086f365cae68a33410ca1c6ed95b116e6145ee974a1e277a12a6ffff2d89594 WHIRLPOOL f8aec9bdef54e0b9e5dbd770f063a111b3fdd07fcc6dc63ee25441a828de421629ff9c332911482d2ace61d809545b0c1ea0ca7634ac1cdf713d7b20aaf0ef3f
-EBUILD xf86-video-ati-7.1.0.ebuild 846 SHA256 2e049bfd7dca4c9bad8a317c2f51e0ed49f07e6e0e778f40d458e62931b2141b SHA512 f4948c451a7a38f041d4d879fe4c383b385eb8e9021b99ac43f75e9a552571200b29eff19418440ccbb4d1fa88b0258d1a2b8952d047bf0678bc893f4af234fd WHIRLPOOL 8de8807a9fd7ea87ff2597a91e43a04f28d869724028e7907094a93a4eff0ff4702fce1662d2d599a178c766cb6ee121d5a93592597f92dc42f78b595f8a70ac
 EBUILD xf86-video-ati-7.2.0.ebuild 834 SHA256 3ffe01e846066696c5d1363c8376b34cdea50007ff76b4dca4881f9323ab7c94 SHA512 f5ac3fd946127d2cabee92684f25d326ea6827cb5b8c34aad6fd17d6b281968f90e2a4950cf0d6f5e74e6001a034dc8e761732b04d903ee9a9b1218c0b084561 WHIRLPOOL 04e1147317c74091f37b61be4d76aa9162663a13d3ca2d1cd92a9ec83fe6db723c9e5d0ca39a52d30d6d24e397837ae787d0fb63462cc709da650e8573112e87
-MISC ChangeLog 36180 SHA256 04bbec821a74c1a88baff813ac14ceeae6888f68d55e5bfa2652bd2ee26cbe8d SHA512 1efdae9db21ed600121b676cda5ae47919a996ec385a4d1d7374872468b732d19f6142eadef709793e9150a0e5d9c7230bec593ea22d60a3f4f5d04a0c865a1d WHIRLPOOL 6d3e33ec0a216164d689f040489bda5baa40bf78a3a45f50acd8c6297c0159ebf4758c9162f42fc1573093dc42c74ed355151c0be6cc6a0da5349f91b961ded2
+EBUILD xf86-video-ati-7.3.0.ebuild 853 SHA256 cbcddd2107fec7ecf35fcd8bc3c25c62f1b1b0abba8ac4f53205ec077980fdc0 SHA512 22296244ebafad6fc23d26ef1a0a5518f0f036c0d779fe80eff5e9a4d562f65475e1ba33174295ca881f43a80de894bcf29b3075af3d38fa0fd83e5d43c99690 WHIRLPOOL 5bb983ed9dd00dcc082c1d39bff48b564c126a781268fec15478c617e7b0d932bcbbcaa7d17455220939d21e7234dc7887d27b35b26fa6efee7cb5e0cb90ac8d
+MISC ChangeLog 36646 SHA256 8f4c9fd6a9dea040f8801dbe62ad7ccf071e06ace2a5bdd4b8517235e9248858 SHA512 f5e7c15021726ef43785e23035ce3cbc9a17413266e2f498c1c28056b452d009af48456689fc0df72536ad5cfb13b3aba16fb42e9fed8ecb4b12a5cff67b31f5 WHIRLPOOL c90bd2c323c44f0b083786862b63d90bdd689d2c512c1f10294c3cdba396728a341012ae6fcd94b8dff64b04f4a5e61974e7ff7d42b4c031fa3147a639657d4b
 MISC metadata.xml 234 SHA256 c576bf25080db3484d07d654f7154894c03e15ba75c1e0a2461e4b3cee64ea3e SHA512 68aca8ec7b1603cc347d814cacf1415dd0eb3211b28e3325a8218c27a47ebe0e8dcb1d336db6054005da5fd9a85c4c3a7b67fababdb2f0a311e4b6b9e82caec7 WHIRLPOOL a72d888c968b4f22f8b37fe083b70ec18bce0942543fe6d1644ed27080ec882122972c78271689f2096ce6615c9a21ee3e4758da8288be6813da0b1efc07d335
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSU5KlAAoJELp701BxlEWfGWIQAJEIKgVzXAvojl60MbBO3A0O
-cKTDr4C0V997umWG/S+4a/ITr6yP/8cAr4nLRuSCwA45scGp5CdApDcAuXlq20gX
-ChbU3ygePSPY0bM6ub1m6St+KEjokz265otKT8+vR2hnj20ollX2tqJK8hUY4W37
-IKYBVqRGElLUZ/uyz9bXOW0aS/Mi/Alw65IPKaxVIHvlmBWXieak3eoW48NKB6gs
-RBsV/AYWnwrLe/elA6iEH00M/WqTOLqTZfB7PPtg2tujUtpQW4SVyQrJBL5aEIgW
-OP5jKot/p2pani7o6RiNz3hGuqc1mnD1sHtirlQNPqD9rdrGstE2Wb6vwbhvz4E6
-B4gpqpIIpNLWktMeDgC2S1W1tSK1/akX9fFN5rKor4lvRFihkeJ/N4/jQ43E88uD
-WIeQZV0Z9FzjcHt+NKouJHe2vrPWirsO58A6Auysy1/Fs/lstoIGbr9G0hkydaUm
-uYYZt6vZSblhqlvdDvkzJQLt5U8ZTE8qIMkneWn5fYUXL5KBCKBpT25i7On6876B
-lpc3USuheEl9btPNbNPCpLUOMYbwQsexHNUyrp4I3g1+uULkjG8G2UdpIDlsMTod
-DvgmuLII1YryFi83HMKVPb75i8Ru8+hhxdqSv+zE8vqz+20LWZW8/Zba4TpIhY/9
-XZFLMPtT14xknujjxRGs
-=KZ6B
------END PGP SIGNATURE-----
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}"