Bump to mono-2.4 version.

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

3 files changed, 281 insertions, 2 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 4941a175e834..2d0998591028 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # 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.157 2009/03/28 00:53:50 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.158 2009/03/30 21:48:20 loki_val Exp $
+
+*mono-2.4 (30 Mar 2009)
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> +mono-2.4.ebuild:
+  Bump to mono-2.4 version.
 
   28 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/mono-2.2-freebsd-elf_common.patch, mono-2.2-r4.ebuild:
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 8916ce9d0a8e..cfd6e952a00f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -18,9 +18,11 @@ DIST mono-1.2.5.1.tar.bz2 17492757 RMD160 8000374d9aaa3149599ba83079959303a6bae0
 DIST mono-1.2.6.tar.bz2 18163130 RMD160 c6536b008cb73845943956c9ab365589a28c013c SHA1 f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae SHA256 24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
 DIST mono-2.0.1.tar.bz2 19385815 RMD160 ecada26dc398f0ea4cc4cae62885f4d1438bd540 SHA1 1c06d614b9b83ca0c8cff98d06136fd5a17344e2 SHA256 7089e8591ce793940d8a30f3ff5414437c32fc346fa918ec7f186516dab3e212
 DIST mono-2.2.tar.bz2 24360722 RMD160 664f09ccd8822b62d94d242871b956b00adae7b6 SHA1 028c061ba4f4631c4ff10a15b832211a67ec5858 SHA256 7d427aa354c1f9139c81e3b0ec7943e7f73cfc2607c357c8bfc145abfd2b73f3
+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 2672 RMD160 3316aa2244269309cce2f3ab52da64f3d219c9e7 SHA1 3ab7144923afb5ffde32c7107b3691731847d40b SHA256 5f0c313d5b0bbf6165989f87f6a8676efdc9211e144c2c62fb14d69828191a4b
 EBUILD mono-2.2-r4.ebuild 7701 RMD160 b5659dc0f26420df1327f50bd19edb5f75428d21 SHA1 5c5de8d70d1803cbadb44b1886c0807f75d2f63b SHA256 4a4123ac9ff99e32bf401cfa6d9b7f81d3896041a28290975c957537379d3c4d
