Do not require kernel sources, warn if sources not found.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 48 insertions, 27 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 59b4a9fc27c7..b46e75fa4e1b 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.163 2009/04/17 01:29:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.164 2009/04/20 05:01:45 loki_val Exp $
+
+  20 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> mono-2.0.1-r1,
+  mono-2.2-r5, mono-2.4:
+  Do not require kernel sources, warn if sources not found.
 
   17 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> mono-2.0.1-r1.ebuild,
   mono-2.2-r5.ebuild, mono-2.4.ebuild:
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 72174ae033a0..c238a485759f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -22,8 +22,8 @@ DIST mono-2.2.tar.bz2 24360722 RMD160 664f09ccd8822b62d94d242871b956b00adae7b6 S
 DIST mono-2.4.tar.bz2 24861051 RMD160 cc0581b0ef13349a7bbdc4284cf985af9c52bd94 SHA1 a0b5ea2f17f9ecc1d85f34e12e83797342104f5d SHA256 653544a91374102bf473458a09f1e779955083b6d86682f171ab58a8446511c7
 EBUILD mono-1.2.5.1-r1.ebuild 3683 RMD160 401b51ae78003a32d05e9ff1a80d13c798e07fe3 SHA1 bc24aca5e487f01bb1b0a9010a6e5e032c558e46 SHA256 a7cb4ef5ca8cd35456bbf8a3fbdae6e3c01ad2cea86a9be78ca97343867482fb
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
-EBUILD mono-2.0.1-r1.ebuild 3093 RMD160 93016694f8e5ce09d0783095c8dc06d949ca06af SHA1 8c73b40c7da84b612e788718c88b0a96cd9ca7ae SHA256 e976221a82cd4483013bfd5f79bb1e3ade05d8e4508322915582e4fb4e44f63a
-EBUILD mono-2.2-r5.ebuild 6897 RMD160 c811a593273b4ca7e47c6dec2535a1939a1b8b00 SHA1 5d48aae9bb423d7f6a016d78aac14f55faaded4f SHA256 8d33ffa01ba706dec4e7709433a1db1b6bd2b8586bd4f4c26b05d0ee4a9ceb1b
-EBUILD mono-2.4.ebuild 6769 RMD160 8d94d90c8ab5714bd79c45d0ee19a4edea51dd04 SHA1 8aa54f85f57fb8f8e13e7564de1eea49b07f5d5c SHA256 11ded1d18d8a5db5fa54000c92165af16a3552bdc6e1248cbfde2880c3fbb02f
-MISC ChangeLog 36186 RMD160 f81cd8ac333b915fe488dd70e9b2ef8ef386759d SHA1 f856652575dc94b2c4ff98f23ffe9daf7dc485ac SHA256 d63bf99900fc3029996886b3a0965a258031269e557e75b4615f8d4d8e43a0eb
+EBUILD mono-2.0.1-r1.ebuild 3345 RMD160 01c45829585999af6d2ee4469cd6167b20e19909 SHA1 7a8a11b53738287882bbf919e4b7d7da6263f7e6 SHA256 1640b26b7b9d65c8449fc22d2ef6a717af3cca65734145b48c403454b1b01efe
+EBUILD mono-2.2-r5.ebuild 7148 RMD160 bdbdbe8b2bb13c72879880b02f07a20c5b01295f SHA1 8281fc4a4f7c52c8242506bf06a6804d11c8cac7 SHA256 d0669daee864058838207a9b6f8adba720f0322f97652e9758caf47aafd98c21
+EBUILD mono-2.4.ebuild 7021 RMD160 5e8e7200aff57bf24ac4d5a8c0a95cc68f31678c SHA1 f561af0952785cf9ad4dcf2186e073df0440d8b4 SHA256 840b575a6284d8172e629ef6a4548ff1b237d9e10fbae82c120989f0a5f66dc9
+MISC ChangeLog 36340 RMD160 a482675ecab9a170b2b0f1fc6a30227fcc9f2980 SHA1 e44e96fb77e7092de0e5a1ebc4d28141ae51b542 SHA256 8d11ad6d183234b1b02964b81297fb34f61779fa8ef25e3069ad7cd1fbef40fa
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/mono-2.0.1-r1.ebuild b/dev-lang/mono/mono-2.0.1-r1.ebuild
index f0b7367966cb..3ee60fec5151 100644
--- a/dev-lang/mono/mono-2.0.1-r1.ebuild
+++ b/dev-lang/mono/mono-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1-r1.ebuild,v 1.5 2009/04/17 01:29:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1-r1.ebuild,v 1.6 2009/04/20 05:01:45 loki_val Exp $
 
 EAPI=2
 
