dev-dotnet/nant-0.85: fixed threading issue (bug #199748)

Package-Manager: portage-2.1.3.19

4 files changed, 48 insertions, 15 deletions

diff --git a/dev-dotnet/nant/ChangeLog b/dev-dotnet/nant/ChangeLog
index 217b91665d38..fa956fd500cd 100644
--- a/dev-dotnet/nant/ChangeLog
+++ b/dev-dotnet/nant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/nant
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.16 2007/08/11 04:19:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.17 2007/12/31 16:32:28 jurek Exp $
+
+  31 Dec 2007; Jurek Bartuszek <jurek@gentoo.org>
+  +files/nant-0.85-threadingfix.patch, nant-0.85.ebuild:
+  Fixed threading issue (bug #199748)
 
   10 Aug 2007; Steve Dibb <beandog@gentoo.org> nant-0.85.ebuild:
   amd64 stable, bug 186686
diff --git a/dev-dotnet/nant/Manifest b/dev-dotnet/nant/Manifest
index 7366097578a4..e54981c0e0f9 100644
--- a/dev-dotnet/nant/Manifest
+++ b/dev-dotnet/nant/Manifest
@@ -2,15 +2,19 @@ AUX nant-0.85-obselencense.patch 539 RMD160 4872803ea618b61791a06254d2943af6462d
 MD5 34040c181c36599771589c3d48656dfa files/nant-0.85-obselencense.patch 539
 RMD160 4872803ea618b61791a06254d2943af6462dedf3 files/nant-0.85-obselencense.patch 539
 SHA256 c6432193a58d306fc4c479722947326d034b92c7ab3cd4973638e7be097dec52 files/nant-0.85-obselencense.patch 539
+AUX nant-0.85-threadingfix.patch 747 RMD160 5e2451e746667624f15f7f8f26769b18edd13d62 SHA1 669d6996ae9bd3f6be7d8a811ac97d649e91d480 SHA256 cd96b94a96e4a0d53a984c4af7f8417a4d91d7879c8f4ad04ce580560591cf74
+MD5 fc370ee1fb333e61c56586c215843580 files/nant-0.85-threadingfix.patch 747
+RMD160 5e2451e746667624f15f7f8f26769b18edd13d62 files/nant-0.85-threadingfix.patch 747
+SHA256 cd96b94a96e4a0d53a984c4af7f8417a4d91d7879c8f4ad04ce580560591cf74 files/nant-0.85-threadingfix.patch 747
 DIST nant-0.85-src.tar.gz 2130856 RMD160 0d69f4f49305fecbd17c4b6e9cdc29a0bc5cc8fd SHA1 df97d7b542a4e561c37a0804bb8a159803cc05cd SHA256 f50fbcba5ea3819ecafab9631c8937460e2b8b04d65c435c71fef7220c5cfc7d
-EBUILD nant-0.85.ebuild 1431 RMD160 cddbcfc2bf614dc1eae1362b9a5b654fefb4c314 SHA1 edc56fb94f8e97a9cd41ab6ee0f97c99681d55be SHA256 344f8e47189844bdb8753626d48acf1c330f6d77dea2b1de71544ab7a21d1e5d
-MD5 b9c002077b52b3ffc79c75393014e680 nant-0.85.ebuild 1431
-RMD160 cddbcfc2bf614dc1eae1362b9a5b654fefb4c314 nant-0.85.ebuild 1431
-SHA256 344f8e47189844bdb8753626d48acf1c330f6d77dea2b1de71544ab7a21d1e5d nant-0.85.ebuild 1431
-MISC ChangeLog 2821 RMD160 bfdebfd9628d88cef887111eefc7c7559a2d83b4 SHA1 154bc9e55110dc22521c18cf37af8105bd777339 SHA256 be6952a179c811fee705143d0b8e34603e822692af7c2247de129ffb4b57fd4c
-MD5 ab604fe4b8149a0b187a795dc0772b1b ChangeLog 2821
-RMD160 bfdebfd9628d88cef887111eefc7c7559a2d83b4 ChangeLog 2821
-SHA256 be6952a179c811fee705143d0b8e34603e822692af7c2247de129ffb4b57fd4c ChangeLog 2821
+EBUILD nant-0.85.ebuild 1567 RMD160 663eb37ad41e8d115b8fea985ddbde3470ebfddf SHA1 b9db94c9eddabe58098d5ea5fd525d43855583a8 SHA256 7b3980c7f1124f1d04cbd5f939ffaa74f89f74fdcf5b3d7313d02212fdd40bda
+MD5 708f4e4c7fa3a17a042adb7738f9301f nant-0.85.ebuild 1567
+RMD160 663eb37ad41e8d115b8fea985ddbde3470ebfddf nant-0.85.ebuild 1567
+SHA256 7b3980c7f1124f1d04cbd5f939ffaa74f89f74fdcf5b3d7313d02212fdd40bda nant-0.85.ebuild 1567
+MISC ChangeLog 2965 RMD160 7a68a005b2e8e409a015c5499efc1beb9675d5f6 SHA1 c8fdc8878e7934c8af57db388eb8cb3b3e0511d3 SHA256 d5e03cc11a729c4b16e5ec0f31be10740ed7d8c9aa994ac33c86dee92f5b6b58
+MD5 8f0740236f3a3a6b3532f8e1d88f23eb ChangeLog 2965
+RMD160 7a68a005b2e8e409a015c5499efc1beb9675d5f6 ChangeLog 2965
+SHA256 d5e03cc11a729c4b16e5ec0f31be10740ed7d8c9aa994ac33c86dee92f5b6b58 ChangeLog 2965
 MISC metadata.xml 256 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 SHA1 00c387ede4fbb9e5419d2c09b551635800512439 SHA256 c213280db6f2ba60c0bdfdcd476b3082ad6aab28cfb51143ae486c67b158b695
 MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 metadata.xml 256
diff --git a/dev-dotnet/nant/files/nant-0.85-threadingfix.patch b/dev-dotnet/nant/files/nant-0.85-threadingfix.patch
new file mode 100644
index 000000000000..7e91abaa2b8c
--- /dev/null
+++ b/dev-dotnet/nant/files/nant-0.85-threadingfix.patch
@@ -0,0 +1,22 @@
+--- src/NAnt.Core/Tasks/ExternalProgramBase.cs	2005-04-04 14:08:28.000000000 +0200
++++ src/NAnt.Core/Tasks/ExternalProgramBase.cs.new	2007-12-31 17:28:09.000000000 +0100
+@@ -452,7 +452,8 @@
+                     }

+                 }

