Add a compilation fix on newer mono versions (bug #146131), and remove one older version.

Package-Manager: portage-2.1.1_rc1-r2

3 files changed, 16 insertions, 76 deletions

diff --git a/dev-dotnet/nant/Manifest b/dev-dotnet/nant/Manifest
index 6d5eae2bd194..e5df8c1a32a8 100644
--- a/dev-dotnet/nant/Manifest
+++ b/dev-dotnet/nant/Manifest
@@ -10,35 +10,31 @@ AUX nant-0.85-rc3-mono-1.1.7-compat.diff 10113 RMD160 8cb8465f5e25465f4d154b3e6f
 MD5 54217cd904b8abdea6d05a48091ceda5 files/nant-0.85-rc3-mono-1.1.7-compat.diff 10113
 RMD160 8cb8465f5e25465f4d154b3e6f80088046a7c0cb files/nant-0.85-rc3-mono-1.1.7-compat.diff 10113
 SHA256 eef726862f4e7071660ead16bb58b3854d1f60780f5ef515d1d73dc2e1bd67b6 files/nant-0.85-rc3-mono-1.1.7-compat.diff 10113
-DIST nant-0.85-nightly-2005-12-13-src.tar.gz 2014018
-DIST nant-0.85-rc2-src.tar.gz 2096197
+AUX nant-0.85_rc3-assignfix.diff 716 RMD160 523b6ed827e37bb2a503ccc883196cc6199bd9cc SHA1 b0ec65e55fff56dc6cfc2819b561df02e2669fa2 SHA256 fde441cbc232c6b8d5fe2936e31c63a29df00dd7d085540cbcefa8a087c4a3c0
+MD5 85b55f3d55802392166e5b6d00f6f8fd files/nant-0.85_rc3-assignfix.diff 716
+RMD160 523b6ed827e37bb2a503ccc883196cc6199bd9cc files/nant-0.85_rc3-assignfix.diff 716
+SHA256 fde441cbc232c6b8d5fe2936e31c63a29df00dd7d085540cbcefa8a087c4a3c0 files/nant-0.85_rc3-assignfix.diff 716
+DIST nant-0.85-nightly-2005-12-13-src.tar.gz 2014018 RMD160 05e77e6ac44f239aecd75e795328c5865ba68c87 SHA1 bad0110e6064b408177aa3f277b07413a5a8d6c1 SHA256 ee048c3e9d2e6a5f93b832b3b5886a4cb9991f805ad0c82d090d5fa0824e42de
 DIST nant-0.85-rc3-src.tar.gz 1965686
-EBUILD nant-0.85_rc2.ebuild 1295 RMD160 55abea83509e2a5044bee07a84d683c97a31991c SHA1 84110aad343a939f50259187cae3020a7ddca605 SHA256 258fe3d1c4b3d0db573fe90b58190ac277e0c4b59b50c6b6a8fbbf0641774943
-MD5 74a1e8f3568cb14518f0e4d017f45fa1 nant-0.85_rc2.ebuild 1295
-RMD160 55abea83509e2a5044bee07a84d683c97a31991c nant-0.85_rc2.ebuild 1295
-SHA256 258fe3d1c4b3d0db573fe90b58190ac277e0c4b59b50c6b6a8fbbf0641774943 nant-0.85_rc2.ebuild 1295
-EBUILD nant-0.85_rc3-r1.ebuild 1314 RMD160 78a68c66d988ddea7fbb05d0800afba66a7fc676 SHA1 8c1057f5002bc59375746e895de0b4d191f15a93 SHA256 fbb4bc1835e124e8f402d6d6e9a1962babb7dd9c76a68d45a429bdc44c63da40
-MD5 7ebb716d33637e91bba96f205de2baf8 nant-0.85_rc3-r1.ebuild 1314
-RMD160 78a68c66d988ddea7fbb05d0800afba66a7fc676 nant-0.85_rc3-r1.ebuild 1314
-SHA256 fbb4bc1835e124e8f402d6d6e9a1962babb7dd9c76a68d45a429bdc44c63da40 nant-0.85_rc3-r1.ebuild 1314
+EBUILD nant-0.85_rc3-r1.ebuild 1355 RMD160 f6d866847f0ecaeea28d516b84f0727fd0f68cf1 SHA1 168a3623d48d26b9efb9c8ebebfb40b5c2577e29 SHA256 12bb249389d9c60088c30d81e55af88b946d2c996b6ba6d4df8b2909c5d866b1
+MD5 861a185dfd1163ee0e71b73a94f69130 nant-0.85_rc3-r1.ebuild 1355
+RMD160 f6d866847f0ecaeea28d516b84f0727fd0f68cf1 nant-0.85_rc3-r1.ebuild 1355
+SHA256 12bb249389d9c60088c30d81e55af88b946d2c996b6ba6d4df8b2909c5d866b1 nant-0.85_rc3-r1.ebuild 1355
 EBUILD nant-0.85_rc3.ebuild 2117 RMD160 8235822f4410a8847c9d98d353ae5819143e70ee SHA1 5fe19902bd40549725a97b4724ecb88c4554ee99 SHA256 d992087c22d7324f3bfb31b87781965e03718b017752dfae79c20cad1c4da5cb
 MD5 0fc2eac083bd930f2ab6a71ef74622df nant-0.85_rc3.ebuild 2117
 RMD160 8235822f4410a8847c9d98d353ae5819143e70ee nant-0.85_rc3.ebuild 2117
 SHA256 d992087c22d7324f3bfb31b87781965e03718b017752dfae79c20cad1c4da5cb nant-0.85_rc3.ebuild 2117
-MISC ChangeLog 1368 RMD160 da97544cb979529648b36bfa57038e846dae146c SHA1 ea2a7088478ec39286129b426bc8c8ee6db13a6d SHA256 cf747b2ec0a7ae6366a6672347ca61bd06f5b7739b45b860c133806d0c376be8
-MD5 50d44f7ff73fc96d847a4cbe88405a67 ChangeLog 1368
-RMD160 da97544cb979529648b36bfa57038e846dae146c ChangeLog 1368
-SHA256 cf747b2ec0a7ae6366a6672347ca61bd06f5b7739b45b860c133806d0c376be8 ChangeLog 1368
+MISC ChangeLog 1603 RMD160 9602c6414c443898be8112fce4098a9662400e89 SHA1 c0f2a760f7322f6f0fe7e3fb89db8dfad9368d47 SHA256 dd51faf7ef2fd837a171ca8fce7dc60c176a5009823c0672ab28b77c64cd107a
+MD5 24d30637f54ab20267b957d8cd0a7717 ChangeLog 1603
+RMD160 9602c6414c443898be8112fce4098a9662400e89 ChangeLog 1603
+SHA256 dd51faf7ef2fd837a171ca8fce7dc60c176a5009823c0672ab28b77c64cd107a ChangeLog 1603
 MISC metadata.xml 256 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 SHA1 00c387ede4fbb9e5419d2c09b551635800512439 SHA256 c213280db6f2ba60c0bdfdcd476b3082ad6aab28cfb51143ae486c67b158b695
 MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
 RMD160 4cb2d79fd66bacbe8aebed5aa03cde0153a0eb11 metadata.xml 256
 SHA256 c213280db6f2ba60c0bdfdcd476b3082ad6aab28cfb51143ae486c67b158b695 metadata.xml 256
-MD5 4780780090572267e1371fd5386b2788 files/digest-nant-0.85_rc2 70
-RMD160 6a5e2a960212e3181111ee3fdc313c6995d69ea4 files/digest-nant-0.85_rc2 70
-SHA256 ccbd3e52a29aabf03548d78f5c1743fefe7e331cdea6e81569b086d8385fe625 files/digest-nant-0.85_rc2 70
 MD5 7127397acee3d62be717b2255c167009 files/digest-nant-0.85_rc3 70
 RMD160 6a4907eece8f2c1dddbd56d2358476305a32fa50 files/digest-nant-0.85_rc3 70
 SHA256 a4ccfbb5b96a69cc8f8cce185300911b21c0ed89424d286aa8d1b4920fece781 files/digest-nant-0.85_rc3 70
-MD5 3b951526eb9d77edcab4c88bcbb2bbff files/digest-nant-0.85_rc3-r1 85
-RMD160 cce3a40b6e97d9dfa7878884667ecbd9f8f411e5 files/digest-nant-0.85_rc3-r1 85
-SHA256 90c36f345a2fb1d76fce8c2ce172e5c5d16afe51add1b8ec276b02e264fcd5f9 files/digest-nant-0.85_rc3-r1 85
+MD5 0c39387b1d8278bf29599df4865e3697 files/digest-nant-0.85_rc3-r1 301
+RMD160 17feabf24ef1a7fbe3db2cd6a3063e1b2801a208 files/digest-nant-0.85_rc3-r1 301
+SHA256 3d311e7efac8fc30b5eab8c4ca9e87583dc59e5501480394c62606b9bb0280a8 files/digest-nant-0.85_rc3-r1 301
diff --git a/dev-dotnet/nant/files/digest-nant-0.85_rc2 b/dev-dotnet/nant/files/digest-nant-0.85_rc2
deleted file mode 100644
index fbfc20e8889d..000000000000
--- a/dev-dotnet/nant/files/digest-nant-0.85_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1df647ea1f1fcf6c6f176a73ec2b760 nant-0.85-rc2-src.tar.gz 2096197
diff --git a/dev-dotnet/nant/nant-0.85_rc2.ebuild b/dev-dotnet/nant/nant-0.85_rc2.ebuild
deleted file mode 100644
index 26d7322c42f9..000000000000
--- a/dev-dotnet/nant/nant-0.85_rc2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/nant-0.85_rc2.ebuild,v 1.1 2005/03/16 18:52:38 latexer Exp $
-
-inherit mono eutils
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION=".NET build tool"
-HOMEPAGE="http://nant.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lang/mono"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${MY_P}-is-unix.diff || die
-	epatch ${FILESDIR}/${MY_P}-profile.diff || die
-
-	# Fix a problem with duplicate building caused by the doc= target
-	for file in $(find ${S}/src -name '*.build')
-	do
-		sed -i "s: doc=.*>:>:" \
-			${file}
-	done
-
-	# Problem with is-unix() on mono-1.1.x where the platform is detected
-	# as !is-unix().
-	sed -i -e "s:install-windows, install-linux:install-linux:" \
-		-e 's:if.*is-unix()}\"::' \
-		${S}/NAnt.build
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-	# Fix ${D} showing up in the nant wrapper script, as well as silencing
-	# warnings related to the log4net library
-	sed -i \
-		-e "s:${D}::" \
-		-e "2iexport MONO_SILENT_WARNING=1" \
-		${D}/usr/bin/nant
-	dodoc README.txt
-}