Fix bug 264566, nunit-console2 not using the 2.0 runtime. Thanks to Mike Mazur <mmazur@gmail.com> for reporting.

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

4 files changed, 69 insertions, 124 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 95d2d0efdd46..fb4798d15408 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # 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.159 2009/04/04 14:05:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.160 2009/04/04 23:26:02 loki_val Exp $
+
+*mono-2.2-r5 (04 Apr 2009)
+
+  04 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> -mono-2.2-r4.ebuild,
+  +mono-2.2-r5.ebuild, mono-2.4.ebuild:
+  Fix bug 264566, nunit-console2 not using the 2.0 runtime. Thanks to Mike
+  Mazur <mmazur@gmail.com> for reporting.
 
   04 Apr 2009; Markus Meier <maekke@gentoo.org> mono-2.0.1-r1.ebuild:
   amd64/x86 stable, bug #234305
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 120e470c2fc4..6a2f6e3dc2a2 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mono-1.2-glibc28.patch 621 RMD160 51dd3d134ddf2e8894f695f3ea48f705517af7fa SHA1 f4eec2998b42d6fb639f4bc67e0ec45f021e0831 SHA256 378fc337ebea4e6b01885e2581a70c22dc96f14935bc2073595dd2b4e0a2ae12
 AUX mono-1.2.4-pic.patch 515 RMD160 7e6b6bf1bf4279881f5b03135d22f1bf488bed61 SHA1 fa8b18dde84c4305341fafafc88cda725dded3b1 SHA256 daab8ca27e5530d688ba611870c62d558be122781776aed8c0ecd97a56465a63
 AUX mono-1.2.6-bug-347359.patch 468 RMD160 9057edfe349ae587cc73d2a07011faf64e092095 SHA1 26e350f31c54f29d8e407cb4ea3d31333bafb83e SHA256 3ce69a3b5129bc0715eaa46213e28436acfeabdb11e35818a8a3be9ea7fd06c9
@@ -25,14 +22,7 @@ DIST mono-2.4.tar.bz2 24861051 RMD160 cc0581b0ef13349a7bbdc4284cf985af9c52bd94 S
 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 2670 RMD160 b34cdb5ab08d5e8d405206662fb2b129f912ff4c SHA1 70366acbd64ed07ccc946fe0a564041b9ef05135 SHA256 bd4bb3c7c0282b90ca42a6f105eafae8db1298f241e2383fcbd2b40397313f5f
-EBUILD mono-2.2-r4.ebuild 7701 RMD160 b5659dc0f26420df1327f50bd19edb5f75428d21 SHA1 5c5de8d70d1803cbadb44b1886c0807f75d2f63b SHA256 4a4123ac9ff99e32bf401cfa6d9b7f81d3896041a28290975c957537379d3c4d
-EBUILD mono-2.4.ebuild 7535 RMD160 e570d9ac158e27ec449ce8c4bf7fb924f745a324 SHA1 501c4b6efa9e198ec6554b8b22a8d906a9c813bb SHA256 c7e65f3d3a7569925d2b023b57df07df66102a2682c0ec2300866ed8c42d9320
-MISC ChangeLog 35414 RMD160 41b7b2a1a955ddf95cac9a900f281bf695033e27 SHA1 a09520db3b93acfa142d396b5685d59bfcfb0d2b SHA256 d5f2bfac2a3bd440616b998bae025a9679cdde2395190ed11e6ee0340c35bf65
+EBUILD mono-2.2-r5.ebuild 6471 RMD160 d166423e4fa69b57499a8849d940d7b53d8e7291 SHA1 3547cee2f40cdd444c9d21010270f55651d08334 SHA256 9b14a5a757d1afbb37007e9eae5e4d934939389fef9968f20ca4b4e5bf9359fb
+EBUILD mono-2.4.ebuild 6305 RMD160 84e931f3a27b48ffd7dbe060a1c8b608869f9195 SHA1 a57613faa86cabccbdc2710a80dbecdf8e7c518b SHA256 dcddc465cb528bf07fe5a603cd7633a5bc0e36dd704c9b3ef9c0b38d320729c8
+MISC ChangeLog 35676 RMD160 3b7952dd2b9a53269e660fc56e32fa8152e8eaa9 SHA1 783b9ef87a53874eefef7ad17a253f2233adb74e SHA256 c24f8617d996606fa1ae0498577c47962b7b2ce5918b58c046b12e759ed8f411
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknXaToACgkQkKaRLQcq0GJuMwCfTo5w+AC5tDw5+Xt9SbRJhKik
-kBwAoK8bJ1bkxAJ/sRYX7v+cLYjkFLW5
-=Uvjp
------END PGP SIGNATURE-----
diff --git a/dev-lang/mono/mono-2.2-r4.ebuild b/dev-lang/mono/mono-2.2-r5.ebuild
index 414f613b325f..0d40bbbed8c2 100644
--- a/dev-lang/mono/mono-2.2-r4.ebuild
+++ b/dev-lang/mono/mono-2.2-r5.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.2-r4.ebuild,v 1.2 2009/03/28 00:53:50 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r5.ebuild,v 1.1 2009/04/04 23:26:02 loki_val Exp $
 
 EAPI=2
 
@@ -43,11 +43,6 @@ PATCHES=(
 	"${FILESDIR}/mono-2.2-freebsd-elf_common.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 \
@@ -93,23 +88,12 @@ src_test() {
 
 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
@@ -119,48 +103,38 @@ src_install() {
 #pkg_postrm
 #pkg_postinst
 
-pkg_postrm() {
-	if [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit" ]]
+pkg_preinst() {
+	local symlink
+	local NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
+	local pv_atom
+	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
+		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() {
-	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."
diff --git a/dev-lang/mono/mono-2.4.ebuild b/dev-lang/mono/mono-2.4.ebuild
index d81e538d677f..6f68ee40fd8b 100644
--- a/dev-lang/mono/mono-2.4.ebuild
+++ b/dev-lang/mono/mono-2.4.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.ebuild,v 1.1 2009/03/30 21:48:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4.ebuild,v 1.2 2009/04/04 23:26:03 loki_val Exp $
 
 EAPI=2
 
@@ -40,11 +40,6 @@ PATCHES=(
 	"${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 \
@@ -90,23 +85,12 @@ src_test() {
 
 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
@@ -116,48 +100,38 @@ src_install() {
 #pkg_postrm
 #pkg_postinst
 
-pkg_postrm() {
-	if [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit" ]]
+pkg_preinst() {
+	local symlink
+	local NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
+	local pv_atom
+	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
+		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() {
-	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."