20070314 patchball 0.4, 20080710 ebuild reworked a bit, patchball 0.2

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc4 x86_64

4 files changed, 39 insertions, 39 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index b666edb9998c..10ced5bac9b9 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2008/07/11 05:29:05 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.59 2008/09/12 05:15:22 battousai Exp $
+
+  12 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
+  x11-drm-20070314.ebuild, x11-drm-20080710.ebuild:
+  Bump 20070314 to patchball 0.4, with FreeBSD fix. Bump masked 20080710 to
+  patchball 0.2 with numerous fixes and an initial Changelog, removed
+  modprobe.d, and better linux-mod functionality.
 
   11 Jul 2008; Bryan Stine <battousai@gentoo.org> x11-drm-20070314.ebuild:
   20070314 patchball update for updated kernel compatibility.
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index e6c8aa41ff17..c56c7b172ec3 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -4,13 +4,13 @@ DIST linux-drm-20070314-kernelsource.tar.bz2 424009 RMD160 649e007221b1a92e66046
 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.3.tar.bz2 3684 RMD160 ce8b7816048143bf7bf79f755a0380dadb47e1b4 SHA1 33e8bf92569dcf8a61661f9d324211b2746b1c02 SHA256 e39fc9e7dbffdb125afd2d94e5d329ab7d723ad883a23cbd3fa02122622a26dd
-DIST x11-drm-20070314-gentoo-0.3.tar.bz2 2019 RMD160 778dd891b651b278706779deb1d14c716096ef43 SHA1 9419e8c61e6ca4baff22a546640d4fa977436e02 SHA256 9657ffc5fdb8cb5bb94b36477355dde9ea48c6422e72f379623941883aba7a07
+DIST x11-drm-20070314-gentoo-0.4.tar.bz2 2412 RMD160 a25e2e7d6b4e0394761574c3932ea61b2d0e3e24 SHA1 ba799492c728dadd018376cc326b073b6797cd86 SHA256 490f493a558e8c6e5436d4ea1d9527090875847d3fe1241429457e2679ae0d9c
 DIST x11-drm-20071019-gentoo-0.2.tar.bz2 1680 RMD160 8f2c615500cfeeb4ae71147207d62a1b2de6a76b SHA1 97b1b27daff91e8c7849f831024494c6d73a4482 SHA256 da2c20faa9c9d8dd9583737d8526052c0cefce8bfe97d80a2d43ba245ddfabb3
-DIST x11-drm-20080710-gentoo-0.1.tar.bz2 1552 RMD160 8de03f86edb7b213f0b137e9c08166972f78b225 SHA1 4179a8d66463cdc93625c8a7c73aa12c2fe87c29 SHA256 2af2e2b94423e118582b68d8a0387c9a2f82bef006a5aa5e9ad287f029a11b85
+DIST x11-drm-20080710-gentoo-0.2.tar.bz2 4776 RMD160 c53279914445ab48b185e57f88d62dfd48fa285d SHA1 2a6b3874197a7e88969a4d6abe4c8249e9e4472c SHA256 8bd6294dc21975428dd9e8d6197ab4634fde25482a0e9cc0bf826c9865bdb85f
 EBUILD x11-drm-20060608-r1.ebuild 8281 RMD160 fa7894bfcb294d3e549ce959c4c50a4ea4bec0e0 SHA1 94c43dcb0d8daf5d327c3a3a2630daddecab0f88 SHA256 d51be111dfc27161d2b96256816c546f527eb90c5bce44b8ebe0c4f64c707f58
 EBUILD x11-drm-20060608.ebuild 6170 RMD160 38b75375805fe021b262d32e2a58f715185346d2 SHA1 2f7f5a521361fea5cf7f45e0f7428675ff260aea SHA256 56c5badbb9fc41b82fb36886ea9da14c40c475509cf607e9eda6dd5ad060c0f7
