--- smage/trunk/include/kernel.sminc	2011/09/06 18:31:29	2937
+++ smage/trunk/include/kernel.sminc	2011/09/06 18:52:10	2938
@@ -27,16 +27,16 @@
 : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
 
 : ${SRC_URI=(
-	http://www.kernel.org/pub/linux/kernel/v${PVER:0:3}/${SRCFILE}
-	mirror://kernel26-${BRANCH}/${SRCFILE}
-	mirror://kernel26-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-i686
-	mirror://kernel26-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-x86_64
+	http://www.kernel.org/pub/linux/kernel/v${PVER%%.*}/${SRCFILE}
+	mirror://kernel-${BRANCH}/${SRCFILE}
+	mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-i686
+	mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-x86_64
 )}
 
 : ${DEPEND=">= sys-apps/module-init-tools-3.2
 	>= sys-fs/udev-115
 	>= sys-apps/mkinitrd-5.0.8
-	>= sys-apps/initscripts-0.4.3"}
+	>= virtual/initscripts"}
 
 : ${PROVIDE="virtual/kernel"}
 
@@ -87,7 +87,16 @@
 			make ARCH=${ARCH/i*86/x86} prepare || die
 			# needed to cover >=2.6.14 builds
 			# but deprecated with >=2.6.21, prepare cover all targets there
-			[[ $(echo ${PVER} | sed "s:\.::g") < 2621 ]] && { make ARCH=${ARCH/i*86/x86} prepare-all || die; }
+			local kver=$(echo ${PVER} | sed "s:\.::g")
+			# honor >=3.0.x; add one zero
+			if [[ ${PVER%%.*} -gt 2 ]]
+			then
+				kver="${kver}0"
+			fi
+			if [[ ${kver} < 2621 ]]
+			then
+				make ARCH=${ARCH/i*86/x86} prepare-all || die
+			fi
 			make ARCH=${ARCH/i*86/x86} scripts || die
 
 			# at least alsa-drivers needs this one ...
@@ -248,8 +257,10 @@
 {
 	local ksrc="$@"
 	local mod_suffix
+	local kmv
 
-	if [[ $(kernel_major_version ${ksrc}) = 2.6 ]]
+	kmv=$(kernel_major_version ${ksrc})
+	if [[ ${kmv//.} -ge 26 ]]
 	then
 		mod_suffix="ko"
 	else