x11-drivers/xf86-video-intel: bump to 2.5.0 with patches to remove old symlinks

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64

7 files changed, 282 insertions, 12 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 3856e3b90434..4f6d3105e36a 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.3 2008/10/23 18:23:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.4 2008/10/28 13:52:40 remi Exp $
+
+*xf86-video-intel-2.5.0 (28 Oct 2008)
+
+  28 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patc
+  h, +files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch,
+  +files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
+  ,
+  +files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.pat
+  ch, +xf86-video-intel-2.5.0.ebuild:
+  bump to 2.5.0 with patches to remove old symlinks
 
   22 Oct 2008; Rémi Cardona <remi@gentoo.org>
   xf86-video-intel-1.6.5.ebuild, xf86-video-intel-1.7.4.ebuild,
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 08833f0e3a65..67cdbb72588e 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 AUX 2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
 AUX 2.2.1-0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e
@@ -8,6 +5,10 @@ AUX 2.3.2-0001-intel-fix-drm-check.patch 966 RMD160 f77d00d99bbc02d233fd3455055e
 AUX 2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch 1612 RMD160 d00b5607c258e8905ea91309d2244577918ddee8 SHA1 a995fb3718a6bd52a9248e766ad5d1f8adbaf1a8 SHA256 d8bfae95675f9ad5f81e12f42e6228e3a4311ce9690c4fff164ae69f12798782
 AUX 2.4.2-0002-Disable-render-standby.patch 1724 RMD160 52cd119e0d17b1d3439d1190e2551fc6f239594c SHA1 3e9d4649b2e6ee67f3a133631347b22aee8d83a4 SHA256 70dca79e533d9d1913fed90781c534af574e21e63fe5b858503ef8b3d6b02af4
 AUX 2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa67b53bbc3c24b05724e45a3be212 SHA1 c69ef012f98b36c428688fa863f27d9f60fda601 SHA256 03a72ddddd2baec9e7769a6d8c906c71b33fc2a4b418ae1e4333fc568200ba8d
+AUX 2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch 1898 RMD160 258b1e4c931606390cd0874f98e9ee0ca0a7d289 SHA1 9547598d0bf15da75b7890efb11cfb6947d51008 SHA256 75671e4f9501e1ba59c9ea903860930971787423bd858bf9d06f60b7e777695a
+AUX 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch 1408 RMD160 7614486b272d4a689c1024efa346abca5bff7e94 SHA1 16217a652364318b1c021fcfa9eeadae5d73063f SHA256 014704c1d5c40443ffaaa0714927a6bc15b2f5538fe1e181f1663a0417180d46
+AUX 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch 1211 RMD160 d25c957761de6602df9d2ee712b52fc22bbe0b4a SHA1 ae5ecc1c0733e2a095283f352fa765b82ae9d89e SHA256 304206372466cf5b65603472a86de15a44abd4843f0fadd78d21996ea68e27c5
+AUX 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch 2123 RMD160 bfbdfbf0f2357aaba78a7d701d6474b9cfeedec4 SHA1 0935a784a3068bc75c3e76e90c0773dfda0608c3 SHA256 34b1119de22b38c089618be533552bd029f1da83a76a73e54c3f4f743ec31a2b
 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
 DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2 SHA1 3c2837283ec3e9d1aeec430bb2460178aec94a90 SHA256 ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259
@@ -17,6 +18,7 @@ DIST xf86-video-intel-2.2.1.tar.bz2 604749 RMD160 5746abeb91d5b017d54cb26d2689b3
 DIST xf86-video-intel-2.3.2.tar.bz2 665611 RMD160 5137493fb00b7a6fe3c03750f42599939a69c11b SHA1 86be1572c68a438bb92d40fff262b71d9e40c976 SHA256 060aaa267ded1d5d0987d077b1d4c027f99ee507cee8fd2e5233f15842f9ed27
 DIST xf86-video-intel-2.4.2.tar.bz2 684445 RMD160 939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06 SHA1 fe071bf0c98b1cce96f6647d87a74217632fc2ad SHA256 5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b
 DIST xf86-video-intel-2.4.98.0.tar.bz2 721624 RMD160 50ec2e78c94366f9abc3698d14733739ddc51d64 SHA1 8213fc95ceaa347cf96f70375d8820818b406400 SHA256 856ac75992ebcf0522b7d59c60514251922f7599569ca6fa7459b7f457bfce4b
