From b7de548cf068c0a7c9a44c19205bcd5bcf927457 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayonlinux.org>
Date: Fri, 25 Sep 2009 00:54:33 +0200
Subject: [PATCH] [sys-kernel/linux-sabayon*] external modules support
 improvements

- remove version.h created by new sys-kernel/linux-sabayon if required
- sys-kernel/linux-sabayon now installs version.h
---
 sys-kernel/linux-sabayon-sources/Manifest            |  2 +-
 .../linux-sabayon-sources-2.6.31.ebuild              | 12 +++++++++++-
 sys-kernel/linux-sabayon/Manifest                    |  2 +-
 sys-kernel/linux-sabayon/linux-sabayon-2.6.31.ebuild |  5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/linux-sabayon-sources/Manifest b/sys-kernel/linux-sabayon-sources/Manifest
index 7239dec6a..b3a46aea1 100644
--- a/sys-kernel/linux-sabayon-sources/Manifest
+++ b/sys-kernel/linux-sabayon-sources/Manifest
@@ -10,4 +10,4 @@ DIST linux-2.6.30.tar.bz2 59435895 RMD160 72219f992c6266dfe78c6d803d0506c9db1e45
 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
 EBUILD linux-sabayon-sources-2.6.30-r1.ebuild 1351 RMD160 2dd6a66325194f06f67540484c5bf30458beea86 SHA1 e16eb2851bf962ab043c583436962f2cba33cd3e SHA256 7eec47aeda07f7dea2a25de768cdbae51112a4d7d96fd8bdb2b8022078f4a74c
 EBUILD linux-sabayon-sources-2.6.30.ebuild 1214 RMD160 7fbaad9322b0fbb6178f8af4a41360fc15174386 SHA1 513fbd288805eb9daa38dbbe4c2eca1bfc13a497 SHA256 5ec6ca955bf55396a6a0483369f6b64bc6293977dc6a22abd4c2972e8823bdb8
-EBUILD linux-sabayon-sources-2.6.31.ebuild 1209 RMD160 22b0dbcc6e2025784f9414af3e4bde85b4cab060 SHA1 e7a9d2406871936dabcaf7cf81cb7629dc5035e4 SHA256 013dd903e3eb3333978c795f4c68f00f9142f32210c95c070f85465ee1af8300
+EBUILD linux-sabayon-sources-2.6.31.ebuild 1490 RMD160 984a8b094bed95ae7e8b5fa5923c1a32e813506f SHA1 3fa5e28f6162c5d78c5eac730d2cd4bcf59ebf3e SHA256 625ad3297c06957bf95527e53eb76e6a077956d46ebbd1f6365cafe0a6386480
diff --git a/sys-kernel/linux-sabayon-sources/linux-sabayon-sources-2.6.31.ebuild b/sys-kernel/linux-sabayon-sources/linux-sabayon-sources-2.6.31.ebuild
index 37587f8bf..7000699ef 100644
--- a/sys-kernel/linux-sabayon-sources/linux-sabayon-sources-2.6.31.ebuild
+++ b/sys-kernel/linux-sabayon-sources/linux-sabayon-sources-2.6.31.ebuild
@@ -39,12 +39,22 @@ src_unpack() {
 }
 
 src_install() {
+
+	local version_h_name="usr/src/linux-${KV_FULL}/include/linux"
+	local version_h="${ROOT}${version_h_name}"
+	if [ -f "${version_h}" ]; then
+		einfo "Discarding previously installed version.h to avoid collisions"
+		addwrite "/${version_h_name}"
+		rm -f "${version_h}"
+	fi
+
 	kernel-2_src_install
-	cd ${D}/usr/src/${KV_FULL}
+	cd "${D}/usr/src/linux-${KV_FULL}"
 	local oldarch=${ARCH}
 	cp ${FILESDIR}/${P/-sources}-${ARCH}.config .config || die "cannot copy kernel config"
 	unset ARCH
 	make modules_prepare || die "failed to run modules_prepare"
 	rm .config
 	ARCH=${oldarch}
+
 }
diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index 2a6f5424b..8fb0fc207 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -35,4 +35,4 @@ EBUILD linux-sabayon-2.6.29-r2.ebuild 5308 RMD160 ee7ca95f7e9b8cf757f2c502def441
 EBUILD linux-sabayon-2.6.29.ebuild 5302 RMD160 eb4de93fc3061731abb7dad281fc54cad7febeaa SHA1 3f7261efa2acfb2d60b373b7292e0e3bec15af24 SHA256 356530463059c22e1c37946df06c5272b394a6940690a173777cc0bd8893ae06
 EBUILD linux-sabayon-2.6.30-r1.ebuild 4912 RMD160 6213a478a22aa169607ce587927f197ddec7c8cf SHA1 ddcfea17ca82b43581c5580982913161fbfc209c SHA256 7ea4f63a46aa7a561788f3a946738b1ffd42d5a94ebf49ede64c697cde6b6d43
 EBUILD linux-sabayon-2.6.30.ebuild 4906 RMD160 ba68cd5858ebbe9c9141564298b3bf1b28ca5614 SHA1 66759a5c4207015059b165945c1fcc5f571d1b39 SHA256 60cf1efdb1bbf5a3a5512a68921957ab60a2b4faa1af50a86ee50abc7ef6f3de
-EBUILD linux-sabayon-2.6.31.ebuild 4962 RMD160 17191411f129d1938cec5b191dceb6357d090c0e SHA1 635dc95aa6c42ed9c6050b3247bdefb77440038c SHA256 82c7ea751e8fb26c8146ad263696ea6deac06213d0d92626946ab67ef5327d39
+EBUILD linux-sabayon-2.6.31.ebuild 5171 RMD160 e82862b44869b0590576849aa388197058bb5e2e SHA1 7e764a7e320baaf29fd11b00ecc8a612d5ea5f66 SHA256 6572cd758f924602b290775088138305761a2e5a336023d713a2409e9b3a82bb
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.31.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.31.ebuild
index 0ca79a930..7cd957f32 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.31.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.31.ebuild
@@ -99,6 +99,11 @@ src_install() {
 	doins Module.symvers || die "cannot copy Module.symvers"
 	doins System.map || die "cannot copy System.map"
 
+	# Include include/linux/version.h to make Portage happy
+	dodir "${MY_KERNEL_DIR}/include/linux"
+	insinto "${MY_KERNEL_DIR}/include/linux"
+	doins "${S}/include/linux/version.h" || die "cannot copy version.h"
+
 	insinto "/boot"
 	doins "${WORKDIR}"/boot/*
 	cp -Rp "${WORKDIR}"/lib/* "${D}/"