x11-drivers/xf86-video-intel: remove broken 2.6.2 release

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 9 insertions, 185 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 195b1778d2ba..520ad92050b0 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.15 2009/03/05 14:02:43 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.16 2009/03/07 12:26:35 remi Exp $
+
+  07 Mar 2009; Rémi Cardona <remi@gentoo.org>
+  -files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.pat
+  ch,
+  -files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.pat
+  ch, -xf86-video-intel-2.6.2.ebuild:
+  remove broken 2.6.2 release
 
 *xf86-video-intel-2.6.3 (05 Mar 2009)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 86c77776d6f1..c0654cf0a8dc 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -6,8 +6,6 @@ AUX 2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa6
 AUX 2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
 AUX 2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch 820 RMD160 6df19b267a211a1c013de7c1a302b73daeee74d7 SHA1 5345c0a409c2ca98ec2f315da152e175b49c6eb1 SHA256 5892c7acf43ac13ad032ace5dbaf4c3216a144b66be3757540b25cdd4cf31c9b
 AUX 2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
-AUX 2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
-AUX 2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch 917 RMD160 3dc97ceec889e598b62ca5c5eac857cb071077e0 SHA1 80556229b14b001105bbd74bc505ec32a19edcc0 SHA256 c1b93fec61cae2fbc2b08dd717aa8c2841f348a7f9db0a6b9afd11047b4e20ac
 AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
@@ -18,7 +16,6 @@ DIST xf86-video-intel-2.3.2.tar.bz2 665611 RMD160 5137493fb00b7a6fe3c03750f42599
 DIST xf86-video-intel-2.4.3.tar.bz2 661105 RMD160 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e SHA1 8335294c9b76b1f9daad5082d2290555ba2dbce5 SHA256 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd
 DIST xf86-video-intel-2.5.1.tar.bz2 716182 RMD160 f1d4b438931b564233dc4f76e3cb7fa1b9801aa2 SHA1 58f6f005a698e63cb34ba1b011b0ddce0b0b3862 SHA256 c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313
 DIST xf86-video-intel-2.6.1.tar.bz2 789536 RMD160 642c0e0d296eaec18806059e60fdce9c448ce466 SHA1 c4d3fff72771c71eab152660be1fb33af679c06e SHA256 31a3ab9ce33542f1d6431eac992344d086345ccc8cd43a184c93c9d1b4a4086c
-DIST xf86-video-intel-2.6.2.tar.bz2 790743 RMD160 f0339da3d1ba473bfddd647a4cdac36cf5056387 SHA1 8da19bf6c66fa66d42eedae322ee98397ee58397 SHA256 d0753cb837438d12d88b32be0429c437b63c1b07d53a4bc72a5bad5867068b39
 DIST xf86-video-intel-2.6.3.tar.bz2 790275 RMD160 7b31866c2fd42fbb2d46efb137bf968d80221fb1 SHA1 96fe7e8b804ab8833b1d462f99c08be29bb9e283 SHA256 b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
 EBUILD xf86-video-intel-1.6.5.ebuild 857 RMD160 c381cb8685bf2d849703fdfdd2122457772ee847 SHA1 4a9d49657a525d6195acb8bfcc1c9b640aa7fced SHA256 416809b3637c6d98a7ad0b328324350a6804100433800acd65b4ab613025c69f
 EBUILD xf86-video-intel-1.7.4.ebuild 813 RMD160 7d25d1a8ce062d450283a795b32349b1b2460d2c SHA1 afd2fdd66cd97ad788f32b7b1eb0ad48226e59c3 SHA256 3299e2800e0f417b3c85bec5860172e1c8c202e1b6a1d6866e21757c9f130a16
@@ -28,7 +25,6 @@ EBUILD xf86-video-intel-2.3.2.ebuild 788 RMD160 f52a3ba4fe74fefb6a42ed09d6a9d15a
 EBUILD xf86-video-intel-2.4.3.ebuild 805 RMD160 a3f03f6d96d84fcc74662b9ea9e4023e9a130f24 SHA1 6279539da257cd4d804f72fca70823f24c3eac93 SHA256 5830b5a1365781e46a3ba4b153aa17975c14c23152c4ef7ee405dc1297c2363a
 EBUILD xf86-video-intel-2.5.1-r1.ebuild 904 RMD160 8d376f0cd1615344e30d3c5183261892c2ce635f SHA1 644ad3e4a23c926f94739ce7f80e1a3c5d6231f8 SHA256 e0882b1430572943182b47f2ae499bb4ba4d7d12b367e622fcbe80c72303d66a
 EBUILD xf86-video-intel-2.6.1.ebuild 896 RMD160 309b6380d1d0ff4889bdbba1b5a3de100d51316f SHA1 2ca8b6fd648d588de2875229259cf5e08034b3d9 SHA256 db8b06927ac5e965bd4bd9e6a9fa7cfb9d729797a3241c8a599d61597857182e
-EBUILD xf86-video-intel-2.6.2.ebuild 980 RMD160 d14bf41cc841b724f31825cc0e6676643d530ffc SHA1 b3f8f7e73d609ffd608ccdebce3ff76da2f07d3a SHA256 33244b6e78a0ad384d793ccd0d20e287d758d0295b4c7b5e6d64ed05428d9750
 EBUILD xf86-video-intel-2.6.3.ebuild 896 RMD160 ef6786931d2a06271db42ff3bd0bfd1897917896 SHA1 2bd9256848fceaddfa2a58ce5339ce1a24c949a4 SHA256 f09b3bb61a1da727ccbe20cbc0ed25d526e3bd2a807e1503729893b192f3367c
