Fix bug 268610. Thanks to Priit Laes <amd@store20.com> for reporting.

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

5 files changed, 60 insertions, 24 deletions

diff --git a/dev-lang/boo/ChangeLog b/dev-lang/boo/ChangeLog
index 8894d57db9c9..d7ca488eae95 100644
--- a/dev-lang/boo/ChangeLog
+++ b/dev-lang/boo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/boo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.27 2009/05/06 08:09:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.28 2009/05/06 11:07:45 loki_val Exp $
+
+*boo-0.9.1.3287-r1 (06 May 2009)
+*boo-0.9.0.3203-r1 (06 May 2009)
+
+  06 May 2009; Peter Alfredsen <loki_val@gentoo.org> -boo-0.9.0.3203.ebuild,
+  +boo-0.9.0.3203-r1.ebuild, -boo-0.9.1.3287.ebuild,
+  +boo-0.9.1.3287-r1.ebuild, +files/boo-0.9.1.3287-GACproblems.patch:
+  Fix bug 268610. Thanks to Priit Laes <amd@store20.com> for reporting.
 
   06 May 2009; Peter Alfredsen <loki_val@gentoo.org> boo-0.9.0.3203.ebuild,
   boo-0.9.1.3287.ebuild:
diff --git a/dev-lang/boo/Manifest b/dev-lang/boo/Manifest
index 512a0c5a90af..7139a8fa7024 100644
--- a/dev-lang/boo/Manifest
+++ b/dev-lang/boo/Manifest
@@ -1,10 +1,11 @@
+AUX boo-0.9.1.3287-GACproblems.patch 1158 RMD160 b5d8e14efa22605318be17405331c2c638026e19 SHA1 7c2f1ce84f6c471ad2a24dbfc00b96d7cf63f7c1 SHA256 20d1beeefceecaff9b3ac872319e220f99b7edd88927218fc54619c892f039d0
 DIST boo-0.7.6.2237-src.tar.bz2 1882826 RMD160 4c2f7dbc9dafb0f33f8712cff3bdcc1e252101c2 SHA1 9a498706373153c7beaa98dee466a9055fd7e95d SHA256 bd6d2ba2d5b160dd0ce452f43e71d799bf90cd07352b9f76709d176352529329
 DIST boo-0.8.2.2960.tar.gz 564998 RMD160 26ddc8dcae50fe6439c108efe75bc75ae2083a43 SHA1 1dd1bb1d6480011eb115849e981a3128e00977bf SHA256 1afd0c8aa92b7a3a08851d3f2f814141cfa13e40200af67ccb1e97a153ff7a03
 DIST boo-0.9.0.3203-2-src.zip 3530892 RMD160 688bbc31274f6b499c98421ca8e8136ab711693a SHA1 c28fb32499c432a408292ddcd17963b6a83b425a SHA256 168bc23f2177c57fd326c7130fc2039e4c5e06d68dc14431c37791fe506b2190
 DIST boo-0.9.1.3287-src.zip 3603869 RMD160 535ca6caeccac2a9b71cc9d9dc5aa101e56bc003 SHA1 9c42253abd374f63b06685ce99ae7632678b1a80 SHA256 b386ad02dd4c3061de51a478818ea06730a6e59e5cc3472ba2a507b698764fa5
 EBUILD boo-0.7.6.2237-r1.ebuild 1155 RMD160 99b6ef85761f670f5a98d5d53cc1fc70a5a91232 SHA1 fbaf62fb63ca4af648b7eeb9f3fc376940c635bd SHA256 b7e0b29d04a5773f89322e85a86f1645a2668388aee1f8ad3b343e56ff43ffe0
 EBUILD boo-0.8.2.2960.ebuild 1123 RMD160 89cd75b68d66b9870f6021941b06eb7679d3cb0a SHA1 04b0f71538b23cad0d92e80c2d46a20f5d695076 SHA256 98f8fa5e6548cac89cde554694dbc1d4f598cc90a1380b93c811c13af8f27685
