Version bump to 2.10, build against system boehm (bug #252547 by Diego Elio Pettenò), drop some no longer needed changes at src_install.

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

4 files changed, 362 insertions, 16 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 9321989040e7..cee455244df9 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.210 2011/01/29 17:02:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.211 2011/02/27 12:52:41 pacho Exp $
+
+*mono-2.10.1 (27 Feb 2011)
+
+  27 Feb 2011; Pacho Ramos <pacho@gentoo.org> +mono-2.10.1.ebuild,
+  +files/mono-2.10.1-libdir.patch:
+  Version bump to 2.10, build against system boehm (bug #252547 by Diego Elio
+  Pettenò), drop some no longer needed changes at src_install.
 
   29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> mono-2.8.2-r1.ebuild:
   Stable on amd64 wrt bug #352808
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 10fae55ac1ab..a0b292cb97dd 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,32 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX mono-2.10.1-libdir.patch 2467 RMD160 3a6bc529fc8188405144bec106cee63c8dae5b71 SHA1 bddb8ba2eea84b5f484248477e106df36c1039cf SHA256 82898532790db535694ba1945f6ed6be1ad194e3db4bface6299988570223d8d
 AUX mono-2.2-libdir126.patch 2788 RMD160 931e034c90accc2058596714d7ec07d138a77575 SHA1 7807f1d3e28c82ac0292cec2f49e063898a5d0cb SHA256 2d3de73c7aa6fdc90ddec67fc814910f40d6d8ed52ec918397ca9f5ac219c6a1
 AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec70951d38 SHA1 3dda8a39085fddec0b0e25e31743d49762575605 SHA256 b2a708fc4ec8b886bf095c0d5eacbfdb8c08e1bc58442cfb6fd116f93de466a7
 AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
 AUX mono-2.6.4-require-glib.patch 458 RMD160 312ffe40e55ae726ab2bdb8b323cfb110abf804a SHA1 4c1979a940bf550fcafbaa29a11470fa7e55eac1 SHA256 fc27512f901920a72c5e7744ecef134ed9081d2f2ff689e1af2f48f6fe9a6028
 AUX mono-2.8-libdir.patch 2721 RMD160 9a694e1a373fb3f18c79a75e76aaa4abbfbc283f SHA1 4ca811b882b2f9a6045cfe516cace7badb419c2d SHA256 58424336e2ff348fe9ad6f279936cd90e8ad918196382654bfb7fd60b7c928fc
 AUX mono-2.8.1-radegast-crash.patch 554 RMD160 178225b9a8afe118a478752a2d2ce3a358212381 SHA1 34e80ec5691d1f4f481a2c070de2e8f364bdf506 SHA256 6cf9a2adb3e6e1f6daf2a8c578a060e7a1598967116ad72af877d3a693b3c527
+DIST mono-2.10.1.tar.bz2 33483937 RMD160 3c9acc54d1df0f63ee546bf47bed3ca53b3f679e SHA1 234ee4eca6c80dda9d8fe955f3aafa25530921a7 SHA256 31a573b114bfb85a4283a7d6252addef5ae9d9431134a623723272b247d3cc76
 DIST mono-2.6.7.tar.bz2 27921963 RMD160 5825ad284e4123e4ddb8933637a3dbf5f57f7f5a SHA1 6528c009d344a21eb0898876369222a7fff76838 SHA256 ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4
 DIST mono-2.8.2.tar.bz2 31292886 RMD160 8536c1c9a481ece2ba254a7c943353f9ade66a84 SHA1 4223a40706b422c44be5eb1c89b4f316026a02a5 SHA256 e33409ea5e8d581b60a2b73587d9d94a283b39c6406f9d348badcbdb253381bb
+EBUILD mono-2.10.1.ebuild 7646 RMD160 907655a341dccee4d1ea6a1ea366d74b821f2b46 SHA1 f096f1bafc229f7cf71d71d32deab9aedfb31eb1 SHA256 e955db045ebaa630e13381d05020d7ed6ea714f130cf10430cff307e1adf42ad
 EBUILD mono-2.6.7.ebuild 7564 RMD160 e83f25ce2d6bb38ecba81d86e96958a5ea7567d7 SHA1 a12f62b9decdc1c6ed93b6c6fbe4659d16e8074f SHA256 e8cbfd812e094cdd45149873461e5618be424219b5a6b7251e6f1d4371a09fed
 EBUILD mono-2.8.2-r1.ebuild 8143 RMD160 f83cbb412d2d91b81a8f5f89a8539072cb7edde0 SHA1 53cf701fd8ba1c58446b0789be06012f9041f123 SHA256 1d153a7fb056f450902411eec2765790f2b08ef47ad632aa671559f1df2e1473
-MISC ChangeLog 44614 RMD160 42fbbfbf97d19ba1a611f3eff296dc3b9bc25057 SHA1 ff5996d3423a9b80b51826bcadd8be2c6d610ac7 SHA256 6ea7f95bbf8c0a156ee4b22bf081385fc01e6bcacfb5813728b246d98382708a
+MISC ChangeLog 44884 RMD160 83f9488dd1522c4e45c11d17ac0f251f9078520f SHA1 6a2e366aea3c6255a8579c87fcbc66dd00d69d08 SHA256 6a816b8304859ae6e323658e7feed4612a9860125bd47150eb3f9e86c67d00f3
 MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNREf/AAoJEPqDWhW0r/LCQgwQALibOVmLHL8/v2Hb0CMyW9Pu
-8hgd+gGBn9GSf6gWy+1WGGybT8nMZXLtf3DDguw8TaOTOnUEsdhZwel91olZYU/M
-Cj55sk/VxN/iKeEwFztglkManr8LE01xDE1fPaXaAal+5WOd1u2exWppj6kyxnjN
-+WEqVTgKeU9PnEVTT8je7f2yHEN69i6Ouiv9dIfnUytVs8fJOc7Ynb18jT0KmvYX
-VnXePR/hygxBZUAO2Mqs8s4zD0qQcPLWwfqoXv57eUI9Ssr9mWApZ7ZiTqgz2fi2
-lO9bAI/1w57KJk+IeRan/9tcySrqJawJk/YeTPja+ownvFPE+4q5/mDZyuCi/gBa
-qFwvXrLfM4B/LAsgauEB5b9M3/Fko5YZwnt3pJcrY9a1IPVpuji0oeB3Pk3SgDGv
-/qNMIwL2RoxWwR3mTqchJzPkyiiEGLIzMpBnjlDzdk7TOyedWMY/j67Puwxr4lHX
-m19G+Vb8KT3Dtl47zj7kKjbtMUIV0g6dTdolxK9y1stP77aoR5vkUjhB01bl47bw
-VXiqpY3BLGKYsdjipJ7ve/G7RrL8GpkkcSnB0YI8UzaoqDfqwsRQHAk5fMGm8jYR
-8d8b4/HPWSzXFexUiTJjw3kKuyEy2HbihV7WQtAh7evr1mgDa+WyJPi3J1mL5/0Q
-3z4PSDzYVrypDIJ8ezin
-=sRWK
+iEYEARECAAYFAk1qSR4ACgkQCaWpQKGI+9QXwQCeN/HznWg2sptZKmOP3/wFOF1W
+wHwAn11zIW5tRylQix5Yl9tdn5g2p3be
+=vZJP
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/mono-2.10.1-libdir.patch b/dev-lang/mono/files/mono-2.10.1-libdir.patch
new file mode 100644
index 000000000000..8d6dd8197702
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.10.1-libdir.patch
@@ -0,0 +1,67 @@
+--- mcs/tools/gacutil/driver.cs~	2011-02-23 20:21:01.000000000 +0100
++++ mcs/tools/gacutil/driver.cs	2011-02-27 11:46:39.000000000 +0100
+@@ -808,7 +808,7 @@
+ 		private static string EnsureLib (string dir)
+ 		{
+ 			DirectoryInfo d = new DirectoryInfo (dir);
+-			if (d.Name == "lib")
++			if (d.Name == "lib" || d.Name == "@MONOLIBDIR@")
+ 				return dir;
+ 			return Path.Combine (dir, "lib");
+ 		}
+--- mono/metadata/assembly.c~	2011-02-23 20:21:01.000000000 +0100
++++ mono/metadata/assembly.c	2011-02-27 11:49:38.000000000 +0100
+@@ -597,7 +597,7 @@
+ 	}
+ 
+ 	config = g_build_filename (base, "etc", NULL);
+-	lib = g_build_filename (base, "lib", NULL);
++	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
+ 	mono = g_build_filename (lib, "mono/2.0", NULL);
+ 	if (stat (mono, &buf) == -1)
+ 		fallback ();
+@@ -652,7 +652,7 @@
+ 
+ 	bindir = g_path_get_dirname (resolvedname);
+ 	installdir = g_path_get_dirname (bindir);
+-	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
++	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);
+ 
+ 	config = g_build_filename (root, "..", "etc", NULL);
+ #ifdef HOST_WIN32
+@@ -2155,7 +2155,7 @@
+ 	if (extra_gac_paths) {
+ 		paths = extra_gac_paths;
+ 		while (!res && *paths) {
+-			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
++			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
+ 			res = probe_for_partial_name (gacpath, fullname, aname, status);
+ 			g_free (gacpath);
+ 			paths++;
+@@ -2206,7 +2206,7 @@
+ 		if (*gp != G_DIR_SEPARATOR)
+ 			continue;
+ 		gp++;
+-		if (strncmp (gp, "lib", 3))
++		if (strncmp (gp, "@MONOLIBDIR@", 3))
+ 			continue;
+ 		gp += 3;
+ 		if (*gp != G_DIR_SEPARATOR)
+@@ -2285,7 +2285,7 @@
+ 		paths = extra_gac_paths;
+ 		while (!image && *paths) {
+ 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
+-					"lib", "mono", "gac", subpath, NULL);
++					"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
+ 			image = mono_image_open (fullpath, NULL);
+ 			g_free (fullpath);
+ 			paths++;
+@@ -2591,7 +2591,7 @@
+ 	if (extra_gac_paths) {
+ 		paths = extra_gac_paths;
+ 		while (!result && *paths) {
+-			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
++			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
+ 			result = mono_assembly_open_full (fullpath, status, refonly);
+ 			g_free (fullpath);
+ 			paths++;
diff --git a/dev-lang/mono/mono-2.10.1.ebuild b/dev-lang/mono/mono-2.10.1.ebuild
new file mode 100644
index 000000000000..226ea8d29b6e
--- /dev/null
+++ b/dev-lang/mono/mono-2.10.1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.1.ebuild,v 1.1 2011/02/27 12:52:41 pacho Exp $
+
+EAPI="2"
+
+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.mono-project.com/Main_Page"
+
+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="hardened minimal xen"
+
+#Bash requirement is for += operator
+COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
+	!dev-util/monodoc
+	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
+	ia64? (	sys-libs/libunwind )
+	dev-libs/boehm-gc"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )"
+
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	>=app-shells/bash-3.2
+	hardened? ( sys-apps/paxctl )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${WORKDIR}/${PN}-2.10.1-libdir.patch"
+	"${FILESDIR}/${PN}-2.2-ppc-threading.patch"
+	"${FILESDIR}/${PN}-2.2-uselibdir.patch"
+)
+
+pkg_setup() {
+	if use kernel_linux
+	then
+		get_version
+		if linux_config_exists
+		then
+			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
+			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
+}
+
+src_prepare() {
+	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
+		< "${FILESDIR}"/${PN}-2.10.1-libdir.patch \
+		> "${WORKDIR}"/${PN}-2.10.1-libdir.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() {
+	# mono's build system is finiky, strip the flags
+	strip-flags
+
+	#Remove this at your own peril. Mono will barf in unexpected ways.
+	append-flags -fno-strict-aliasing
+
+	# NOTE: We need the static libs for now so mono-debugger works.
+	# See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
+	#
+	# --without-moonlight since www-plugins/moonlight is not the only one
+	# using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
+	#
+	# --with-profile4 needs to be always enabled since it's used by default
+	# and, otherwise, problems like bug #340641 appear.
+
+	go-mono_src_configure \
+		--enable-static \
+		--disable-quiet-build \
+		--without-moonlight \
+		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
+		$(use_with xen xen_opt) \
+		--without-ikvm-native \
+		--with-jit \
+		--disable-dtrace \
+		--with-profile4 \
+		--with-gc=boehm
+}
+
+src_test() {
+	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	export MONO_REGISTRY_PATH="${T}/registry"
+	export XDG_DATA_HOME="${T}/data"
+	export MONO_SHARED_DIR="${T}/shared"
+	export XDG_CONFIG_HOME="${T}/config"
+	export HOME="${T}/home"
+
+	emake -j1 check
+}
+
+src_install() {
+	go-mono_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${D}"/usr/$(get_libdir)/mono/2.0/mscorlib.dll.so
+	rm -f "${D}"/usr/$(get_libdir)/mono/2.0/mcs.exe.so
+}
+
+#THINK!!!! Before touching postrm and postinst
+#Reference phase order:
+#pkg_preinst
+#pkg_prerm
+#pkg_postrm
+#pkg_postinst
+
+pkg_preinst() {
+	local symlink
+	local NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
+	local pv_atom
+	if  [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit"* ]]
+	then
+		for pv_atom in 2.2{,-r1,-r2,-r3,-r4} '2.4_pre*' '2.4_rc*' 2.4
+		do
+			if has_version "=dev-lang/mono-${pv_atom}"
+			then
+				einfo "If you just received a file collision warning message,"
+				einfo "be advised that this is a known problem, which will now be fixed:"
+				ebegin "Found broken symlinks created by $(best_version dev-lang/mono), fixing"
+				for symlink in						\
+					"${ROOT}/${NUNIT_DIR}"				\
+					"${ROOT}/usr/$(get_libdir)/pkgconfig/nunit.pc"	\
+					"${ROOT}/usr/bin/nunit-console"			\
+					"${ROOT}/usr/bin/nunit-console2"
+				do
+					if [[ -L "${symlink}" ]]
+					then
+						rm -f "${symlink}" &> /dev/null
+					fi
+				done
+				eend 0
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "PLEASE TAKE NOTE!"
+	elog ""
+	elog "Some of the namespaces supported by Mono require extra packages to be installed."
+	elog "Below is a list of namespaces and the corresponding package you must install:"
+	elog ""
+	elog ">=x11-libs/cairo-1.6.4"
+	elog "	Mono.Cairo"
+	elog "Also read:"
+	elog "http://www.mono-project.com/Mono.Cairo"
+	elog ""
+	elog ">=dev-db/firebird-2.0.4.13130.1"
+	elog "	FirebirdSql.Data.Firebird"
+	elog "Also read:"
+	elog "http://www.mono-project.com/Firebird_Interbase"
+	elog ""
+	elog "=dev-dotnet/gluezilla-${GO_MONO_REL_PV}*"
+	elog "	Mono.Mozilla"
+	elog "	Mono.Mozilla.WebBrowser"
+	elog "	Mono.Mozilla.Widget"
+	elog "	Interop.SHDocVw"
+	elog "	AxInterop.SHDocVw"
+	elog "	Interop.mshtml.dll"
+	elog "	System.Windows.Forms.WebBrowser"
+	elog "	Microsoft.IE"
+	elog "Also read:"
+	elog "http://www.mono-project.com/WebBrowser"
+	elog ""
+	elog "dev-db/sqlite:3"
+	elog "	Mono.Data.Sqlite"
+	elog "Also read:"
+	elog "http://www.mono-project.com/SQLite"
+	elog ""
+	elog ">=dev-db/oracle-instantclient-basic-10.2"
+	elog "	System.Data.OracleClient"
+	elog "Also read:"
+	elog "http://www.mono-project.com/Oracle"
+	elog ""
+	elog "Mono also has support for packages that are not included in portage:"
+	elog ""
+	elog "No ebuild available:"
+	elog "	IBM.Data.DB2"
+	elog "Also read: http://www.mono-project.com/IBM_DB2"
+	elog ""
+	elog "No ebuild needed:"
+	elog "	Mono.Data.SybaseClient"
+	elog "Also read: http://www.mono-project.com/Sybase"
+}
+
+# NOTICE: THE COPYRIGHT FILES IN THE TARBALL ARE UNCLEAR!
+# WHENEVER YOU THINK SOMETHING IS GPL-2+, IT'S ONLY GPL-2
+# UNLESS MIGUEL DE ICAZA HIMSELF SAYS OTHERWISE.
+
+# mono
+# The code we use is LGPL, but contributions must be made under the MIT/X11
+# license, so Novell can serve its paying customers. Exception is mono/man.
+# LICENSE="LGPL-2.1"
+
+	# mono/man
+	# LICENSE="MIT"
+
+# mcs/mcs
+# mcs/gmcs
+# LICENSE="GPL-2 MIT"
+
+# tests
+# LICENSE="MIT"
+
+# mcs/class
+# Except the listed exceptions:
+# LICENSE="MIT"
+
+	# mcs/class/ByteFX.Data
+	# mcs/class/Npgsql
+	# LICENSE="LGPL-2.1"
+
+	# mcs/class/FirebirdSql.Data.Firebird
+	# LICENSE="IDPL"
+
+	# mcs/class/ICSharpCode.SharpZipLib
+	# LICENSE="GPL-2-with-linking-exception"
+
+	# mcs/class/MicrosoftAjaxLibrary
+	# LICENSE="Ms-Pl"
+
+	# mcs/class/Microsoft.JScript/Microsoft.JScript/TokenStream.cs
+	# mcs/class/Microsoft.JScript/Microsoft.JScript/Token.cs
+	# mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
+	# mcs/class/Microsoft.JScript/Microsoft.JScript/Decompiler.cs
+	# LICENSE="|| ( NPL-1.1 GPL-2 )"
+
+# mcs/jay
+# LICENSE="BSD-4"
+
+# mcs/tools
+# Except the listed exceptions:
+# LICENSE="MIT"
+
+	# mcs/tools/mdoc/Mono.Documentation/monodocs2html.cs
+	# LICENSE="GPL-2"
+
+	# mcs/tools/sqlsharp/SqlSharpCli.cs
+	# LICENSE="GPL-2"
+
+	# mcs/tools/csharp/repl.cs
+	# LICENSE="|| ( MIT GPL-2 )"
+
+	# mcs/tools/mono-win32-setup.nsi
+	# LICENSE="GPL-2"
+
+# samples
+# LICENSE="MIT"