Bump to 2.4.2.3, remove 2.4, 2.4-r3. Fixes bug 282012. Contains fix for 277878.

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

4 files changed, 12 insertions, 277 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index c62ced031a72..f7998855f918 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # 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.177 2009/06/30 06:01:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.178 2009/08/23 00:59:23 loki_val Exp $
+
+*mono-2.4.2.3 (23 Aug 2009)
+
+  23 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> -mono-2.4.ebuild,
+  -mono-2.4-r3.ebuild, +mono-2.4.2.3.ebuild:
+  Bump to 2.4.2.3, remove 2.4, 2.4-r3. Fixes bug 282012. Contains fix for
+  277878.
 
 *mono-2.4.2 (30 Jun 2009)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index ccd918f6f734..3e59911abebe 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -20,18 +20,17 @@ 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.2.3.tar.bz2 24815426 RMD160 f52bf6e281b076b859a567c17917577710522684 SHA1 c0e7c2992ef6c1ea3d1fd48ef581aa1ff6ec29cb SHA256 1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
 DIST mono-2.4.2.tar.bz2 24759918 RMD160 25012dc9e3771422f3248ef7ee0813901e13449e SHA1 da0502fc613566e741258b6cc996e88b50c81f23 SHA256 994324e776af7b77c9feab5cd98eb28bffbf182cf07a17b282e7ec8e181904d1
-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 3345 RMD160 01c45829585999af6d2ee4469cd6167b20e19909 SHA1 7a8a11b53738287882bbf919e4b7d7da6263f7e6 SHA256 1640b26b7b9d65c8449fc22d2ef6a717af3cca65734145b48c403454b1b01efe
 EBUILD mono-2.0.9999.ebuild 7408 RMD160 9da9483986c94abc6fde62638a3f7d294835c4a4 SHA1 0fee13d59dd09149ce6eb1ffce011ff6bbcf1acb SHA256 ff664cf85b598de20be40542d534321b0c20b4f0dff707f1de5f0813402b1939
 EBUILD mono-2.2-r5.ebuild 7148 RMD160 bdbdbe8b2bb13c72879880b02f07a20c5b01295f SHA1 8281fc4a4f7c52c8242506bf06a6804d11c8cac7 SHA256 d0669daee864058838207a9b6f8adba720f0322f97652e9758caf47aafd98c21
 EBUILD mono-2.2.9999.ebuild 7523 RMD160 10e7ea92bb787bb3d0123f948aef2582d4f42c40 SHA1 250c6b5b21aabddc0a5a11b589c2cda668b6bd6d SHA256 cdbfd1ab7e5491e5449bf5babc354b28e7c681363c49f58d72e142f652298f58
-EBUILD mono-2.4-r3.ebuild 7242 RMD160 2ab4a9a34882f3039e0520a5e82c611ba8eb1769 SHA1 48d67fbdb31e2320d197ff183274c58b372ddc6a SHA256 e54b4bac2af6fc6a583847eb9cdce99fdfb2193991e10abd376ace9c98521c93
+EBUILD mono-2.4.2.3.ebuild 7159 RMD160 f5b96709793447e7d0e062cd6fb7b5959fabaee5 SHA1 9591a35d67cd183e2c234a2bc33c588c38b571a6 SHA256 374a51eede5c0cfe7002b12a3b57f76ef30e8baa0645e299b5cc8db843799d09
 EBUILD mono-2.4.2.ebuild 7157 RMD160 d31253e7f6353e1e1b83046d1263f2c9ccfba25b SHA1 610b2569f252c21d04796e4b657c5b4e270868ef SHA256 1bc2d2b83a9feeea9129d1678b7e0b80e7fc7fd2181221eab66c2837d0bbcc48
 EBUILD mono-2.4.9999.ebuild 7523 RMD160 b3a32df7546ed7338010cfa783a64f662e1e5685 SHA1 1b02a456e2fb88b955273edcc5e17a53b0c16c57 SHA256 f75845b98f6029e22d31d64b47bf312c28e22389b5e1fe7f89ee55fbcab19061
-EBUILD mono-2.4.ebuild 7024 RMD160 4d5db5246a4b9803c7959976479026b981f5dc80 SHA1 0f569db8666af89cfb7a09cbe78370709dbb60e0 SHA256 09900e973e58d33f4de91e9f1da9d317851b2a3d721f806f55cdee0c2bcf8812
 EBUILD mono-9999.ebuild 7519 RMD160 be535ffd797d5fa21cdb11e519acb34d29648e60 SHA1 d1edbbb519f44998aa5d53c2a23dceb025863aa4 SHA256 c03bd6e3f9e1902f219d209df77858a3fa180bec01ded772a08dcff0c2929361
-MISC ChangeLog 38446 RMD160 fb5d76916fc459037149310213252903abcb11ee SHA1 9a1bd009cbba8245739abfc9b41eac979e74eae5 SHA256 969d1035e9fa9c2c59ba3c9cb1478a6e339bc237d7e31133d1d2076f62895649
+MISC ChangeLog 38676 RMD160 ec64b7675102c203f6a37bf8d3812f7cb2a63320 SHA1 ef2ae0684178bbbf2ded9fdabf2367b4100fc318 SHA256 e34af71bab584efd546d175a737ab278a5c912908da1096369113d1dc6a18e20
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/mono-2.4-r3.ebuild b/dev-lang/mono/mono-2.4.2.3.ebuild
index db8acdd9a4cf..58bf371a9cb2 100644
--- a/dev-lang/mono/mono-2.4-r3.ebuild
+++ b/dev-lang/mono/mono-2.4.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.2 2009/05/21 23:53:49 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4.2.3.ebuild,v 1.1 2009/08/23 00:59:23 loki_val Exp $
 
 EAPI=2
 
@@ -38,8 +38,6 @@ 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"
-	"${FILESDIR}/mono-2.4-openoffice.patch"
 )
 
 pkg_setup() {
diff --git a/dev-lang/mono/mono-2.4.ebuild b/dev-lang/mono/mono-2.4.ebuild
deleted file mode 100644
index 2b1379c7776d..000000000000
--- a/dev-lang/mono/mono-2.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# 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.6 2009/05/20 19:51:28 ranger 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="~amd64 ~ppc ~x86"
-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"
-}
-
-#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"