+DIST xf86-video-intel-2.5.0.tar.bz2 721366 RMD160 ba6b52535cd5963f0ea3a629195899fb8ea9c621 SHA1 081709117a665af9d9f0339b58a298b8a7c786f8 SHA256 09d740bfebc994a9ba7d9840fb2080c14ff111fa3bd46379e9cfe10b9f7925b4
 EBUILD xf86-video-intel-1.6.5.ebuild 985 RMD160 0f59d51ea9c22dc00f81a31675b405a7500bd251 SHA1 a100061ee6e53e9f26e58e1a43a3ad0677b6fbe4 SHA256 8661b66502aa1f38c5fec6cb71f28670d1681628f5e56330b8b6896f1702c238
 EBUILD xf86-video-intel-1.7.4.ebuild 941 RMD160 803fc4d698dd1a5bf390775ab6b26d5f048b2dbd SHA1 a8a795853437ead7945ea6446216903a95e2ccc3 SHA256 9c5f81e31af7a92fc0aff82bd39797c6289da16def24655cd5f71f7f8ce2248e
 EBUILD xf86-video-intel-2.1.1.ebuild 898 RMD160 b052abfdb21fd80a1ccd268c8146498e366e709f SHA1 e39505e37ab4ba0f12b6f5435cca63b0163cdbb3 SHA256 425caafd13cc639a6dab568aa0a1ec69c42b24437e230616cdd9b08803bf09c4
@@ -26,12 +28,6 @@ EBUILD xf86-video-intel-2.3.2.ebuild 916 RMD160 c4b61c4f12571cfd2e3a9631ecf649c9
 EBUILD xf86-video-intel-2.4.2-r2.ebuild 999 RMD160 39d15795c9759b7101aaaa7099c6ba0bc3c0d176 SHA1 c6719b45521c877afaa1382843434e971a0d9f1f SHA256 2202c9973f8fef7535eef32ec6a3e74607404001b23a1fe8a6dbbea76556a752
 EBUILD xf86-video-intel-2.4.2-r3.ebuild 1065 RMD160 1b67f860c32d8b876c32b75b839e77b64305e4b2 SHA1 33bd71649c243f7dd63aa046b99d45fe1ac44bdc SHA256 852f98475f27e538ab3dff6172412b66b840af661a9e591abc266a3b7929e6a4
 EBUILD xf86-video-intel-2.4.98.0.ebuild 843 RMD160 dc0a473f8e489da9f699de6aeb332e76541c9447 SHA1 9c00968ba2c19f8201e7ece8e867e02cc7646d36 SHA256 e1c1e84825bc255283f76d011005f32963d122c5fe4dc73f7a54fc3a16aebc48