-MISC ChangeLog 35188 RMD160 0f83a765042f7de0edc54f8b1544f2821216f8a7 SHA1 7ef488a87ca70ddb4ab5286529913bc8940cd654 SHA256 d41c8136422d63dc2a3019d4e40476d3e4d9cd9ec6afe442b0fb741048636076
+EBUILD mono-2.4.ebuild 7535 RMD160 e570d9ac158e27ec449ce8c4bf7fb924f745a324 SHA1 501c4b6efa9e198ec6554b8b22a8d906a9c813bb SHA256 c7e65f3d3a7569925d2b023b57df07df66102a2682c0ec2300866ed8c42d9320
+MISC ChangeLog 35313 RMD160 6ccf6ef25930c40ea82508bba8c13e11cd97b9bf SHA1 0b502d4672515e8f4a440ae46bb8ecbb739ea950 SHA256 e4b26fab9c6447afa430b84a2c58a2158ab72d05d020dff79ab09a8e4b346831
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/mono-2.4.ebuild b/dev-lang/mono/mono-2.4.ebuild
new file mode 100644
index 000000000000..d81e538d677f
--- /dev/null
+++ b/dev-lang/mono/mono-2.4.ebuild
@@ -0,0 +1,272 @@
+# 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.1 2009/03/30 21:48:20 loki_val Exp $
+
+EAPI=2
+
+inherit mono eutils flag-o-matic multilib go-mono
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+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="~x86 ~amd64"
+IUSE="xen moonlight minimal"
+
+#Bash requirement is for += operator
+COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
+	!dev-util/monodoc
+	dev-libs/glib:2
+	!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"
+PDEPEND="dev-dotnet/pe-format"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${WORKDIR}/mono-2.2-libdir126.patch"
+	"${FILESDIR}/mono-2.2-ppc-threading.patch"
+	"${FILESDIR}/mono-2.2-uselibdir.patch"
+)
+
+pkg_setup() {
+	MONO_NUNIT_DIR="/usr/$(get_libdir)/mono/mono-nunit"
+	NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
+}
+
+src_prepare() {
+	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
+		< "${FILESDIR}"/mono-2.2-libdir126.patch \
+		> "${WORKDIR}"/mono-2.2-libdir126.patch ||
+		die "Sedding patch file failed"
+	go-mono_src_prepare
+}
+
+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
+	go-mono_src_configure \
+		--enable-static \
+		--disable-quiet-build \
+		--with-preview \
+		--with-glib=system \
+		$(use_with moonlight) \
+		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
+		$(use_with xen xen_opt) \
+		--without-ikvm-native \
+		--with-jit \
+		--disable-dtrace
+
+}
+
+src_test() {
+	vecho ">>> 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
+	#Bug 255610
+	sed -i -e "s:mono/2.0/mod.exe:mono/1.0/mod.exe:" \
+		"${D}"/usr/bin/mod || die "Failed to fix mod."
+
+	find "${D}"/usr/ -name '*nunit-docs*' -exec rm -rf '{}' '+' || die "Removing nunit .docs failed"
+
+	#Standardize install paths for eselect-nunit
+	dodir ${MONO_NUNIT_DIR}
+	rm -f "${D}"/usr/bin/nunit-console*
+
+	for file in "${D}"/usr/$(get_libdir)/mono/1.0/nunit*.dll "${D}"/usr/$(get_libdir)/mono/1.0/nunit*.exe
+	do
+		dosym ../1.0/${file##*/} ${MONO_NUNIT_DIR}/${file##*/}
+	done
+
+	make_wrapper "nunit-console" "mono ${MONO_NUNIT_DIR}/nunit-console.exe" "" "" "${MONO_NUNIT_DIR}"
+	dosym nunit-console "${MONO_NUNIT_DIR}"/nunit-console2
+}
+
+#THINK!!!! Before touching postrm and postinst
+#Reference phase order:
+#pkg_preinst
+#pkg_prerm
+#pkg_postrm
+#pkg_postinst
+
+pkg_postrm() {
+	if [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit" ]]
+	then
+		ebegin "Removing old symlinks for nunit"
+		rm -rf "${ROOT}"/${NUNIT_DIR} &> /dev/null
+		rm -rf "${ROOT}"/usr/bin/nunit-console &> /dev/null
+		rm -rf "${ROOT}"/usr/bin/nunit-console2 &> /dev/null
+		rm -rf "${ROOT}"/usr/$(get_libdir)/pkgconfig/nunit.pc &> /dev/null
+		eend 0
+	fi
+}
+
+pkg_postinst() {
+	local -a FAIL
+	local fail return=0
+	if ! [[ -L "${ROOT}/${NUNIT_DIR}" ]]
+	then
+		einfo "No default NUnit installed, using mono-nunit as default."
+		ebegin "Removing stale symlinks for nunit, if any"
+		rm -rf "${ROOT}"/${NUNIT_DIR} &> /dev/null
+		rm -rf "${ROOT}"/usr/bin/nunit-console &> /dev/null
+		rm -rf "${ROOT}"/usr/bin/nunit-console2 &> /dev/null
+		rm -rf "${ROOT}"/usr/$(get_libdir)/pkgconfig/nunit.pc &> /dev/null
+		eend 0
+
+		ebegin "Installing mono-nunit symlinks"
+		ln -sf mono-nunit "${ROOT}/${NUNIT_DIR}"					|| { return=1; FAIL+=( $NUNIT_DIR ) ; }
+		ln -sf ../..${NUNIT_DIR}/nunit-console  "${ROOT}"/usr/bin/nunit-console	|| { return=1; FAIL+=( /usr/bin/nunit-console ) ; }
+		ln -sf ../..${NUNIT_DIR}/nunit-console2 "${ROOT}"/usr/bin/nunit-console2	|| { return=1; FAIL+=( /usr/bin/nunit-console2 ) ; }
+		ln -sf mono-nunit.pc "${ROOT}"/usr/$(get_libdir)/pkgconfig/nunit.pc		|| { return=1; FAIL+=( /usr/$(get_libdir)/pkgconfig/nunit.pc ) ; }
+		eend $return
+
+		if [[ "$return" = "1" ]]
+		then
+			elog "These errors are non-fatal, if re-emerging mono does not solve them, file a bug."
+			for fail in "${FAIL[@]}"
+			do
+				eerror "Linking $fail failed"
+			done
+		fi
+	fi
+
+	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 "	Mono.Data.SqliteClient"
+	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"