--- branches/magellan-next/include/kernel.sminc	2012/01/10 13:05:07	9740
+++ branches/magellan-next/include/kernel.sminc	2012/01/13 19:22:05	9863
@@ -59,11 +59,11 @@
 fi
 
 # some sane defaults
-: ${PCATEGORIE="sys-kernel"}
+: ${PCAT="sys-kernel"}
 : ${HOMEPAGE="http://magellan-linux.de/"}
-: ${SRCFILE="linux-${PVER/${PSUBVER}/}.tar.bz2"}
-: ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
 : ${TARBALLPVER="${PVER}"}
+: ${SRCFILE="linux-${TARBALLPVER}.tar.bz2"}
+: ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
 
 if [[ -z ${SRC_URI[*]} ]]
 then
@@ -90,12 +90,12 @@
 			>= sys-fs/udev-115
 			>= sys-apps/mkinitrd-5.0.8
 			>= virtual/initscripts"}
-		: ${DESCRIPTION="Kernel image of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel."}
+		: ${DESCRIPTION="Kernel image of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."}
 		;;
 
 	sources)
 		: ${PROVIDE="virtual/kernel-sources"}
-		: ${DESCRIPTION="Kernel sources of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel."}
+		: ${DESCRIPTION="Kernel sources of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."}
 		;;
 
 	headers)
@@ -116,7 +116,7 @@
 kernel_src_prepare()
 {
 	munpack ${SRCFILE} || die
-	mv ${BUILDDIR}/linux-${TARBALLPVER/${PSUBVER}/} ${SRCDIR} || die
+	mv ${BUILDDIR}/linux-${TARBALLPVER} ${SRCDIR} || die
 
 	# fix permissions
 	chown -R 0:0 ${SRCDIR} || die
@@ -276,6 +276,9 @@
 {
 	cd ${SRCDIR}
 	make ARCH=${ARCH/i*86/x86} INSTALL_HDR_PATH=${BINDIR}/usr headers_install || die
+
+	# clean-up unnecessary files
+	find ${BINDIR} -name .install -or -name ..install.cmd | xargs --no-run-if-empty rm -f
 }
 
 kernel_sources_src_install()