From 59850052e0c5da3b27cd47686e1c77f3a9ff302e Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <djc@gentoo.org>
Date: Sun, 2 May 2010 11:41:08 +0000
Subject: [PATCH] Remove unused patches. Package-Manager:
 portage-2.1.8.3/cvs/Linux x86_64

---
 dev-lang/scala/ChangeLog                      |  6 +-
 dev-lang/scala/Manifest                       | 14 +---
 .../scala/files/scala-2.6.0-build.xml.patch   | 79 -------------------
 .../scala/files/scala-2.6.1-build.xml.patch   | 79 -------------------
 4 files changed, 6 insertions(+), 172 deletions(-)
 delete mode 100644 dev-lang/scala/files/scala-2.6.0-build.xml.patch
 delete mode 100644 dev-lang/scala/files/scala-2.6.1-build.xml.patch

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index a52ef039fea7..c9d5c37efb87 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.19 2010/01/09 14:29:08 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.20 2010/05/02 11:41:07 djc Exp $
+
+  02 May 2010; Dirkjan Ochtman <djc@gentoo.org>
+  -files/scala-2.6.0-build.xml.patch, -files/scala-2.6.1-build.xml.patch:
+  Remove unused patches.
 
   09 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> scala-2.7.7.ebuild:
   Split compiling to multiple ant invocations to lower resources needed to
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 58cce3b9cf77..0edb2f6e8121 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,8 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX scala-2.6.0-build.xml.patch 2964 RMD160 481e726ad79546bc42d929f4c647f8ee28b32a1a SHA1 7c4364306da9ffaee8dfadb455e60e30d53cf553 SHA256 70a4de1065377003c48ecf8a4ea78a61ddc54dad7f8d05f49f30361b7032ca70
-AUX scala-2.6.1-build.xml.patch 2979 RMD160 2802d77c5ee835aa5f39e09f48ffc6a19f676686 SHA1 05b9ba1bd5b5311a10bc84f8825eeb207a864b94 SHA256 09182f2d72a225a098d560aa3853b05a8e58aef12dad414b1a133f134a0efab6
 AUX scala-2.7.3-build.xml.patch 417 RMD160 825678486a85872c365349c04f6fc104f894656c SHA1 2a253c198543b9bbfab58aa9ccad77ba511c97bf SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211
 DIST scala-2.7.2-gentoo-binary.tar.bz2 12691171 RMD160 47f663b0916cb0ddb2e4626c38ed199ab9826833 SHA1 15b86b3a581250dbd1e255f347bde06d328bf412 SHA256 28a6db309f17bb30e6fe2d494872266eea643cf037235fa2dc2bb184be86686e
 DIST scala-2.7.2.final-sources.tgz 26906402 RMD160 2ead1c774c08d64d6ab6280278faf5f65fa269af SHA1 3d792210adaa1ebbb0c2c6b74bb3eb7dc32a2311 SHA256 46d1d3d58b7f2a4c0547a1dde53f099d0169072c3db491ebb9e3992aada7bb56
@@ -21,12 +16,5 @@ EBUILD scala-2.7.4-r1.ebuild 3180 RMD160 d665788a889d5ef288c9e09d8e63c457fe477b1
 EBUILD scala-2.7.4.ebuild 3296 RMD160 87f09f17c82a206cd180c6133963b4b23bd65767 SHA1 612ed29f4c8634492b24d1ca038127b854d8650b SHA256 0dc8c0bc6d60feae0148d08a93c845655f79267bf7d6acd8afc017a2acb6ba31
 EBUILD scala-2.7.5.ebuild 3160 RMD160 e67be38e5221d07be347976a57b57d1916ccc6e4 SHA1 5c5f14d39eb4bbab2cd2999d567d05ed7a1a84de SHA256 e778a21c3e06da4be77ef3c9f1a6c70c70e5fb84b2d64481b759d7dfb1c9858e
 EBUILD scala-2.7.7.ebuild 3300 RMD160 7663fe14a0aa5dcb2019f4c475c5a1b385f6ea3d SHA1 88ebb6f1a17c24c9130277de36a0974b616a5341 SHA256 4afd32daf623e541e71f8ffd033cafa5522a03a0e6c7e313415963afe7615d7d
