Remove old patches as recommended by upstream, they also look unneeded. Include upstream fix to allow mono-basic compilation on ppc.

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

4 files changed, 302 insertions, 5 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 7361c0bd6a72..a47c3d238c6c 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.215 2011/03/20 19:01:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.216 2011/03/21 19:34:33 pacho Exp $
+
+*mono-2.10.1-r2 (21 Mar 2011)
+
+  21 Mar 2011; Pacho Ramos <pacho@gentoo.org> +mono-2.10.1-r2.ebuild,
+  +files/mono-2.10.1-ppc-len.patch:
+  Remove old patches as recommended by upstream, they also look unneeded.
+  Include upstream fix to allow mono-basic compilation on ppc.
 
   20 Mar 2011; Pacho Ramos <pacho@gentoo.org> mono-2.10.1-r1.ebuild:
   Fix building on ppc (bug #359515 by Brent Baude).
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index e193ba60f044..206e13a336e4 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX mono-2.10.1-libdir.patch 2467 RMD160 3a6bc529fc8188405144bec106cee63c8dae5b71 SHA1 bddb8ba2eea84b5f484248477e106df36c1039cf SHA256 82898532790db535694ba1945f6ed6be1ad194e3db4bface6299988570223d8d
+AUX mono-2.10.1-ppc-len.patch 302 RMD160 61a016d2647b443b0e605df5532ba9c0b22cdb96 SHA1 e8cff140de0983f00473aff5d11aa162da22f61a SHA256 9882bc94999af095b106d45d31ed103e9902a8fa6e88e478e62bc5f7e0b4b5e2
 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
@@ -12,14 +13,15 @@ DIST mono-2.10.1.tar.bz2 33483937 RMD160 3c9acc54d1df0f63ee546bf47bed3ca53b3f679
 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-r1.ebuild 7771 RMD160 9d6122e6006f4b081c649734b32be47184e3accb SHA1 cd1d510d98476f7359187dce36275e61d3b92ed3 SHA256 efff5f91bc571b30494de35a03625c3a6b8d9bb98792272728f2a4f053f30da6
+EBUILD mono-2.10.1-r2.ebuild 7510 RMD160 604b295a27d027019032995d74e29c7beeefb726 SHA1 0f309ef98720dacd1e1b1df1504f0596858e1486 SHA256 eb07adf45b99f8453bafdf71a9ffc86cbf828e84e528ea3d4b2ca0ad40dbe8f3
 EBUILD mono-2.6.7.ebuild 7564 RMD160 e83f25ce2d6bb38ecba81d86e96958a5ea7567d7 SHA1 a12f62b9decdc1c6ed93b6c6fbe4659d16e8074f SHA256 e8cbfd812e094cdd45149873461e5618be424219b5a6b7251e6f1d4371a09fed
 EBUILD mono-2.8.2-r1.ebuild 8187 RMD160 39bceb17278f67ebeb4f7b20e4597436c54e1936 SHA1 f43b70a840f2c7addfb87fe405bbb924c722ac5e SHA256 85452792f1fdd0813153c53a85be0a60074fb850e2f9539d0bc51e0ed96e9333
-MISC ChangeLog 45519 RMD160 25262ba5153d367820a62bcd547da5b9ea753971 SHA1 68a60b19f8e1f402c1cabed8cd6ef0042db07f63 SHA256 ad2d83de4547c88e8eb4ffcaa4f65ad1106c8660511fdf31d30586eed774a307
+MISC ChangeLog 45794 RMD160 75747ecfddff69adf80f167d49377ad290d01885 SHA1 546a47829b9b8eaa665761acef4d12d2c6c5b44d SHA256 0285882979e19524d06a5a636559f5014165b0d03c850d628adce95470c6e104
 MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2GTxwACgkQCaWpQKGI+9TjjwCdHlshpnxZHJ7lvTBqUBxyWrg8
-p8oAn0S6n7dOG0I5Zf/ApeUtUkhPjr+9
-=mjBP
+iEYEARECAAYFAk2HqE8ACgkQCaWpQKGI+9SRIQCfS/2SdzvWwQFf+U9Fdl2jBPHn
+vtwAni7vMTD2ZQYsipxDelTjP0d/pDQI
+=52KA
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/mono-2.10.1-ppc-len.patch b/dev-lang/mono/files/mono-2.10.1-ppc-len.patch
new file mode 100644
index 000000000000..6cfd0882d03a
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.10.1-ppc-len.patch
@@ -0,0 +1,13 @@
+diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md
+index a9f679f..f21320c 100644
+--- a/mono/mini/cpu-ppc.md
++++ b/mono/mini/cpu-ppc.md
+@@ -48,7 +48,7 @@
+ memory_barrier: len:4
+ nop: len:4
+ relaxed_nop: len:4
+-break: len:4
++break: len:32
+ seq_point: len:24
+ jmp: len:108
+ tailcall: len:120 clob:c
diff --git a/dev-lang/mono/mono-2.10.1-r2.ebuild b/dev-lang/mono/mono-2.10.1-r2.ebuild
new file mode 100644
index 000000000000..2134ddc5bf11
--- /dev/null
+++ b/dev-lang/mono/mono-2.10.1-r2.ebuild
@@ -0,0 +1,275 @@
+# 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-r2.ebuild,v 1.1 2011/03/21 19:34:33 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 )"
+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"
+
+PATCHES=( "${FILESDIR}/${P}-ppc-len.patch" )
+
+RESTRICT="test"
+
+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() {
+	go-mono_src_prepare
+
+	# we need to sed in the paxctl -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTEC is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	if use hardened ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+		sed '/exec/ i\paxctl -mr "$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.
+	#
+	# sgen fails on ppc, bug #359515
+
+	local myconf=""
+	use ppc && myconf="${myconf} --with-sgen=no"
+	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 \
+		${myconf}
+}
+
+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"