--- ati-drivers-10.9.ebuild	2010-09-22 17:18:53.611938397 +0200
+++ ati-drivers-10.9-r1.ebuild	2010-09-22 17:18:23.242761372 +0200
@@ -259,6 +259,21 @@
 
 	# Fix a known compilation error
 	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
+	# Patch for 3.6.36 kernel
+	if kernel_is eq 2 6 36 ; then
+		epatch "${FILESDIR}"/ati-drivers-2.6.36.patch || \
+			die "epatch ati-drivers-2.6.36.patch failed"
+	fi
+	if kernel_is eq 2 6 36 || kernel_is eq 2 6 35 ; then
+		case "${KV_PATCH}/${KV_EXTRA}" in
+			35/-gentoo-r[1-7]) ;;
+			35/.*\.[1-4]) ;;
+			36/-rc4-git1|-rc[1-3]-git.*) ;;
+			36/-rc[1-4]) ;; #the next patch apply only to .36>=-rc4-git2 or .35>=.5
+			*) epatch "${FILESDIR}"/ati-drivers-2.6.36-rc4-git2.patch || \
+			die "epatch ati-drivers-2.6.36-rc4-git2.patch failed" ;;
+		esac
+	fi
 
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.
@@ -536,10 +551,17 @@
 	elog "You will have to source /etc/profile (or logout and back in) for dri"
 	elog "to work, unless you previously had ati-drivers installed."
 
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
+	if kernel_is eq 2 6 36 || kernel_is eq 2 6 35 ; then
+		case "${KV_PATCH}/${KV_EXTRA}" in
+			35/-gentoo-r[1-7]) ;;
+			35/.*\.[1-4]) ;;
+			36/-rc4-git1|-rc[1-3]-git.*) ;;
+			36/-rc[1-4]) ;;
+			*)
+				ewarn "With this kernel there might be a security hole due to"
+				ewarn "the ati-drivers-2.6.36-rc4-git2.patch."
+		esac
+	fi
 
 	use modules && linux-mod_pkg_postinst
 	"${ROOT}"/usr/bin/eselect opengl set --use-old ati