@@ -40,14 +40,20 @@ pkg_setup() {
 	if use kernel_linux
 	then
 		get_version
-		require_configured_kernel
-		if linux_chkconfig_present SYSVIPC
+		if linux_config_exists
 		then
-			einfo "CONFIG_SYSVIPC is set, looking good."
+			if linux_chkconfig_present SYSVIPC
+			then
+				einfo "CONFIG_SYSVIPC is set, looking good."
+			else
+				eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+				eerror "See http://bugs.gentoo.org/261869 for more info."
+				die "Please set CONFIG_SYSVIPC in your kernel .config"
+			fi
 		else
-			eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			eerror "See http://bugs.gentoo.org/261869 for more info."
-			die "Please set CONFIG_SYSVIPC in your kernel .config"
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See http://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
 }
diff --git a/dev-lang/mono/mono-2.2-r5.ebuild b/dev-lang/mono/mono-2.2-r5.ebuild
index eddda7dedf72..46606d25acc6 100644
--- a/dev-lang/mono/mono-2.2-r5.ebuild
+++ b/dev-lang/mono/mono-2.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r5.ebuild,v 1.3 2009/04/17 01:29:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r5.ebuild,v 1.4 2009/04/20 05:01:45 loki_val Exp $
 
 EAPI=2
 
@@ -42,19 +42,24 @@ PATCHES=(
 	"${FILESDIR}/mono-2.2-r123987-bless-crash.patch"
 	"${FILESDIR}/mono-2.2-freebsd-elf_common.patch"
 )
-
 pkg_setup() {
 	if use kernel_linux
 	then
 		get_version
-		require_configured_kernel
-		if linux_chkconfig_present SYSVIPC
+		if linux_config_exists
 		then
-			einfo "CONFIG_SYSVIPC is set, looking good."
+			if linux_chkconfig_present SYSVIPC
+			then
+				einfo "CONFIG_SYSVIPC is set, looking good."
+			else
+				eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+				eerror "See http://bugs.gentoo.org/261869 for more info."
+				die "Please set CONFIG_SYSVIPC in your kernel .config"
+			fi
 		else
-			eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			eerror "See http://bugs.gentoo.org/261869 for more info."
-			die "Please set CONFIG_SYSVIPC in your kernel .config"
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See http://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
 }
diff --git a/dev-lang/mono/mono-2.4.ebuild b/dev-lang/mono/mono-2.4.ebuild
index 9956968a8bfb..739cfee53eb8 100644
--- a/dev-lang/mono/mono-2.4.ebuild
+++ b/dev-lang/mono/mono-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4.ebuild,v 1.4 2009/04/17 01:29:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4.ebuild,v 1.5 2009/04/20 05:01:45 loki_val Exp $
 
 EAPI=2
 
@@ -45,14 +45,20 @@ pkg_setup() {
 	if use kernel_linux
 	then
 		get_version
-		require_configured_kernel
-		if linux_chkconfig_present SYSVIPC
+		if linux_config_exists
 		then
-			einfo "CONFIG_SYSVIPC is set, looking good."
+			if linux_chkconfig_present SYSVIPC
+			then
+				einfo "CONFIG_SYSVIPC is set, looking good."
+			else
+				eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+				eerror "See http://bugs.gentoo.org/261869 for more info."
+				die "Please set CONFIG_SYSVIPC in your kernel .config"
+			fi
 		else
-			eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			eerror "See http://bugs.gentoo.org/261869 for more info."
-			die "Please set CONFIG_SYSVIPC in your kernel .config"
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See http://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
 }