-EBUILD boo-0.9.0.3203.ebuild 1944 RMD160 03633ffa78896e9e143545133bb2e7c25afa4a31 SHA1 50d3ef133ef0b18a37e48a183ec08d9890586b0b SHA256 0c83b0a7f5e0c621143f3929275f2befdafa2371157e4a36e3dc8e18be5d9756
-EBUILD boo-0.9.1.3287.ebuild 1942 RMD160 2454825e49a58c1acf1db9b227eb0f412a74841f SHA1 c7bea7ad991317b0ddce67dd6576d876760310a7 SHA256 ef6de158c9278d34e7920b73136afc1ebeec069d53bca51eca4e7d8ad3d599fc
-MISC ChangeLog 4018 RMD160 d0bbba49726ed501b50258ce378bf9441f64edfb SHA1 e0c92ad132155c52ea6cabd26215db9da7616aa1 SHA256 530181e8cbb68e608b6b5f0f9c2fcfcb52c1f39cd4a159623ee3067a61ef088c
+EBUILD boo-0.9.0.3203-r1.ebuild 2062 RMD160 b5d05f0de607ce04025c14239ab4cd37187abcc6 SHA1 469d6db362cff7f51cf6904a8e453a82b6df1ec0 SHA256 e5947e7f8b4d2d04283927cb23b79d88317b079e0ec21fc59ac912d8147eaf01
+EBUILD boo-0.9.1.3287-r1.ebuild 2060 RMD160 ac4435e8dc12588faa5636310d13a3c528ec92a3 SHA1 c50c634f67a956d2081230b69e671a8aa07c63c3 SHA256 a4243c5008f2228610c12014a1de90c2ccb74df5c6cbb6cc656c420fbcdbb791
+MISC ChangeLog 4358 RMD160 2f0252adf40d1cc5f85dc966f367e818b255c64f SHA1 c296aec35f56897e1c3d42610d24b19b1e6f93ff SHA256 cd2d9cd8131c927ecc033c4f510445fae63f54489e8ccf6b5bf842d312d6dc2f
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-lang/boo/boo-0.9.0.3203.ebuild b/dev-lang/boo/boo-0.9.0.3203-r1.ebuild
index ae50d2b7c283..ec888c7da4c1 100644
--- a/dev-lang/boo/boo-0.9.0.3203.ebuild
+++ b/dev-lang/boo/boo-0.9.0.3203-r1.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/boo/boo-0.9.0.3203.ebuild,v 1.2 2009/05/06 08:09:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.0.3203-r1.ebuild,v 1.1 2009/05/06 11:07:45 loki_val Exp $
 
 EAPI=2
 
@@ -22,19 +22,17 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	>=dev-dotnet/nant-0.86_beta1"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 RESTRICT="test"
 
-# Irritating bug: Boo has to be uninstalled for boo to compile.
 pkg_setup() {
-	if has_version ${CATEGORY}/${PN}
+	if /usr/bin/gacutil -l|grep Boo.Lang.Extensions &> /dev/null
 	then
-		eerror "${CATEGORY}/${PN}'s install process is buggy. It requires that you remove any"
-		eerror "existing install before attempting to reinstall it."
-		eerror "Please emerge -C ${CATEGORY}/${PN} and try again."
-		eerror "See http://bugs.gentoo.org/268610 for details."
-		die "Please emerge -C ${CATEGORY}/${PN}"
+		eerror "$(best_version ${CATEGORY}/${PN}) has installed Boo.Lang.Extensions into the GAC."
+		eerror "This is a bug, that will cause compilation of ${CATEGORY}/${PF} to fail. It has"
+		eerror "been fixed in this version. For now, it requires that you uninstall"
+		eerror "${CATEGORY}/${PN} before updating."
+		eerror "Please run: emerge -C ${CATEGORY}/${PN} and try again."
+		die "Please run: emerge -C ${CATEGORY}/${PN} and try again."
 	fi
 }
 
