Version bump, remove old testing and 9999 version since it's not really maintained downstream.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 11 insertions, 362 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 4404f8bfc35d..39f72574cf9b 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.206 2010/12/17 20:58:15 ali_bush Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.207 2011/01/25 17:47:14 pacho Exp $
+
+*mono-2.8.2 (25 Jan 2011)
+
+  25 Jan 2011; Pacho Ramos <pacho@gentoo.org> -mono-2.8.1-r1.ebuild,
+  +mono-2.8.2.ebuild, -mono-9999.ebuild, -files/mono-9999-libdir.patch:
+  Version bump, remove old testing and 9999 version since it's not really
+  maintained downstream.
 
   17 Dec 2010; Alistair Bush <ali_bush@gentoo.org>
   files/mono-9999-libdir.patch:
diff --git a/dev-lang/mono/files/mono-9999-libdir.patch b/dev-lang/mono/files/mono-9999-libdir.patch
deleted file mode 100644
index 99884a71521b..000000000000
--- a/dev-lang/mono/files/mono-9999-libdir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur mono-9999.bak/mcs/tools/gacutil/driver.cs mono-9999/mcs/tools/gacutil/driver.cs
---- mono-9999.bak/mcs/tools/gacutil/driver.cs	2010-12-17 23:53:23.000000000 +1300
-+++ mono-9999/mcs/tools/gacutil/driver.cs	2010-12-17 23:55:57.000000000 +1300
-@@ -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");
- 		}
-diff -Naur mono-9999.bak/mono/metadata/assembly.c mono-9999/mono/metadata/assembly.c
---- mono-9999.bak/mono/metadata/assembly.c	2010-12-17 23:53:22.000000000 +1300
-+++ mono-9999/mono/metadata/assembly.c	2010-12-18 00:12:41.000000000 +1300
-@@ -566,7 +566,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 ();
-@@ -621,7 +621,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
-@@ -2116,7 +2116,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++;
-@@ -2167,7 +2167,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)
-@@ -2246,7 +2246,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++;
-@@ -2546,7 +2546,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.8.1-r1.ebuild b/dev-lang/mono/mono-2.8.2.ebuild
index cd720ade3418..307914af93b1 100644
--- a/dev-lang/mono/mono-2.8.1-r1.ebuild
+++ b/dev-lang/mono/mono-2.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.8.1-r1.ebuild,v 1.1 2010/11/27 15:50:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.8.2.ebuild,v 1.1 2011/01/25 17:47:14 pacho Exp $
 
 EAPI="2"
 
diff --git a/dev-lang/mono/mono-9999.ebuild b/dev-lang/mono/mono-9999.ebuild
deleted file mode 100644
index 90ce910352b2..000000000000
--- a/dev-lang/mono/mono-9999.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-9999.ebuild,v 1.5 2010/12/18 10:17:27 ali_bush 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.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=""
-IUSE="hardened xen minimal"
-
-#Bash requirement is for += operator
-COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
-	!dev-util/monodoc
-	>=dev-libs/glib-2.4: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
-	hardened? ( sys-apps/paxctl )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/${P}-libdir.patch"
-	"${FILESDIR}/mono-2.2-ppc-threading.patch"
-	"${FILESDIR}/mono-2.2-uselibdir.patch"
-)
-
-pkg_setup() {
-	if ! has_version dev-lang/mono
-	then
-		eerror "To compile the GIT version of mono, you must first have a working install of"
-		eerror "dev-lang/mono. Preferably one that is not too old relative to the branch you're"
-		eerror "trying to build."
-		die "A working install of dev-lang/mono is required for building the GIT version."
-	fi
-	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}"/${P}-libdir.patch \
-		> "${WORKDIR}"/${P}-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
-}
-
-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
-
-	#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}"/usr/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"