Remove old.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

7 files changed, 7 insertions, 316 deletions

diff --git a/dev-dotnet/nant/ChangeLog b/dev-dotnet/nant/ChangeLog
index b035bab9d65b..e414fc93319a 100644
--- a/dev-dotnet/nant/ChangeLog
+++ b/dev-dotnet/nant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/nant
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.32 2011/01/13 20:07:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.33 2011/01/25 21:07:54 pacho Exp $
+
+  25 Jan 2011; Pacho Ramos <pacho@gentoo.org> -nant-0.86_beta1.ebuild,
+  -files/nant-0.86_beta1-build.patch, -files/nant-0.86_beta1-dropnunit1.patch,
+  -files/nant-0.86_beta1-nunit-2.4.8.patch,
+  -files/nant-0.86_beta1-refmono-nunit.patch, metadata.xml:
+  Remove old.
 
   13 Jan 2011; Brent Baude <ranger@gentoo.org> nant-0.86_beta1-r1.ebuild:
   stable ppc, bug 344333
diff --git a/dev-dotnet/nant/files/nant-0.86_beta1-build.patch b/dev-dotnet/nant/files/nant-0.86_beta1-build.patch
deleted file mode 100644
index 908bcae7ebb5..000000000000
--- a/dev-dotnet/nant/files/nant-0.86_beta1-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nant-0.85-rc4/NAnt.build	2006-06-02 20:07:52.000000000 +0100
-+++ nant-0.85-rc4/NAnt-new.build	2006-09-16 00:56:44.000000000 +0100
-@@ -807,13 +807,14 @@
-     </target>
-     
-     <target name="install-linux" depends="build" if="${platform::is-unix()}">
--        <property name="install.realprefix" value="/usr/local" />
-+        <property name="install.realprefix" value="/usr" />
-         <if test="${property::exists('install.prefix') and string::get-length(install.prefix) != 0}">
-             <property name="install.realprefix" value="${install.prefix}" />
-         </if>
-         <property name="install.bindir" value="${path::combine(install.realprefix, 'bin')}"/>
--        <property name="install.share" value="${path::combine(install.realprefix, 'share')}"/>
--        <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/>
-+	<property name="install.libdir" value="${path::combine(install.realprefix, '@LIB@')}"/>
-+        <property name="install.share" value="${path::combine(install.realprefix, '@LIB@')}"/>
-+        <property name="install.copylocation" value="${path::combine(install.libdir, 'NAnt')}"/>
-         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
-         <echo message="Installing NAnt to '${install.copylocation}' ..." />
-         
diff --git a/dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch b/dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch
deleted file mode 100644
index 8f823c6d975b..000000000000
--- a/dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -NrU5 nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build
---- nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build	2009-05-03 16:38:14.000000000 +0200
-+++ nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build	2009-05-03 16:39:16.000000000 +0200
-@@ -18,34 +18,10 @@
-             <references>
-                 <include name="${build.dir}/bin/NAnt.Core.dll" />
-                 <include name="${lib.framework.dir}/nunit.framework.dll" />
-             </references>
-         </csc>
--        <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit1Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit1Tasks.xml">
--            <nowarn>
--                <!-- do not report warnings for missing XML comments -->
--                <warning number="1591" />
--                 <!-- workaround for Mono bug #61902: do not report deprecation warnings -->
--                <warning number="0618" if="${framework::get-family(framework::get-target-framework()) == 'mono'}" />
--            </nowarn>
--            <sources>
--                <include name="NUnit1/**/*.cs"/>
--                <!-- common assembly-level attributes -->
--                <include name="../CommonAssemblyInfo.cs" />
--            </sources>
--            <references>
--                <!-- temporary workaround for Mono Runtime bug #57602 -->
--                <include name="${lib.framework.dir}/log4net.dll" />
--                <!-- end workaround -->
--                <include name="${build.dir}/bin/NAnt.Core.dll" />
--                <include name="${build.dir}/bin/NAnt.NUnit.dll" />
--                <include name="${lib.dir}/common/neutral/NUnitCore.dll" />
--            </references>
--            <resources>
--                <include name="*.resx"/>
--            </resources>
--        </csc>
-         <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit2Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit2Tasks.xml">
-             <nowarn>
-                 <!-- do not report deprecation warnings -->
-                 <warning number="0618" />
-             </nowarn>
diff --git a/dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch b/dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch
deleted file mode 100644
index f1e50120b279..000000000000
--- a/dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_nunit_2.4.dpatch by Jelmer Vernooij <jelmer@samba.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update NUnit task to work with NUnit 2.4.7
-
-@DPATCH@
-diff -ur nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs
---- nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs	2006-04-23 19:53:12.000000000 +0200
-+++ nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs	2008-06-14 16:50:35.000000000 +0200
-@@ -31,6 +31,7 @@
- using System.Xml.XPath;