-EBUILD x11-drm-20070314.ebuild 8073 RMD160 6f1558c8c25d0515b54d6c2b198d1e223369f7fb SHA1 4c2e25c57c6e0e5c2df1ce99ac68c58ae68fcb21 SHA256 a2b33c9b3327cddd6daf22be70d97a9d86bab9b397af6b52f981ea816b0a37e4
+EBUILD x11-drm-20070314.ebuild 8073 RMD160 3909eaec5c1b34522ab8ab4e45fc5ed472aeaca1 SHA1 7b2495e23104293838ccb513c0002fac38489695 SHA256 18e56151213c0326a835403840b4ac8d230cb2747f887351644c1c69bebdc7be
 EBUILD x11-drm-20071019.ebuild 8053 RMD160 d92e9b127aa857942da6f92c63a22d1107cf0cc0 SHA1 ebdffea34f43d3b7297f7a2f44965c48cc0345e9 SHA256 5ba21236646e0ffe14e721ef7f90ede73b48d811f50fb31a27aeb45ebb641e7e
-EBUILD x11-drm-20080710.ebuild 7895 RMD160 60df58d0c24c9178221d469bcd062578e93a2be9 SHA1 24a9cd45f61cba5d767b65bbf6cbb65057bc9e5c SHA256 665d1a52bbc1248f3fae08daddb65a362e5e7c7c9693954b4696ef57c28d05d9
-MISC ChangeLog 24682 RMD160 17ed1c25dc34f15b9ba75f093be2f75306bc042d SHA1 4af7de1fb4bb82bf11a464951c1bb3bed81903ad SHA256 ec21fb09e89abd743a8c3148fa7c373a5a664177a771ce972aecd559abb793d2
+EBUILD x11-drm-20080710.ebuild 7799 RMD160 3a11d70418c3659b28e42e4a488af085f9aecb1c SHA1 1f8b5aee649acf9c34f5b264886490b2e9bf5026 SHA256 5092416ae7c1836d50155fbbd47d368023daa8d977be2a802f3923cb9145b897
+MISC ChangeLog 24984 RMD160 7f96d975ee885ebc17835389a361be75cc1655c0 SHA1 f5c518a339760eb54c03a080534bbe2f13b28ada SHA256 ea26d40dfa5a045b37e4cf50fc8fd15f5d97e17f0b6692b7461afb2e0ec47c29
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
index cb219f719aef..b5ddb5c20e66 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
 # 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.5 2008/07/11 05:29:05 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.6 2008/09/12 05:15:22 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@ IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
diff --git a/x11-base/x11-drm/x11-drm-20080710.ebuild b/x11-base/x11-drm/x11-drm-20080710.ebuild
index ecc6584b02c5..07cc371defac 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
 # 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.1 2008/07/11 04:57:43 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.2 2008/09/12 05:15:22 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.1"
+PATCHVER="0.2"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -49,12 +49,12 @@ pkg_setup() {
 	# Setup the kernel's stuff.
 	kernel_setup
 
-	# Set video cards to build for.
-	set_vidcards
-
 	# Determine which -core dir we build in.
 	get_drm_build_dir
 
+	# Set video cards to build for.
+	set_vidcards
+
 	return 0
 }
 
@@ -129,8 +129,6 @@ kernel_setup() {
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 4
 		then
 			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
@@ -138,11 +136,12 @@ kernel_setup() {
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		linux_chkconfig_builtin "DRM" && \
-			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		CONFIG_CHECK="!DRM ~AGP"
+		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
+		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP).
+			This will probably be essential for direct rendering."
 
-		CONFIG_CHECK="AGP"
-		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -184,6 +183,19 @@ set_vidcards() {
 		use video_cards_xgi && \
 			VIDCARDS="${VIDCARDS} xgi.${KV_OBJ}"
 	fi
+
+	MODULE_NAMES=""
+	if use kernel_linux
+	then
+		LIBDIR="x11-drm"
+		for VIDCARD in ${VIDCARDS}
+		do
+			MODULE_NAMES="${MODULE_NAMES} ${VIDCARD/\.${KV_OBJ}/(${LIBDIR}:${SRC_BUILD})}"
+		done
+		MODULE_NAMES="${MODULE_NAMES} drm(${LIBDIR}:${SRC_BUILD})"
+		BUILD_PARAMS="LINUXDIR=\"${KERNEL_DIR}\" DRM_MODULES=\"${VIDCARDS}\""
+		BUILD_TARGETS="modules"
+	fi
 }
 
 get_drm_build_dir() {
@@ -250,17 +262,7 @@ src_install_os() {
 
 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
+	linux-mod_src_compile
 
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
 	cd "${SRC_BUILD}"
@@ -300,15 +302,7 @@ die_error() {
 
 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."
+	linux-mod_src_install
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules