Add a -r1 version of mono that skips installing jay. See bug #265912.

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

3 files changed, 281 insertions, 2 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 50c808e4c2b2..d9d2f5f72d09 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.166 2009/05/05 13:01:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.167 2009/05/08 09:44:19 flameeyes Exp $
+
+*mono-2.4-r1 (08 May 2009)
+
+  08 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> +mono-2.4-r1.ebuild:
+  Add a -r1 version of mono that skips installing jay. See bug #265912.
 
   05 May 2009; Peter Alfredsen <loki_val@gentoo.org> mono-2.4.9999.ebuild:
   Change to 2-4-1 branch.
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 94a0e219a483..fc89b3fde51d 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -26,8 +26,9 @@ EBUILD mono-2.0.1-r1.ebuild 3345 RMD160 01c45829585999af6d2ee4469cd6167b20e19909
 EBUILD mono-2.0.9999.ebuild 7424 RMD160 f2dce783cbe755aa3c716acc2dc33266c97a96bc SHA1 95a2312709715fdda3e60baf2e51cab27513a026 SHA256 5fbe767454182db3091f57c34a3953b33c4600538ffcdc137289630da867f9de
 EBUILD mono-2.2-r5.ebuild 7148 RMD160 bdbdbe8b2bb13c72879880b02f07a20c5b01295f SHA1 8281fc4a4f7c52c8242506bf06a6804d11c8cac7 SHA256 d0669daee864058838207a9b6f8adba720f0322f97652e9758caf47aafd98c21
 EBUILD mono-2.2.9999.ebuild 7539 RMD160 8979507f63308d3ea1703019315e77d30f105611 SHA1 f3ef56f15bfb57fc2ba2ab1dbde433b93f5cab98 SHA256 921633a30b2629cfb0617d3168e4174e85b8accba131a8fd525bf9ab56f212ca
+EBUILD mono-2.4-r1.ebuild 7198 RMD160 b72423a0f7050937292a1b0340918238c1ffeaa2 SHA1 6bd37677cc91c1ee661571fb0fae1d7774ecee50 SHA256 4600d0944fe6d5ea26db6169aa64e6244eeca0904f0f9d16d8bcfb6627f8064d
 EBUILD mono-2.4.9999.ebuild 7562 RMD160 91dec57e28d8aa558eb27ef096068f6ce648c603 SHA1 87b24b9c3de549393e0a2c1bb31ed5f8b7d77438 SHA256 f108243b1e16f145faec42890090f4ce8a2bfd17755da215c2c533f52ba22ade
 EBUILD mono-2.4.ebuild 7021 RMD160 5e8e7200aff57bf24ac4d5a8c0a95cc68f31678c SHA1 f561af0952785cf9ad4dcf2186e073df0440d8b4 SHA256 840b575a6284d8172e629ef6a4548ff1b237d9e10fbae82c120989f0a5f66dc9
 EBUILD mono-9999.ebuild 7535 RMD160 2e8b279fa1ad5faff6fd2ad995792baaec940a51 SHA1 72ea252f50cf82489eb8c2de970ec39d331a638c SHA256 e6172cc44b375914724e8fa1df2d4213c978815d099e158e139a8325ec79c421
-MISC ChangeLog 36747 RMD160 2aa118d3930aa9a38e0efbb800c75898304c9483 SHA1 3c864ef3c47784373082c88ddc3751cf364a0f7c SHA256 ef22f2b5d3b127fdc0d29be24277b8713ff32a4bd68e1c1546b823d72b248c81
+MISC ChangeLog 36926 RMD160 6e3faadb2400948d96bd5284894c7f93f3d68b5e SHA1 dedd2206e2ad289b9f1cb6c298e32128268694ff SHA256 dc763d643a3efabd94b6f89b4889c4a7885414f84e18badf9f2aa8b47c1fa92b
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/mono-2.4-r1.ebuild b/dev-lang/mono/mono-2.4-r1.ebuild
new file mode 100644
index 000000000000..d46c1997f378
--- /dev/null
+++ b/dev-lang/mono/mono-2.4-r1.ebuild
@@ -0,0 +1,273 @@
+# 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-r1.ebuild,v 1.1 2009/05/08 09:44:19 flameeyes Exp $
+
+EAPI=2
+
+inherit linux-info 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"
+	"${FILESDIR}/mono-2.4-ppcbuild-fix.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}"/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"
+
+	# Remove Jay to avoid colliding with dev-util/jay, the internal
+	# version is only used to build mcs.
+	rm -r "${D}"/usr/share/jay "${D}"/usr/bin/jay "${D}"/user/share/man/man1/jay.1*
+}
+
+#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 "	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"