Bump to 20080710-0.5, with patch to fix bug #255956. Dropped 20060608 versions. Minor convention fix in all ebuilds.

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

7 files changed, 30 insertions, 626 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index db273484314e..cc8f4e48b3d9 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/x11-drm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.67 2008/11/02 00:02:58 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.68 2009/01/22 23:19:06 battousai Exp $
+
+  22 Jan 2009; Bryan D. Stine <battousai@gentoo.org>
+  -x11-drm-20060608.ebuild, -x11-drm-20060608-r1.ebuild,
+  x11-drm-20070314.ebuild, x11-drm-20071019.ebuild, x11-drm-20080710.ebuild:
+  Push 20080710 patchball 0.5, restoring compatibility with kernel 2.6.28.
+  Dropped old 20060608 snapshot. Rename I810_VIDCARDS to INTEL_VIDCARDS for
+  consistency. 20080710-0.5 fixes bug #255956.
 
   02 Nov 2008; Markus Meier <maekke@gentoo.org> x11-drm-20070314.ebuild:
   amd64/x86 stable, bug #237876
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index 792881f10f6e..59ac14fc64e0 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST linux-drm-20060608-kernelsource.tar.bz2 568004 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f SHA1 466c1410c05f715286cf44437c1946cdaacf2cde SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731
 DIST linux-drm-20070314-kernelsource.tar.bz2 424009 RMD160 649e007221b1a92e6604695f9467e065bc90e6b8 SHA1 b8d8c12affaa85d8e9eb025bc3a5516afaf53719 SHA256 ff9b834426fdbcee24991c42acef823c8beab6c15baec0c39e66a5acb790fd69
 DIST linux-drm-20071019-kernelsource.tar.bz2 487002 RMD160 501cba11044cda6cd88e6183ec68b2669ea1d558 SHA1 4afbac5b18be2671e3d422e5996f8fcf5516c072 SHA256 28c8fb25351cc05733c5aed5128e034009d2094681f9b4df6387c0c29a2803a9
 DIST linux-drm-20080710-kernelsource.tar.bz2 566434 RMD160 6c84c435da347c30fbffdbaa1daed580ac9b160d SHA1 66c0375ece91cd557fb1309eccaee7ef195f0b91 SHA256 65f0378c35b6cbf83c463f203f544ff0643690f17d6e537646eab52f3ec03f58
-DIST x11-drm-20060608-gentoo-0.4.tar.bz2 5130 RMD160 aaa6632d238a258e4c28dc8ea10e4676024192bd SHA1 c982a51b596ff1ec1d6253ca32b08fb00081089b SHA256 9a942821a4706bc14fc312c5e0c7f81415a5aa4700187b18f8970e06f7317fde
 DIST x11-drm-20070314-gentoo-0.6.tar.bz2 12021 RMD160 26b15ca372606e7ae0b0550bafe123612f2bf3e9 SHA1 ca62c04fc70b50e1132658ebd9b34de24f95c1e4 SHA256 b6cf5485bf38bad53f7f4262b2ed93fdbf81f2f2b486471e268bd349800a0b20
 DIST x11-drm-20071019-gentoo-0.3.tar.bz2 10793 RMD160 af71f2a223c87240d87b73d4da6fcfbac7d6d810 SHA1 7994d9be5e2fce1e22351aec26d93ab3a0842d00 SHA256 a2475ef16806d98206a66d0a5c2363f91feb960795915116bdd9f5ce888e02db
-DIST x11-drm-20080710-gentoo-0.4.tar.bz2 5441 RMD160 e09a4011e7e16299bc09f42444ff4eb4ebe3cec7 SHA1 d1d9656a30e24868f68fbd19c12ce091148eea59 SHA256 48d764aae43a627d63b46d493a4bf209da2d3eb086334db36542f91a2f37a6d9
-EBUILD x11-drm-20060608-r1.ebuild 8777 RMD160 a7b355de1dd0cd065bdcc8d1ac1a932680940d83 SHA1 c9a9233c937abb273f5118ff42b1b8e9af9e5c52 SHA256 54a17db856a7c07d1b3e9901d7efc2075ee9710440aef112bfa7b53a55f98ef0
-EBUILD x11-drm-20060608.ebuild 6655 RMD160 6bd8de83a9446bd84ede47fec77e85387e4944cb SHA1 1a809e08a9c107232956a96a0855aa6a7018d813 SHA256 dff5e93c423e6632654a0957ba9126c4415d7b08df76646ca57df407dd2d3aa6
-EBUILD x11-drm-20070314.ebuild 8325 RMD160 05953e9fe1262eca325e46716d4779d91ceeac82 SHA1 8f585bae374567466f7fd6424c26b631a4b3e089 SHA256 e3a7f70f351833b0eceb7e31cd75a052bd6c55995d33bf66832352541616e9f7
-EBUILD x11-drm-20071019.ebuild 8307 RMD160 36d6982fc40b349319638b3b9e93e5e8db1915d3 SHA1 6d61cd26a13f9859ee87b33bdd78c6f02c107a5a SHA256 ebef9c56e4c1c2d8105fce3ab18df39aa0a018ed926a3f3c94c9a3c645a9686a
-EBUILD x11-drm-20080710.ebuild 8263 RMD160 8419def127a06251ff0b7e5e6492026b2f4fdf55 SHA1 e803a2c60636fc684651c2bad33293ef3bb276a4 SHA256 5a9dc112147732ffca3e481e6b94058c4e355dd240d857f279f262fae0bac44e
-MISC ChangeLog 26837 RMD160 37824e9aa72d068667c6620aaff61efd026ff507 SHA1 c4cff2c1dab45ddc3b8c17c2b5163754b84404bd SHA256 2f78a68419676b875526d6e51fcd536840f8a39de763f077d6516e5a12ae3742
+DIST x11-drm-20080710-gentoo-0.5.tar.bz2 5953 RMD160 db8a315d8539659459d90e7c09fcc42992e2f393 SHA1 b8a998095dc2e9e5052e7cdd86e81ba96047a963 SHA256 95a2980cc501203387610270f186c2651725f53d82e0e1153ded9e88df91dc36
+EBUILD x11-drm-20070314.ebuild 8331 RMD160 b6c6b7d93f2e1d984b6e4a5eaccfcb364aec1486 SHA1 83d87ce1b90bd4a09354033270f64949bc57a439 SHA256 352222e6c1b975aa597035b7ba23a2eae8255ff1062efdf878d998078206dd25
+EBUILD x11-drm-20071019.ebuild 8315 RMD160 7f029741d57e04d90d32974d2dfb27e32c8d791f SHA1 d745f4f4d61de8378fe5d3cae73c8904fc88c241 SHA256 741518f60968843d8eb9f79967b4e225fb29ee5a2f0e0015c35c817717431965
+EBUILD x11-drm-20080710.ebuild 8271 RMD160 0c91d0d29e680a6cc7e1cd94049c11a5f19d0621 SHA1 5e4986f3ee42a3bcbb30393b2e5592f2af144ea8 SHA256 97a8875a88810956336963d841cfb3fa2568805452bed6f769ee34f512f05003
+MISC ChangeLog 27226 RMD160 8324bb3d2826982b38b068b7e4828214257cf3d4 SHA1 6908fc76410268a956e006bf39a7debb3744dec1 SHA256 8ab907a17bd454e2302de917320deb67bc21d18707dce0bd0c56a443e7416be6
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkM7jkACgkQkKaRLQcq0GI4iQCfQsU+rDVzQQdD2/wmAOrPkYzQ
-o9kAn1wcJEo8ebHXW3l+YTuejtY4AjXp
-=Oc5S
------END PGP SIGNATURE-----
diff --git a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
deleted file mode 100644
index 570a8d6b80de..000000000000
--- a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.10 2008/10/22 16:12:49 remi Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.7"
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="strip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.4"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )"
-RDEPEND=""
-
-pkg_setup() {
-	# Setup the kernel's stuff.
-	kernel_setup
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
-
-	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd "${SRC_BUILD}"
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp "${S}"/tests/*.c "${SRC_BUILD}"
-
-	src_unpack_os
-
-	cd "${S}"
-	eautoreconf -v --install
-}
-
-src_compile() {
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	dodoc "${S}/linux-core/README.drm"
-
-	dobin dristat
-	dobin drmstat
-}
-
-pkg_postinst() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 6
-		then
-			CONFIG_CHECK="!DRM AGP"
-			ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
-			ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
-
-			kernel_is ge 2 6 25 && \
-				CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
-				ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
-		elif kernel_is 2 4
-		then
-			CONFIG_CHECK="DRM"
-			ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
-		fi
-
-		linux-mod_pkg_setup
-	fi
-}
-
-set_vidcards() {
-	if use kernel_linux; then
-		set_kvobj
-		I810_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
-	elif use kernel_FreeBSD; then
-		KV_OBJ="ko"
-		# bsd does not have i810/i830, only i915:
-		I810_VIDCARDS="i915.${KV_OBJ}"
-	fi
-
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}"
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_nv && \
-			VIDCARDS="${VIDCARDS} nv.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon && \
-			VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-		use video_cards_savage && \
-			VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-		use video_cards_sis && \
-			VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-		use video_cards_via && \
-			VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-		use video_cards_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-	if use kernel_linux
-	then
-	    kernel_is 2 4 && mv -f "${PATCHDIR}"/*kernel-2.6* "${EXCLUDED}"
-	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
-	fi
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-src_unpack_freebsd() {
-	# Do FreeBSD stuff.
-	if use kernel_FreeBSD
-	then
-		# Link in freebsd kernel.
-		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-	fi
-}
-
-src_unpack_os() {
-	if use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# This now uses an M= build system. Makefile does most of the work.
-	cd "${SRC_BUILD}"
-	unset ARCH
-	emake M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd "${SRC_BUILD}"
-	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-
-	cd "${S}/tests"
-	# -D_POSIX_SOURCE skips the definition of several stuff we need
-	# for these two to compile
-	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
-	emake dristat || die "Building dristat failed."
-	emake drmstat || die "Building drmstat failed."
-	# Move these where the linux stuff expects them
-	mv dristat drmstat "${SRC_BUILD}"
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	cd "${SRC_BUILD}"
-	unset ARCH
-	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
-	emake KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
-		O="${KBUILD_OUTPUT}" \
-		install || die "Install failed."
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-pkg_postinst_os() {
-	if use kernel_linux
-	then
-		linux-mod_pkg_postinst
-
-		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
-		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
-		elog "be seen during the installation. If you experience any of those problems,"
-		elog "please ensure that the in-kernel DRM modules are not installed."
-		elog "This can be done with the following:"
-		elog "    cd ${KERNEL_DIR}"
-		elog "    make modules modules_install"
-		elog "This should allow the x11-drm modules to load and function normally."
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
deleted file mode 100644
index 411cfd7845bf..000000000000
--- a/x11-base/x11-drm/x11-drm-20060608.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.15 2008/10/22 16:12:49 remi Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.7"
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}"
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="strip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.4"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="alpha amd64 ia64 ppc x86"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-pkg_setup() {
-	if kernel_is 2 6 ; then
-		CONFIG_CHECK="!DRM AGP"
-		ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
-		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
-
-		kernel_is ge 2 6 25 && \
-			CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
-			ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
-	elif kernel_is 2 4 ; then
-		CONFIG_CHECK="DRM"
-		ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
-	fi
-
-	linux-mod_pkg_setup
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	cd "${S}"
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
-
-	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd "${SRC_BUILD}"
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp "${S}"/tests/*.c "${SRC_BUILD}"
-
-	cd "${S}"
-	eautoreconf -v --install
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	cd "${SRC_BUILD}"
-
-	# This now uses an M= build system. Makefile does most of the work.
-	unset ARCH
-	make M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	cd "${S}"
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	cd "${SRC_BUILD}"
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	unset ARCH
-	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
-	make KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
-		O="${KBUILD_OUTPUT}" \
-		install || die "Install failed."
-
-	dodoc README.drm
-
-	dobin dristat
-	dobin drmstat
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-pkg_postinst() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	linux-mod_pkg_postinst
-
-	elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
-	elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
-	elog "be seen during the installation. If you experience any of those problems,"
-	elog "please ensure that the in-kernel DRM modules are not installed."
-	elog "This can be done with the following:"
-	elog "    cd ${KERNEL_DIR}"
-	elog "    make modules modules_install"
-	elog "This should allow the x11-drm modules to load and function normally."
-}
-
-# Functions used above are defined below:
-
-set_vidcards() {
-	set_kvobj
-
-	POSSIBLE_VIDCARDS="mga tdfx r128 radeon i810 i830 i915 mach64 nv savage
-		sis via"
-	if use sparc; then
-		POSSIBLE_VIDCARDS="${POSSIBLE_VIDCARDS} ffb"
-	fi
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_nv && \
-			VIDCARDS="${VIDCARDS} nv.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon && \
-			VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-		use video_cards_savage && \
-			VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-		use video_cards_sis && \
-			VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-		use video_cards_via && \
-			VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-		use video_cards_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	else
-		for card in ${POSSIBLE_VIDCARDS}; do
-			VIDCARDS="${VIDCARDS} ${card}.${KV_OBJ}"
-		done
-	fi
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-
-	kernel_is 2 4 && mv -f "${PATCHDIR}"/*kernel-2.6* "${EXCLUDED}"
-	kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-get_drm_build_dir() {
-	if kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
index 95757a74f029..cf3e06803f9d 100644
--- a/x11-base/x11-drm/x11-drm-20070314.ebuild
+++ b/x11-base/x11-drm/x11-drm-20070314.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.13 2008/11/02 00:02:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.14 2009/01/22 23:19:06 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -146,18 +146,18 @@ kernel_setup() {
 set_vidcards() {
 	if use kernel_linux; then
 		set_kvobj
-		I810_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
 	elif use kernel_FreeBSD; then
 		KV_OBJ="ko"
 		# bsd does not have i810/i830, only i915:
-		I810_VIDCARDS="i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i915.${KV_OBJ}"
 	fi
 
 	VIDCARDS=""
 
 	if [[ -n "${VIDEO_CARDS}" ]]; then
 		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}"
+			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
 		use video_cards_mach64 && \
 			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
 		use video_cards_mga && \
diff --git a/x11-base/x11-drm/x11-drm-20071019.ebuild b/x11-base/x11-drm/x11-drm-20071019.ebuild
index 5374f2363989..60760aee9f67 100644
--- a/x11-base/x11-drm/x11-drm-20071019.ebuild
+++ b/x11-base/x11-drm/x11-drm-20071019.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.5 2008/10/22 16:12:49 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.6 2009/01/22 23:19:06 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -146,18 +146,18 @@ kernel_setup() {
 set_vidcards() {
 	if use kernel_linux; then
 		set_kvobj
-		I810_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
 	elif use kernel_FreeBSD; then
 		KV_OBJ="ko"
 		# bsd does not have i810, only i915:
-		I810_VIDCARDS="i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i915.${KV_OBJ}"
 	fi
 
 	VIDCARDS=""
 
 	if [[ -n "${VIDEO_CARDS}" ]]; then
 		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}"
+			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
 		use video_cards_mach64 && \
 			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
 		use video_cards_mga && \
diff --git a/x11-base/x11-drm/x11-drm-20080710.ebuild b/x11-base/x11-drm/x11-drm-20080710.ebuild
index 4023fe7f53b1..c88a4491c922 100644
--- a/x11-base/x11-drm/x11-drm-20080710.ebuild
+++ b/x11-base/x11-drm/x11-drm-20080710.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.6 2008/10/22 16:12:49 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.7 2009/01/22 23:19:06 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -27,7 +27,7 @@ IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.4"
+PATCHVER="0.5"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -147,18 +147,18 @@ kernel_setup() {
 set_vidcards() {
 	if use kernel_linux; then
 		set_kvobj
-		I810_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
 	elif use kernel_FreeBSD; then
 		KV_OBJ="ko"
 		# bsd does not have i810, only i915:
-		I810_VIDCARDS="i915.${KV_OBJ}"
+		INTEL_VIDCARDS="i915.${KV_OBJ}"
 	fi
 
 	VIDCARDS=""
 
 	if [[ -n "${VIDEO_CARDS}" ]]; then
 		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}"
+			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
 		use video_cards_mach64 && \
 			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
 		use video_cards_mga && \