Bump to new snapshot.

(Portage version: 2.1_rc1-r3)

4 files changed, 253 insertions, 1 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 244557dafccb..b31c661a323e 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.32 2006/04/16 20:21:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.33 2006/06/08 22:51:33 battousai Exp $
+
+*x11-drm-20060608 (08 Jun 2006)
+
+  08 Jun 2006; Bryan Stine <battousai@gentoo.org> +x11-drm-20060608.ebuild:
+  Bump to new snapshot.
 
   16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
   x11-drm-20051223.ebuild:
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051223 b/x11-base/x11-drm/files/digest-x11-drm-20051223
index 411ef258aee1..6d48f511b5dc 100644
--- a/x11-base/x11-drm/files/digest-x11-drm-20051223
+++ b/x11-base/x11-drm/files/digest-x11-drm-20051223
@@ -1,2 +1,6 @@
 MD5 e3586c43652beda09e68558528929d9e linux-drm-20051223-kernelsource.tar.bz2 560381
+RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 linux-drm-20051223-kernelsource.tar.bz2 560381
+SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef linux-drm-20051223-kernelsource.tar.bz2 560381
 MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20051223-gentoo-0.1.tar.bz2 2106
+RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20051223-gentoo-0.1.tar.bz2 2106
+SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20051223-gentoo-0.1.tar.bz2 2106
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20060608 b/x11-base/x11-drm/files/digest-x11-drm-20060608
new file mode 100644
index 000000000000..6f48ada3a256
--- /dev/null
+++ b/x11-base/x11-drm/files/digest-x11-drm-20060608
@@ -0,0 +1,6 @@
+MD5 b43b229f76a38ae31fd35c69733d00cb linux-drm-20060608-kernelsource.tar.bz2 568004
+RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f linux-drm-20060608-kernelsource.tar.bz2 568004
+SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731 linux-drm-20060608-kernelsource.tar.bz2 568004
+MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20060608-gentoo-0.1.tar.bz2 2106
+RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20060608-gentoo-0.1.tar.bz2 2106
+SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20060608-gentoo-0.1.tar.bz2 2106
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
new file mode 100644
index 000000000000..a0b6482c78b5
--- /dev/null
+++ b/x11-base/x11-drm/x11-drm-20060608.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2006 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.1 2006/06/08 22:51:33 battousai Exp $
+
+inherit eutils x11 linux-mod
+
+IUSE_VIDEO_CARDS="
+	video_cards_i810
+	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="nostrip"
+
+S="${WORKDIR}/drm"
+PATCHVER="0.1"
+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="~x86 ~alpha ~ia64 ~ppc ~amd64"
+
+DEPEND=">=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/libtool-1.5.14
+	>=sys-devel/m4-1.4
+	virtual/linux-sources
+	>=sys-apps/portage-2.0.49-r13"
+
+pkg_setup() {
+	get_version
+
+	if linux_chkconfig_builtin "DRM"
+	then
+		die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+	fi
+
+	if ! linux_chkconfig_present "AGP"
+	then
+		einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
+		einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
+		echo
+	fi
+
+	# 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}
+	WANT_AUTOCONF="2.59" WANT_AUTOMAKE="1.7" autoreconf -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
+	make KV="${KV_FULL}" \
+		LINUXDIR="${KERNEL_DIR}" \
+		DESTDIR="${D}" \
+		RUNNING_REL="${KV_FULL}" \
+		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
+		install || die "Install failed."
+
+	dodoc README.drm
+
+	dobin dristat
+	dobin drmstat
+
+	# Strip binaries, leaving /lib/modules untouched (bug #24415)
+	strip_bins \/lib\/modules
+
+	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
+	keepdir /etc/modules.d
+	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+}
+
+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
+
+	einfo "Checking kernel module dependencies"
+	update_modules
+	update_depmod
+}
+
+# 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_i810 && \
+			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
+}