-MISC ChangeLog 3552 RMD160 8f13d464439a8452f507035dbf627d04cfdc45ae SHA1 9d0d3726a731f53d90196e691c682343ce6296cd SHA256 21ab6703231cd364318081713d52ec7a9c43d471495bfe7f23078aa30a625e75
+MISC ChangeLog 3693 RMD160 9f7acfdb16f9418e27c780143897ea711294776c SHA1 483c43be7f99e1b60559ea4c9e22c71882de0fa9 SHA256 348fcf3b81daad8723328028dd7dd91eb1501b07c194e25ac7e01a9346d6a685
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktIkrkACgkQcxLzpIGCsLTdCQCcCgt8ogTUzhX6ac0y8jFGaxsh
-MRUAn1BTkYi3BxaN7os71HkZH32DYcyp
-=0WqW
------END PGP SIGNATURE-----
diff --git a/dev-lang/scala/files/scala-2.6.0-build.xml.patch b/dev-lang/scala/files/scala-2.6.0-build.xml.patch
deleted file mode 100644
index 67a225329d62..000000000000
--- a/dev-lang/scala/files/scala-2.6.0-build.xml.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- build.xml.orig	2007-12-17 12:05:42.000000000 -0500
-+++ build.xml	2007-12-17 12:07:34.000000000 -0500
-@@ -90,11 +90,13 @@
-   <!-- Setting-up Ant contrib tasks -->
-     <taskdef resource="net/sf/antcontrib/antlib.xml"
-              classpath="${ant-contrib.jar}"/>
-+      <!--
-     <fail message="External library ${ant-contrib.jar} requires the optional Ant tasks to be installed">
-       <condition><not><and>
-         <available file="${ant.home}/lib/ant-nodeps.jar"/>
-       </and></not></condition>
-     </fail>
-+      -->
-   </target>
- 
- <!-- ===========================================================================
-@@ -1052,7 +1054,7 @@
- DOCUMENTATION
- ============================================================================ -->
- 
--  <target name="docs" depends="setup.quick"
-+  <target name="docs" depends="setup.quick" if="do.docs"
-     description="Generated the API for library sources">
-     <mkdir dir="${api-lib.dir}"/>
-     <quickdoc
-@@ -1070,7 +1072,7 @@
-     </quickdoc>
-   </target>
- 
--  <target name="docs.compiler" depends="setup.quick"
-+  <target name="docs.compiler" depends="setup.quick" if="do.docs"
-     description="Generated the API for compiler sources">
-     <mkdir dir="${api-comp.dir}"/>
-     <quickdoc
-@@ -1155,7 +1157,7 @@
- 
-   <target name="dist.patch" depends="init">
-     <propertyfile file="${number.file}">
--      <entry key="version.patch" type="int" default="0" operation="+"/>
-+      <entry key="version.patch" type="int" default="0"/>
-     </propertyfile>
-     <property file="${number.file}"/>
-     <property name="version.number"
-@@ -1165,7 +1167,7 @@
- 
-   <target name="dist.minor" depends="init">
-     <propertyfile file="${number.file}">
--      <entry key="version.minor" type="int" default="0" operation="+"/>
-+      <entry key="version.minor" type="int" default="0"/>
-       <entry key="version.patch" type="int" value="0"/>
-     </propertyfile>
-     <property file="${number.file}"/>
-@@ -1339,7 +1341,7 @@
-     <copy todir="${dist.current.dir}/doc/scala">
-       <fileset dir="${docs.dir}" includes="README,LICENSE"/>
-     </copy>
--    <copy todir="${dist.current.dir}/doc/scala/api">
-+    <copy todir="${dist.current.dir}/doc/scala/api" failonerror="false">
-       <fileset dir="${api-lib.dir}"/>
-     </copy>
-     <copy todir="${dist.current.dir}/doc/scala/examples">
-@@ -1360,7 +1362,7 @@
-   </target>
- 
-   <!-- Create the SBaz packages -->
--  <target name="build.sbaz" depends="build.dist">
-+  <target name="build.sbaz" depends="build.dist" if="do.archive">
-     <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
-     <mkdir dir="${dist.dir}"/>
-   <!-- Create the Scala library package -->
-@@ -1426,7 +1428,7 @@
-     </quicksbaz>
-   </target>
- 
--  <target name="build.archive" depends="build.dist">
-+  <target name="build.archive" depends="build.dist" if="do.archive">
-     <tar
-       destfile="${dist.dir}/scala-${version.number}.tgz"
-       compression="gzip">
diff --git a/dev-lang/scala/files/scala-2.6.1-build.xml.patch b/dev-lang/scala/files/scala-2.6.1-build.xml.patch
deleted file mode 100644
index 9c5fd40a1501..000000000000
--- a/dev-lang/scala/files/scala-2.6.1-build.xml.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- build.xml	2007-12-19 14:34:43.000000000 +0100
-+++ build.xml	2008-01-20 18:00:33.000000000 +0100
-@@ -108,11 +108,13 @@
-   <!-- Setting-up Ant contrib tasks -->
-     <taskdef resource="net/sf/antcontrib/antlib.xml"
-              classpath="${ant-contrib.jar}"/>
-+      <!--
-     <fail message="External library ${ant-contrib.jar} requires the optional Ant tasks to be installed">
-       <condition><not><and>
-         <available file="${ant.home}/lib/ant-nodeps.jar"/>
-       </and></not></condition>
-     </fail>
-+      -->
-   </target>
- 
- <!-- ===========================================================================
-@@ -1410,7 +1412,7 @@
- DOCUMENTATION
- ============================================================================ -->
- 
--  <target name="docs" depends="setup.quick"
-+  <target name="docs" depends="setup.quick" if="do.docs"
-     description="Generated the API for library sources">
-     <mkdir dir="${api-lib.dir}"/>
-     <quickdoc
-@@ -1428,7 +1430,7 @@
-     </quickdoc>
-   </target>
- 
--  <target name="docs.compiler" depends="setup.quick"
-+  <target name="docs.compiler" depends="setup.quick" if="do.docs"
-     description="Generated the API for compiler sources">
-     <mkdir dir="${api-comp.dir}"/>
-     <quickdoc
-@@ -1513,7 +1515,7 @@
- 
-   <target name="dist.patch" depends="init">
-     <propertyfile file="${number.file}">
--      <entry key="version.patch" type="int" default="0" operation="+"/>
-+      <entry key="version.patch" type="int" default="0"/>
-     </propertyfile>
-     <property file="${number.file}"/>
-     <property name="version.number"
-@@ -1523,7 +1525,7 @@
- 
-   <target name="dist.minor" depends="init">
-     <propertyfile file="${number.file}">
--      <entry key="version.minor" type="int" default="0" operation="+"/>
-+      <entry key="version.minor" type="int" default="0"/>
-       <entry key="version.patch" type="int" value="0"/>
-     </propertyfile>
-     <property file="${number.file}"/>
-@@ -1729,7 +1731,7 @@
-     <copy todir="${dist.current.dir}/doc/scala">
-       <fileset dir="${docs.dir}" includes="README,LICENSE"/>
-     </copy>
--    <copy todir="${dist.current.dir}/doc/scala/api">
-+    <copy todir="${dist.current.dir}/doc/scala/api" failonerror="false">
-       <fileset dir="${api-lib.dir}"/>
-     </copy>
-     <copy todir="${dist.current.dir}/doc/scala/examples">
-@@ -1750,7 +1752,7 @@
-   </target>
- 
-   <!-- Create the SBaz packages -->
--  <target name="build.sbaz" depends="build.dist,msil,cldc,android">
-+  <target name="build.sbaz" depends="build.dist" if="do.archive">
-     <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
-     <mkdir dir="${dist.dir}"/>
-   <!-- Create the Scala library package -->
-@@ -1846,7 +1848,7 @@
-     </then></if>
-   </target>
- 
--  <target name="build.archive" depends="build.dist">
-+  <target name="build.archive" depends="build.dist" if="do.archive">
-     <tar
-       destfile="${dist.dir}/scala-${version.number}.tgz"
-       compression="gzip">
-- 
2.26.2