added USE flag for drm-next patch

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

4 files changed, 15 insertions, 6 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 96b65ad2f6de..7f74fb39ed07 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.8 2009/11/07 04:42:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.9 2009/11/08 20:12:51 wired Exp $
+
+  08 Nov 2009; Alex Alexander <wired@gentoo.org>
+  zen-sources-2.6.31_p7.ebuild, metadata.xml:
+  added USE flag for drm-next patch
 
 *zen-sources-2.6.31_p7 (07 Nov 2009)
 
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index ea7e3684df8a..2142098d6ae9 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -3,6 +3,7 @@ DIST 2.6.30-zen10.patch.lzma 1829253 RMD160 a85a41b88135424d49bfb2e7703f9d5f28fb
 DIST 2.6.30-zen9.patch.bz2 2022105 RMD160 0fe9f64e445634537ac0b4fd66292b94c5c17d50 SHA1 46ffc5b42149dd0979710cfec65dc54738482894 SHA256 e56b67b3db5e8402903290b3e29c1814f071dba5c0dd0e8ac68542c9618501a1
 DIST 2.6.31-zen5.patch.lzma 2336309 RMD160 4ef986e4cc60c76c77ef962c63460e46388d0e85 SHA1 f478338293621facd849653bce560e300e361901 SHA256 35614bc21e7756649cec27c68e2446de04c33761b1d9137c1f6912328e4e3b6e
 DIST 2.6.31-zen6.patch.lzma 2389767 RMD160 d8b909b892e474e849ff4d03198d2a2e0d325416 SHA1 3011b7f0be3031079b1670066f2ae64a3b79130b SHA256 eff5f7a116024c580e0f8cdee6845474d1704897cb8d6bbd947620d550ed25a9
+DIST 2.6.31-zen7-drmnext.patch 4775647 RMD160 81048a28e51f1b0bf62353170500d4a07eb06d1e SHA1 3bc5a94322f12e2423921a33104cd00c63623d2a SHA256 313659849fbb04108dfc385403899707fc83e38d1266a9fa04d81de262f2b02c
 DIST 2.6.31-zen7.patch.lzma 1895031 RMD160 d21f6a7fbe038e553ca275e4ca2661847ea85395 SHA1 c0b71bf0466b2327535ed9e1e3345f5b1a9b7659 SHA256 588efc601ac882ee8fd4e21e28565ede12e63c620071801fa4a2eb5425516096
 DIST 2.6.32-rc5-zen2.patch.lzma 1713437 RMD160 77eb3007bfd5bf834524c935f4eb72a7a3c4cb77 SHA1 f238807c65791e6fe41eb2544105370f65362424 SHA256 ee3c79ad518b831a082d8e85a8ee309bde5f456cacb013e8092c550335669157
 DIST 2.6.32-rc6-zen1.patch.lzma 2113713 RMD160 a8d266d44724a70500efc8ef9459615f9ba2e8eb SHA1 ab430134b0b7c8b421d661efb7ca821b09ef6aac SHA256 3d5a3247c7980a3e4d2b81be187f82d87ce937b91e81915b07ec7ba2e53d0b78
@@ -14,9 +15,9 @@ EBUILD zen-sources-2.6.30_p10.ebuild 1372 RMD160 24df9ccb0795e43dbd95f496e9ed560
 EBUILD zen-sources-2.6.30_p9-r1.ebuild 1371 RMD160 df769ae011bb41754da7d291f5414b426560c39a SHA1 3bce21e97d1ceee288c3091a80f588db2bd1f2b0 SHA256 02789e0801fbda874418aec74f8fef1949918f2dfe7b5ada08fd2eef99846959
 EBUILD zen-sources-2.6.31_p5-r2.ebuild 1421 RMD160 e97117826809b47dc767f0071adf5a6e597152e5 SHA1 b70ce6f2fb92a798583a7e1f53ce19b73264d89b SHA256 9736cb4606ed924f3e6d1059799b9d8a0c908081a7cf934be4f2169cd6924ab3
 EBUILD zen-sources-2.6.31_p6.ebuild 1372 RMD160 24df9ccb0795e43dbd95f496e9ed560cac3a4e96 SHA1 4872169ed383e34f916770e0db85d6f6280e26c8 SHA256 7f422eb830d3fad416f54f6816825ba2477bc5f8329e6a7b8294cde84ee07ab5
