--- kernel-2.eclass.old	2013-04-30 00:31:16.000000000 +0200
+++ kernel-2.eclass	2013-05-13 22:05:58.752002797 +0200
@@ -415,19 +415,47 @@
 	kernel_is 2 6 || kernel_is 2 5
 }
 
-# Capture the sources type and set DEPENDs
+# Capture the sources type and set some basic variables.
+# See bug #469696 for discussion of *DEPENDs.
 if [[ ${ETYPE} == sources ]]; then
-	DEPEND="!build? ( sys-apps/sed
-					  >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
-					   sys-devel/make 
+	DEPEND="!build? ( sys-apps/sed )"
+	RDEPEND="!build? ( sys-apps/sed
+					   >=sys-devel/binutils-2.11.90.0.31
+					   sys-apps/coreutils
+					   sys-apps/diffutils
+					   sys-apps/findutils
+					   sys-apps/grep
+					   sys-apps/net-tools
+					   sys-apps/which
+					   sys-devel/make
+					   sys-devel/gcc
+					   virtual/awk
 					   dev-lang/perl
-					   sys-devel/bc )"
+					   ncurses? ( >=sys-libs/ncurses-5.2 )
+					   modules? ( sys-apps/kmod )
+					   gtk? ( virtual/pkgconfig
+							  dev-libs/glib:2
+							  x11-libs/gtk+:2
+							  gnome-base/libglade:2.0
+							)
+					   qt4? ( virtual/pkgconfig
+							  sys-devel/gcc[cxx]
+							  dev-qt/qtcore:4[qt3support]
+							  dev-qt/qtgui:4[qt3support]
+							  dev-qt/qt3support:4
+							)
+					   lzo? ( app-arch/lzop )
+					   lzma? ( app-arch/xz-utils )
+					   gzip? ( app-arch/gzip )
+					   bzip2? ( app-arch/bzip2 )
+					   initramfs? ( app-arch/cpio )
+					 )"
 	PDEPEND="!build? ( virtual/dev-manager )"
+	REQUIRED_USE="|| ( lzo lzma gzip bzip2 )"
 
 	SLOT="${PVR}"
 	DESCRIPTION="Sources based on the Linux Kernel."
-	IUSE="symlink build"
+	IUSE="symlink build +modules ncurses gtk qt4 lzo lzma gzip bzip2 initramfs"
 
 	# Bug #266157, deblob for libre support
 	if [[ -z ${K_PREDEBLOBBED} ]] ; then
@@ -770,7 +798,7 @@
 		use deblob && \
 		K_SECURITY_UNSUPPORTED=deblob
 
-	# if we are to forcably symlink, delete it if it already exists first.
+	# if we are to forcibly symlink, delete it if it already exists first.
 	if [[ ${K_SYMLINK} > 0 ]]; then
 		[[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux
 		MAKELINK=1
@@ -788,6 +816,14 @@
 	# Don't forget to make directory for sysfs
 	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
 
+	if ! use ncurses && ! use gtk && ! use qt4; then
+		echo
+		ewarn "You have neither of the USE flags ncurses/gtk/qt4 turned on."
+		ewarn "Without these libraries you will be limited to very simple, line-based"
+		ewarn "kernel configuration tools (make config, make oldconfig and similar)."
+		echo
+	fi
+
 	echo
 	elog "If you are upgrading from a previous kernel, you may be interested"
 	elog "in the following document:"