Drop PDEPEND on pe-format (bug #333907 by Michał Górny), fix build on hardened (bug #286280 by Jason Mattax and fix by Magnus Granberg) and allow people to enable .NET 4.0 profile if they want (bug #326497 by Ron MacNeil).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 37 insertions, 20 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 80d3d2a4298d..cf0f64086cf3 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.194 2010/07/21 17:13:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.195 2010/09/07 21:07:33 pacho Exp $
+
+  07 Sep 2010; Pacho Ramos <pacho@gentoo.org> mono-2.6.7.ebuild,
+  metadata.xml:
+  Drop PDEPEND on pe-format (bug #333907 by Michał Górny), fix build on
+  hardened (bug #286280 by Jason Mattax and fix by Magnus Granberg) and
+  allow people to enable .NET 4.0 profile if they want (bug #326497 by Ron
+  MacNeil).
 
 *mono-2.6.7 (21 Jul 2010)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index c14d88ec2f31..7e62f0d70ccc 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -35,14 +35,14 @@ EBUILD mono-2.4.2.3.ebuild 7151 RMD160 c2bbe180e11197bde2a66470650a3df7a2457e6e
 EBUILD mono-2.4.3.1.ebuild 7157 RMD160 63827e3616a2309735957af316de803209c98e04 SHA1 17669288558ee84d191b7be890a32613d1d91a8e SHA256 b69a1d8793cabb140519127d0c5bb15562b85ec19066138d1d484641b8ffdaf7
 EBUILD mono-2.4.9999.ebuild 7518 RMD160 418f1ac99aab05b312fc4b29ebdede696f11a825 SHA1 ae4c7a6392f097dd410ffb04d0a0ccba69c30f09 SHA256 10cba6104c6f149ef552f6f29f2daa727f7f010bcf676ad41611621637385660
 EBUILD mono-2.6.4-r1.ebuild 7199 RMD160 eb43fbe763657ada61087cde7a09b4ecc4c08be7 SHA1 f794643b791803570f3111a88e9082662ee6294a SHA256 7f20e3595e27fda4539a7dfca07651298873f9c8e441bb5f333db235a6709966
-EBUILD mono-2.6.7.ebuild 7198 RMD160 c39db521d9c3be22545f622c58462664d3499109 SHA1 c2b1d81548a7c9c13fce1dd1cd129be61da61800 SHA256 0cdf11bd151856806276644f8b7e0abcf713eef73c1180651a3749e4b05e8c54
+EBUILD mono-2.6.7.ebuild 7564 RMD160 b058501dbc39b0f5edbb1514e37521faa17f6620 SHA1 0c31755a56605fca2a6a8be4df62192dec7d289d SHA256 3db8031f4704fd4920b83e2a6396540cccf8cc1e01d19c007f9ecc61ed842e60
 EBUILD mono-9999.ebuild 7514 RMD160 55cdc9888175ef15226016d5bd38f6e030050c86 SHA1 3288813c56d7042dbe53ebabf3d0209efef20f04 SHA256 87c00e70ed8eb0a34e44d03c5a99b42b69da9617966860bb72ccda2752acb042
-MISC ChangeLog 40804 RMD160 40feac3629b8af010233cc5a1127502e27a3233b SHA1 1c7d98066ac4459b6775aea5d34eba983646c83b SHA256 0ffb402aa6c091f1a771c84b7e81fa045a3d64b5601f9460ce59dff8bda45cdf
-MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
+MISC ChangeLog 41119 RMD160 c0f2aa2a39057fcd2d9463ac2a47d465824495cc SHA1 b3ba0cd480f8bb0e698db1d51e5c0c6eb7dca75e SHA256 a96f045c69566c904d9875ae586ed0cfe86de5920f50954a8ae50d3f86623521
+MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxHKrcACgkQCaWpQKGI+9QrYQCfY7je1Kbt25+dUJ4i7emfxNNz
-JosAn1f7NAeHTg++cLKoz1vKBz+ickik
-=NyjU
+iEYEARECAAYFAkyGqZ4ACgkQCaWpQKGI+9Ra5gCeMpPZGhY6qctw3ERoEJYD5MDS
+XNkAn2wl/Obo5MCdF/Kh+9bewNx7C96h
+=SxOX
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index 277d2c018bbb..c2e0dd03b2b8 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -3,7 +3,11 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 	<use>
-		<flag name='xen'>Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
 		<flag name='moonlight'>Generate Moonlight 2.1 assemblies</flag>
+		<flag name='profile4'>Include partial support for C# 4.0 and
+		some of the upcoming .NET 4.0 APIs.</flag>
+		<flag name='xen'>Make mono generate code that is
+		considerably faster on xen VMs but slightly slower on for
+		normal systems.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/mono/mono-2.6.7.ebuild b/dev-lang/mono/mono-2.6.7.ebuild
index 305de9da672c..453e45b23095 100644
--- a/dev-lang/mono/mono-2.6.7.ebuild
+++ b/dev-lang/mono/mono-2.6.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild,v 1.1 2010/07/21 17:13:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild,v 1.2 2010/09/07 21:07:34 pacho Exp $
 
 EAPI=2
 
-inherit linux-info mono eutils flag-o-matic multilib go-mono
+inherit linux-info mono eutils flag-o-matic multilib go-mono pax-utils
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com"
@@ -12,23 +12,22 @@ HOMEPAGE="http://www.go-mono.com"
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xen moonlight minimal"
+
+IUSE="hardened minimal moonlight profile4 xen"
 
 #Bash requirement is for += operator
 COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
 	!dev-util/monodoc
-	dev-libs/glib:2
+	>=dev-libs/glib-2.4:2
 	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
-	ia64? (
-		sys-libs/libunwind
-	)"
+	ia64? (	sys-libs/libunwind )"
 RDEPEND="${COMMONDEPEND}
 	|| ( www-client/links www-client/lynx )"
 
 DEPEND="${COMMONDEPEND}
 	sys-devel/bc
-	>=app-shells/bash-3.2"
-PDEPEND="dev-dotnet/pe-format"
+	>=app-shells/bash-3.2
+	hardened? ( sys-apps/paxctl )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -69,6 +68,13 @@ src_prepare() {
 		> "${WORKDIR}"/mono-2.2-libdir126.patch ||
 		die "Sedding patch file failed"
 	go-mono_src_prepare
+
+	# we need to sed in the paxctl -m in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTEC is enable. #286280
+	if use hardened ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+		sed '/exec/ i\paxctl -m "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
+	fi
 }
 
 src_configure() {
@@ -90,8 +96,8 @@ src_configure() {
 		$(use_with xen xen_opt) \
 		--without-ikvm-native \
 		--with-jit \
-		--disable-dtrace
-
+		--disable-dtrace \
+		$(use_with profile4)
 }
 
 src_test() {