-MISC ChangeLog 30365 RMD160 3ff596012e2e18cab4ec546e1db87fff87e8a194 SHA1 7eee4793fdcda60ce694d6df4281cb9c9fa5779c SHA256 d3b55ae6c7a23d85065ff863f2a5a1f9ad8276f10cdcf3de34ae971164f0cd97
+MISC ChangeLog 30641 RMD160 ee5cbf511c2ea107577c356af3b5102332270ebf SHA1 60a57f57a72f33ec1e287b8c0b6f8f717c53cee7 SHA256 746fdbd9f017283e031a54dfd1616da34aa6b22a71ab3bf5af98a3dcffb50bd3
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch b/x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch
deleted file mode 100644
index 132acca1a206..000000000000
--- a/x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Fri, 14 Nov 2008 13:55:52 +0100
-Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver
-
----
- man/Makefile.am   |   20 ++------------------
- src/Makefile.am   |    6 ------
- src/i810.h        |    1 -
- src/i810_driver.c |   19 +------------------
- 4 files changed, 3 insertions(+), 43 deletions(-)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 7432d5a..ac08621 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -25,21 +25,12 @@
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
- 
--DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
--
--driverman_PRE = @DRIVER_NAME@.man
--
--driverman_DATA = \
--	$(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
--	i810.@DRIVER_MAN_SUFFIX@
--
--EXTRA_DIST = @DRIVER_NAME@.man
-+EXTRA_DIST = $(DRIVER_NAME).man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
- # Strings to replace in man pages
- XORGRELSTRING = @PACKAGE_STRING@
-   XORGMANNAME = X Version 11
-@@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
- 	sed $(MAN_SUBSTS) < $< > $@
--
--BUILT_SOURCES = shadows.DONE
--
--shadows.DONE:
--	-rm -f i810.@DRIVER_MAN_SUFFIX@
--	echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
--		i810.@DRIVER_MAN_SUFFIX@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 232ac53..8e3cfad 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -222,9 +222,3 @@ if XVMC
- intel_drv_la_SOURCES += \
- 	$(INTEL_XVMC_SRCS)
- endif
--
--install-data-local: install-intel_drv_laLTLIBRARIES
--	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
--
--uninstall-local:
--	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
-diff --git a/src/i810.h b/src/i810.h
-index 7ea2043..c88771e 100644
---- a/src/i810.h
-+++ b/src/i810.h
-@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #define I810_VERSION 4000
- #define I810_NAME "intel"
- #define I810_DRIVER_NAME "intel"
--#define I810_LEGACY_DRIVER_NAME "i810"
- 
- #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
- #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
-diff --git a/src/i810_driver.c b/src/i810_driver.c
-index cc28ad8..404789d 100644
---- a/src/i810_driver.c
-+++ b/src/i810_driver.c
-@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = {
- 
- _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL };
- 
--static XF86ModuleVersionInfo i810VersRec = {
--   "i810",
--   MODULEVENDORSTRING,
--   MODINFOSTRING1,
--   MODINFOSTRING2,
--   XORG_VERSION_CURRENT,
--   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
--   ABI_CLASS_VIDEODRV,
--   ABI_VIDEODRV_VERSION,
--   MOD_CLASS_VIDEODRV,
--   {0, 0, 0, 0}
--};
--
--_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL };
--
- static pointer
- i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
- {
-@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags)
-     * driver, and return if there are none.
-     */
-    if ((numDevSections =
--	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 &&
--       (numDevSections =
--	xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) {
-+	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) {
-       return FALSE;
-    }
- 
--- 
-1.6.0.3
-
diff --git a/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch b/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch
deleted file mode 100644
index c1a9b3941060..000000000000
--- a/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 70e0261208654c6c875ad462da2734c6aa9eeb96 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 24 Feb 2009 20:54:05 -0800
-Subject: [PATCH] Disable fb resizing for DRI1-only server so that DRI1 can initialize.
-
----
- src/i830_driver.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 2461e8a..1506ea7 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -1684,6 +1684,10 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
-     pI830->can_resize = FALSE;
-     if (pI830->accel == ACCEL_UXA && pI830->directRenderingType != DRI_XF86DRI)
- 	pI830->can_resize = TRUE;
-+#if !defined(DRI2) && defined(XF86DRI)
-+    /* Disable resizing so that DRI1 can initialize and give us GEM support. */
-+    pI830->can_resize = FALSE;
-+#endif
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 	       "Resizable framebuffer: %s (%d %d)\n",
--- 
-1.6.1.3
-
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild
deleted file mode 100644
index 2e923168569c..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild
+++ /dev/null
@@ -1,35 +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-intel/xf86-video-intel-2.6.2.ebuild,v 1.2 2009/02/28 10:38:34 remi Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.5
-	x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-1.99.3
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xineramaproto
-	x11-proto/glproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( 	x11-proto/xf86driproto
-			>=x11-libs/libdrm-2.4.5
-			x11-libs/libX11 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
-PATCHES=(
-"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
-"${FILESDIR}/${PV}-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch"
-)