+             }

+-            OutputWriter.Flush();

++	    lock (_lockObject)

++	        OutputWriter.Flush();

+         }

+ 
        /// <summary>
        /// Reads from the stream until the external program is ended.
        /// </summary>

+         private void StreamReaderThread_Error() {

+@@ -476,7 +477,8 @@
+                     }

+                 }

+             }

+-            ErrorWriter.Flush();

++	    lock (_lockObject)

++                ErrorWriter.Flush();

+         }

+ 

+         /// <summary>

diff --git a/dev-dotnet/nant/nant-0.85.ebuild b/dev-dotnet/nant/nant-0.85.ebuild
index 5c00e1a03385..1648c094658b 100644
--- a/dev-dotnet/nant/nant-0.85.ebuild
+++ b/dev-dotnet/nant/nant-0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/nant-0.85.ebuild,v 1.7 2007/08/11 04:19:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/nant-0.85.ebuild,v 1.8 2007/12/31 16:32:28 jurek Exp $
 
 inherit mono eutils
 
@@ -21,19 +21,22 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix a problem with duplicate building caused by the doc= target
-	for file in $(find ${S}/src -name '*.build') ; do
+	for file in $(find "${S}"/src -name '*.build') ; do
 		sed -i "s: doc=.*>:>:" ${file}
 	done
 
 	# Build against the .NET 2.0 Framework, as it is backwards compatible
 	sed -i -e "s/-f:NAnt.build/-t:mono-2.0 -f:NAnt.build/" \
-		${S}/Makefile || die "sed failed"
+		"${S}"/Makefile || die "sed failed"
+
+	# Patch to prevent build from failing due to threading issues (see bug #199748)
+	epatch "${FILESDIR}"/${P}-threadingfix.patch
 
 	# Patch to allow building on current mono releases
-	epatch ${FILESDIR}/${PN}-0.85-obselencense.patch
+	epatch "${FILESDIR}"/${PN}-0.85-obselencense.patch
 }
 
 src_compile() {
@@ -53,7 +56,7 @@ src_install() {
 	sed -i \
 		-e "s:${D}::" \
 		-e "2iexport MONO_SILENT_WARNING=1" \
-		${D}/usr/bin/nant
+		"${D}"/usr/bin/nant
 
 	dodoc README.txt
 }