- 

- using NUnit.Core;

-+using NUnit.Core.Filters;

- using TestCase = NUnit.Core.TestCase;

- using TestOutput = NUnit.Core.TestOutput;

- using NUnit.Framework;

-@@ -185,16 +186,16 @@
-             EventListener listener = new EventCollector(logWriter, logWriter);

- 

-             foreach (NUnit2Test testElement in Tests) {

--                IFilter categoryFilter = null;

-+                ITestFilter categoryFilter = null;

- 

-                 // include or exclude specific categories

-                 string categories = testElement.Categories.Includes.ToString();

-                 if (!StringUtils.IsNullOrEmpty(categories)) {

--                    categoryFilter = new CategoryFilter(categories.Split(','), false);

-+                    categoryFilter = new CategoryFilter(categories.Split(','));

-                 } else {

-                     categories = testElement.Categories.Excludes.ToString();

-                     if (!StringUtils.IsNullOrEmpty(categories)) {

--                        categoryFilter = new CategoryFilter(categories.Split(','), true);

-+                        categoryFilter = new NotFilter(new CategoryFilter(categories.Split(',')));

-                     }

-                 }

- 

-@@ -203,27 +204,22 @@
- 

-                     try {

-                         TestRunner runner = domain.CreateRunner(new FileInfo(testAssembly), testElement.AppConfigFile);

-+						TestPackage package = new TestPackage(testAssembly);

- 

--                        Test test = null;

--                        if (testElement.TestName != null) {

--                            test = runner.Load(testAssembly, testElement.TestName);

--                        } else {

--                            test = runner.Load(testAssembly);

--                        }

--

--                        if (test == null) {

-+						bool test = runner.Load(package);

-+                        if (!test) {

-                             Log(Level.Warning, "Assembly \"{0}\" contains no tests.",

-                                 testAssembly);

-                             continue;

-                         }

- 

--                        // set category filter

--                        if (categoryFilter != null) {

--                            runner.Filter = categoryFilter;

--                        }

--

-+						TestResult result;

-                         // run test

--                        TestResult result = runner.Run(listener);

-+						if (categoryFilter != null) {

-+							result = runner.Run(listener, categoryFilter);

-+						} else {

-+							result = runner.Run(listener);

-+						}

- 

-                         // flush test output to log

-                         logWriter.Flush();

-@@ -371,7 +367,7 @@
-         

-         #endregion Private Instance Methods

- 

--        private class EventCollector : LongLivingMarshalByRefObject, EventListener {

-+        private class EventCollector : MarshalByRefObject, EventListener {

-             private TextWriter outWriter;

-             private TextWriter errorWriter;

-             private string currentTestName;

-@@ -382,10 +378,10 @@
-                 this.currentTestName = string.Empty;

-              }

- 

--            public void RunStarted(Test[] tests) {

-+            public void RunStarted(string name, int testcount) {

-             }

- 

--            public void RunFinished(TestResult[] results) {

-+            public void RunFinished(TestResult result) {

-             }

- 

-             public void RunFinished(Exception exception) {

-@@ -395,11 +391,11 @@
-                 currentTestName = string.Empty;

-             }

- 

--            public void TestStarted(TestCase testCase) {

--                currentTestName = testCase.FullName;

-+            public void TestStarted(TestName testName) {

-+                currentTestName = testName.FullName;

-             }

- 

--            public void SuiteStarted(TestSuite suite) {

-+            public void SuiteStarted(TestName testName) {

-             }

- 

-             public void SuiteFinished(TestSuiteResult suiteResult) {

-@@ -423,4 +419,4 @@
-             }

-         }

-     }

--}
-\ Kein Zeilenumbruch am Dateiende.
-+}

diff --git a/dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch b/dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch
deleted file mode 100644
index 27e5ee56b2a2..000000000000
--- a/dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -NrU5 nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build
---- nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build	2009-05-03 17:04:46.000000000 +0200
-+++ nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build	2009-05-03 17:05:03.000000000 +0200
-@@ -15,12 +15,14 @@
-                 <!-- common assembly-level attributes -->
-                 <include name="../CommonAssemblyInfo.cs" />
-             </sources>
-             <references>
-                 <include name="${build.dir}/bin/NAnt.Core.dll" />
--                <include name="${lib.framework.dir}/nunit.framework.dll" />
-             </references>
-+	    <pkg-references>
-+	        <package name="mono-nunit"/>
-+	    </pkg-references>
-         </csc>
-         <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit2Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit2Tasks.xml">
-             <nowarn>
-                 <!-- do not report deprecation warnings -->
-                 <warning number="0618" />
-@@ -36,12 +38,12 @@
-                 <include name="${lib.framework.dir}/NDoc.Core.dll" />
-                 <!-- end workaround -->
-                 <include name="${build.dir}/bin/NAnt.Core.dll" />
-                 <include name="${build.dir}/bin/NAnt.NUnit.dll" />
-                 <include name="${build.dir}/bin/NAnt.DotNetTasks.dll" />
--                <include name="${lib.framework.dir}/nunit.framework.dll" />
--                <include name="${lib.framework.dir}/nunit.core.dll" />
--                <include name="${lib.framework.dir}/nunit.util.dll" />
-             </references>
-+	    <pkg-references>
-+	        <package name="mono-nunit"/>
-+	    </pkg-references>
-         </csc>
-     </target>
- </project>
diff --git a/dev-dotnet/nant/metadata.xml b/dev-dotnet/nant/metadata.xml
index 5c82bcf2c18c..e01adbb307db 100644
--- a/dev-dotnet/nant/metadata.xml
+++ b/dev-dotnet/nant/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dotnet</herd>
-	<use>
-		<flag name='bootstrap'>Bootstrap nant by using pre-built ndoc binaries.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-dotnet/nant/nant-0.86_beta1.ebuild b/dev-dotnet/nant/nant-0.86_beta1.ebuild
deleted file mode 100644
index 3c2760726d20..000000000000
--- a/dev-dotnet/nant/nant-0.86_beta1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/nant-0.86_beta1.ebuild,v 1.5 2009/09/27 17:08:01 nixnut Exp $
-
-EAPI=2
-
-inherit mono multilib eutils
-
-DESCRIPTION=".NET build tool"
-HOMEPAGE="http://nant.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nant/${P/_/-}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+bootstrap"
-
-RDEPEND="
-	bootstrap? (
-		>=dev-lang/mono-2.0
-	)
-	!bootstrap? (
-		>=dev-dotnet/ndoc-1.3.1-r3
-		>=dev-lang/mono-2.4
-	)
-	"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-# This build is not parallel build friendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-	if use bootstrap && has_version '>=dev-dotnet/ndoc-1.3.1-r3' && has_version '>=dev-lang/mono-2.4'
-	then
-		elog "USE=bootstrap is set. Bootstrapping is required on first install of"
-		elog "${CATEGORY}/${PN} and is set to on by default to not break up"
-		elog "the dependency graph, since USE=-bootstrap requires:"
-		elog ">=dev-lang/mono-2.4"
-		elog ">=dev-dotnet/ndoc-1.3.1-r3"
-		elog "Which would cause a circular dependency between ${CATEGORY}/${PN} and"
-		elog "dev-dotnet/ndoc."
-		elog "You have both installed, so you can set USE=-bootstrap and re-emerge:"
-		elog "echo '${CATEGORY}/${PN} -bootstrap' >> /etc/portage/package.use"
-		elog "emerge -1 =${CATEGORY}/${PF}"
-	fi
-}
-src_prepare() {
-	if ! use bootstrap
-	then
-		edos2unix NAnt.build src/NAnt.NUnit/NAnt.NUnit.build
-		sed -e "s:@LIB@:$(get_libdir):" "${FILESDIR}/${P}-build.patch" \
-			> "${WORKDIR}/${P}-build.patch"
-		epatch "${WORKDIR}/${P}-build.patch"
-		epatch "${FILESDIR}/${P}-dropnunit1.patch"
-		epatch "${FILESDIR}/${P}-nunit-2.4.8.patch"
-		epatch "${FILESDIR}/${P}-refmono-nunit.patch"
-
-		rm -rf lib/common/neutral/NUnitCore.dll
-
-		for file in lib/mono/*/nunit*.dll
-		do
-			echo $file
-			mono_file=${file#lib/}
-			rm -f $file
-			ln -s "/usr/$(get_libdir)/${mono_file}" "$file" || die
-		done
-
-		for file in lib/mono/*/NDoc*.dll
-		do
-			echo $file
-			mono_file=${file#lib/mono/*/}
-			rm -f $file
-			ln -s "/usr/$(get_libdir)/mono/ndoc/${mono_file}" "$file" || die
-		done
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}/usr" install || die "install failed"
-
-	# 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 || die "Sed nant failed"
-
-	dodoc README.txt
-	if ! use bootstrap
-	then
-		rm -rf "${D}"/usr/$(get_libdir)/NAnt/bin/lib/{mono,net}
-	fi
-}