-MISC ChangeLog 26671 RMD160 687818e94edd561077c8c558a30b18ca2a5d38a9 SHA1 493f3b30788f3d15d34d9f559ccb8427a2c214c5 SHA256 acb0adcdaadb30e61a552ad793f742cdb096cfcc45079c10a6e6c5a33cff6831
+EBUILD xf86-video-intel-2.5.0.ebuild 1215 RMD160 8562ce231277adb838377e47bec8623cc3830353 SHA1 70fef43ef58d42f75262822ae7ff97ba1ac53d25 SHA256 278333828bde3a8eb08fbc0157aefcfcefd73128091aa384cb5d5a659ed5e12d
+MISC ChangeLog 27156 RMD160 ffe1edb2694afc60a3ebb0d380e6c12377e2f09b SHA1 c0ce073910b31f02f7a6cc6722deabf476c0f0e5 SHA256 48efe0ce777f7cbc9f7d752eba17c22c63febbfc94b8238bf3a86cc7eecc2a8b
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkAwTIACgkQI1lqEGTUzyTuyQCeJpWkbXVzGf+q4r7d588A01dM
-/n4An39dzb7Rubc0ijonEe+Axya6Lhqe
-=0LF/
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
new file mode 100644
index 000000000000..e197177b0b02
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
@@ -0,0 +1,52 @@
+From c07321e220df325c315f2138b05ef70146fed5ad Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Mon, 20 Oct 2008 18:46:49 -0700
+Subject: [PATCH 1/4] Default kernel mode setting to off, add configure flag to enable
+
+Should help avoid unpleasantness.
+---
+ configure.ac |   21 ++++++++++++++-------
+ 1 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ccbdf..a53b225 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,11 @@ AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
+               [XVMC="$enableval"],
+               [XVMC=auto])
+ 
++AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
++                                  [Enable kernel mode setting support [[default=no]]]),
++              [KMS="$enableval"],
++              [KMS=no])
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+@@ -107,13 +112,15 @@ if test x$DRI != xno; then
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+ 	AC_CHECK_FILE([${sdkdir}/damage.h],
+                       [have_damage_h="yes"], [have_damage_h="no"])
+-	AC_CHECK_HEADER(xf86drmMode.h,
+-			[DRM_MODE=yes],[DRM_MODE=no]
+-			[#include "stdint.h"])
+-	dnl exaGetPixmapDriverPrivate required for DRM_MODE.
+-	PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
+-	if test "x$DRM_MODE" = xyes; then
+-	   	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
++	if test x$KMS != xno; then
++		AC_CHECK_HEADER(xf86drmMode.h,
++				[DRM_MODE=yes],[DRM_MODE=no]
++				[#include "stdint.h"])
++		dnl exaGetPixmapDriverPrivate required for DRM_MODE.
++		PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
++		if test "x$DRM_MODE" = xyes; then
++	   		AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
++		fi
+ 	fi
+ fi
+ AC_MSG_CHECKING([whether to include DRI support])
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
new file mode 100644
index 000000000000..17c0047020ef
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
@@ -0,0 +1,53 @@
+From 7b847b328e314ac24cdad56dc9846a06b9d44e23 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Mon, 20 Oct 2008 11:27:36 +0200
+Subject: [PATCH 2/4] clean up man pages generation and installation
+
+---
+ man/Makefile.am |   21 +++++----------------
+ 1 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 7432d5a..2a1cc81 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -25,21 +25,14 @@
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+-
+-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@
++	$(DRIVER_NAME).$(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
+@@ -61,9 +54,5 @@ 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@
++i810.$(DRIVER_MAN_SUFFIX):
++	echo .so man$(DRIVER_MAN_SUFFIX)/$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) > $@
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
new file mode 100644
index 000000000000..c5ebdc1f534e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
@@ -0,0 +1,41 @@
+From d437f3107635a85486faae15e48a7237b6d69e42 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Mon, 20 Oct 2008 13:17:32 +0200
+Subject: [PATCH 3/4] use standard automake macros for handling symlinks
+
+---
+ configure.ac    |    1 +
+ src/Makefile.am |    6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a53b225..36852aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AC_PROG_LIBTOOL
+ DOLT
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AC_PROG_LN_S
+ 
+ AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
+ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9b32215..b16ba6c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -223,8 +223,8 @@ 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)
++install-exec-hook:
++	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
+ 
+-uninstall-local:
++uninstall-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
new file mode 100644
index 000000000000..8e46c35a0df4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
@@ -0,0 +1,76 @@
+From ef7a85624b6bf3ab9935c8a797978a18e6334dec Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Wed, 22 Oct 2008 12:15:35 +0200
+Subject: [PATCH 4/4] add a configure switch for pre-2.0 compatibility symlinks
+
+Conflicts:
+
+	configure.ac
+---
+ configure.ac    |    8 ++++++++
+ man/Makefile.am |    7 ++++---
+ src/Makefile.am |    2 ++
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36852aa..b725acf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,6 +81,11 @@ AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
+               [KMS="$enableval"],
+               [KMS=no])
+ 
++AC_ARG_ENABLE(symlinks, AC_HELP_STRING([--enable-symlinks],
++                                       [Disable old "i810" symlinks [[default=yes]]]),
++              [SYMLINKS="$enableval"],
++              [SYMLINKS="yes"])
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+@@ -262,6 +267,9 @@ if test "$XVMC" = yes; then
+     	AC_SUBST([XVMCLIB_CFLAGS])
+ fi
+ 
++AC_MSG_CHECKING([whether to setup old "i810" symlinks])
++AC_MSG_RESULT([$SYMLINKS])
++AM_CONDITIONAL(SYMLINKS, [test "$SYMLINKS" = "yes"])
+ 
+ AC_SUBST([DRI_CFLAGS])
+ AC_SUBST([XORG_CFLAGS])
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 2a1cc81..b07b3f0 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -25,9 +25,10 @@
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+-driverman_DATA = \
+-	$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \
+-	i810.$(DRIVER_MAN_SUFFIX)
++driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
++if SYMLINKS
++driverman_DATA += i810.$(DRIVER_MAN_SUFFIX)
++endif
+ 
+ EXTRA_DIST = $(DRIVER_NAME).man
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b16ba6c..881fbaa 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -223,8 +223,10 @@ intel_drv_la_SOURCES += \
+ 	$(INTEL_XVMC_SRCS)
+ endif
+ 
++if SYMLINKS
+ install-exec-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
++endif
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
new file mode 100644
index 000000000000..0d7b60838f98
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 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.5.0.ebuild,v 1.1 2008/10/28 13:52:40 remi Exp $
+
+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.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			x11-proto/glproto
+			>=x11-libs/libdrm-2.4.0
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri) --disable-symlinks"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch"
+"${FILESDIR}/${PV}-0002-clean-up-man-pages-generation-and-installation.patch"
+"${FILESDIR}/${PV}-0003-use-standard-automake-macros-for-handling-symlinks.patch"
+"${FILESDIR}/${PV}-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}