@@ -42,6 +40,7 @@ src_prepare() {
 	sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die
 	sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \
 		extras/boo.pc.in || die
+	epatch "${FILESDIR}/boo-0.9.1.3287-GACproblems.patch"
 }
 
 src_compile() {
diff --git a/dev-lang/boo/boo-0.9.1.3287.ebuild b/dev-lang/boo/boo-0.9.1.3287-r1.ebuild
index a6953ede7fd9..bc2ebc5d7ae1 100644
--- a/dev-lang/boo/boo-0.9.1.3287.ebuild
+++ b/dev-lang/boo/boo-0.9.1.3287-r1.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/boo/boo-0.9.1.3287.ebuild,v 1.2 2009/05/06 08:09:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.1.3287-r1.ebuild,v 1.1 2009/05/06 11:07:45 loki_val Exp $
 
 EAPI=2
 
@@ -22,19 +22,17 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	>=dev-dotnet/nant-0.86_beta1"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 RESTRICT="test"
 
-# Irritating bug: Boo has to be uninstalled for boo to compile.
 pkg_setup() {
-	if has_version ${CATEGORY}/${PN}
+	if /usr/bin/gacutil -l|grep Boo.Lang.Extensions &> /dev/null
 	then
-		eerror "${CATEGORY}/${PN}'s install process is buggy. It requires that you remove any"
-		eerror "existing install before attempting to reinstall it."
-		eerror "Please emerge -C ${CATEGORY}/${PN} and try again."
-		eerror "See http://bugs.gentoo.org/268610 for details."
-		die "Please emerge -C ${CATEGORY}/${PN}"
+		eerror "$(best_version ${CATEGORY}/${PN}) has installed Boo.Lang.Extensions into the GAC."
+		eerror "This is a bug, that will cause compilation of ${CATEGORY}/${PF} to fail. It has"
+		eerror "been fixed in this version. For now, it requires that you uninstall"
+		eerror "${CATEGORY}/${PN} before updating."
+		eerror "Please run: emerge -C ${CATEGORY}/${PN} and try again."
+		die "Please run: emerge -C ${CATEGORY}/${PN} and try again."
 	fi
 }
 
@@ -42,6 +40,7 @@ src_prepare() {
 	sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die
 	sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \
 		extras/boo.pc.in || die
+	epatch "${FILESDIR}/boo-0.9.1.3287-GACproblems.patch"
 }
 
 src_compile() {
diff --git a/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch b/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch
new file mode 100644
index 000000000000..e563bcf8b905
--- /dev/null
+++ b/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch
@@ -0,0 +1,29 @@
+diff -NrU5 boo-0.9.1.3287.orig/default.build boo-0.9.1.3287/default.build
+--- boo-0.9.1.3287.orig/default.build	2009-05-06 12:07:51.000000000 +0200
++++ boo-0.9.1.3287/default.build	2009-05-06 12:25:31.000000000 +0200
+@@ -561,17 +561,24 @@
+ 				<include name="*.exe"/>

+ 				<include name="*.rsp"/>

+ 				<include name="*.config"/>

+ 				<include name="*.targets"/>

+ 				<include name="*.Tasks.dll" />

++				<include name="Boo.Lang.Extensions.dll" />

+ 			</fileset>

+ 		</copy>

+ 

+ 		<foreach item="File" property="filename">

+ 		<in>

+ 			<items>

+-				<include name="${build.dir}/Boo.Lang*.dll" />

++				<include name="${build.dir}/Boo.Lang.dll" />

++				<include name="${build.dir}/Boo.Lang.CodeDom.dll" />

++				<include name="${build.dir}/Boo.Lang.Compiler.dll" />

++				<include name="${build.dir}/Boo.Lang.Interpreter.dll" />

++				<include name="${build.dir}/Boo.Lang.Parser.dll" />

++				<include name="${build.dir}/Boo.Lang.PatternMatching.dll" />

++				<include name="${build.dir}/Boo.Lang.Useful.dll" />

+ 			</items>

+ 		</in>

+ 		<do>

+ 			<exec program="gacutil" useruntimeengine="false" workingdir="${build.dir}">

+ 				<arg value="/i" />