-EBUILD zen-sources-2.6.31_p7.ebuild 1372 RMD160 24df9ccb0795e43dbd95f496e9ed560cac3a4e96 SHA1 4872169ed383e34f916770e0db85d6f6280e26c8 SHA256 7f422eb830d3fad416f54f6816825ba2477bc5f8329e6a7b8294cde84ee07ab5
+EBUILD zen-sources-2.6.31_p7.ebuild 1630 RMD160 b71a32d88b6b36337ece3d9475e0fd7868066eaa SHA1 42b5db52395c176d2196dffe519dd3f1866dbc92 SHA256 91b5e97c447642dd8852779e1f64ba78638b70a9e6f31b4fa348f6c64dc7345c
 EBUILD zen-sources-2.6.32_rc5_p2-r1.ebuild 1372 RMD160 24df9ccb0795e43dbd95f496e9ed560cac3a4e96 SHA1 4872169ed383e34f916770e0db85d6f6280e26c8 SHA256 7f422eb830d3fad416f54f6816825ba2477bc5f8329e6a7b8294cde84ee07ab5
 EBUILD zen-sources-2.6.32_rc6_p1.ebuild 1372 RMD160 24df9ccb0795e43dbd95f496e9ed560cac3a4e96 SHA1 4872169ed383e34f916770e0db85d6f6280e26c8 SHA256 7f422eb830d3fad416f54f6816825ba2477bc5f8329e6a7b8294cde84ee07ab5
 EBUILD zen-sources-9999.ebuild 1289 RMD160 405869d34ec23f1bf638b5ddcb2c035f79368d8e SHA1 ad8f925c2c9c8229573737a819f58c72a9bff343 SHA256 51cec14683d8109787e6422e63dfc71a1f4b8be8db13423b4f51cc3be73069b4
-MISC ChangeLog 2671 RMD160 72ef3a1f300542eafe67e47e89693bec2af4c592 SHA1 4658fb34f6fda5a93a704b8481e222cf55921373 SHA256 accf5f31a2ff8aab59ffc708278951e8d300fe8e54a817d189b0232c73e991c9
-MISC metadata.xml 406 RMD160 36a85a7116d32aa941e651960397e8fac3fdcd7f SHA1 df41ca21c65ca099dec6167aa239c909cdd5e5e3 SHA256 db45a0530615ff447534de9c671f4284f6c5b483e5740605404acc694172a525
+MISC ChangeLog 2800 RMD160 c2b21935d6b79efdc2a8bf1289eb86d1342e4759 SHA1 798d641933f4ac0287cbb5bb559f46dc7f09931c SHA256 40eec41e15ab801982b96255d7491ce1aee6d7b2ca1a76077c1fcb3796582554
+MISC metadata.xml 462 RMD160 1a2551d61bd21846ff1b8469a4b8c367c000bb23 SHA1 ecb5a2310bce4cf73147fe137ca853cee4ca90c5 SHA256 62463389952546833d94a333f2a906c609848b85bda3b9379bac97c79f89dbf4
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index 5c38f232abf8..b7e06c34044c 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -11,6 +11,7 @@
 	<name>Alex Alexander</name>
 </maintainer>
 <use>
+	<flag name="drm-next">Enable the drm-next patch</flag>
 	<flag name="stable">Clone stable git tree</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.31_p7.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.31_p7.ebuild
index bb5ed5e4bbf1..2c2f561efb9a 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.31_p7.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.31_p7.ebuild
@@ -22,11 +22,13 @@ ZEN_PATCHSET="${PV/*_p}"
 ZEN_KERNEL="${PV/_p[0-9]*}"
 ZEN_KERNEL="${ZEN_KERNEL/_/-}"
 ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
+ZEN_DRM_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}-drmnext.patch"
 ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
-SRC_URI="${KERNEL_URI} ${ZEN_URI}"
+ZEN_DRM_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/custom/${ZEN_DRM_FILE}"
+SRC_URI="${KERNEL_URI} ${ZEN_URI} drm-next? ( ${ZEN_DRM_URI} )"
 
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="drm-next"
 
 KV_FULL="${PVR/_p/-zen}"
 S="${WORKDIR}"/linux-"${KV_FULL}"
@@ -46,6 +48,7 @@ src_unpack(){
 	kernel-2_src_unpack
 	cd "${S}"
 	epatch "${DISTDIR}"/"${ZEN_FILE}"
+	use drm-next && epatch "${DISTDIR}"/"${ZEN_DRM_FILE}"
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \