[gentoo-commits] gentoo-x86 commit in dev-lang/mono: metadata.xml ChangeLog mono-2.6.7.ebuild

[Pacho Ramos (pacho)]

pacho       10/09/07 21:07:34

  Modified:             metadata.xml ChangeLog mono-2.6.7.ebuild
  Log:
  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).
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-lang/mono/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mono/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	18 Jan 2009 17:45:22 -0000	1.5
+++ metadata.xml	7 Sep 2010 21:07:33 -0000	1.6
@@ -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>



1.195                dev-lang/mono/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/ChangeLog?rev=1.195&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/ChangeLog?rev=1.195&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/ChangeLog?r1=1.194&r2=1.195

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- ChangeLog	21 Jul 2010 17:13:14 -0000	1.194
+++ ChangeLog	7 Sep 2010 21:07:33 -0000	1.195
@@ -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@g.o> 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)
 



1.2                  dev-lang/mono/mono-2.6.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild?r1=1.1&r2=1.2

Index: mono-2.6.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-2.6.7.ebuild	21 Jul 2010 17:13:14 -0000	1.1
+++ mono-2.6.7.ebuild	7 Sep 2010 21:07:34 -0000	1.2
@@ -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 @@
 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 @@
 		> "${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 @@
 		$(use_with xen xen_opt) \
 		--without-ikvm-native \
 		--with-jit \
-		--disable-dtrace
-
+		--disable-dtrace \
+		$(use_with profile4)
 }
 
 src_test() {